Merge branch 'Preview4_0' into EngineAssetify_Followups

Engine/lib/convexDecomp/NvThreadConfig.cpp

@@ -133,9 +133,15 @@ void tc_spinloop()
    // Pause would do nothing on the Xbox. Threads are not scheduled.
 #elif defined( _WIN64 )
    YieldProcessor( );
-#elif defined( __APPLE__ )||(__linux__)
+#elif defined( __APPLE__ )
    pthread_yield_np();
-#else
+#elif defined(__linux__)
+   #if defined(_POSIX_PRIORITY_SCHEDULING)
+      sched_yield();
+   #else
+      asm("pause");
+   #endif
+#elif
    __asm { pause };
 #endif
 }

Engine/source/gfx/gfxStringEnumTranslate.cpp

@@ -131,6 +131,7 @@ void GFXStringEnumTranslate::init()
    GFX_STRING_ASSIGN_MACRO( GFXStringTextureFormat, GFXFormatR16F );
    GFX_STRING_ASSIGN_MACRO( GFXStringTextureFormat, GFXFormatR16G16F );
    GFX_STRING_ASSIGN_MACRO( GFXStringTextureFormat, GFXFormatR10G10B10A2 );
+   GFX_STRING_ASSIGN_MACRO( GFXStringTextureFormat, GFXFormatR11G11B10);
 
    GFX_STRING_ASSIGN_MACRO( GFXStringTextureFormat, GFXFormatR8G8B8_SRGB );
    GFX_STRING_ASSIGN_MACRO( GFXStringTextureFormat, GFXFormatR8G8B8A8_LINEAR_FORCE );

Templates/BaseGame/game/core/Core.module → Templates/BaseGame/game/core/core.module

@@ -2,7 +2,7 @@
 	ModuleId="CoreModule"
 	VersionId="1"
 	Description="Module that implements the core engine-level setup for the game."
-	ScriptFile="Core"
+	ScriptFile="core"
 	CreateFunction="onCreate"
 	DestroyFunction="onDestroy"
 	Group="Core"/>

Templates/BaseGame/game/core/postFX/Core_PostFX.tscript

@@ -6,7 +6,7 @@ function Core_PostFX::onCreate(%this)
    exec("./scripts/postFx." @ $TorqueScriptFileExtension);
    
    //Load the default config
-   loadPresetHandler("./scripts/default.postfxpreset." @ $TorqueScriptFileExtension);
+   PostFXManager.loadPresetHandler("./scripts/default.postfxpreset." @ $TorqueScriptFileExtension);
 }
 
 function Core_PostFX::onDestroy(%this)

Templates/BaseGame/game/data/ExampleModule/ExampleModule.tscript

@@ -33,7 +33,7 @@ function ExampleModule::onDestroy(%this)
 function ExampleModule::initServer(%this)
 {
    //This script contains our ExampleGameMode logic
-   %this.queueExec("./scripts/ExampleGamemodeScript." @ $TorqueScriptFileExtension);
+   %this.queueExec("./scripts/ExampleGamemodeScript");
 }
 
 //This is called when a game session server is actually created so the game may be played. It's called 
@@ -74,13 +74,13 @@ function ExampleModule::initClient(%this)
    
    //client scripts
    //Here, we exec out keybind scripts so the player is able to move when they get into a game
-   %this.queueExec("./scripts/default.keybinds." @ $TorqueScriptFileExtension);
+   %this.queueExec("./scripts/default.keybinds");
    
    %prefPath = getPrefpath();
    if(isFile(%prefPath @ "/keybinds." @ $TorqueScriptFileExtension))
       exec(%prefPath @ "/keybinds." @ $TorqueScriptFileExtension);
       
-   %this.queueExec("./scripts/inputCommands." @ $TorqueScriptFileExtension);
+   %this.queueExec("./scripts/inputCommands");
 }
 
 //This is called when a game session client successfuly connects to a game server. 

Templates/BaseGame/game/data/gameUI/gameUI.tscript

@@ -16,7 +16,7 @@ function gameUI::initClient(%this)
 {
    //guis
    %this.queueExec("./GUIs/playGui.gui");
-   %this.queueExec("./GUIs/playGui." @ $TorqueScriptFileExtension);
+   %this.queueExec("./GUIs/playGui");
 }
 
 function gameUI::onCreateClientConnection(%this){}

Templates/BaseGame/game/data/ui/UI.tscript

@@ -30,55 +30,55 @@ function UI::initClient(%this)
 {
    //Load UI stuff
    //we need to load this because some of the menu profiles use the sounds here
-   //%this.queueExec("./datablocks/guiSounds." @ $TorqueScriptFileExtension);
+   //%this.queueExec("./datablocks/guiSounds");
    
    //Profiles
-   %this.queueExec("./scripts/profiles." @ $TorqueScriptFileExtension);
+   %this.queueExec("./scripts/profiles");
    
    //Now gui files
-   %this.queueExec("./scripts/menuInputButtons." @ $TorqueScriptFileExtension);
+   %this.queueExec("./scripts/menuInputButtons");
    
-   %this.queueExec("./guis/mainMenu." @ $TorqueScriptFileExtension);
+   %this.queueExec("./guis/mainMenu");
    %this.queueExec("./guis/mainMenu.gui");
    
-   %this.queueExec("./guis/chooseLevelDlg." @ $TorqueScriptFileExtension);
+   %this.queueExec("./guis/chooseLevelDlg");
    %this.queueExec("./guis/chooseLevelDlg.gui");
    
-   %this.queueExec("./guis/joinServerMenu." @ $TorqueScriptFileExtension);
+   %this.queueExec("./guis/joinServerMenu");
    %this.queueExec("./guis/joinServerMenu.gui");
    
    %this.queueExec("./guis/loadingGui.gui");
    
-   %this.queueExec("./guis/optionsMenu." @ $TorqueScriptFileExtension);
+   %this.queueExec("./guis/optionsMenu");
    %this.queueExec("./guis/optionsMenu.gui");
    
-   %this.queueExec("./guis/pauseMenu." @ $TorqueScriptFileExtension);
+   %this.queueExec("./guis/pauseMenu");
    %this.queueExec("./guis/pauseMenu.gui");
    
    %this.queueExec("./guis/remapDlg.gui");
    %this.queueExec("./guis/remapConfirmDlg.gui");
    
-   %this.queueExec("./guis/profiler." @ $TorqueScriptFileExtension);
+   %this.queueExec("./guis/profiler");
    %this.queueExec("./guis/profiler.gui");
    
    %this.queueExec("./guis/netGraphGui.gui");
    %this.queueExec("./guis/RecordingsDlg.gui");
    
-   %this.queueExec("./guis/guiMusicPlayer." @ $TorqueScriptFileExtension);
+   %this.queueExec("./guis/guiMusicPlayer");
    %this.queueExec("./guis/guiMusicPlayer.gui");
    
-   %this.queueExec("./guis/startupGui." @ $TorqueScriptFileExtension);
+   %this.queueExec("./guis/startupGui");
    %this.queueExec("./guis/startupGui.gui");
    
    // Load Editor Dialogs
    %this.queueExec("./guis/messageBoxDlg.gui");
    
    //Load scripts
-   %this.queueExec("./scripts/controlsMenu." @ $TorqueScriptFileExtension);
-   %this.queueExec("./scripts/messageBoxes." @ $TorqueScriptFileExtension);
-   %this.queueExec("./scripts/help." @ $TorqueScriptFileExtension);
-   %this.queueExec("./scripts/cursors." @ $TorqueScriptFileExtension);
-   %this.queueExec("./scripts/utility." @ $TorqueScriptFileExtension);
+   %this.queueExec("./scripts/controlsMenu");
+   %this.queueExec("./scripts/messageBoxes");
+   %this.queueExec("./scripts/help");
+   %this.queueExec("./scripts/cursors");
+   %this.queueExec("./scripts/utility");
 }
 
 function UI::onCreateClientConnection(%this){}

Templates/BaseGame/game/data/ui/guis/guiMusicPlayer.tscript

@@ -21,13 +21,6 @@
 //-----------------------------------------------------------------------------
 
 // A very simple music player.
-
-//---------------------------------------------------------------------------------------------
-// Prerequisites.
-
-if( !isObject( GuiMusicPlayer ) )
-   exec( "./guiMusicPlayer.gui" );
-
 //---------------------------------------------------------------------------------------------
 // Preferences.
 

Templates/BaseGame/game/tools/Tools.module → Templates/BaseGame/game/tools/tools.module

@@ -2,7 +2,7 @@
 	ModuleId="ToolsModule"
 	VersionId="1"
 	Description="Module that implements the tools and editor suite."
-	ScriptFile="Tools"
+	ScriptFile="tools"
 	CreateFunction="onCreate"
 	DestroyFunction="onDestroy"
 	Group="Tools">

Tools/CMake/torque3d.cmake

@@ -33,8 +33,8 @@ if(UNIX)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CXX_FLAG32} -Wundef -msse -pipe -Wfatal-errors -Wno-return-type-c-linkage -Wno-unused-local-typedef ${TORQUE_ADDITIONAL_LINKER_FLAGS}")
     else()
     # default compiler flags
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_FLAG32} -Wundef -msse -pipe -Wfatal-errors -no-pie ${TORQUE_ADDITIONAL_LINKER_FLAGS} -Wl,-rpath,'$$ORIGIN'")
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CXX_FLAG32} -Wundef -msse -pipe -Wfatal-errors ${TORQUE_ADDITIONAL_LINKER_FLAGS} -Wl,-rpath,'$$ORIGIN'")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_FLAG32} -Wundef -msse -pipe -Wfatal-errors -no-pie ${TORQUE_ADDITIONAL_LINKER_FLAGS} -Wl,-rpath,'$ORIGIN'")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CXX_FLAG32} -Wundef -msse -pipe -Wfatal-errors ${TORQUE_ADDITIONAL_LINKER_FLAGS} -Wl,-rpath,'$ORIGIN'")
 
    endif()