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

more case sensitivity corrections.

Browse source
This commit is contained in:
Areloch 2016-07-09 16:07:57 -05:00
parent 8424f99052
commit a2a4b1c5e3
8 changed files with 67 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/Full/game/tools/decalEditor/decalEditorGui.cs
View file

@ -315,7 +315,7 @@ function DecalEditorGui::updateDecalPreview( %this, %material )
if( isObject( %material ) ) if( isObject( %material ) )
DecalPreviewWindow-->decalPreview.setBitmap( MaterialEditorGui.searchForTexture( %material.getId(), %material.diffuseMap[0]) ); DecalPreviewWindow-->decalPreview.setBitmap( MaterialEditorGui.searchForTexture( %material.getId(), %material.diffuseMap[0]) );
else else
DecalPreviewWindow-->decalPreview.setBitmap("tools/materialeditor/gui/unknownImage"); DecalPreviewWindow-->decalPreview.setBitmap("tools/materialEditor/gui/unknownImage");
} }
function DecalEditorGui::updateInstancePreview( %this, %material ) function DecalEditorGui::updateInstancePreview( %this, %material )
@ -323,7 +323,7 @@ function DecalEditorGui::updateInstancePreview( %this, %material )
if( isObject( %material ) ) if( isObject( %material ) )
DecalPreviewWindow-->instancePreview.setBitmap( MaterialEditorGui.searchForTexture( %material.getId(), %material.diffuseMap[0]) ); DecalPreviewWindow-->instancePreview.setBitmap( MaterialEditorGui.searchForTexture( %material.getId(), %material.diffuseMap[0]) );
else else
DecalPreviewWindow-->instancePreview.setBitmap("tools/materialeditor/gui/unknownImage"); DecalPreviewWindow-->instancePreview.setBitmap("tools/materialEditor/gui/unknownImage");
} }
function DecalEditorGui::rebuildInstanceTree( %this ) function DecalEditorGui::rebuildInstanceTree( %this )

12
Templates/Full/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui
View file

@ -365,7 +365,7 @@
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiTextCtrl(matEd_cubeMapEd_xPosTxt) { new GuiTextCtrl(matEd_cubeMapEd_xPosTxt) {
@ -408,7 +408,7 @@
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiTextCtrl(matEd_cubeMapEd_xNegTxt) { new GuiTextCtrl(matEd_cubeMapEd_xNegTxt) {
@ -451,7 +451,7 @@
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiTextCtrl(matEd_cubeMapEd_yPosTxt) { new GuiTextCtrl(matEd_cubeMapEd_yPosTxt) {
@ -494,7 +494,7 @@
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiTextCtrl(matEd_cubeMapEd_yNegTxt) { new GuiTextCtrl(matEd_cubeMapEd_yNegTxt) {
@ -537,7 +537,7 @@
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiTextCtrl(matEd_cubeMapEd_zPosTxt) { new GuiTextCtrl(matEd_cubeMapEd_zPosTxt) {
@ -580,7 +580,7 @@
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiTextCtrl(matEd_cubeMapEd_zNegTxt) { new GuiTextCtrl(matEd_cubeMapEd_zNegTxt) {

16
Templates/Full/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui
View file

@ -277,7 +277,7 @@
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiBitmapButtonCtrl() { new GuiBitmapButtonCtrl() {
@ -429,7 +429,7 @@
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiTextCtrl() { new GuiTextCtrl() {
@ -555,7 +555,7 @@
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiTextCtrl() { new GuiTextCtrl() {
@ -713,7 +713,7 @@
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiBitmapButtonCtrl() { new GuiBitmapButtonCtrl() {
@ -858,7 +858,7 @@
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiBitmapButtonCtrl() { new GuiBitmapButtonCtrl() {
@ -1003,7 +1003,7 @@
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiBitmapButtonCtrl() { new GuiBitmapButtonCtrl() {
@ -1129,7 +1129,7 @@
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiTextCtrl() { new GuiTextCtrl() {
@ -1255,7 +1255,7 @@
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiTextCtrl() { new GuiTextCtrl() {

58
Templates/Full/game/tools/materialEditor/scripts/materialEditor.ed.cs
View file

@ -27,12 +27,12 @@ function MaterialEditorGui::establishMaterials(%this)
//Cubemap used to preview other cubemaps in the editor. //Cubemap used to preview other cubemaps in the editor.
singleton CubemapData( matEdCubeMapPreviewMat ) singleton CubemapData( matEdCubeMapPreviewMat )
{ {
cubeFace[0] = "tools/materialeditor/gui/cube_xNeg"; cubeFace[0] = "tools/materialEditor/gui/cube_xNeg";
cubeFace[1] = "tools/materialeditor/gui/cube_xPos"; cubeFace[1] = "tools/materialEditor/gui/cube_xPos";
cubeFace[2] = "tools/materialeditor/gui/cube_ZNeg"; cubeFace[2] = "tools/materialEditor/gui/cube_ZNeg";
cubeFace[3] = "tools/materialeditor/gui/cube_ZPos"; cubeFace[3] = "tools/materialEditor/gui/cube_ZPos";
cubeFace[4] = "tools/materialeditor/gui/cube_YNeg"; cubeFace[4] = "tools/materialEditor/gui/cube_YNeg";
cubeFace[5] = "tools/materialeditor/gui/cube_YPos"; cubeFace[5] = "tools/materialEditor/gui/cube_YPos";
parentGroup = "RootGroup"; parentGroup = "RootGroup";
}; };
@ -40,7 +40,7 @@ function MaterialEditorGui::establishMaterials(%this)
singleton Material(materialEd_previewMaterial) singleton Material(materialEd_previewMaterial)
{ {
mapTo = "matEd_mappedMat"; mapTo = "matEd_mappedMat";
diffuseMap[0] = "tools/materialeditor/gui/matEd_mappedMat"; diffuseMap[0] = "tools/materialEditor/gui/matEd_mappedMat";
}; };
singleton CustomMaterial( materialEd_justAlphaMaterial ) singleton CustomMaterial( materialEd_justAlphaMaterial )
@ -371,32 +371,32 @@ function MaterialEditorGui::updatePreviewObject(%this)
{ {
case "sphere": case "sphere":
matEd_quickPreview_Popup.selected = %newModel; matEd_quickPreview_Popup.selected = %newModel;
matEd_previewObjectView.setModel("tools/materialeditor/gui/spherePreview.dts"); matEd_previewObjectView.setModel("tools/materialEditor/gui/spherePreview.dts");
matEd_previewObjectView.setOrbitDistance(4); matEd_previewObjectView.setOrbitDistance(4);
case "cube": case "cube":
matEd_quickPreview_Popup.selected = %newModel; matEd_quickPreview_Popup.selected = %newModel;
matEd_previewObjectView.setModel("tools/materialeditor/gui/cubePreview.dts"); matEd_previewObjectView.setModel("tools/materialEditor/gui/cubePreview.dts");
matEd_previewObjectView.setOrbitDistance(5); matEd_previewObjectView.setOrbitDistance(5);
case "pyramid": case "pyramid":
matEd_quickPreview_Popup.selected = %newModel; matEd_quickPreview_Popup.selected = %newModel;
matEd_previewObjectView.setModel("tools/materialeditor/gui/pyramidPreview.dts"); matEd_previewObjectView.setModel("tools/materialEditor/gui/pyramidPreview.dts");
matEd_previewObjectView.setOrbitDistance(5); matEd_previewObjectView.setOrbitDistance(5);
case "cylinder": case "cylinder":
matEd_quickPreview_Popup.selected = %newModel; matEd_quickPreview_Popup.selected = %newModel;
matEd_previewObjectView.setModel("tools/materialeditor/gui/cylinderPreview.dts"); matEd_previewObjectView.setModel("tools/materialEditor/gui/cylinderPreview.dts");
matEd_previewObjectView.setOrbitDistance(4.2); matEd_previewObjectView.setOrbitDistance(4.2);
case "torus": case "torus":
matEd_quickPreview_Popup.selected = %newModel; matEd_quickPreview_Popup.selected = %newModel;
matEd_previewObjectView.setModel("tools/materialeditor/gui/torusPreview.dts"); matEd_previewObjectView.setModel("tools/materialEditor/gui/torusPreview.dts");
matEd_previewObjectView.setOrbitDistance(4.2); matEd_previewObjectView.setOrbitDistance(4.2);
case "knot": case "knot":
matEd_quickPreview_Popup.selected = %newModel; matEd_quickPreview_Popup.selected = %newModel;
matEd_previewObjectView.setModel("tools/materialeditor/gui/torusknotPreview.dts"); matEd_previewObjectView.setModel("tools/materialEditor/gui/torusknotPreview.dts");
} }
} }
@ -802,7 +802,7 @@ function MaterialEditorGui::guiSync( %this, %material )
if((%material).diffuseMap[%layer] $= "") if((%material).diffuseMap[%layer] $= "")
{ {
MaterialEditorPropertiesWindow-->diffuseMapNameText.setText( "None" ); MaterialEditorPropertiesWindow-->diffuseMapNameText.setText( "None" );
MaterialEditorPropertiesWindow-->diffuseMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" ); MaterialEditorPropertiesWindow-->diffuseMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
} }
else else
{ {
@ -813,7 +813,7 @@ function MaterialEditorGui::guiSync( %this, %material )
if((%material).normalMap[%layer] $= "") if((%material).normalMap[%layer] $= "")
{ {
MaterialEditorPropertiesWindow-->normalMapNameText.setText( "None" ); MaterialEditorPropertiesWindow-->normalMapNameText.setText( "None" );
MaterialEditorPropertiesWindow-->normalMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" ); MaterialEditorPropertiesWindow-->normalMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
} }
else else
{ {
@ -824,7 +824,7 @@ function MaterialEditorGui::guiSync( %this, %material )
if((%material).overlayMap[%layer] $= "") if((%material).overlayMap[%layer] $= "")
{ {
MaterialEditorPropertiesWindow-->overlayMapNameText.setText( "None" ); MaterialEditorPropertiesWindow-->overlayMapNameText.setText( "None" );
MaterialEditorPropertiesWindow-->overlayMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" ); MaterialEditorPropertiesWindow-->overlayMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
} }
else else
{ {
@ -835,7 +835,7 @@ function MaterialEditorGui::guiSync( %this, %material )
if((%material).detailMap[%layer] $= "") if((%material).detailMap[%layer] $= "")
{ {
MaterialEditorPropertiesWindow-->detailMapNameText.setText( "None" ); MaterialEditorPropertiesWindow-->detailMapNameText.setText( "None" );
MaterialEditorPropertiesWindow-->detailMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" ); MaterialEditorPropertiesWindow-->detailMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
} }
else else
{ {
@ -846,7 +846,7 @@ function MaterialEditorGui::guiSync( %this, %material )
if((%material).detailNormalMap[%layer] $= "") if((%material).detailNormalMap[%layer] $= "")
{ {
MaterialEditorPropertiesWindow-->detailNormalMapNameText.setText( "None" ); MaterialEditorPropertiesWindow-->detailNormalMapNameText.setText( "None" );
MaterialEditorPropertiesWindow-->detailNormalMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" ); MaterialEditorPropertiesWindow-->detailNormalMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
} }
else else
{ {
@ -857,7 +857,7 @@ function MaterialEditorGui::guiSync( %this, %material )
if((%material).lightMap[%layer] $= "") if((%material).lightMap[%layer] $= "")
{ {
MaterialEditorPropertiesWindow-->lightMapNameText.setText( "None" ); MaterialEditorPropertiesWindow-->lightMapNameText.setText( "None" );
MaterialEditorPropertiesWindow-->lightMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" ); MaterialEditorPropertiesWindow-->lightMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
} }
else else
{ {
@ -868,7 +868,7 @@ function MaterialEditorGui::guiSync( %this, %material )
if((%material).toneMap[%layer] $= "") if((%material).toneMap[%layer] $= "")
{ {
MaterialEditorPropertiesWindow-->toneMapNameText.setText( "None" ); MaterialEditorPropertiesWindow-->toneMapNameText.setText( "None" );
MaterialEditorPropertiesWindow-->toneMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" ); MaterialEditorPropertiesWindow-->toneMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
} }
else else
{ {
@ -879,7 +879,7 @@ function MaterialEditorGui::guiSync( %this, %material )
if((%material).specularMap[%layer] $= "") if((%material).specularMap[%layer] $= "")
{ {
MaterialEditorPropertiesWindow-->specMapNameText.setText( "None" ); MaterialEditorPropertiesWindow-->specMapNameText.setText( "None" );
MaterialEditorPropertiesWindow-->specMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" ); MaterialEditorPropertiesWindow-->specMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
} }
else else
{ {
@ -1141,7 +1141,7 @@ function MaterialEditorGui::updateTextureMap( %this, %type, %action )
else else
{ {
%textCtrl.setText("None"); %textCtrl.setText("None");
%bitmapCtrl.setBitmap("tools/materialeditor/gui/unknownImage"); %bitmapCtrl.setBitmap("tools/materialEditor/gui/unknownImage");
MaterialEditorGui.updateActiveMaterial(%type @ "Map[" @ %layer @ "]",""); MaterialEditorGui.updateActiveMaterial(%type @ "Map[" @ %layer @ "]","");
} }
} }
@ -1185,7 +1185,7 @@ function MaterialEditorGui::updateSpecMap(%this,%action)
else else
{ {
MaterialEditorPropertiesWindow-->specMapNameText.setText("None"); MaterialEditorPropertiesWindow-->specMapNameText.setText("None");
MaterialEditorPropertiesWindow-->specMapDisplayBitmap.setBitmap("tools/materialeditor/gui/unknownImage"); MaterialEditorPropertiesWindow-->specMapDisplayBitmap.setBitmap("tools/materialEditor/gui/unknownImage");
MaterialEditorGui.updateActiveMaterial("specularMap[" @ %layer @ "]",""); MaterialEditorGui.updateActiveMaterial("specularMap[" @ %layer @ "]","");
} }
@ -1604,12 +1604,12 @@ function MaterialEditorGui::createNewCubemap( %this, %cubemap )
new CubemapData(%cubemap) new CubemapData(%cubemap)
{ {
cubeFace[0] = "tools/materialeditor/gui/cube_xNeg"; cubeFace[0] = "tools/materialEditor/gui/cube_xNeg";
cubeFace[1] = "tools/materialeditor/gui/cube_xPos"; cubeFace[1] = "tools/materialEditor/gui/cube_xPos";
cubeFace[2] = "tools/materialeditor/gui/cube_ZNeg"; cubeFace[2] = "tools/materialEditor/gui/cube_ZNeg";
cubeFace[3] = "tools/materialeditor/gui/cube_ZPos"; cubeFace[3] = "tools/materialEditor/gui/cube_ZPos";
cubeFace[4] = "tools/materialeditor/gui/cube_YNeg"; cubeFace[4] = "tools/materialEditor/gui/cube_YNeg";
cubeFace[5] = "tools/materialeditor/gui/cube_YPos"; cubeFace[5] = "tools/materialEditor/gui/cube_YPos";
parentGroup = RootGroup; parentGroup = RootGroup;
}; };

2
Templates/Full/game/tools/particleEditor/ParticleEditor.ed.gui
View file

@ -1862,7 +1862,7 @@ $PE_guielement_ext_colorpicker = "18 18";
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiTextCtrl() { new GuiTextCtrl() {

2
Templates/Full/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui
View file

@ -158,7 +158,7 @@
tooltipprofile = "ToolsGuiToolTipProfile"; tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000"; hovertime = "1000";
wrap = "0"; wrap = "0";
bitmap= "tools/materialeditor/gui/unknownImage"; bitmap= "tools/materialEditor/gui/unknownImage";
}; };
new GuiBitmapCtrl(ETerrainMaterialSelectedBorder) { new GuiBitmapCtrl(ETerrainMaterialSelectedBorder) {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";

16
Templates/Full/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui
View file

@ -261,7 +261,7 @@
Visible = "1"; Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile"; tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiBitmapButtonCtrl() { new GuiBitmapButtonCtrl() {
@ -358,7 +358,7 @@
MinExtent = "8 2"; MinExtent = "8 2";
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
Command = "TerrainMaterialDlg-->baseTexCtrl.setBitmap(\"tools/materialeditor/gui/unknownImage\");"; Command = "TerrainMaterialDlg-->baseTexCtrl.setBitmap(\"tools/materialEditor/gui/unknownImage\");";
tooltipprofile = "ToolsGuiToolTipProfile"; tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000"; hovertime = "1000";
groupNum = "-1"; groupNum = "-1";
@ -466,7 +466,7 @@
Visible = "1"; Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile"; tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiTextCtrl() { new GuiTextCtrl() {
@ -563,7 +563,7 @@
MinExtent = "8 2"; MinExtent = "8 2";
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
Command = "TerrainMaterialDlg-->normTexCtrl.setBitmap(\"tools/materialeditor/gui/unknownImage\");"; Command = "TerrainMaterialDlg-->normTexCtrl.setBitmap(\"tools/materialEditor/gui/unknownImage\");";
tooltipprofile = "ToolsGuiToolTipProfile"; tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000"; hovertime = "1000";
groupNum = "-1"; groupNum = "-1";
@ -662,7 +662,7 @@
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
new GuiBitmapCtrl() { new GuiBitmapCtrl() {
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
position = "1 1"; position = "1 1";
extent = "47 47"; extent = "47 47";
@ -787,7 +787,7 @@
profile = "ToolsGuiDefaultProfile"; profile = "ToolsGuiDefaultProfile";
visible = "1"; visible = "1";
active = "1"; active = "1";
command = "TerrainMaterialDlg-->macroTexCtrl.setBitmap(\"tools/materialeditor/gui/unknownImage\");"; command = "TerrainMaterialDlg-->macroTexCtrl.setBitmap(\"tools/materialEditor/gui/unknownImage\");";
tooltipProfile = "ToolsGuiToolTipProfile"; tooltipProfile = "ToolsGuiToolTipProfile";
hovertime = "1000"; hovertime = "1000";
isContainer = "0"; isContainer = "0";
@ -999,7 +999,7 @@
Visible = "1"; Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile"; tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000"; hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage"; bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0"; wrap = "0";
}; };
new GuiBitmapButtonCtrl() { new GuiBitmapButtonCtrl() {
@ -1096,7 +1096,7 @@
MinExtent = "8 2"; MinExtent = "8 2";
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
Command = "TerrainMaterialDlg-->detailTexCtrl.setBitmap(\"tools/materialeditor/gui/unknownImage\");"; Command = "TerrainMaterialDlg-->detailTexCtrl.setBitmap(\"tools/materialEditor/gui/unknownImage\");";
tooltipprofile = "ToolsGuiToolTipProfile"; tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000"; hovertime = "1000";
groupNum = "-1"; groupNum = "-1";

24
Templates/Full/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.cs
View file

@ -218,7 +218,7 @@ function TerrainMaterialDlg::changeBase( %this )
if( %ctrl.bitmap !$= "" ) if( %ctrl.bitmap !$= "" )
%file = %ctrl.bitmap; %file = %ctrl.bitmap;
else else
%file = "tools/materialeditor/gui/unknownImage"; %file = "tools/materialEditor/gui/unknownImage";
} }
%file = makeRelativePath( %file, getMainDotCsDir() ); %file = makeRelativePath( %file, getMainDotCsDir() );
@ -240,7 +240,7 @@ function TerrainMaterialDlg::changeDetail( %this )
if( %ctrl.bitmap !$= "" ) if( %ctrl.bitmap !$= "" )
%file = %ctrl.bitmap; %file = %ctrl.bitmap;
else else
%file = "tools/materialeditor/gui/unknownImage"; %file = "tools/materialEditor/gui/unknownImage";
} }
%file = makeRelativePath( %file, getMainDotCsDir() ); %file = makeRelativePath( %file, getMainDotCsDir() );
@ -262,7 +262,7 @@ function TerrainMaterialDlg::changeMacro( %this )
if( %ctrl.bitmap !$= "" ) if( %ctrl.bitmap !$= "" )
%file = %ctrl.bitmap; %file = %ctrl.bitmap;
else else
%file = "tools/materialeditor/gui/unknownImage"; %file = "tools/materialEditor/gui/unknownImage";
} }
%file = makeRelativePath( %file, getMainDotCsDir() ); %file = makeRelativePath( %file, getMainDotCsDir() );
@ -285,7 +285,7 @@ function TerrainMaterialDlg::changeNormal( %this )
if( %ctrl.bitmap !$= "" ) if( %ctrl.bitmap !$= "" )
%file = %ctrl.bitmap; %file = %ctrl.bitmap;
else else
%file = "tools/materialeditor/gui/unknownImage"; %file = "tools/materialEditor/gui/unknownImage";
} }
%file = makeRelativePath( %file, getMainDotCsDir() ); %file = makeRelativePath( %file, getMainDotCsDir() );
@ -376,22 +376,22 @@ function TerrainMaterialDlg::setActiveMaterial( %this, %mat )
%this-->matNameCtrl.setText( %mat.internalName ); %this-->matNameCtrl.setText( %mat.internalName );
if (%mat.diffuseMap $= ""){ if (%mat.diffuseMap $= ""){
%this-->baseTexCtrl.setBitmap( "tools/materialeditor/gui/unknownImage" ); %this-->baseTexCtrl.setBitmap( "tools/materialEditor/gui/unknownImage" );
}else{ }else{
%this-->baseTexCtrl.setBitmap( %mat.diffuseMap ); %this-->baseTexCtrl.setBitmap( %mat.diffuseMap );
} }
if (%mat.detailMap $= ""){ if (%mat.detailMap $= ""){
%this-->detailTexCtrl.setBitmap( "tools/materialeditor/gui/unknownImage" ); %this-->detailTexCtrl.setBitmap( "tools/materialEditor/gui/unknownImage" );
}else{ }else{
%this-->detailTexCtrl.setBitmap( %mat.detailMap ); %this-->detailTexCtrl.setBitmap( %mat.detailMap );
} }
if (%mat.macroMap $= ""){ if (%mat.macroMap $= ""){
%this-->macroTexCtrl.setBitmap( "tools/materialeditor/gui/unknownImage" ); %this-->macroTexCtrl.setBitmap( "tools/materialEditor/gui/unknownImage" );
}else{ }else{
%this-->macroTexCtrl.setBitmap( %mat.macroMap ); %this-->macroTexCtrl.setBitmap( %mat.macroMap );
} }
if (%mat.normalMap $= ""){ if (%mat.normalMap $= ""){
%this-->normTexCtrl.setBitmap( "tools/materialeditor/gui/unknownImage" ); %this-->normTexCtrl.setBitmap( "tools/materialEditor/gui/unknownImage" );
}else{ }else{
%this-->normTexCtrl.setBitmap( %mat.normalMap ); %this-->normTexCtrl.setBitmap( %mat.normalMap );
} }
@ -428,22 +428,22 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
%newName = %this-->matNameCtrl.getText(); %newName = %this-->matNameCtrl.getText();
if (%this-->baseTexCtrl.bitmap $= "tools/materialeditor/gui/unknownImage"){ if (%this-->baseTexCtrl.bitmap $= "tools/materialEditor/gui/unknownImage"){
%newDiffuse = ""; %newDiffuse = "";
}else{ }else{
%newDiffuse = %this-->baseTexCtrl.bitmap; %newDiffuse = %this-->baseTexCtrl.bitmap;
} }
if (%this-->normTexCtrl.bitmap $= "tools/materialeditor/gui/unknownImage"){ if (%this-->normTexCtrl.bitmap $= "tools/materialEditor/gui/unknownImage"){
%newNormal = ""; %newNormal = "";
}else{ }else{
%newNormal = %this-->normTexCtrl.bitmap; %newNormal = %this-->normTexCtrl.bitmap;
} }
if (%this-->detailTexCtrl.bitmap $= "tools/materialeditor/gui/unknownImage"){ if (%this-->detailTexCtrl.bitmap $= "tools/materialEditor/gui/unknownImage"){
%newDetail = ""; %newDetail = "";
}else{ }else{
%newDetail = %this-->detailTexCtrl.bitmap; %newDetail = %this-->detailTexCtrl.bitmap;
} }
if (%this-->macroTexCtrl.bitmap $= "tools/materialeditor/gui/unknownImage"){ if (%this-->macroTexCtrl.bitmap $= "tools/materialEditor/gui/unknownImage"){
%newMacro = ""; %newMacro = "";
}else{ }else{
%newMacro = %this-->macroTexCtrl.bitmap; %newMacro = %this-->macroTexCtrl.bitmap;