Browse Source

Updated ToolsGuiTextPadProile to comply to editor theme
Further tweaks/reorg to UI module
Implemented cubemap array scaling on GL so it doesn't crash when texture quality is lowered

Areloch 5 years ago
parent
commit
c9a63d63cf

+ 23 - 5
Engine/source/gfx/gl/gfxGLCubemap.cpp

@@ -326,17 +326,26 @@ void GFXGLCubemapArray::init(GFXCubemapHandle *cubemaps, const U32 cubemapCount)
    AssertFatal(cubemaps, "GFXGLCubemapArray- Got null GFXCubemapHandle!");
    AssertFatal(cubemaps, "GFXGLCubemapArray- Got null GFXCubemapHandle!");
    AssertFatal(*cubemaps, "GFXGLCubemapArray - Got empty cubemap!");
    AssertFatal(*cubemaps, "GFXGLCubemapArray - Got empty cubemap!");
 
 
+   U32 downscalePower = GFXTextureManager::smTextureReductionLevel;
+   U32 scaledSize = cubemaps[0]->getSize();
+
+   if (downscalePower != 0)
+   {
+      // Otherwise apply the appropriate scale...
+      scaledSize >>= downscalePower;
+   }
+
    //all cubemaps must be the same size,format and number of mipmaps. Grab the details from the first cubemap
    //all cubemaps must be the same size,format and number of mipmaps. Grab the details from the first cubemap
-   mSize = cubemaps[0]->getSize();
+   mSize = scaledSize;
    mFormat = cubemaps[0]->getFormat();
    mFormat = cubemaps[0]->getFormat();
-   mMipMapLevels = cubemaps[0]->getMipMapLevels();
+   mMipMapLevels = cubemaps[0]->getMipMapLevels() - downscalePower;
    mNumCubemaps = cubemapCount;
    mNumCubemaps = cubemapCount;
    const bool isCompressed = ImageUtil::isCompressedFormat(mFormat);
    const bool isCompressed = ImageUtil::isCompressedFormat(mFormat);
 
 
    glGenTextures(1, &mCubemap);
    glGenTextures(1, &mCubemap);
    PRESERVE_CUBEMAP_ARRAY_TEXTURE();
    PRESERVE_CUBEMAP_ARRAY_TEXTURE();
    glBindTexture(GL_TEXTURE_CUBE_MAP_ARRAY, mCubemap);
    glBindTexture(GL_TEXTURE_CUBE_MAP_ARRAY, mCubemap);
-   glTexParameteri(GL_TEXTURE_CUBE_MAP_ARRAY, GL_TEXTURE_MAX_LEVEL, mMipMapLevels - 1);
+   glTexParameteri(GL_TEXTURE_CUBE_MAP_ARRAY, GL_TEXTURE_MAX_LEVEL, mMin(mMipMapLevels - 1, 1));
    glTexParameteri(GL_TEXTURE_CUBE_MAP_ARRAY, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
    glTexParameteri(GL_TEXTURE_CUBE_MAP_ARRAY, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
    glTexParameteri(GL_TEXTURE_CUBE_MAP_ARRAY, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
    glTexParameteri(GL_TEXTURE_CUBE_MAP_ARRAY, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
    glTexParameteri(GL_TEXTURE_CUBE_MAP_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
    glTexParameteri(GL_TEXTURE_CUBE_MAP_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -374,10 +383,19 @@ void GFXGLCubemapArray::init(GFXCubemapHandle *cubemaps, const U32 cubemapCount)
 //Just allocate the cubemap array but we don't upload any data
 //Just allocate the cubemap array but we don't upload any data
 void GFXGLCubemapArray::init(const U32 cubemapCount, const U32 cubemapFaceSize, const GFXFormat format)
 void GFXGLCubemapArray::init(const U32 cubemapCount, const U32 cubemapFaceSize, const GFXFormat format)
 {
 {
+   U32 downscalePower = GFXTextureManager::smTextureReductionLevel;
+   U32 scaledSize = cubemapFaceSize;
+
+   if (downscalePower != 0)
+   {
+      // Otherwise apply the appropriate scale...
+      scaledSize >>= downscalePower;
+   }
+
    //all cubemaps must be the same size,format and number of mipmaps. Grab the details from the first cubemap
    //all cubemaps must be the same size,format and number of mipmaps. Grab the details from the first cubemap
-   mSize = cubemapFaceSize;
+   mSize = scaledSize;
    mFormat = format;
    mFormat = format;
-   mMipMapLevels = ImageUtil::getMaxMipCount(cubemapFaceSize, cubemapFaceSize);
+   mMipMapLevels = ImageUtil::getMaxMipCount(scaledSize, scaledSize);
    mNumCubemaps = cubemapCount;
    mNumCubemaps = cubemapCount;
    const bool isCompressed = ImageUtil::isCompressedFormat(mFormat);
    const bool isCompressed = ImageUtil::isCompressedFormat(mFormat);
 
 

+ 4 - 0
Templates/BaseGame/game/data/ui/UI.cs

@@ -72,6 +72,10 @@ function UI::initClient(%this)
    exec("./guis/startupGui.gui");
    exec("./guis/startupGui.gui");
    exec("./guis/startupGui.cs");
    exec("./guis/startupGui.cs");
    
    
+   // Load Editor Dialogs
+   exec("./guis/messageBoxOk.gui");
+   exec("./guis/messageBoxYesNo.gui");
+   
    //Load scripts
    //Load scripts
    exec("./scripts/optionsList.cs");
    exec("./scripts/optionsList.cs");
    exec("./scripts/displayMenu.cs");
    exec("./scripts/displayMenu.cs");

+ 0 - 0
Templates/BaseGame/game/data/ui/scripts/guis/messageBoxOK.gui → Templates/BaseGame/game/data/ui/guis/messageBoxOK.gui


+ 0 - 0
Templates/BaseGame/game/data/ui/scripts/guis/messageBoxYesNo.gui → Templates/BaseGame/game/data/ui/guis/messageBoxYesNo.gui


+ 0 - 34
Templates/BaseGame/game/data/ui/scripts/datablocks/guiSounds.cs

@@ -1,34 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2012 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-singleton SFXProfile(menuButtonPressed)
-{
-   preload = true;
-   description = AudioGui;
-   fileName = "data/ui/sound/buttonClick";
-};
-
-singleton SFXProfile(menuButtonHover)
-{
-   preload = true;
-   description = AudioGui;
-   fileName = "data/ui/sound/buttonHover";
-};

+ 0 - 11
Templates/BaseGame/game/data/ui/scripts/messageBoxes.cs

@@ -20,17 +20,6 @@
 // IN THE SOFTWARE.
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
 
-
-// Cleanup Dialog created by 'core'
-if( isObject( MessageBoxYesNoDlg ) )
-   MessageBoxYesNoDlg.delete();
-if( isObject( MessageBoxOKDlg ) )
-   MessageBoxOKDlg.delete();
-
-// Load Editor Dialogs
-exec("./guis/messageBoxOk.gui");
-exec("./guis/messageBoxYesNo.gui");
-
 // --------------------------------------------------------------------
 // --------------------------------------------------------------------
 // Message Sound
 // Message Sound
 // --------------------------------------------------------------------
 // --------------------------------------------------------------------

BIN
Templates/BaseGame/game/data/ui/sound/buttonClick.wav


BIN
Templates/BaseGame/game/data/ui/sound/buttonHover.wav


+ 6 - 0
Templates/BaseGame/game/tools/gui/profiles.ed.cs

@@ -639,6 +639,12 @@ new GuiControlProfile( ToolsGuiTextPadProfile )
    // Deviate from the Default
    // Deviate from the Default
    opaque=true;  
    opaque=true;  
    fillColor = EditorSettings.value("Theme/windowBackgroundColor");   
    fillColor = EditorSettings.value("Theme/windowBackgroundColor");   
+   fillColorHL = EditorSettings.value("Theme/fieldBGHLColor");
+   fillColorSEL = EditorSettings.value("Theme/fieldBGSELColor");
+   
+   fontColor = EditorSettings.value("Theme/fieldTextColor");   
+   fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");   
+   fontColorSEL = EditorSettings.value("Theme/fieldTextSELColor");   
    border = 0;
    border = 0;
    category = "Tools";
    category = "Tools";
 };
 };

+ 1 - 1
Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui

@@ -1,7 +1,7 @@
 //--- OBJECT WRITE BEGIN ---
 //--- OBJECT WRITE BEGIN ---
 %guiContent = new GuiControl(ScriptEditorDlg,EditorGuiGroup) {
 %guiContent = new GuiControl(ScriptEditorDlg,EditorGuiGroup) {
    isContainer = "1";
    isContainer = "1";
-   Profile = "ToolsGuiDefaultProfile";
+   Profile = "ToolsGuiDefaultNonModalProfile";
    HorizSizing = "width";
    HorizSizing = "width";
    VertSizing = "height";
    VertSizing = "height";
    position = "0 0";
    position = "0 0";

+ 158 - 158
Templates/BaseGame/game/tools/settings.xml

@@ -1,5 +1,44 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <EditorSettings>
 <EditorSettings>
+    <Group name="LevelInformation">
+        <Setting name="levelsDirectory">data/FPSGameplay/levels</Setting>
+        <Group name="levels">
+            <Group name="BlankRoom.mis">
+                <Setting name="cameraSpeed">25</Setting>
+            </Group>
+            <Group name="PbrMatTest.mis">
+                <Setting name="cameraSpeed">5</Setting>
+            </Group>
+        </Group>
+    </Group>
+    <Group name="MeshRoadEditor">
+        <Setting name="DefaultNormal">0 0 1</Setting>
+        <Setting name="DefaultWidth">10</Setting>
+        <Setting name="HoverSplineColor">255 0 0 255</Setting>
+        <Setting name="sideMaterialName">DefaultRoadMaterialOther</Setting>
+        <Setting name="topMaterialName">DefaultRoadMaterialTop</Setting>
+        <Setting name="SelectedSplineColor">0 255 0 255</Setting>
+    </Group>
+    <Group name="Theme">
+        <Setting name="fieldTextHLColor">234 232 230 255</Setting>
+        <Setting name="tooltipDividerColor">72 70 68 255</Setting>
+        <Setting name="tooltipTextColor">255 255 255 255</Setting>
+        <Setting name="headerColor">50 49 48 255</Setting>
+        <Setting name="fieldBGSELColor">100 98 96 255</Setting>
+        <Setting name="dividerMidColor">50 49 48 255</Setting>
+        <Setting name="dividerDarkColor">17 16 15 255</Setting>
+        <Setting name="dividerLightColor">96 94 92 255</Setting>
+        <Setting name="fieldBGHLColor">72 70 68 255</Setting>
+        <Setting name="fieldTextSELColor">255 255 255 255</Setting>
+        <Setting name="tooltipBGColor">43 43 43 255</Setting>
+        <Setting name="windowBackgroundColor">32 31 30 255</Setting>
+        <Setting name="tabsHLColor">50 49 48 255</Setting>
+        <Setting name="fieldTextColor">178 175 172 255</Setting>
+        <Setting name="fieldBGColor">59 58 57 255</Setting>
+        <Setting name="tabsColor">37 36 35 255</Setting>
+        <Setting name="tabsSELColor">59 58 57 255</Setting>
+        <Setting name="headerTextColor">236 234 232 255</Setting>
+    </Group>
     <Group name="AxisGizmo">
     <Group name="AxisGizmo">
         <Setting name="renderInfoText">1</Setting>
         <Setting name="renderInfoText">1</Setting>
         <Setting name="mouseRotateScalar">0.8</Setting>
         <Setting name="mouseRotateScalar">0.8</Setting>
@@ -9,214 +48,175 @@
         <Setting name="mouseScaleScalar">0.8</Setting>
         <Setting name="mouseScaleScalar">0.8</Setting>
         <Setting name="rotationSnap">15</Setting>
         <Setting name="rotationSnap">15</Setting>
         <Group name="Grid">
         <Group name="Grid">
-            <Setting name="renderPlane">0</Setting>
-            <Setting name="gridColor">255 255 255 20</Setting>
+            <Setting name="snapToGrid">0</Setting>
             <Setting name="planeDim">500</Setting>
             <Setting name="planeDim">500</Setting>
+            <Setting name="renderPlane">0</Setting>
             <Setting name="gridSize">10 10 10</Setting>
             <Setting name="gridSize">10 10 10</Setting>
-            <Setting name="snapToGrid">0</Setting>
+            <Setting name="gridColor">255 255 255 20</Setting>
             <Setting name="renderPlaneHashes">0</Setting>
             <Setting name="renderPlaneHashes">0</Setting>
         </Group>
         </Group>
     </Group>
     </Group>
+    <Group name="GuiEditor">
+        <Setting name="lastPath">tools/gui</Setting>
+        <Setting name="previewResolution">1024 768</Setting>
+        <Group name="EngineDevelopment">
+            <Setting name="showEditorProfiles">0</Setting>
+            <Setting name="toggleIntoEditor">0</Setting>
+            <Setting name="showEditorGuis">0</Setting>
+        </Group>
+        <Group name="Library">
+            <Setting name="viewType">Categorized</Setting>
+        </Group>
+        <Group name="Snapping">
+            <Setting name="snapToCenters">1</Setting>
+            <Setting name="snapToControls">1</Setting>
+            <Setting name="snap2GridSize">8</Setting>
+            <Setting name="snap2Grid">0</Setting>
+            <Setting name="snapToCanvas">1</Setting>
+            <Setting name="snapToGuides">1</Setting>
+            <Setting name="sensitivity">2</Setting>
+            <Setting name="snapToEdges">1</Setting>
+        </Group>
+        <Group name="Help">
+            <Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
+            <Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
+            <Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
+        </Group>
+        <Group name="Rendering">
+            <Setting name="drawBorderLines">1</Setting>
+            <Setting name="drawGuides">1</Setting>
+        </Group>
+        <Group name="Selection">
+            <Setting name="fullBox">0</Setting>
+        </Group>
+    </Group>
     <Group name="WorldEditor">
     <Group name="WorldEditor">
-        <Setting name="dropType">screenCenter</Setting>
-        <Setting name="currentEditor">WorldEditorInspectorPlugin</Setting>
+        <Setting name="orthoFOV">50</Setting>
+        <Setting name="orthoShowGrid">1</Setting>
+        <Setting name="torsionPath">AssetWork_Debug.exe</Setting>
+        <Setting name="forceLoadDAE">0</Setting>
         <Setting name="displayType">6</Setting>
         <Setting name="displayType">6</Setting>
+        <Setting name="currentEditor">WorldEditorInspectorPlugin</Setting>
+        <Setting name="dropType">screenCenter</Setting>
         <Setting name="undoLimit">40</Setting>
         <Setting name="undoLimit">40</Setting>
-        <Setting name="forceLoadDAE">0</Setting>
-        <Setting name="torsionPath">AssetWork_Debug.exe</Setting>
-        <Setting name="orthoShowGrid">1</Setting>
-        <Setting name="orthoFOV">50</Setting>
-        <Group name="ObjectIcons">
-            <Setting name="fadeIconsEndAlpha">0</Setting>
-            <Setting name="fadeIcons">1</Setting>
-            <Setting name="fadeIconsStartDist">8</Setting>
-            <Setting name="fadeIconsEndDist">20</Setting>
-            <Setting name="fadeIconsStartAlpha">255</Setting>
-        </Group>
-        <Group name="Tools">
-            <Setting name="dropAtScreenCenterMax">100</Setting>
-            <Setting name="dropAtScreenCenterScalar">1</Setting>
-            <Setting name="boundingBoxCollision">0</Setting>
-            <Setting name="snapSoftSize">2</Setting>
-            <Setting name="snapGround">0</Setting>
-            <Setting name="objectsUseBoxCenter">1</Setting>
-            <Setting name="snapSoft">0</Setting>
-        </Group>
         <Group name="Render">
         <Group name="Render">
-            <Setting name="renderSelectionBox">1</Setting>
-            <Setting name="renderObjText">1</Setting>
-            <Setting name="renderPopupBackground">1</Setting>
             <Setting name="showMousePopupInfo">1</Setting>
             <Setting name="showMousePopupInfo">1</Setting>
+            <Setting name="renderObjText">1</Setting>
+            <Setting name="renderSelectionBox">1</Setting>
             <Setting name="renderObjHandle">1</Setting>
             <Setting name="renderObjHandle">1</Setting>
-        </Group>
-        <Group name="Theme">
-            <Setting name="windowTitleBGColor">50 50 50 255</Setting>
-            <Setting name="windowTitleFontHLColor">255 255 255 255</Setting>
-            <Setting name="windowTitleBGNAColor">180 180 180 255</Setting>
-            <Setting name="windowTitleBGHLColor">48 48 48 255</Setting>
-            <Setting name="windowTitleFontColor">215 215 215 255</Setting>
+            <Setting name="renderPopupBackground">1</Setting>
         </Group>
         </Group>
         <Group name="Color">
         <Group name="Color">
+            <Setting name="popupBackgroundColor">100 100 100 255</Setting>
+            <Setting name="objectTextColor">255 255 255 255</Setting>
+            <Setting name="dragRectColor">255 255 0 255</Setting>
             <Setting name="objMouseOverColor">0 255 0 255</Setting>
             <Setting name="objMouseOverColor">0 255 0 255</Setting>
             <Setting name="selectionBoxColor">255 255 0 255</Setting>
             <Setting name="selectionBoxColor">255 255 0 255</Setting>
-            <Setting name="objectTextColor">255 255 255 255</Setting>
-            <Setting name="popupBackgroundColor">100 100 100 255</Setting>
-            <Setting name="objMouseOverSelectColor">0 0 255 255</Setting>
             <Setting name="objSelectColor">255 0 0 255</Setting>
             <Setting name="objSelectColor">255 0 0 255</Setting>
-            <Setting name="dragRectColor">255 255 0 255</Setting>
-        </Group>
-        <Group name="Images">
-            <Setting name="lockedHandle">tools/worldEditor/images/LockedHandle</Setting>
-            <Setting name="defaultHandle">tools/worldEditor/images/DefaultHandle</Setting>
-            <Setting name="selectHandle">tools/worldEditor/images/SelectHandle</Setting>
+            <Setting name="objMouseOverSelectColor">0 0 255 255</Setting>
         </Group>
         </Group>
         <Group name="Grid">
         <Group name="Grid">
-            <Setting name="gridSnap">0</Setting>
-            <Setting name="gridColor">102 102 102 100</Setting>
-            <Setting name="gridOriginColor">255 255 255 100</Setting>
             <Setting name="gridMinorColor">51 51 51 100</Setting>
             <Setting name="gridMinorColor">51 51 51 100</Setting>
+            <Setting name="gridColor">102 102 102 100</Setting>
             <Setting name="gridSize">1</Setting>
             <Setting name="gridSize">1</Setting>
+            <Setting name="gridOriginColor">255 255 255 100</Setting>
+            <Setting name="gridSnap">0</Setting>
+        </Group>
+        <Group name="ObjectIcons">
+            <Setting name="fadeIconsEndDist">20</Setting>
+            <Setting name="fadeIconsStartDist">8</Setting>
+            <Setting name="fadeIcons">1</Setting>
+            <Setting name="fadeIconsEndAlpha">0</Setting>
+            <Setting name="fadeIconsStartAlpha">255</Setting>
         </Group>
         </Group>
         <Group name="Docs">
         <Group name="Docs">
-            <Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
             <Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
             <Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
-            <Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
-            <Setting name="forumURL">http://www.garagegames.com/products/torque-3d/forums</Setting>
-        </Group>
-    </Group>
-    <Group name="GuiEditor">
-        <Setting name="previewResolution">1024 768</Setting>
-        <Setting name="lastPath">tools/gui</Setting>
-        <Group name="EngineDevelopment">
-            <Setting name="showEditorGuis">0</Setting>
-            <Setting name="toggleIntoEditor">0</Setting>
-            <Setting name="showEditorProfiles">0</Setting>
-        </Group>
-        <Group name="Help">
             <Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
             <Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
-            <Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
+            <Setting name="forumURL">http://www.garagegames.com/products/torque-3d/forums</Setting>
             <Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
             <Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
         </Group>
         </Group>
-        <Group name="Snapping">
-            <Setting name="snap2Grid">0</Setting>
-            <Setting name="snapToCenters">1</Setting>
-            <Setting name="snapToGuides">1</Setting>
-            <Setting name="snap2GridSize">8</Setting>
-            <Setting name="snapToEdges">1</Setting>
-            <Setting name="snapToCanvas">1</Setting>
-            <Setting name="snapToControls">1</Setting>
-            <Setting name="sensitivity">2</Setting>
-        </Group>
-        <Group name="Selection">
-            <Setting name="fullBox">0</Setting>
+        <Group name="Tools">
+            <Setting name="boundingBoxCollision">0</Setting>
+            <Setting name="dropAtScreenCenterScalar">1</Setting>
+            <Setting name="objectsUseBoxCenter">1</Setting>
+            <Setting name="dropAtScreenCenterMax">100</Setting>
+            <Setting name="snapSoftSize">2</Setting>
+            <Setting name="snapSoft">0</Setting>
+            <Setting name="snapGround">0</Setting>
         </Group>
         </Group>
-        <Group name="Rendering">
-            <Setting name="drawBorderLines">1</Setting>
-            <Setting name="drawGuides">1</Setting>
+        <Group name="Theme">
+            <Setting name="windowTitleFontHLColor">255 255 255 255</Setting>
+            <Setting name="windowTitleBGColor">50 50 50 255</Setting>
+            <Setting name="windowTitleBGHLColor">48 48 48 255</Setting>
+            <Setting name="windowTitleFontColor">215 215 215 255</Setting>
+            <Setting name="windowTitleBGNAColor">180 180 180 255</Setting>
         </Group>
         </Group>
-        <Group name="Library">
-            <Setting name="viewType">Categorized</Setting>
+        <Group name="Images">
+            <Setting name="lockedHandle">tools/worldEditor/images/LockedHandle</Setting>
+            <Setting name="selectHandle">tools/worldEditor/images/SelectHandle</Setting>
+            <Setting name="defaultHandle">tools/worldEditor/images/DefaultHandle</Setting>
         </Group>
         </Group>
     </Group>
     </Group>
-    <Group name="ConvexEditor">
-        <Setting name="materialName">Grid_512_Orange</Setting>
+    <Group name="ShapeEditor">
+        <Setting name="SunAmbientColor">180 180 180 255</Setting>
+        <Setting name="RenderCollision">0</Setting>
+        <Setting name="showBounds">0</Setting>
+        <Setting name="renderMounts">1</Setting>
+        <Setting name="gridSize">0.1</Setting>
+        <Setting name="SunAngleZ">135</Setting>
+        <Setting name="showNodes">1</Setting>
+        <Setting name="highlightMaterial">1</Setting>
+        <Setting name="showObjBox">1</Setting>
+        <Setting name="SunDiffuseColor">255 255 255 255</Setting>
+        <Setting name="backgroundColor">0 0 0 100</Setting>
+        <Setting name="AdvancedWndVisible">1</Setting>
+        <Setting name="SunAngleX">45</Setting>
+        <Setting name="ShowGrid">1</Setting>
+        <Setting name="gridDimension">40 40</Setting>
     </Group>
     </Group>
     <Group name="TerrainEditor">
     <Group name="TerrainEditor">
         <Setting name="currentAction">lowerHeight</Setting>
         <Setting name="currentAction">lowerHeight</Setting>
+        <Group name="Brush">
+            <Setting name="brushPressure">1</Setting>
+            <Setting name="brushSize">40 40</Setting>
+            <Setting name="maxBrushSize">40 40</Setting>
+            <Setting name="brushSoftness">1</Setting>
+            <Setting name="brushType">ellipse</Setting>
+        </Group>
         <Group name="ActionValues">
         <Group name="ActionValues">
-            <Setting name="noiseFactor">1</Setting>
             <Setting name="setHeightVal">100</Setting>
             <Setting name="setHeightVal">100</Setting>
-            <Setting name="smoothFactor">0.1</Setting>
+            <Setting name="scaleVal">1</Setting>
             <Setting name="SlopeMinAngle">0</Setting>
             <Setting name="SlopeMinAngle">0</Setting>
             <Setting name="adjustHeightVal">10</Setting>
             <Setting name="adjustHeightVal">10</Setting>
             <Setting name="softSelectRadius">50</Setting>
             <Setting name="softSelectRadius">50</Setting>
-            <Setting name="scaleVal">1</Setting>
-            <Setting name="softSelectDefaultFilter">1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000</Setting>
             <Setting name="SlopeMaxAngle">90</Setting>
             <Setting name="SlopeMaxAngle">90</Setting>
+            <Setting name="softSelectDefaultFilter">1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000</Setting>
             <Setting name="softSelectFilter">1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000</Setting>
             <Setting name="softSelectFilter">1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000</Setting>
-        </Group>
-        <Group name="Brush">
-            <Setting name="brushSoftness">1</Setting>
-            <Setting name="brushPressure">1</Setting>
-            <Setting name="maxBrushSize">40 40</Setting>
-            <Setting name="brushType">ellipse</Setting>
-            <Setting name="brushSize">40 40</Setting>
+            <Setting name="noiseFactor">1</Setting>
+            <Setting name="smoothFactor">0.1</Setting>
         </Group>
         </Group>
     </Group>
     </Group>
-    <Group name="RoadEditor">
-        <Setting name="SelectedSplineColor">0 255 0 255</Setting>
-        <Setting name="HoverNodeColor">255 255 255 255</Setting>
-        <Setting name="materialName">DefaultDecalRoadMaterial</Setting>
-        <Setting name="DefaultWidth">10</Setting>
-    </Group>
-    <Group name="ShapeEditor">
-        <Setting name="showBounds">0</Setting>
-        <Setting name="backgroundColor">0 0 0 100</Setting>
-        <Setting name="SunAngleZ">135</Setting>
-        <Setting name="SunAngleX">45</Setting>
-        <Setting name="gridDimension">40 40</Setting>
-        <Setting name="RenderCollision">0</Setting>
-        <Setting name="highlightMaterial">1</Setting>
-        <Setting name="renderMounts">1</Setting>
-        <Setting name="showObjBox">1</Setting>
-        <Setting name="gridSize">0.1</Setting>
-        <Setting name="SunDiffuseColor">255 255 255 255</Setting>
-        <Setting name="ShowGrid">1</Setting>
-        <Setting name="AdvancedWndVisible">1</Setting>
-        <Setting name="showNodes">1</Setting>
-        <Setting name="SunAmbientColor">180 180 180 255</Setting>
-    </Group>
-    <Group name="MeshRoadEditor">
-        <Setting name="HoverSplineColor">255 0 0 255</Setting>
-        <Setting name="sideMaterialName">DefaultRoadMaterialOther</Setting>
-        <Setting name="topMaterialName">DefaultRoadMaterialTop</Setting>
-        <Setting name="DefaultWidth">10</Setting>
-        <Setting name="DefaultNormal">0 0 1</Setting>
-        <Setting name="SelectedSplineColor">0 255 0 255</Setting>
-    </Group>
     <Group name="RiverEditor">
     <Group name="RiverEditor">
+        <Setting name="DefaultNormal">0 0 1</Setting>
+        <Setting name="HoverNodeColor">255 255 255 255</Setting>
         <Setting name="HoverSplineColor">255 0 0 255</Setting>
         <Setting name="HoverSplineColor">255 0 0 255</Setting>
         <Setting name="SelectedSplineColor">0 255 0 255</Setting>
         <Setting name="SelectedSplineColor">0 255 0 255</Setting>
-        <Setting name="HoverNodeColor">255 255 255 255</Setting>
         <Setting name="DefaultWidth">10</Setting>
         <Setting name="DefaultWidth">10</Setting>
         <Setting name="DefaultDepth">5</Setting>
         <Setting name="DefaultDepth">5</Setting>
-        <Setting name="DefaultNormal">0 0 1</Setting>
-    </Group>
-    <Group name="Theme">
-        <Setting name="tooltipDividerColor">72 70 68 255</Setting>
-        <Setting name="dividerLightColor">96 94 92 255</Setting>
-        <Setting name="fieldBGSELColor">100 98 96 255</Setting>
-        <Setting name="headerColor">50 49 48 255</Setting>
-        <Setting name="windowBackgroundColor">32 31 30 255</Setting>
-        <Setting name="fieldBGHLColor">72 70 68 255</Setting>
-        <Setting name="tabsHLColor">50 49 48 255</Setting>
-        <Setting name="tabsColor">37 36 35 255</Setting>
-        <Setting name="fieldBGColor">59 58 57 255</Setting>
-        <Setting name="headerTextColor">236 234 232 255</Setting>
-        <Setting name="dividerMidColor">50 49 48 255</Setting>
-        <Setting name="tooltipTextColor">255 255 255 255</Setting>
-        <Setting name="fieldTextSELColor">255 255 255 255</Setting>
-        <Setting name="tooltipBGColor">43 43 43 255</Setting>
-        <Setting name="dividerDarkColor">17 16 15 255</Setting>
-        <Setting name="fieldTextHLColor">234 232 230 255</Setting>
-        <Setting name="tabsSELColor">59 58 57 255</Setting>
-        <Setting name="fieldTextColor">178 175 172 255</Setting>
-    </Group>
-    <Group name="LevelInformation">
-        <Setting name="levelsDirectory">data/FPSGameplay/levels</Setting>
-        <Group name="levels">
-            <Group name="PbrMatTest.mis">
-                <Setting name="cameraSpeed">5</Setting>
-            </Group>
-            <Group name="BlankRoom.mis">
-                <Setting name="cameraSpeed">25</Setting>
-            </Group>
-        </Group>
     </Group>
     </Group>
     <Group name="NavEditor">
     <Group name="NavEditor">
-        <Setting name="spawnDatablock">DefaultPlayerData</Setting>
-        <Setting name="SpawnClass">AIPlayer</Setting>
         <Setting name="backgroundBuild">1</Setting>
         <Setting name="backgroundBuild">1</Setting>
+        <Setting name="SpawnClass">AIPlayer</Setting>
+        <Setting name="spawnDatablock">DefaultPlayerData</Setting>
+    </Group>
+    <Group name="RoadEditor">
+        <Setting name="HoverNodeColor">255 255 255 255</Setting>
+        <Setting name="DefaultWidth">10</Setting>
+        <Setting name="materialName">DefaultDecalRoadMaterial</Setting>
+        <Setting name="SelectedSplineColor">0 255 0 255</Setting>
+    </Group>
+    <Group name="ConvexEditor">
+        <Setting name="materialName">Grid_512_Orange</Setting>
     </Group>
     </Group>
     <Group name="DatablockEditor">
     <Group name="DatablockEditor">
         <Setting name="libraryTab">1</Setting>
         <Setting name="libraryTab">1</Setting>