TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes names so assignment of ORM config map on terrain materials works properly again

Browse source
This commit is contained in:
JeffR 2022-04-04 01:41:40 -05:00
parent d044ae0702
commit 5a83897ede
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui
View file

@ -536,7 +536,7 @@ $guiContent = new GuiControl(TerrainMaterialDlg,EditorGuiGroup) {
profile = "ToolsGuiDefaultProfile"; profile = "ToolsGuiDefaultProfile";
tooltipProfile = "ToolsGuiToolTipProfile"; tooltipProfile = "ToolsGuiToolTipProfile";
}; };
new GuiContainer(ORMMapContainer) { new GuiContainer(ORMConfigMapContainer) {
position = "6 314"; position = "6 314";
extent = "261 64"; extent = "261 64";
horizSizing = "width"; horizSizing = "width";
@ -576,7 +576,7 @@ $guiContent = new GuiControl(TerrainMaterialDlg,EditorGuiGroup) {
profile = "ToolsGuiTextProfile"; profile = "ToolsGuiTextProfile";
tooltipProfile = "ToolsGuiToolTipProfile"; tooltipProfile = "ToolsGuiToolTipProfile";
isContainer = "0"; isContainer = "0";
internalName = "ORMMapAssetId"; internalName = "ORMConfigMapAssetId";
}; };
new GuiButtonCtrl() { new GuiButtonCtrl() {
text = "Edit"; text = "Edit";
@ -584,7 +584,7 @@ $guiContent = new GuiControl(TerrainMaterialDlg,EditorGuiGroup) {
extent = "40 16"; extent = "40 16";
horizSizing = "left"; horizSizing = "left";
profile = "ToolsGuiButtonProfile"; profile = "ToolsGuiButtonProfile";
command = "TerrainMaterialDlg.updateTextureMap(\"OrmConfigMap\");"; command = "TerrainMaterialDlg.updateTextureMap(\"ORMConfigMap\");";
tooltipProfile = "ToolsGuiToolTipProfile"; tooltipProfile = "ToolsGuiToolTipProfile";
}; };
new GuiBitmapButtonCtrl() { new GuiBitmapButtonCtrl() {

18
Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript
View file

@ -262,8 +262,8 @@ function TerrainMaterialDlg::clearTextureMap(%this, %mapName)
NormalMapContainer.callOnChildren("setActive", false); NormalMapContainer.callOnChildren("setActive", false);
%this.clearTextureMap("NormalMap"); %this.clearTextureMap("NormalMap");
ORMMapContainer.callOnChildren("setActive", false); ORMConfigMapContainer.callOnChildren("setActive", false);
%this.clearTextureMap("ORMMap"); %this.clearTextureMap("ORMConfigMap");
MacroMapContainer.callOnChildren("setActive", false); MacroMapContainer.callOnChildren("setActive", false);
%this.clearTextureMap("MacroMap"); %this.clearTextureMap("MacroMap");
@ -292,7 +292,7 @@ function TerrainMaterialDlg::changeTerrainMatMapAsset(%this)
{ {
//show the supplemental maps //show the supplemental maps
NormalMapContainer.callOnChildren("setActive", true); NormalMapContainer.callOnChildren("setActive", true);
ORMMapContainer.callOnChildren("setActive", true); ORMConfigMapContainer.callOnChildren("setActive", true);
MacroMapContainer.callOnChildren("setActive", true); MacroMapContainer.callOnChildren("setActive", true);
} }
} }
@ -377,13 +377,13 @@ function TerrainMaterialDlg::activateMaterialCtrls( %this, %active )
if(%this-->texDetailMap.getBitmap() $= "" || %this-->texDetailMap.getBitmap() $= $TerrainMaterialEditor::emptyMaterialImage) if(%this-->texDetailMap.getBitmap() $= "" || %this-->texDetailMap.getBitmap() $= $TerrainMaterialEditor::emptyMaterialImage)
{ {
NormalMapContainer.callOnChildren("setActive", false); NormalMapContainer.callOnChildren("setActive", false);
ORMMapContainer.callOnChildren("setActive", false); ORMConfigMapContainer.callOnChildren("setActive", false);
MacroMapContainer.callOnChildren("setActive", false); MacroMapContainer.callOnChildren("setActive", false);
} }
else else
{ {
NormalMapContainer.callOnChildren("setActive", true); NormalMapContainer.callOnChildren("setActive", true);
ORMMapContainer.callOnChildren("setActive", true); ORMConfigMapContainer.callOnChildren("setActive", true);
MacroMapContainer.callOnChildren("setActive", true); MacroMapContainer.callOnChildren("setActive", true);
} }
} }
@ -438,7 +438,7 @@ function TerrainMaterialDlg::setActiveMaterial( %this, %mat )
// //
%imgPath = %mat.getORMConfigMap(); %imgPath = %mat.getORMConfigMap();
%imgPathText = %imgPath !$= "" && %imgPath !$= $TerrainMaterialEditor::emptyMaterialImage ? %mat.getORMConfigMapAsset() : "None"; %imgPathText = %imgPath !$= "" && %imgPath !$= $TerrainMaterialEditor::emptyMaterialImage ? %mat.getORMConfigMapAsset() : "None";
%this-->ORMMapAssetId.setText( %imgPathText ); %this-->ORMConfigMapAssetId.setText( %imgPathText );
%this-->texORMConfigMap.setBitmap( getAssetPreviewImage(%imgPath) ); %this-->texORMConfigMap.setBitmap( getAssetPreviewImage(%imgPath) );
// //
@ -656,7 +656,7 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %materialAssetId )
%newNormal = ""; %newNormal = "";
//--- //---
%newormConfig = %this-->ORMMapAssetId.text; %newormConfig = %this-->ORMConfigMapAssetId.text;
if(%newormConfig $= "None") if(%newormConfig $= "None")
%newormConfig = ""; %newormConfig = "";
@ -995,9 +995,9 @@ function NormalMapContainer::onControlDropped( %this, %payload, %position )
terrMatEdDragNDropMapAssignment("NormalMap", %payload); terrMatEdDragNDropMapAssignment("NormalMap", %payload);
} }
function ORMMapContainer::onControlDropped( %this, %payload, %position ) function ORMConfigMapContainer::onControlDropped( %this, %payload, %position )
{ {
terrMatEdDragNDropMapAssignment("ORMMap", %payload); terrMatEdDragNDropMapAssignment("ORMConfigMap", %payload);
} }
function MacroMapContainer::onControlDropped( %this, %payload, %position ) function MacroMapContainer::onControlDropped( %this, %payload, %position )