Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into alpha40/genericObjectSpawner

Templates/BaseGame/game/tools/worldEditor/gui/ManageBookmarksWindow.ed.gui

@@ -45,7 +45,7 @@
          //Docking = "Top";
          
          new GuiTextCtrl() {
-            profile = "GuiCenterTextProfile";
+            profile = "ToolsGuiTextProfile";
             horizSizing = "right";
             vertSizing = "bottom";
             position = "1 2";

Templates/BaseGame/game/tools/worldEditor/gui/objectBuilderGui.ed.gui

@@ -32,7 +32,7 @@
 		text = "Create Object";
 
 		new GuiTextCtrl() {
-			profile = "GuiCenterTextProfile";
+			profile = "ToolsGuiTextProfile";
 			horizSizing = "right";
 			vertSizing = "bottom";
 			position = "9 26";
@@ -1268,3 +1268,23 @@ function RibbonData::create( %datablock )
 
    return %obj;
 }
+
+function ParticleEmitterData::create( %datablock ) 
+{
+   %obj = new ParticleEmitter()
+   {
+      dataBlock = %datablock;
+      parentGroup = EWCreatorWindow.objectGroup;
+   };
+   return %obj;
+}
+
+function PrecipitationData::create(%datablock)
+{
+   %obj = new Precipitation()
+   {
+      dataBlock = %datablock;
+      parentGroup = EWCreatorWindow.objectGroup;
+   };
+   return %obj;
+}

Templates/BaseGame/game/tools/worldEditor/main.tscript

@@ -25,8 +25,8 @@ function initializeWorldEditor()
    echo(" % - Initializing World Editor");
    
    // Load GUI
-   exec("./gui/profiles.ed.cs");
-   exec("./scripts/cursors.ed.cs");
+   exec("./gui/profiles.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/cursors.ed." @ $TorqueScriptFileExtension);
 
    exec("./gui/guiCreateNewTerrainGui.gui" );
    exec("./gui/GenericPromptDialog.ed.gui" );
@@ -51,32 +51,32 @@ function initializeWorldEditor()
    exec("tools/gui/postFxEditor.gui" );
    
    // Load Scripts.
-   exec("./scripts/menus.ed.cs");
-   exec("./scripts/menuHandlers.ed.cs");
-   exec("./scripts/editor.ed.cs");
-   exec("./scripts/editorInputCommands.cs");
-   exec("./scripts/editor.keybinds.cs");
-   exec("./scripts/undoManager.ed.cs");
-   exec("./scripts/lighting.ed.cs");
-   exec("./scripts/EditorGui.ed.cs");
-   exec("./scripts/editorPrefs.ed.cs");
-   exec("./scripts/editorRender.ed.cs");
-   exec("./scripts/editorPlugin.ed.cs");
-   exec("./scripts/EditorChooseLevelGui.ed.cs");
-   exec("./scripts/cameraBookmarks.ed.cs");
-   exec("./scripts/ManageSFXParametersWindow.ed.cs");
-   exec("./scripts/AddFMODProjectDlg.ed.cs");
-   exec("./scripts/SelectObjectsWindow.ed.cs");
-   exec("./scripts/cameraCommands.ed.cs");
-   exec("./scripts/probeBake.ed.cs");
-   exec("./scripts/visibility/visibilityLayer.ed.cs");
-   exec("./scripts/visibility/lightViz.cs");
-   exec("./scripts/visibility/shadowViz.cs");
-   exec("./scripts/visibility/probeViz.cs");
-   exec("./scripts/visibility/miscViz.cs");
+   exec("./scripts/menus.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/menuHandlers.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/editor.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/editorInputCommands." @ $TorqueScriptFileExtension);
+   exec("./scripts/editor.keybinds." @ $TorqueScriptFileExtension);
+   exec("./scripts/undoManager.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/lighting.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/EditorGui.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/editorPrefs.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/editorRender.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/editorPlugin.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/EditorChooseLevelGui.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/cameraBookmarks.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/ManageSFXParametersWindow.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/AddFMODProjectDlg.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/SelectObjectsWindow.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/cameraCommands.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/probeBake.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/visibility/visibilityLayer.ed." @ $TorqueScriptFileExtension);
+   exec("./scripts/visibility/lightViz." @ $TorqueScriptFileExtension);
+   exec("./scripts/visibility/shadowViz." @ $TorqueScriptFileExtension);
+   exec("./scripts/visibility/probeViz." @ $TorqueScriptFileExtension);
+   exec("./scripts/visibility/miscViz." @ $TorqueScriptFileExtension);
    
-   exec("tools/gui/postFxEditor.cs" );
-   exec("tools/gui/renderTargetVisualizer.ed.cs");
+   exec("tools/gui/postFxEditor." @ $TorqueScriptFileExtension );
+   exec("tools/gui/renderTargetVisualizer.ed." @ $TorqueScriptFileExtension);
 
    // Load Custom Editors
    loadDirectory(expandFilename("./scripts/editors"));

Templates/BaseGame/game/tools/worldEditor/scripts/AddFMODProjectDlg.ed.tscript

@@ -140,7 +140,7 @@ function AddFMODProjectDlg::onOK( %this )
    // If an event script exists from a previous instantiation,
    // delete it first.
    
-   %eventFileName = %fileName @ ".cs";
+   %eventFileName = %fileName @ "." @ $TorqueScriptFileExtension;
    if( isFile( %eventFileName ) )
       fileDelete( %eventFileName );
    
@@ -164,7 +164,7 @@ function AddFMODProjectDlg::onOK( %this )
    {
       // Save the object.
 
-      %objName.setFileName( "scripts/client/audioData.cs" );
+      %objName.setFileName( "scripts/client/audioData." @ $TorqueScriptFileExtension );
       %this.persistenceMgr.setDirty( %objName );
       %this.persistenceMgr.saveDirty();
    }

Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript

@@ -38,7 +38,7 @@ function EditorGui::init(%this)
    if( !isObject( %this-->ToolsPaletteWindow ) )
    {
       // Load Creator/Inspector GUI
-      exec("~/worldEditor/gui/ToolsPaletteGroups/init.cs");
+      exec("~/worldEditor/gui/ToolsPaletteGroups/init." @ $TorqueScriptFileExtension);
       exec("~/worldEditor/gui/ToolsPaletteWindow.ed.gui");
       
       if( isObject( EWToolsPaletteWindow ) )
@@ -157,7 +157,7 @@ function EditorGui::init(%this)
    if( !isObject( %this-->EditorSettingsWindow ) )
    {
       exec("tools/gui/EditorSettingsWindow.ed.gui");
-      exec("tools/gui/editorSettingsWindow.ed.cs");
+      exec("tools/gui/editorSettingsWindow.ed." @ $TorqueScriptFileExtension);
       %this.add( ESettingsWindow );
       ESettingsWindow.setVisible(false);
       
@@ -178,7 +178,7 @@ function EditorGui::init(%this)
    if( !isObject( %this-->SnapOptionsWindow ) )
    {
       exec("~/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui");
-      exec("~/worldEditor/scripts/objectSnapOptions.ed.cs");
+      exec("~/worldEditor/scripts/objectSnapOptions.ed." @ $TorqueScriptFileExtension);
       %this.add( ESnapOptions );
       ESnapOptions.setVisible(false);
       ESnapOptionsTabBook.selectPage(0);
@@ -188,7 +188,7 @@ function EditorGui::init(%this)
    if( !isObject( %this-->TransformSelectionWindow ) )
    {
       exec("~/worldEditor/gui/TransformSelectionWindow.ed.gui");
-      exec("~/worldEditor/scripts/transformSelection.ed.cs");
+      exec("~/worldEditor/scripts/transformSelection.ed." @ $TorqueScriptFileExtension);
       %this.add( ETransformSelection );
       ETransformSelection.setVisible(false);
    }

Templates/BaseGame/game/tools/worldEditor/scripts/ManageSFXParametersWindow.ed.tscript

@@ -26,7 +26,7 @@
 //=============================================================================
 
 /// File to save newly created SFXParameters in by default.
-$SFX_PARAMETER_FILE = "scripts/client/audioData.cs";
+$SFX_PARAMETER_FILE = "scripts/client/audioData." @ $TorqueScriptFileExtension;
 
 $SFX_PARAMETER_CHANNELS[  0 ] = "Volume";
 $SFX_PARAMETER_CHANNELS[  1 ] = "Pitch";

Templates/BaseGame/game/tools/worldEditor/scripts/editor.ed.tscript

@@ -138,8 +138,7 @@ function toggleEditor(%make)
          }
          else
          {
-            canvas.pushDialog( EditorLoadingGui );
-            canvas.repaint();
+            displayEditorLoadingGui();
             
             Editor.open();
 			
@@ -151,7 +150,7 @@ function toggleEditor(%make)
             if (theLevelInfo.type $= "DemoScene")
                commandToServer('dropCameraAtPlayer', true);
                
-            canvas.popDialog(EditorLoadingGui);
+            hideEditorLoadingGui();
          }
          
          popInstantGroup();
@@ -163,7 +162,7 @@ function toggleEditor(%make)
 }
 
 //------------------------------------------------------------------------------
-//  The editor action maps are defined in editor.bind.cs
+//  The editor action maps are defined in editor.bind.tscript
 GlobalActionMap.bind(keyboard, "f11", fastLoadWorldEdit);
 
 

Templates/BaseGame/game/tools/worldEditor/scripts/editorPlugin.ed.tscript

@@ -40,9 +40,9 @@
 ///   
 ///   EditorPlugin::register( %obj );
 ///
-/// For an a full example see: tools/roadEditor/main.cs
-///                        or: tools/riverEditor/main.cs
-///                        or: tools/decalEditor/main.cs
+/// For an a full example see: tools/roadEditor/main.tscript
+///                        or: tools/riverEditor/main.tscript
+///                        or: tools/decalEditor/main.tscript
 ///
 
 /// It is not intended for the user to overload this method.

Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript

@@ -340,10 +340,10 @@ function TerrainMaterialDlg::newMat( %this )
       internalName = %matName;
       parentGroup = TerrainMaterialDlgNewGroup;
    };
-   %newMat.setFileName( "art/terrains/materials.cs" );
+   %newMat.setFileName( "art/terrains/materials." @ $TorqueScriptFileExtension );
    
    // Mark it as dirty and to be saved in the default location.
-   ETerrainMaterialPersistMan.setDirty( %newMat, "art/terrains/materials.cs" );*/
+   ETerrainMaterialPersistMan.setDirty( %newMat, "art/terrains/materials." @ $TorqueScriptFileExtension );*/
 
    %scene = getRootScene();
    %path = filePath(%scene.getFilename());
@@ -591,7 +591,7 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
    {
       error("TerrainMaterialDlg::saveDirtyMaterial() - terrain material doesn't have a fileName set to save to.");
       return;
-      //%fileName = "data/terrains/materials.cs";
+      //%fileName = "data/terrains/materials." @ $TorqueScriptFileExtension;
    }
       
    ETerrainMaterialPersistMan.setDirty( %mat, %fileName );