mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-01-19 20:24:49 +00:00
Merge pull request #1598 from Azaezel/profileCleanups
Some checks are pending
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Waiting to run
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Waiting to run
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Waiting to run
Some checks are pending
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Waiting to run
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Waiting to run
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Waiting to run
Profile cleanups
This commit is contained in:
commit
2ebd49a058
|
|
@ -1,284 +1,165 @@
|
|||
//--- OBJECT WRITE BEGIN ---
|
||||
$guiContent = new GuiContainer(DamageGuiOverlay) {
|
||||
isContainer = "1";
|
||||
Profile = "GuiContentProfile";
|
||||
HorizSizing = "relative";
|
||||
VertSizing = "relative";
|
||||
position = "0 0";
|
||||
Extent = "1024 768";
|
||||
MinExtent = "8 8";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
tooltipprofile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
$guiContent = new GuiContainer(damageGuiOverlay) {
|
||||
extent = "1280 720";
|
||||
minExtent = "8 8";
|
||||
horizSizing = "relative";
|
||||
vertSizing = "relative";
|
||||
profile = "GuiDefaultProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
canSaveDynamicFields = "1";
|
||||
Enabled = "1";
|
||||
enabled = "1";
|
||||
helpTag = "0";
|
||||
noCursor = "1";
|
||||
|
||||
new GuiShapeNameHud() {
|
||||
fillColor = "0 0 0 0.25";
|
||||
frameColor = "0 1 0 1";
|
||||
textColor = "0 1 0 1";
|
||||
showFill = "0";
|
||||
showFrame = "0";
|
||||
verticalOffset = "0.2";
|
||||
distanceFade = "0.1";
|
||||
isContainer = "0";
|
||||
Profile = "GuiModelessDialogProfile";
|
||||
HorizSizing = "width";
|
||||
VertSizing = "height";
|
||||
position = "0 0";
|
||||
Extent = "1024 768";
|
||||
MinExtent = "8 8";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
tooltipprofile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
canSaveDynamicFields = "0";
|
||||
extent = "1280 720";
|
||||
minExtent = "8 8";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
profile = "GuiModelessDialogProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
new GuiCrossHairHud(Reticle) {
|
||||
damageFillColor = "0 1 0 1";
|
||||
damageFrameColor = "1 0.6 0 1";
|
||||
damageRect = "50 4";
|
||||
damageOffset = "0 10";
|
||||
bitmapAsset = "FPSEquipment:blank_image";
|
||||
wrap = "0";
|
||||
isContainer = "0";
|
||||
Profile = "GuiModelessDialogProfile";
|
||||
HorizSizing = "center";
|
||||
VertSizing = "center";
|
||||
position = "496 368";
|
||||
Extent = "32 32";
|
||||
MinExtent = "8 8";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
tooltipprofile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
canSaveDynamicFields = "0";
|
||||
BitmapAsset = "FPSEquipment:crosshair_image";
|
||||
BitmapFile = "data/FPSEquipment/images/weaponHud/crossHair.png";
|
||||
position = "624 344";
|
||||
extent = "32 32";
|
||||
minExtent = "8 8";
|
||||
horizSizing = "center";
|
||||
vertSizing = "center";
|
||||
profile = "GuiModelessDialogProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
new GuiCrossHairHud(ZoomReticle) {
|
||||
damageFillColor = "0 1 0 1";
|
||||
damageFrameColor = "1 0.6 0 1";
|
||||
damageRect = "50 4";
|
||||
damageOffset = "0 10";
|
||||
bitmapAsset = "DamageModel:bino_image";
|
||||
wrap = "0";
|
||||
isContainer = "0";
|
||||
Profile = "GuiModelessDialogProfile";
|
||||
HorizSizing = "width";
|
||||
VertSizing = "height";
|
||||
position = "0 0";
|
||||
Extent = "1024 768";
|
||||
MinExtent = "8 8";
|
||||
canSave = "1";
|
||||
Visible = "0";
|
||||
tooltipprofile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
canSaveDynamicFields = "0";
|
||||
extent = "1280 720";
|
||||
minExtent = "8 8";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
profile = "GuiModelessDialogProfile";
|
||||
visible = "0";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hidden = "1";
|
||||
};
|
||||
new GuiBitmapBorderCtrl(WeaponHUD) {
|
||||
isContainer = "0";
|
||||
Profile = "ChatHudBorderProfile";
|
||||
HorizSizing = "right";
|
||||
VertSizing = "top";
|
||||
position = "78 693";
|
||||
Extent = "124 72";
|
||||
MinExtent = "8 8";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
tooltipprofile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
canSaveDynamicFields = "0";
|
||||
position = "78 645";
|
||||
extent = "124 72";
|
||||
minExtent = "8 8";
|
||||
vertSizing = "top";
|
||||
profile = "GuiModelessDialogProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
|
||||
new GuiBitmapCtrl() {
|
||||
bitmap = "UI:hudfill_image";
|
||||
wrap = "0";
|
||||
isContainer = "0";
|
||||
Profile = "GuiDefaultProfile";
|
||||
HorizSizing = "width";
|
||||
VertSizing = "height";
|
||||
position = "8 8";
|
||||
Extent = "108 56";
|
||||
MinExtent = "8 8";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
tooltipprofile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
canSaveDynamicFields = "0";
|
||||
position = "8 0";
|
||||
extent = "108 56";
|
||||
minExtent = "8 8";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
profile = "GuiModelessDialogProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
new GuiBitmapCtrl(PreviewImage) {
|
||||
bitmapAsset = "UI:hudfill_image";
|
||||
wrap = "0";
|
||||
isContainer = "0";
|
||||
Profile = "GuiDefaultProfile";
|
||||
HorizSizing = "width";
|
||||
VertSizing = "height";
|
||||
position = "8 8";
|
||||
Extent = "108 56";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
tooltipprofile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
canSaveDynamicFields = "0";
|
||||
new GuiBitmapCtrl(previewImage) {
|
||||
BitmapAsset = "FPSEquipment:ryder_image";
|
||||
BitmapFile = "data/FPSEquipment/images/weaponHud/ryder.png";
|
||||
position = "8 0";
|
||||
extent = "108 56";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
profile = "GuiModelessDialogProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
};
|
||||
new GuiTextCtrl(AmmoAmount) {
|
||||
Text = "Ammo: 8/80";
|
||||
maxLength = "255";
|
||||
Margin = "0 0 0 0";
|
||||
Padding = "0 0 0 0";
|
||||
AnchorTop = "0";
|
||||
AnchorBottom = "0";
|
||||
AnchorLeft = "0";
|
||||
AnchorRight = "0";
|
||||
anchorTop = "0";
|
||||
anchorLeft = "0";
|
||||
position = "8 56";
|
||||
extent = "120 16";
|
||||
minExtent = "8 8";
|
||||
vertSizing = "top";
|
||||
profile = "HudTextItalicProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
isContainer = "0";
|
||||
Profile = "HudTextItalicProfile";
|
||||
HorizSizing = "right";
|
||||
VertSizing = "top";
|
||||
position = "40 8";
|
||||
Extent = "120 16";
|
||||
MinExtent = "8 8";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
tooltipprofile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
};
|
||||
new GuiHealthTextHud() {
|
||||
fillColor = "0 0 0 0.65";
|
||||
frameColor = "0 0 0 1";
|
||||
textColor = "1 1 1 1";
|
||||
warningColor = "1 0 0 1";
|
||||
showFill = "1";
|
||||
showFrame = "1";
|
||||
showTrueValue = "0";
|
||||
showEnergy = "0";
|
||||
warnThreshold = "25";
|
||||
pulseThreshold = "15";
|
||||
pulseRate = "750";
|
||||
position = "5 693";
|
||||
position = "5 645";
|
||||
extent = "72 72";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "top";
|
||||
profile = "GuiBigTextProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiControl(DamageHUD) {
|
||||
position = "384 256";
|
||||
position = "512 232";
|
||||
extent = "256 256";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "center";
|
||||
vertSizing = "center";
|
||||
profile = "GuiDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
profile = "GuiModelessDialogProfile";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
|
||||
new GuiBitmapCtrl(DamageFront) {
|
||||
bitmapAsset = "DamageModel:damageFront_image";
|
||||
wrap = "0";
|
||||
position = "0 0";
|
||||
BitmapAsset = "DamageModel:damageFront_image";
|
||||
BitmapFile = "data/DamageModel/images/damageFront.png";
|
||||
extent = "256 32";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
profile = "GuiModelessDialogProfile";
|
||||
visible = "0";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "Damage[Front]";
|
||||
hidden = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiBitmapCtrl(DamageTop) {
|
||||
bitmapAsset = "DamageModel:damageTop_image";
|
||||
wrap = "0";
|
||||
position = "0 0";
|
||||
BitmapAsset = "DamageModel:damageTop_image";
|
||||
BitmapFile = "data/DamageModel/images/damageTop.png";
|
||||
extent = "256 32";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
profile = "GuiModelessDialogProfile";
|
||||
visible = "0";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "Damage[Top]";
|
||||
hidden = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiBitmapCtrl(DamageBottom) {
|
||||
bitmapAsset = "DamageModel:damageBottom_image";
|
||||
wrap = "0";
|
||||
BitmapAsset = "DamageModel:damageBottom_image";
|
||||
BitmapFile = "data/DamageModel/images/damageBottom.png";
|
||||
position = "0 224";
|
||||
extent = "256 32";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
profile = "GuiModelessDialogProfile";
|
||||
visible = "0";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "Damage[Bottom]";
|
||||
hidden = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiBitmapCtrl(DamageLeft) {
|
||||
bitmapAsset = "DamageModel:damageLeft_image";
|
||||
wrap = "0";
|
||||
position = "0 0";
|
||||
BitmapAsset = "DamageModel:damageLeft_image";
|
||||
BitmapFile = "data/DamageModel/images/damageLeft.png";
|
||||
extent = "32 256";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
profile = "GuiModelessDialogProfile";
|
||||
visible = "0";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "Damage[Left]";
|
||||
hidden = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiBitmapCtrl(DamageRight) {
|
||||
bitmapAsset = "DamageModel:damageRight_image";
|
||||
wrap = "0";
|
||||
BitmapAsset = "DamageModel:damageRight_image";
|
||||
BitmapFile = "data/DamageModel/images/damageRight.png";
|
||||
position = "224 0";
|
||||
extent = "32 256";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiDefaultProfile";
|
||||
profile = "GuiModelessDialogProfile";
|
||||
visible = "0";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "Damage[Right]";
|
||||
hidden = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -227,3 +227,103 @@ new GuiControlProfile(MenuTextEditprofile)
|
|||
fontSize = "18";
|
||||
cursorColor = "255 255 255 255";
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Core Hud profiles
|
||||
|
||||
singleton GuiControlProfile (HudScrollProfile)
|
||||
{
|
||||
opaque = false;
|
||||
border = true;
|
||||
borderColor = "0 255 0";
|
||||
bitmap = "data/UI/art/scrollBar";
|
||||
hasBitmapArray = true;
|
||||
};
|
||||
|
||||
singleton GuiControlProfile (HudTextProfile)
|
||||
{
|
||||
opaque = false;
|
||||
fillColor = "128 128 128";
|
||||
fontColor = "0 255 0";
|
||||
border = true;
|
||||
borderColor = "0 255 0";
|
||||
modal = false;
|
||||
};
|
||||
|
||||
singleton GuiControlProfile (ChatHudBorderProfile)
|
||||
{
|
||||
bitmap = "data/UI/art/chatHudBorderArray";
|
||||
hasBitmapArray = true;
|
||||
opaque = false;
|
||||
modal = false;
|
||||
};
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Center and bottom print
|
||||
|
||||
singleton GuiControlProfile (CenterPrintProfile)
|
||||
{
|
||||
opaque = false;
|
||||
fillColor = "128 128 128";
|
||||
fontColor = "0 255 0";
|
||||
border = true;
|
||||
borderColor = "0 255 0";
|
||||
modal = false;
|
||||
};
|
||||
|
||||
singleton GuiControlProfile (CenterPrintTextProfile)
|
||||
{
|
||||
opaque = false;
|
||||
fontType = "Arial";
|
||||
fontSize = 12;
|
||||
fontColor = "0 255 0";
|
||||
modal = false;
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// HUD text
|
||||
// -----------------------------------------------------------------------------
|
||||
singleton GuiControlProfile (HudTextNormalProfile)
|
||||
{
|
||||
opaque = false;
|
||||
fontType = "Arial";
|
||||
fontSize = 18;
|
||||
fontColor = "255 255 255";
|
||||
modal = false;
|
||||
};
|
||||
|
||||
singleton GuiControlProfile (HudTextItalicProfile : HudTextNormalProfile)
|
||||
{
|
||||
fontType = "ArialItalic";
|
||||
};
|
||||
|
||||
singleton GuiControlProfile (HudTextBoldProfile : HudTextNormalProfile)
|
||||
{
|
||||
fontType = "ArialBold";
|
||||
};
|
||||
|
||||
singleton GuiControlProfile( GuiBigTextProfile : GuiMenuDefaultProfile )
|
||||
{
|
||||
fontType = "Arial Bold";
|
||||
fontSize = 24;
|
||||
fontColor = "255 255 255";
|
||||
justify = "center";
|
||||
modal = false;
|
||||
category = "BaseUI";
|
||||
modal = false;
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// Numerical health text
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
singleton GuiControlProfile (NumericHealthProfile)
|
||||
{
|
||||
opaque = true;
|
||||
justify = "center";
|
||||
fontType = "ArialBold";
|
||||
fontSize = 32;
|
||||
fontColor = "255 255 255";
|
||||
modal = false;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue