Skip to content

Fix a few more case sensitivity issues #1678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Areloch merged 2 commits into from
Jul 9, 2016
Merged

Fix a few more case sensitivity issues #1678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8424f99
Some case sensitivity fixes.
Areloch Jul 9, 2016
a2a4b1c
more case sensitivity corrections.
Areloch Jul 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Templates/Full/game/tools/decalEditor/decalEditorGui.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,15 +315,15 @@
if( isObject( %material ) )
DecalPreviewWindow-->decalPreview.setBitmap( MaterialEditorGui.searchForTexture( %material.getId(), %material.diffuseMap[0]) );
else
DecalPreviewWindow-->decalPreview.setBitmap("tools/materialeditor/gui/unknownImage");
DecalPreviewWindow-->decalPreview.setBitmap("tools/materialEditor/gui/unknownImage");
}

function DecalEditorGui::updateInstancePreview( %this, %material )
{
if( isObject( %material ) )
DecalPreviewWindow-->instancePreview.setBitmap( MaterialEditorGui.searchForTexture( %material.getId(), %material.diffuseMap[0]) );
else
DecalPreviewWindow-->instancePreview.setBitmap("tools/materialeditor/gui/unknownImage");
DecalPreviewWindow-->instancePreview.setBitmap("tools/materialEditor/gui/unknownImage");
}

function DecalEditorGui::rebuildInstanceTree( %this )
Expand Down
0 .../tools/materialEditor/gui/cubepreview.dts → .../tools/materialEditor/gui/cubePreview.dts
View file
Open in desktop
File renamed without changes.
0 ...ls/materialEditor/gui/cylinderpreview.dts → ...ls/materialEditor/gui/cylinderPreview.dts
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions Templates/Full/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage";
bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0";
};
new GuiTextCtrl(matEd_cubeMapEd_xPosTxt) {
Expand Down Expand Up @@ -408,7 +408,7 @@
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage";
bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0";
};
new GuiTextCtrl(matEd_cubeMapEd_xNegTxt) {
Expand Down Expand Up @@ -451,7 +451,7 @@
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage";
bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0";
};
new GuiTextCtrl(matEd_cubeMapEd_yPosTxt) {
Expand Down Expand Up @@ -494,7 +494,7 @@
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage";
bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0";
};
new GuiTextCtrl(matEd_cubeMapEd_yNegTxt) {
Expand Down Expand Up @@ -537,7 +537,7 @@
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage";
bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0";
};
new GuiTextCtrl(matEd_cubeMapEd_zPosTxt) {
Expand Down Expand Up @@ -580,7 +580,7 @@
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage";
bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0";
};
new GuiTextCtrl(matEd_cubeMapEd_zNegTxt) {
Expand Down
16 changes: 8 additions & 8 deletions Templates/Full/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage";
bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0";
};
new GuiBitmapButtonCtrl() {
Expand Down Expand Up @@ -429,7 +429,7 @@
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage";
bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0";
};
new GuiTextCtrl() {
Expand Down Expand Up @@ -555,7 +555,7 @@
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage";
bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0";
};
new GuiTextCtrl() {
Expand Down Expand Up @@ -713,7 +713,7 @@
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage";
bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0";
};
new GuiBitmapButtonCtrl() {
Expand Down Expand Up @@ -858,7 +858,7 @@
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage";
bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0";
};
new GuiBitmapButtonCtrl() {
Expand Down Expand Up @@ -1003,7 +1003,7 @@
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage";
bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0";
};
new GuiBitmapButtonCtrl() {
Expand Down Expand Up @@ -1129,7 +1129,7 @@
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage";
bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0";
};
new GuiTextCtrl() {
Expand Down Expand Up @@ -1255,7 +1255,7 @@
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage";
bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0";
};
new GuiTextCtrl() {
Expand Down
0 ...ools/materialEditor/gui/spherepreview.dts → ...ools/materialEditor/gui/spherePreview.dts
View file
Open in desktop
File renamed without changes.
0 ...tools/materialEditor/gui/toruspreview.dts → ...tools/materialEditor/gui/torusPreview.dts
View file
Open in desktop
File renamed without changes.
0 ...s/materialEditor/gui/torusknotpreview.dts → ...s/materialEditor/gui/torusknotPreview.dts
View file
Open in desktop
File renamed without changes.
58 changes: 29 additions & 29 deletions Templates/Full/game/tools/materialEditor/scripts/materialEditor.ed.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,20 @@
//Cubemap used to preview other cubemaps in the editor.
singleton CubemapData( matEdCubeMapPreviewMat )
{
cubeFace[0] = "tools/materialeditor/gui/cube_xNeg";
cubeFace[1] = "tools/materialeditor/gui/cube_xPos";
cubeFace[2] = "tools/materialeditor/gui/cube_ZNeg";
cubeFace[3] = "tools/materialeditor/gui/cube_ZPos";
cubeFace[4] = "tools/materialeditor/gui/cube_YNeg";
cubeFace[5] = "tools/materialeditor/gui/cube_YPos";
cubeFace[0] = "tools/materialEditor/gui/cube_xNeg";
cubeFace[1] = "tools/materialEditor/gui/cube_xPos";
cubeFace[2] = "tools/materialEditor/gui/cube_ZNeg";
cubeFace[3] = "tools/materialEditor/gui/cube_ZPos";
cubeFace[4] = "tools/materialEditor/gui/cube_YNeg";
cubeFace[5] = "tools/materialEditor/gui/cube_YPos";
parentGroup = "RootGroup";
};

//Material used to preview other materials in the editor.
singleton Material(materialEd_previewMaterial)
{
mapTo = "matEd_mappedMat";
diffuseMap[0] = "tools/materialeditor/gui/matEd_mappedMat";
diffuseMap[0] = "tools/materialEditor/gui/matEd_mappedMat";
};

singleton CustomMaterial( materialEd_justAlphaMaterial )
Expand Down Expand Up @@ -371,32 +371,32 @@ singleton ShaderData( materialEd_justAlphaShader )
{
case "sphere":
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);

case "cube":
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);

case "pyramid":
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);

case "cylinder":
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);

case "torus":
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);

case "knot":
matEd_quickPreview_Popup.selected = %newModel;
matEd_previewObjectView.setModel("tools/materialeditor/gui/torusknotPreview.dts");
matEd_previewObjectView.setModel("tools/materialEditor/gui/torusknotPreview.dts");
}
}

Expand Down Expand Up @@ -802,7 +802,7 @@ singleton Material(notDirtyMaterial)
if((%material).diffuseMap[%layer] $= "")
{
MaterialEditorPropertiesWindow-->diffuseMapNameText.setText( "None" );
MaterialEditorPropertiesWindow-->diffuseMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" );
MaterialEditorPropertiesWindow-->diffuseMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
}
else
{
Expand All @@ -813,7 +813,7 @@ singleton Material(notDirtyMaterial)
if((%material).normalMap[%layer] $= "")
{
MaterialEditorPropertiesWindow-->normalMapNameText.setText( "None" );
MaterialEditorPropertiesWindow-->normalMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" );
MaterialEditorPropertiesWindow-->normalMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
}
else
{
Expand All @@ -824,7 +824,7 @@ singleton Material(notDirtyMaterial)
if((%material).overlayMap[%layer] $= "")
{
MaterialEditorPropertiesWindow-->overlayMapNameText.setText( "None" );
MaterialEditorPropertiesWindow-->overlayMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" );
MaterialEditorPropertiesWindow-->overlayMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
}
else
{
Expand All @@ -835,7 +835,7 @@ singleton Material(notDirtyMaterial)
if((%material).detailMap[%layer] $= "")
{
MaterialEditorPropertiesWindow-->detailMapNameText.setText( "None" );
MaterialEditorPropertiesWindow-->detailMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" );
MaterialEditorPropertiesWindow-->detailMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
}
else
{
Expand All @@ -846,7 +846,7 @@ singleton Material(notDirtyMaterial)
if((%material).detailNormalMap[%layer] $= "")
{
MaterialEditorPropertiesWindow-->detailNormalMapNameText.setText( "None" );
MaterialEditorPropertiesWindow-->detailNormalMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" );
MaterialEditorPropertiesWindow-->detailNormalMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
}
else
{
Expand All @@ -857,7 +857,7 @@ singleton Material(notDirtyMaterial)
if((%material).lightMap[%layer] $= "")
{
MaterialEditorPropertiesWindow-->lightMapNameText.setText( "None" );
MaterialEditorPropertiesWindow-->lightMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" );
MaterialEditorPropertiesWindow-->lightMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
}
else
{
Expand All @@ -868,7 +868,7 @@ singleton Material(notDirtyMaterial)
if((%material).toneMap[%layer] $= "")
{
MaterialEditorPropertiesWindow-->toneMapNameText.setText( "None" );
MaterialEditorPropertiesWindow-->toneMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" );
MaterialEditorPropertiesWindow-->toneMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
}
else
{
Expand All @@ -879,7 +879,7 @@ singleton Material(notDirtyMaterial)
if((%material).specularMap[%layer] $= "")
{
MaterialEditorPropertiesWindow-->specMapNameText.setText( "None" );
MaterialEditorPropertiesWindow-->specMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" );
MaterialEditorPropertiesWindow-->specMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
}
else
{
Expand Down Expand Up @@ -1141,7 +1141,7 @@ singleton Material(notDirtyMaterial)
else
{
%textCtrl.setText("None");
%bitmapCtrl.setBitmap("tools/materialeditor/gui/unknownImage");
%bitmapCtrl.setBitmap("tools/materialEditor/gui/unknownImage");
MaterialEditorGui.updateActiveMaterial(%type @ "Map[" @ %layer @ "]","");
}
}
Expand Down Expand Up @@ -1185,7 +1185,7 @@ singleton Material(notDirtyMaterial)
else
{
MaterialEditorPropertiesWindow-->specMapNameText.setText("None");
MaterialEditorPropertiesWindow-->specMapDisplayBitmap.setBitmap("tools/materialeditor/gui/unknownImage");
MaterialEditorPropertiesWindow-->specMapDisplayBitmap.setBitmap("tools/materialEditor/gui/unknownImage");
MaterialEditorGui.updateActiveMaterial("specularMap[" @ %layer @ "]","");
}

Expand Down Expand Up @@ -1604,12 +1604,12 @@ singleton Material(notDirtyMaterial)

new CubemapData(%cubemap)
{
cubeFace[0] = "tools/materialeditor/gui/cube_xNeg";
cubeFace[1] = "tools/materialeditor/gui/cube_xPos";
cubeFace[2] = "tools/materialeditor/gui/cube_ZNeg";
cubeFace[3] = "tools/materialeditor/gui/cube_ZPos";
cubeFace[4] = "tools/materialeditor/gui/cube_YNeg";
cubeFace[5] = "tools/materialeditor/gui/cube_YPos";
cubeFace[0] = "tools/materialEditor/gui/cube_xNeg";
cubeFace[1] = "tools/materialEditor/gui/cube_xPos";
cubeFace[2] = "tools/materialEditor/gui/cube_ZNeg";
cubeFace[3] = "tools/materialEditor/gui/cube_ZPos";
cubeFace[4] = "tools/materialEditor/gui/cube_YNeg";
cubeFace[5] = "tools/materialEditor/gui/cube_YPos";

parentGroup = RootGroup;
};
Expand Down
2 changes: 1 addition & 1 deletion Templates/Full/game/tools/particleEditor/ParticleEditor.ed.gui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1862,7 +1862,7 @@ $PE_guielement_ext_colorpicker = "18 18";
canSave = "1";
Visible = "1";
hovertime = "1000";
bitmap = "tools/materialeditor/gui/unknownImage";
bitmap = "tools/materialEditor/gui/unknownImage";
wrap = "0";
};
new GuiTextCtrl() {
Expand Down
2 changes: 1 addition & 1 deletion Templates/Full/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
wrap = "0";
bitmap= "tools/materialeditor/gui/unknownImage";
bitmap= "tools/materialEditor/gui/unknownImage";
};
new GuiBitmapCtrl(ETerrainMaterialSelectedBorder) {
canSaveDynamicFields = "0";
Expand Down
6 changes: 3 additions & 3 deletions Templates/Full/game/tools/worldEditor/gui/ToolsPaletteGroups/ForestEditorPalette.ed.gui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Paint (5)";
hovertime = "1000";
bitmap = "tools/foresteditor/images/paint-forest-btn";
bitmap = "tools/forestEditor/images/paint-forest-btn";
buttonType = "RadioButton";
useMouseEvents = "0";
};
Expand All @@ -134,7 +134,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Erase (6)";
hovertime = "1000";
bitmap = "tools/foresteditor/images/erase-all-btn";
bitmap = "tools/forestEditor/images/erase-all-btn";
buttonType = "RadioButton";
useMouseEvents = "0";
};
Expand All @@ -156,7 +156,7 @@
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Erase Selected (7)";
hovertime = "1000";
bitmap = "tools/foresteditor/images/erase-element-btn";
bitmap = "tools/forestEditor/images/erase-element-btn";
buttonType = "RadioButton";
useMouseEvents = "0";
};
Expand Down
Loading