diff --git a/Engine/source/gfx/gl/gfxGLCubemap.cpp b/Engine/source/gfx/gl/gfxGLCubemap.cpp index ba06662ad..40bf88f91 100644 --- a/Engine/source/gfx/gl/gfxGLCubemap.cpp +++ b/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 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 - mSize = cubemaps[0]->getSize(); + mSize = scaledSize; mFormat = cubemaps[0]->getFormat(); - mMipMapLevels = cubemaps[0]->getMipMapLevels(); + mMipMapLevels = cubemaps[0]->getMipMapLevels() - downscalePower; mNumCubemaps = cubemapCount; const bool isCompressed = ImageUtil::isCompressedFormat(mFormat); glGenTextures(1, &mCubemap); PRESERVE_CUBEMAP_ARRAY_TEXTURE(); 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_MAG_FILTER, GL_NEAREST); 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 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 - mSize = cubemapFaceSize; + mSize = scaledSize; mFormat = format; - mMipMapLevels = ImageUtil::getMaxMipCount(cubemapFaceSize, cubemapFaceSize); + mMipMapLevels = ImageUtil::getMaxMipCount(scaledSize, scaledSize); mNumCubemaps = cubemapCount; const bool isCompressed = ImageUtil::isCompressedFormat(mFormat); diff --git a/Templates/BaseGame/game/data/ui/UI.cs b/Templates/BaseGame/game/data/ui/UI.cs index 0a27d952b..56f3c645e 100644 --- a/Templates/BaseGame/game/data/ui/UI.cs +++ b/Templates/BaseGame/game/data/ui/UI.cs @@ -72,6 +72,10 @@ function UI::initClient(%this) exec("./guis/startupGui.gui"); exec("./guis/startupGui.cs"); + // Load Editor Dialogs + exec("./guis/messageBoxOk.gui"); + exec("./guis/messageBoxYesNo.gui"); + //Load scripts exec("./scripts/optionsList.cs"); exec("./scripts/displayMenu.cs"); diff --git a/Templates/BaseGame/game/data/ui/scripts/guis/messageBoxOK.gui b/Templates/BaseGame/game/data/ui/guis/messageBoxOK.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/guis/messageBoxOK.gui rename to Templates/BaseGame/game/data/ui/guis/messageBoxOK.gui diff --git a/Templates/BaseGame/game/data/ui/scripts/guis/messageBoxYesNo.gui b/Templates/BaseGame/game/data/ui/guis/messageBoxYesNo.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/guis/messageBoxYesNo.gui rename to Templates/BaseGame/game/data/ui/guis/messageBoxYesNo.gui diff --git a/Templates/BaseGame/game/data/ui/scripts/datablocks/guiSounds.cs b/Templates/BaseGame/game/data/ui/scripts/datablocks/guiSounds.cs deleted file mode 100644 index 0e8534eec..000000000 --- a/Templates/BaseGame/game/data/ui/scripts/datablocks/guiSounds.cs +++ /dev/null @@ -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"; -}; \ No newline at end of file diff --git a/Templates/BaseGame/game/data/ui/scripts/messageBoxes.cs b/Templates/BaseGame/game/data/ui/scripts/messageBoxes.cs index 9a130b7ca..08d1a9de3 100644 --- a/Templates/BaseGame/game/data/ui/scripts/messageBoxes.cs +++ b/Templates/BaseGame/game/data/ui/scripts/messageBoxes.cs @@ -20,17 +20,6 @@ // 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 // -------------------------------------------------------------------- diff --git a/Templates/BaseGame/game/data/ui/sound/buttonClick.wav b/Templates/BaseGame/game/data/ui/sound/buttonClick.wav deleted file mode 100644 index ec55432ee..000000000 Binary files a/Templates/BaseGame/game/data/ui/sound/buttonClick.wav and /dev/null differ diff --git a/Templates/BaseGame/game/data/ui/sound/buttonHover.wav b/Templates/BaseGame/game/data/ui/sound/buttonHover.wav deleted file mode 100644 index e7276cde4..000000000 Binary files a/Templates/BaseGame/game/data/ui/sound/buttonHover.wav and /dev/null differ diff --git a/Templates/BaseGame/game/tools/gui/profiles.ed.cs b/Templates/BaseGame/game/tools/gui/profiles.ed.cs index 20425548c..b094a4c4e 100644 --- a/Templates/BaseGame/game/tools/gui/profiles.ed.cs +++ b/Templates/BaseGame/game/tools/gui/profiles.ed.cs @@ -639,6 +639,12 @@ new GuiControlProfile( ToolsGuiTextPadProfile ) // Deviate from the Default opaque=true; 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; category = "Tools"; }; diff --git a/Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui b/Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui index 852d347a9..2eca2d3ba 100644 --- a/Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui +++ b/Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui @@ -1,7 +1,7 @@ //--- OBJECT WRITE BEGIN --- %guiContent = new GuiControl(ScriptEditorDlg,EditorGuiGroup) { isContainer = "1"; - Profile = "ToolsGuiDefaultProfile"; + Profile = "ToolsGuiDefaultNonModalProfile"; HorizSizing = "width"; VertSizing = "height"; position = "0 0"; diff --git a/Templates/BaseGame/game/tools/settings.xml b/Templates/BaseGame/game/tools/settings.xml index 9ce74e4ef..7b5338057 100644 --- a/Templates/BaseGame/game/tools/settings.xml +++ b/Templates/BaseGame/game/tools/settings.xml @@ -1,5 +1,44 @@ + + data/FPSGameplay/levels + + + 25 + + + 5 + + + + + 0 0 1 + 10 + 255 0 0 255 + DefaultRoadMaterialOther + DefaultRoadMaterialTop + 0 255 0 255 + + + 234 232 230 255 + 72 70 68 255 + 255 255 255 255 + 50 49 48 255 + 100 98 96 255 + 50 49 48 255 + 17 16 15 255 + 96 94 92 255 + 72 70 68 255 + 255 255 255 255 + 43 43 43 255 + 32 31 30 255 + 50 49 48 255 + 178 175 172 255 + 59 58 57 255 + 37 36 35 255 + 59 58 57 255 + 236 234 232 255 + 1 0.8 @@ -9,214 +48,175 @@ 0.8 15 - 0 - 255 255 255 20 - 500 - 10 10 10 0 + 500 + 0 + 10 10 10 + 255 255 255 20 0 - - screenCenter - WorldEditorInspectorPlugin - 6 - 40 - 0 - AssetWork_Debug.exe - 1 - 50 - - 0 - 1 - 8 - 20 - 255 - - - 100 - 1 - 0 - 2 - 0 - 1 - 0 - - - 1 - 1 - 1 - 1 - 1 - - - 50 50 50 255 - 255 255 255 255 - 180 180 180 255 - 48 48 48 255 - 215 215 215 255 - - - 0 255 0 255 - 255 255 0 255 - 255 255 255 255 - 100 100 100 255 - 0 0 255 255 - 255 0 0 255 - 255 255 0 255 - - - tools/worldEditor/images/LockedHandle - tools/worldEditor/images/DefaultHandle - tools/worldEditor/images/SelectHandle - - - 0 - 102 102 102 100 - 255 255 255 100 - 51 51 51 100 - 1 - - - ../../../Documentation/Official Documentation.html - ../../../Documentation/Torque 3D - Script Manual.chm - http://www.garagegames.com/products/torque-3d/documentation/user - http://www.garagegames.com/products/torque-3d/forums - - - 1024 768 tools/gui + 1024 768 - 0 - 0 0 + 0 + 0 - - ../../../Documentation/Official Documentation.html - ../../../Documentation/Torque 3D - Script Manual.chm - http://www.garagegames.com/products/torque-3d/documentation/user + + Categorized - 0 1 - 1 - 8 - 1 - 1 1 + 8 + 0 + 1 + 1 2 + 1 - - 0 + + ../../../Documentation/Torque 3D - Script Manual.chm + ../../../Documentation/Official Documentation.html + http://www.garagegames.com/products/torque-3d/documentation/user 1 1 - - Categorized + + 0 - - Grid_512_Orange + + 50 + 1 + AssetWork_Debug.exe + 0 + 6 + WorldEditorInspectorPlugin + screenCenter + 40 + + 1 + 1 + 1 + 1 + 1 + + + 100 100 100 255 + 255 255 255 255 + 255 255 0 255 + 0 255 0 255 + 255 255 0 255 + 255 0 0 255 + 0 0 255 255 + + + 51 51 51 100 + 102 102 102 100 + 1 + 255 255 255 100 + 0 + + + 20 + 8 + 1 + 0 + 255 + + + ../../../Documentation/Torque 3D - Script Manual.chm + ../../../Documentation/Official Documentation.html + http://www.garagegames.com/products/torque-3d/forums + http://www.garagegames.com/products/torque-3d/documentation/user + + + 0 + 1 + 1 + 100 + 2 + 0 + 0 + + + 255 255 255 255 + 50 50 50 255 + 48 48 48 255 + 215 215 215 255 + 180 180 180 255 + + + tools/worldEditor/images/LockedHandle + tools/worldEditor/images/SelectHandle + tools/worldEditor/images/DefaultHandle + + + + 180 180 180 255 + 0 + 0 + 1 + 0.1 + 135 + 1 + 1 + 1 + 255 255 255 255 + 0 0 0 100 + 1 + 45 + 1 + 40 40 lowerHeight + + 1 + 40 40 + 40 40 + 1 + ellipse + - 1 100 - 0.1 + 1 0 10 50 - 1 - 1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000 90 + 1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000 1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000 + 1 + 0.1 - - 1 - 1 - 40 40 - ellipse - 40 40 - - - - 0 255 0 255 - 255 255 255 255 - DefaultDecalRoadMaterial - 10 - - - 0 - 0 0 0 100 - 135 - 45 - 40 40 - 0 - 1 - 1 - 1 - 0.1 - 255 255 255 255 - 1 - 1 - 1 - 180 180 180 255 - - - 255 0 0 255 - DefaultRoadMaterialOther - DefaultRoadMaterialTop - 10 - 0 0 1 - 0 255 0 255 + 0 0 1 + 255 255 255 255 255 0 0 255 0 255 0 255 - 255 255 255 255 10 5 - 0 0 1 - - - 72 70 68 255 - 96 94 92 255 - 100 98 96 255 - 50 49 48 255 - 32 31 30 255 - 72 70 68 255 - 50 49 48 255 - 37 36 35 255 - 59 58 57 255 - 236 234 232 255 - 50 49 48 255 - 255 255 255 255 - 255 255 255 255 - 43 43 43 255 - 17 16 15 255 - 234 232 230 255 - 59 58 57 255 - 178 175 172 255 - - - data/FPSGameplay/levels - - - 5 - - - 25 - - - DefaultPlayerData - AIPlayer 1 + AIPlayer + DefaultPlayerData + + + 255 255 255 255 + 10 + DefaultDecalRoadMaterial + 0 255 0 255 + + + Grid_512_Orange 1