Adds some basic, common materials to the editor so some starting point is always on-hand, as well as hook the BlankRoom starting editor level up to use them.

Added a check so if no levels are found from other modules, the default ui module will prompt the user to launch the editor to the base editor level and begin editing or return to main menu if tools are present, or inform them to double-check that there are modules with gameplay/levels and return them to the main menu in no tools available.

Also set it up so if the editor is launched while a mission isn't running, it'll automatically load to the base editor level and set up a default camera object. This way editing can be done even if no level is currently loaded.

Templates/BaseGame/game/core/images/materials.cs

@@ -20,13 +20,6 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-singleton Material( BlankWhite )
-{
-   diffuseMap[0] = "data/art/white";
-   mapTo = "white";
-   materialTag0 = "Miscellaneous";
-};
-
 singleton Material( Empty )
 {
 };

Templates/BaseGame/game/data/clientServer/scripts/server/prefs.cs

@@ -1,13 +0,0 @@
-$Pref::Server::AdminPassword = "";
-$Pref::Server::BanTime = 1800;
-$Pref::Server::ConnectionError = "You do not have the correct version of TEST or the related art needed to play on this server, please contact the server administrator.";
-$Pref::Server::FloodProtectionEnabled = 1;
-$Pref::Server::Info = "This is a Torque 3D server.";
-$Pref::Server::KickBanTime = 300;
-$Pref::Server::MaxChatLen = 120;
-$Pref::Server::MaxPlayers = 64;
-$Pref::Server::Name = "Torque 3D Server";
-$Pref::Server::Password = "";
-$Pref::Server::Port = 28000;
-$Pref::Server::RegionMask = 2;
-$Pref::Server::TimeLimit = 20;

Templates/BaseGame/game/data/ui/scripts/chooseLevelDlg.cs

@@ -26,7 +26,30 @@ function ChooseLevelDlg::onWake( %this )
    CL_levelList.clear();
    ChooseLevelWindow->SmallPreviews.clear();
    
+   %this->CurrentPreview.visible = false;
+   %this->levelName.visible = false;
+   %this->LevelDescriptionLabel.visible = false;
+   %this->LevelDescription.visible = false;
+   
    %count = LevelFilesList.count();
+   
+   if(%count == 0)
+   {
+      //We have no levels found. Prompt the user to open the editor to the default level if the tools are present
+      if(IsDirectory("tools"))
+      {
+         MessageBoxYesNo("Error", "No levels were found in any modules. Do you want to load the editor and start a new level?", 
+            "fastLoadWorldEdit(1);", "Canvas.popDialog(ChooseLevelDlg); Canvas.setContent(MainMenuGUI);");  
+      }
+      else
+      {
+         MessageBoxOK("Error", "No levels were found in any modules. Please ensure you have modules loaded that contain gameplay code and level files.", 
+            "Canvas.popDialog(ChooseLevelDlg); Canvas.setContent(MainMenuGUI);");
+      }
+      
+      return;
+   }
+   
    for ( %i=0; %i < %count; %i++ )
    {
       %file = LevelFilesList.getKey( %i );
@@ -211,21 +234,38 @@ function ChooseLevelWindow::previewSelected(%this, %preview)
 
    // Set the large preview image
    if (isObject(%preview) && %preview.bitmap !$= "")
+   {
+      %this->CurrentPreview.visible = true;
       %this->CurrentPreview.setBitmap(%preview.bitmap);
+   }
    else
-      %this->CurrentPreview.setBitmap("data/ui/art/no-preview");
+   {
+      %this->CurrentPreview.visible = false;
+   }
 
    // Set the current level name
    if (isObject(%preview) && %preview.levelName !$= "")
+   {
+      %this->LevelName.visible = true;
       %this->LevelName.setText(%preview.levelName);
+   }
    else
-      %this->LevelName.setText("Level");
+   {
+      %this->LevelName.visible = false;
+   }
 
    // Set the current level description
    if (isObject(%preview) && %preview.levelDesc !$= "")
+   {
+      %this->LevelDescription.visible = true;
+      %this->LevelDescriptionLabel.visible = true;
       %this->LevelDescription.setText(%preview.levelDesc);
+   }
    else
-      %this->LevelDescription.setText("A Torque Level");
+   {
+      %this->LevelDescription.visible = false;
+      %this->LevelDescriptionLabel.visible = false;
+   }
 }
 
 function ChooseLevelWindow::previousPreviews(%this)

Templates/BaseGame/game/data/ui/scripts/guis/chooseLevelDlg.gui

@@ -1,7 +1,7 @@
 //--- OBJECT WRITE BEGIN ---
 %guiContent = new GuiControl(ChooseLevelDlg) {
    position = "0 0";
-   extent = "1024 768";
+   extent = "1280 1024";
    minExtent = "8 8";
    horizSizing = "width";
    vertSizing = "height";
@@ -13,7 +13,7 @@
    isContainer = "1";
    canSave = "1";
    canSaveDynamicFields = "1";
-      Enabled = "1";
+      enabled = "1";
       launchInEditor = "0";
       returnGui = "MainMenuGui";
 
@@ -33,7 +33,8 @@
       canSaveDynamicFields = "0";
 
       new GuiBitmapCtrl() {
-         bitmap = "./art/no-preview";
+         bitmap = "data/ui/scripts/guis/art/no-preview";
+         color = "255 255 255 255";
          wrap = "0";
          position = "369 31";
          extent = "400 300";
@@ -41,15 +42,16 @@
          horizSizing = "right";
          vertSizing = "bottom";
          profile = "GuiDefaultProfile";
-         visible = "1";
+         visible = "0";
          active = "1";
          tooltipProfile = "GuiToolTipProfile";
          hovertime = "1000";
          isContainer = "0";
          internalName = "CurrentPreview";
+         hidden = "1";
          canSave = "1";
          canSaveDynamicFields = "1";
-            Enabled = "1";
+            enabled = "1";
       };
       new GuiTextCtrl() {
          text = "Empty Room";
@@ -66,12 +68,13 @@
          horizSizing = "right";
          vertSizing = "bottom";
          profile = "GuiMenuButtonProfile";
-         visible = "1";
+         visible = "0";
          active = "1";
          tooltipProfile = "GuiToolTipProfile";
          hovertime = "1000";
          isContainer = "0";
          internalName = "levelName";
+         hidden = "1";
          canSave = "1";
          canSaveDynamicFields = "0";
       };
@@ -90,11 +93,13 @@
          horizSizing = "right";
          vertSizing = "bottom";
          profile = "GuiMenuButtonProfile";
-         visible = "1";
+         visible = "0";
          active = "1";
          tooltipProfile = "GuiToolTipProfile";
          hovertime = "1000";
          isContainer = "0";
+         internalName = "LevelDescriptionLabel";
+         hidden = "1";
          canSave = "1";
          canSaveDynamicFields = "0";
       };
@@ -104,7 +109,7 @@
          maxChars = "-1";
          useURLMouseCursor = "0";
          position = "370 380";
-         extent = "165 28";
+         extent = "165 14";
          minExtent = "8 8";
          horizSizing = "right";
          vertSizing = "bottom";
@@ -119,11 +124,12 @@
          canSaveDynamicFields = "0";
       };
       new GuiBitmapButtonCtrl() {
-         bitmap = "./art/previous-button";
+         bitmap = "data/ui/scripts/guis/art/previous-button";
          bitmapMode = "Stretched";
          autoFitExtents = "0";
          useModifiers = "0";
          useStates = "1";
+         masked = "0";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
@@ -143,15 +149,16 @@
          hidden = "1";
          canSave = "1";
          canSaveDynamicFields = "1";
-            Enabled = "1";
+            enabled = "1";
             wrap = "0";
       };
       new GuiBitmapButtonCtrl() {
-         bitmap = "./art/next-button";
+         bitmap = "data/ui/scripts/guis/art/next-button";
          bitmapMode = "Stretched";
          autoFitExtents = "0";
          useModifiers = "0";
          useStates = "1";
+         masked = "0";
          groupNum = "-1";
          buttonType = "PushButton";
          useMouseEvents = "0";
@@ -171,7 +178,7 @@
          hidden = "1";
          canSave = "1";
          canSaveDynamicFields = "1";
-            Enabled = "1";
+            enabled = "1";
             wrap = "0";
       };
       new GuiTextListCtrl(CL_levelList) {
@@ -219,28 +226,6 @@
          internalName = "SmallPreviews";
          canSave = "1";
          canSaveDynamicFields = "0";
-
-         new GuiButtonCtrl() {
-            text = "Empty";
-            groupNum = "-1";
-            buttonType = "ToggleButton";
-            useMouseEvents = "0";
-            position = "0 0";
-            extent = "368 35";
-            minExtent = "8 2";
-            horizSizing = "right";
-            vertSizing = "bottom";
-            profile = "GuiMenuButtonProfile";
-            visible = "1";
-            active = "1";
-            command = "ChooseLevelWindow.previewSelected(ChooseLevelWindow->SmallPreviews->SmallPreview0);";
-            tooltipProfile = "GuiToolTipProfile";
-            hovertime = "1000";
-            isContainer = "0";
-            internalName = "SmallPreview0";
-            canSave = "1";
-            canSaveDynamicFields = "0";
-         };
       };
       new GuiButtonCtrl(ChooseLevelDlgGoBtn) {
          text = "Start Level";
@@ -284,4 +269,4 @@
       };
    };
 };
-//--- OBJECT WRITE END ---
+//--- OBJECT WRITE END ---

Templates/BaseGame/game/data/ui/scripts/guis/mainMenu.gui

@@ -6,7 +6,7 @@ exec( "tools/gui/profiles.ed.cs" );
    useVariable = "0";
    tile = "0";
    position = "0 0";
-   extent = "1024 768";
+   extent = "1280 1024";
    minExtent = "8 8";
    horizSizing = "width";
    vertSizing = "height";
@@ -18,7 +18,7 @@ exec( "tools/gui/profiles.ed.cs" );
    isContainer = "1";
    canSave = "1";
    canSaveDynamicFields = "1";
-      Enabled = "1";
+      enabled = "1";
       isDecoy = "0";
 
    new GuiBitmapButtonCtrl(MainMenuAppLogo) {
@@ -27,10 +27,11 @@ exec( "tools/gui/profiles.ed.cs" );
       autoFitExtents = "0";
       useModifiers = "0";
       useStates = "1";
+      masked = "0";
       groupNum = "-1";
       buttonType = "PushButton";
       useMouseEvents = "0";
-      position = "368 30";
+      position = "624 30";
       extent = "443 139";
       minExtent = "8 2";
       horizSizing = "left";
@@ -44,7 +45,6 @@ exec( "tools/gui/profiles.ed.cs" );
       isContainer = "0";
       canSave = "1";
       canSaveDynamicFields = "1";
-         
    };
    new GuiControl(MainMenuButtonContainer) {
       position = "67 321";
@@ -168,7 +168,7 @@ exec( "tools/gui/profiles.ed.cs" );
             canSaveDynamicFields = "0";
          };
          new GuiButtonCtrl() {
-            text = "Exit";
+            text = "Launch World Editor";
             groupNum = "-1";
             buttonType = "PushButton";
             useMouseEvents = "0";
@@ -180,6 +180,46 @@ exec( "tools/gui/profiles.ed.cs" );
             profile = "GuiBlankMenuButtonProfile";
             visible = "1";
             active = "1";
+            command = "fastLoadWorldEdit(1);";
+            tooltipProfile = "GuiToolTipProfile";
+            hovertime = "1000";
+            isContainer = "0";
+            canSave = "1";
+            canSaveDynamicFields = "0";
+         };
+         new GuiButtonCtrl() {
+            text = "Launch GUI Editor";
+            groupNum = "-1";
+            buttonType = "PushButton";
+            useMouseEvents = "0";
+            position = "0 200";
+            extent = "442 40";
+            minExtent = "8 8";
+            horizSizing = "relative";
+            vertSizing = "bottom";
+            profile = "GuiBlankMenuButtonProfile";
+            visible = "1";
+            active = "1";
+            command = "fastLoadGUIEdit(1);";
+            tooltipProfile = "GuiToolTipProfile";
+            hovertime = "1000";
+            isContainer = "0";
+            canSave = "1";
+            canSaveDynamicFields = "0";
+         };
+         new GuiButtonCtrl() {
+            text = "Exit";
+            groupNum = "-1";
+            buttonType = "PushButton";
+            useMouseEvents = "0";
+            position = "0 240";
+            extent = "442 40";
+            minExtent = "8 8";
+            horizSizing = "relative";
+            vertSizing = "bottom";
+            profile = "GuiBlankMenuButtonProfile";
+            visible = "1";
+            active = "1";
             command = "quit();";
             tooltipProfile = "GuiToolTipProfile";
             hovertime = "1000";

Templates/BaseGame/game/data/ui/scripts/guis/messageBoxYesNo.gui

@@ -1,126 +1,75 @@
 //--- OBJECT WRITE BEGIN ---
 %guiContent = new GuiControl(MessageBoxYesNoDlg) {
-   position = "0 0";
-   extent = "1024 768";
-   minExtent = "8 8";
-   horizSizing = "width";
-   vertSizing = "height";
-   profile = "GuiOverlayProfile";
-   visible = "1";
-   active = "1";
-   tooltipProfile = "GuiToolTipProfile";
-   hovertime = "1000";
-   isContainer = "1";
-   canSave = "1";
-   canSaveDynamicFields = "1";
-      helpTag = "0";
+	profile = "GuiOverlayProfile";
+	horizSizing = "width";
+	vertSizing = "height";
+	position = "0 0";
+	extent = "640 480";
+	minExtent = "8 8";
+	visible = "1";
+	helpTag = "0";
 
-   new GuiContainer() {
-      margin = "0 0 0 0";
-      padding = "0 0 0 0";
-      anchorTop = "1";
-      anchorBottom = "0";
-      anchorLeft = "1";
-      anchorRight = "0";
-      position = "168 352";
-      extent = "700 64";
-      minExtent = "8 2";
+	new GuiWindowCtrl(MBYesNoFrame) {
+      profile = "GuiWindowProfile";
       horizSizing = "center";
       vertSizing = "center";
-      profile = "GuiDefaultProfile";
+      position = "170 175";
+      extent = "300 100";
+      minExtent = "48 92";
       visible = "1";
-      active = "1";
-      tooltipProfile = "GuiToolTipProfile";
-      hovertime = "1000";
-      isContainer = "1";
-      canSave = "1";
-      canSaveDynamicFields = "0";
+      helpTag = "0";
+      maxLength = "255";
+      resizeWidth = "1";
+      resizeHeight = "1";
+      canMove = "1";
+      canClose = "1";
+      canMinimize = "0";
+      canMaximize = "0";
+      minSize = "50 50";
+      text = "";
+      closeCommand = "MessageCallback(MessageBoxYesNoDlg,MessageBoxYesNoDlg.noCallback);";
 
-      new GuiChunkedBitmapCtrl() {
-         bitmap = "data/ui/art/hudfill.png";
-         useVariable = "0";
-         tile = "0";
-         position = "0 0";
-         extent = "700 64";
-         minExtent = "8 2";
-         horizSizing = "right";
+		new GuiMLTextCtrl(MBYesNoText) {
+         profile = "GuiMLTextProfile";
+         horizSizing = "center";
          vertSizing = "bottom";
-         profile = "GuiDefaultProfile";
-         visible = "1";
-         active = "1";
-         command = "MessageCallback(MessageBoxYesNoDlg,MessageBoxYesNoDlg.noCallback);";
-         accelerator = "escape";
-         tooltipProfile = "GuiToolTipProfile";
-         hovertime = "1000";
-         isContainer = "0";
-         canSave = "1";
-         canSaveDynamicFields = "0";
-      };
-      new GuiTextCtrl(MBYesNoText) {
-         text = "Re-bind \"\" to...";
-         maxLength = "255";
-         margin = "0 0 0 0";
-         padding = "0 0 0 0";
-         anchorTop = "1";
-         anchorBottom = "0";
-         anchorLeft = "1";
-         anchorRight = "0";
-         position = "177 8";
-         extent = "384 20";
+         position = "11 38";
+         extent = "280 14";
          minExtent = "8 8";
-         horizSizing = "width";
-         vertSizing = "height";
-         profile = "GuiMenuButtonProfile";
          visible = "1";
-         active = "1";
-         tooltipProfile = "GuiToolTipProfile";
-         hovertime = "1000";
-         isContainer = "1";
-         canSave = "1";
-         canSaveDynamicFields = "0";
-      };
-      new GuiButtonCtrl() {
-         text = "Yes";
-         groupNum = "-1";
-         buttonType = "PushButton";
-         useMouseEvents = "0";
-         position = "270 36";
-         extent = "80 22";
-         minExtent = "8 8";
+         helpTag = "0";
+         lineSpacing = "2";
+         allowColorChars = "0";
+         maxChars = "-1";
+		};
+		new GuiButtonCtrl() {
+         profile = "GuiButtonProfile";
          horizSizing = "right";
          vertSizing = "top";
-         profile = "GuiButtonProfile";
-         visible = "1";
-         active = "1";
-         command = "MessageCallback(MessageBoxYesNoDlg,MessageBoxYesNoDlg.yesCallback);";
-         accelerator = "return";
-         tooltipProfile = "GuiToolTipProfile";
-         hovertime = "1000";
-         isContainer = "0";
-         canSave = "1";
-         canSaveDynamicFields = "0";
-      };
-      new GuiButtonCtrl() {
-         text = "No";
-         groupNum = "-1";
-         buttonType = "PushButton";
-         useMouseEvents = "0";
-         position = "367 36";
+         position = "70 68";
          extent = "80 22";
          minExtent = "8 8";
+         visible = "1";
+			command = "MessageCallback(MessageBoxYesNoDlg,MessageBoxYesNoDlg.yesCallback);";
+         accelerator = "return";
+         helpTag = "0";
+         text = "Yes";
+         simpleStyle = "0";
+		};
+		new GuiButtonCtrl() {
+         profile = "GuiButtonProfile";
          horizSizing = "right";
          vertSizing = "top";
-         profile = "GuiButtonProfile";
+         position = "167 68";
+         extent = "80 22";
+         minExtent = "8 8";
          visible = "1";
-         active = "1";
-         command = "MessageCallback(MessageBoxYesNoDlg,MessageBoxYesNoDlg.noCallback);";
+			command = "MessageCallback(MessageBoxYesNoDlg,MessageBoxYesNoDlg.noCallback);";
          accelerator = "escape";
-         tooltipProfile = "GuiToolTipProfile";
-         hovertime = "1000";
-         isContainer = "0";
-         canSave = "1";
-         canSaveDynamicFields = "0";
-      };
-   };
+         helpTag = "0";
+         text = "No";
+         simpleStyle = "0";
+		};
+	};
 };
 //--- OBJECT WRITE END ---

Templates/BaseGame/game/data/ui/scripts/messageBoxes.cs

@@ -22,25 +22,14 @@
 
 
 // Cleanup Dialog created by 'core'
-if( isObject( MessagePopupDlg ) )
-   MessagePopupDlg.delete();
 if( isObject( MessageBoxYesNoDlg ) )
    MessageBoxYesNoDlg.delete();
-if( isObject( MessageBoxYesNoCancelDlg ) )
-   MessageBoxYesNoCancelDlg.delete();
-if( isObject( MessageBoxOKCancelDetailsDlg ) )
-   MessageBoxOKCancelDetailsDlg.delete();
-if( isObject( MessageBoxOKCancelDlg ) )
-   MessageBoxOKCancelDlg.delete();
 if( isObject( MessageBoxOKDlg ) )
    MessageBoxOKDlg.delete();
-if( isObject( IODropdownDlg ) )
-   IODropdownDlg.delete();
-   
 
 // Load Editor Dialogs
-exec("./guis/messageBoxOk.ed.gui");
-exec("./guis/messageBoxYesNo.ed.gui");
+exec("./guis/messageBoxOk.gui");
+exec("./guis/messageBoxYesNo.gui");
 
 // --------------------------------------------------------------------
 // Message Sound

Templates/BaseGame/game/tools/base/images/materials.cs

@@ -0,0 +1,80 @@
+//-----------------------------------------------------------------------------
+// Torque
+// Copyright GarageGames, LLC 2011
+//-----------------------------------------------------------------------------
+
+singleton CubemapData( BlankSkyCubemap )
+{
+   cubeFace[0] = "./skybox_1";
+   cubeFace[1] = "./skybox_2";
+   cubeFace[2] = "./skybox_3";
+   cubeFace[3] = "./skybox_4";
+   cubeFace[4] = "./skybox_5";
+   cubeFace[5] = "./skybox_6";
+};
+
+singleton Material( BlankSkyMat )
+{
+   cubemap = BlankSkyCubemap;
+   isSky = true;
+};
+
+singleton Material(White)
+{
+   diffuseMap[0] = "./white.png";
+};
+
+singleton Material(Gray)
+{
+   diffuseMap[0] = "./gray.png";
+};
+
+singleton Material(Black)
+{
+   diffuseMap[0] = "./black.png";
+};
+
+singleton Material(Grid_512_Black)
+{
+   diffuseMap[0] = "./512_black.png";
+};
+
+singleton Material(Grid_512_ForestGreen)
+{
+   diffuseMap[0] = "./512_forestgreen.png";
+};
+
+singleton Material(Grid_512_ForestGreen_Lines)
+{
+   diffuseMap[0] = "./512_forestgreen_lines.png";
+};
+
+singleton Material(Grid_512_Green)
+{
+   diffuseMap[0] = "./512_green.png";
+};
+
+singleton Material(Grid_512_Grey)
+{
+   diffuseMap[0] = "./512_grey.png";
+};
+
+singleton Material(Grid_512_Grey_Base)
+{
+   diffuseMap[0] = "./512_grey_base.png";
+};
+
+singleton Material(Grid_512_Orange)
+{
+   diffuseMap[0] = "./512_orange.png";
+};
+
+singleton Material(Grid_512_Orange_Lines)
+{
+   diffuseMap[0] = "./512_orange_lines.png";
+};
+
+singleton Material(Grid_512_Red)
+{
+   diffuseMap[0] = "./512_red.png";
+};

Templates/BaseGame/game/tools/base/images/sky_skybox.dml

@@ -0,0 +1,7 @@
+skybox_1
+skybox_2
+skybox_3
+skybox_4
+skybox_5
+skybox_6
+skybox_6

Templates/BaseGame/game/tools/convexEditor/images/materials.cs

@@ -1,5 +0,0 @@
-singleton Material(DefaultConvexShapeMat)
-{
-   mapTo = "unmapped_mat";
-   diffuseMap[0] = "./512_orange.png";
-};

Templates/BaseGame/game/tools/convexEditor/main.cs

@@ -201,7 +201,7 @@ function ConvexEditorPlugin::onSaveMission( %this, %missionFile )
 function ConvexEditorPlugin::initSettings( %this )
 {
    EditorSettings.beginGroup( "ConvexEditor", true );
-   EditorSettings.setDefaultValue(  "MaterialName",         "DefaultConvexShapeMat" );
+   EditorSettings.setDefaultValue(  "MaterialName",         "Grid_512_Orange" );
    EditorSettings.endGroup();
 }
 

Templates/BaseGame/game/tools/levels/BlankRoom.mis

@@ -1,42 +1,57 @@
 //--- OBJECT WRITE BEGIN ---
 new SimGroup(MissionGroup) {
+   canSave = "1";
    canSaveDynamicFields = "1";
       cdTrack = "2";
       CTF_scoreLimit = "5";
-      Enabled = "1";
+      enabled = "1";
       musicTrack = "lush";
 
-   new LevelInfo(theLevelInfo) {
+   new LevelInfo(TheLevelInfo) {
+      nearClip = "0.1";
       visibleDistance = "1000";
+      visibleGhostDistance = "0";
+      decalBias = "0.0015";
       fogColor = "0.6 0.6 0.7 1";
       fogDensity = "0";
       fogDensityOffset = "700";
       fogAtmosphereHeight = "0";
       canvasClearColor = "0 0 0 255";
-         canSaveDynamicFields = "1";
+      ambientLightBlendPhase = "1";
+      ambientLightBlendCurve = "0 0 -1 -1";
+      advancedLightmapSupport = "0";
+      soundAmbience = "AudioAmbienceDefault";
+      soundDistanceModel = "Linear";
+      canSave = "1";
+      canSaveDynamicFields = "1";
+         desc0 = "A blank room ready to be populated with Torque objects. Guns, anyone?";
+         enabled = "1";
          levelName = "Blank Room";
-         desc0 = "A blank room ready to be populated with Torque objects.\n\nGuns, anyone?";
-         Enabled = "1";
    };
    new SkyBox(theSky) {
-      canSaveDynamicFields = "1";
-      Position = "0 0 0";
-      rotation = "1 0 0 0";
-      scale = "1 1 1";
-      Material = "BlackSkyMat";
+      Material = "BlankSkyMat";
       drawBottom = "0";
       fogBandHeight = "0";
-   };
-   new Sun(theSun) {
-      canSaveDynamicFields = "1";
-      Position = "0 0 0";
+      position = "0 0 0";
       rotation = "1 0 0 0";
       scale = "1 1 1";
+      canSave = "1";
+      canSaveDynamicFields = "1";
+   };
+   new Sun(theSun) {
       azimuth = "230.396";
       elevation = "45";
       color = "0.968628 0.901961 0.901961 1";
-      ambient = "0.078431 0.113725 0.156863 1";
+      ambient = "0.337255 0.533333 0.619608 1";
+      brightness = "1";
       castShadows = "1";
+      staticRefreshFreq = "250";
+      dynamicRefreshFreq = "8";
+      coronaEnabled = "1";
+      coronaScale = "0.5";
+      coronaTint = "1 1 1 1";
+      coronaUseLightColor = "1";
+      flareScale = "1";
       attenuationRatio = "0 1 1";
       shadowType = "PSSM";
       texSize = "1024";
@@ -47,47 +62,36 @@ new SimGroup(MissionGroup) {
       logWeight = "0.9";
       fadeStartDistance = "0";
       lastSplitTerrainOnly = "0";
-      splitFadeDistances = "1 1 1 1";
+      representedInLightmap = "0";
+      shadowDarkenColor = "0 0 0 -1";
+      includeLightmappedGeometryInShadow = "0";
+      position = "0 0 0";
+      rotation = "1 0 0 0";
+      scale = "1 1 1";
+      canSave = "1";
+      canSaveDynamicFields = "1";
          bias = "0.1";
          Blur = "1";
-         Enabled = "1";
+         enabled = "1";
          height = "1024";
          lightBleedFactor = "0.8";
          minVariance = "0";
          pointShadowType = "PointShadowType_Paraboloid";
          shadowBox = "-100 -100 -100 100 100 100";
+         splitFadeDistances = "1 1 1 1";
          width = "3072";
    };
-   new SimGroup(PlayerDropPoints) {
+   new GroundPlane() {
+      squareSize = "128";
+      scaleU = "25";
+      scaleV = "25";
+      Material = "Grid_512_Grey";
+      canSave = "1";
       canSaveDynamicFields = "1";
-         Enabled = "1";
-
-      new SpawnSphere() {
-         canSaveDynamicFields = "1";
-         Position = "0 0 2";
+         enabled = "1";
+         position = "0 0 0";
          rotation = "1 0 0 0";
          scale = "1 1 1";
-         dataBlock = "SpawnSphereMarker";
-         radius = "5";
-         autoSpawn = "false";
-         sphereWeight = "1";
-         indoorWeight = "1";
-         outdoorWeight = "1";
-            Enabled = "1";
-            homingCount = "0";
-            lockCount = "0";
-      };
-   };
-   new GroundPlane() {
-      canSaveDynamicFields = "1";
-      Position = "0 0 0";
-      rotation = "1 0 0 0";
-      scale = "1 1 1";
-      squareSize = "128";
-      scaleU = "12";
-      scaleV = "12";
-      Material = "BlankWhite";
-         Enabled = "1";
    };
 };
 //--- OBJECT WRITE END ---

Templates/BaseGame/game/tools/levels/BlankRoom.postfxpreset.cs

@@ -0,0 +1,53 @@
+$PostFXManager::Settings::ColorCorrectionRamp = "core/images/null_color_ramp.png";
+$PostFXManager::Settings::DOF::BlurCurveFar = "";
+$PostFXManager::Settings::DOF::BlurCurveNear = "";
+$PostFXManager::Settings::DOF::BlurMax = "";
+$PostFXManager::Settings::DOF::BlurMin = "";
+$PostFXManager::Settings::DOF::EnableAutoFocus = "";
+$PostFXManager::Settings::DOF::EnableDOF = "";
+$PostFXManager::Settings::DOF::FocusRangeMax = "";
+$PostFXManager::Settings::DOF::FocusRangeMin = "";
+$PostFXManager::Settings::EnableDOF = "1";
+$PostFXManager::Settings::EnabledSSAO = "1";
+$PostFXManager::Settings::EnableHDR = "1";
+$PostFXManager::Settings::EnableLightRays = "1";
+$PostFXManager::Settings::EnablePostFX = "1";
+$PostFXManager::Settings::EnableSSAO = "1";
+$PostFXManager::Settings::EnableVignette = "1";
+$PostFXManager::Settings::HDR::adaptRate = "2";
+$PostFXManager::Settings::HDR::blueShiftColor = "1.05 0.97 1.27";
+$PostFXManager::Settings::HDR::brightPassThreshold = "1";
+$PostFXManager::Settings::HDR::enableBloom = "1";
+$PostFXManager::Settings::HDR::enableBlueShift = "0";
+$PostFXManager::Settings::HDR::enableToneMapping = "0.5";
+$PostFXManager::Settings::HDR::gaussMean = "0";
+$PostFXManager::Settings::HDR::gaussMultiplier = "0.3";
+$PostFXManager::Settings::HDR::gaussStdDev = "0.8";
+$PostFXManager::Settings::HDR::keyValue = "0.117347";
+$PostFXManager::Settings::HDR::minLuminace = "0.0459184";
+$PostFXManager::Settings::HDR::whiteCutoff = "1";
+$PostFXManager::Settings::LightRays::brightScalar = "0.75";
+$PostFXManager::Settings::LightRays::decay = "1.0";
+$PostFXManager::Settings::LightRays::density = "0.94";
+$PostFXManager::Settings::LightRays::numSamples = "40";
+$PostFXManager::Settings::LightRays::weight = "5.65";
+$PostFXManager::Settings::SSAO::blurDepthTol = "0.001";
+$PostFXManager::Settings::SSAO::blurNormalTol = "0.95";
+$PostFXManager::Settings::SSAO::lDepthMax = "2";
+$PostFXManager::Settings::SSAO::lDepthMin = "0.2";
+$PostFXManager::Settings::SSAO::lDepthPow = "0.2";
+$PostFXManager::Settings::SSAO::lNormalPow = "2";
+$PostFXManager::Settings::SSAO::lNormalTol = "-0.5";
+$PostFXManager::Settings::SSAO::lRadius = "1";
+$PostFXManager::Settings::SSAO::lStrength = "10";
+$PostFXManager::Settings::SSAO::overallStrength = "2";
+$PostFXManager::Settings::SSAO::quality = "0";
+$PostFXManager::Settings::SSAO::sDepthMax = "1";
+$PostFXManager::Settings::SSAO::sDepthMin = "0.1";
+$PostFXManager::Settings::SSAO::sDepthPow = "1";
+$PostFXManager::Settings::SSAO::sNormalPow = "1";
+$PostFXManager::Settings::SSAO::sNormalTol = "0";
+$PostFXManager::Settings::SSAO::sRadius = "0.1";
+$PostFXManager::Settings::SSAO::sStrength = "6";
+$PostFXManager::Settings::Vignette::VMax = 0.830218;
+$PostFXManager::Settings::Vignette::VMin = 0.2;

Templates/BaseGame/game/tools/main.cs

@@ -223,12 +223,31 @@ function fastLoadWorldEdit(%val)
          onStart();
       }
 
-      if(Canvas.getContent() == MainMenuGui.getId())
+      if(!$Game::running)
       {
          //startGame();
          activatePackage( "BootEditor" );
          ChooseLevelDlg.launchInEditor = false; 
          StartGame("tools/levels/BlankRoom.mis", "SinglePlayer");
+         
+         if(!isObject(Observer))
+         {
+            datablock CameraData(Observer) {};
+         }
+         
+         %cam = new Camera()
+         {
+            datablock = Observer;
+         };
+         
+         %cam.scopeToClient(LocalClientConnection);
+         
+         LocalClientConnection.setCameraObject(%cam);
+         LocalClientConnection.setControlObject(%cam);
+         
+         LocalClientConnection.camera = %cam;
+         
+         %cam.setPosition("0 0 0");
       }
       else
       {        

Templates/BaseGame/game/tools/settings.xml

@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<EditorSettings>
-    <Group name="GuiEditor">
-        <Setting name="lastPath">E:/gamedev/T3DMIT/CLEAN/My Projects/TemplateTest/game/data/scripts/gui</Setting>
-        <Setting name="previewResolution">1280 1024</Setting>
-        <Group name="Help">
-            <Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
-            <Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
-            <Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
-        </Group>
-        <Group name="Rendering">
-            <Setting name="drawGuides">1</Setting>
-            <Setting name="drawBorderLines">1</Setting>
-        </Group>
-        <Group name="EngineDevelopment">
-            <Setting name="showEditorGuis">0</Setting>
-            <Setting name="toggleIntoEditor">0</Setting>
-            <Setting name="showEditorProfiles">0</Setting>
-        </Group>
-        <Group name="Snapping">
-            <Setting name="snap2Grid">0</Setting>
-            <Setting name="snapToGuides">1</Setting>
-            <Setting name="snap2GridSize">8</Setting>
-            <Setting name="snapToEdges">1</Setting>
-            <Setting name="snapToCenters">1</Setting>
-            <Setting name="snapToCanvas">1</Setting>
-            <Setting name="sensitivity">2</Setting>
-            <Setting name="snapToControls">1</Setting>
-        </Group>
-        <Group name="Selection">
-            <Setting name="fullBox">0</Setting>
-        </Group>
-        <Group name="Library">
-            <Setting name="viewType">Categorized</Setting>
-        </Group>
-    </Group>
-    <Group name="WorldEditor">
-        <Setting name="currentEditor">WorldEditorInspectorPlugin</Setting>
-        <Setting name="orthoFOV">50</Setting>
-        <Setting name="forceLoadDAE">0</Setting>
-        <Setting name="undoLimit">40</Setting>
-        <Setting name="dropType">screenCenter</Setting>
-        <Setting name="orthoShowGrid">1</Setting>
-        <Setting name="displayType">6</Setting>
-        <Group name="Tools">
-            <Setting name="snapSoft">0</Setting>
-            <Setting name="boundingBoxCollision">0</Setting>
-            <Setting name="snapSoftSize">2</Setting>
-            <Setting name="snapGround">0</Setting>
-            <Setting name="dropAtScreenCenterMax">100</Setting>
-            <Setting name="dropAtScreenCenterScalar">1</Setting>
-            <Setting name="objectsUseBoxCenter">1</Setting>
-        </Group>
-        <Group name="Grid">
-            <Setting name="gridSnap">1</Setting>
-            <Setting name="gridMinorColor">51 51 51 100</Setting>
-            <Setting name="gridOriginColor">255 255 255 100</Setting>
-            <Setting name="gridSize">1</Setting>
-            <Setting name="gridColor">102 102 102 100</Setting>
-        </Group>
-        <Group name="ObjectIcons">
-            <Setting name="fadeIconsEndDist">20</Setting>
-            <Setting name="fadeIcons">1</Setting>
-            <Setting name="fadeIconsStartAlpha">255</Setting>
-            <Setting name="fadeIconsEndAlpha">0</Setting>
-            <Setting name="fadeIconsStartDist">8</Setting>
-        </Group>
-        <Group name="Color">
-            <Setting name="objMouseOverColor">0 255 0 255</Setting>
-            <Setting name="objSelectColor">255 0 0 255</Setting>
-            <Setting name="dragRectColor">255 255 0 255</Setting>
-            <Setting name="objMouseOverSelectColor">0 0 255 255</Setting>
-            <Setting name="objectTextColor">255 255 255 255</Setting>
-            <Setting name="selectionBoxColor">255 255 0 255</Setting>
-            <Setting name="popupBackgroundColor">100 100 100 255</Setting>
-        </Group>
-        <Group name="Docs">
-            <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>
-            <Setting name="forumURL">http://www.garagegames.com/products/torque-3d/forums</Setting>
-        </Group>
-        <Group name="Render">
-            <Setting name="renderSelectionBox">1</Setting>
-            <Setting name="renderPopupBackground">1</Setting>
-            <Setting name="showMousePopupInfo">1</Setting>
-            <Setting name="renderObjText">1</Setting>
-            <Setting name="renderObjHandle">1</Setting>
-        </Group>
-        <Group name="Images">
-            <Setting name="defaultHandle">tools/worldEditor/images/DefaultHandle</Setting>
-            <Setting name="lockedHandle">tools/worldEditor/images/LockedHandle</Setting>
-            <Setting name="selectHandle">tools/worldEditor/images/SelectHandle</Setting>
-        </Group>
-    </Group>
-    <Group name="TerrainEditor">
-        <Setting name="currentAction">raiseHeight</Setting>
-        <Group name="ActionValues">
-            <Setting name="scaleVal">1</Setting>
-            <Setting name="SlopeMinAngle">0</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="smoothFactor">0.1</Setting>
-            <Setting name="noiseFactor">1</Setting>
-            <Setting name="softSelectRadius">50</Setting>
-            <Setting name="setHeightVal">100</Setting>
-            <Setting name="adjustHeightVal">10</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="maxBrushSize">40 40</Setting>
-            <Setting name="brushType">ellipse</Setting>
-            <Setting name="brushPressure">1</Setting>
-            <Setting name="brushSize">1 1</Setting>
-            <Setting name="brushSoftness">1</Setting>
-        </Group>
-    </Group>
-    <Group name="ShapeEditor">
-        <Setting name="SunDiffuseColor">255 255 255 255</Setting>
-        <Setting name="ShowGrid">1</Setting>
-        <Setting name="highlightMaterial">1</Setting>
-        <Setting name="RenderCollision">0</Setting>
-        <Setting name="SunAngleZ">135</Setting>
-        <Setting name="SunAngleX">45</Setting>
-        <Setting name="showNodes">1</Setting>
-        <Setting name="backgroundColor">0 0 0 100</Setting>
-        <Setting name="gridDimension">40 40</Setting>
-        <Setting name="AdvancedWndVisible">1</Setting>
-        <Setting name="SunAmbientColor">180 180 180 255</Setting>
-        <Setting name="showBounds">0</Setting>
-        <Setting name="showObjBox">1</Setting>
-        <Setting name="renderMounts">1</Setting>
-        <Setting name="gridSize">0.1</Setting>
-    </Group>
-    <Group name="RoadEditor">
-        <Setting name="materialName">DefaultDecalRoadMaterial</Setting>
-        <Setting name="SelectedSplineColor">0 255 0 255</Setting>
-        <Setting name="DefaultWidth">10</Setting>
-        <Setting name="HoverNodeColor">255 255 255 255</Setting>
-        <Setting name="HoverSplineColor">255 0 0 255</Setting>
-    </Group>
-    <Group name="AxisGizmo">
-        <Setting name="snapRotations">0</Setting>
-        <Setting name="mouseScaleScalar">0.8</Setting>
-        <Setting name="renderInfoText">1</Setting>
-        <Setting name="rotationSnap">15</Setting>
-        <Setting name="mouseRotateScalar">0.8</Setting>
-        <Setting name="renderWhenUsed">0</Setting>
-        <Setting name="axisGizmoMaxScreenLen">100</Setting>
-        <Group name="Grid">
-            <Setting name="gridSize">10 10 10</Setting>
-            <Setting name="gridColor">255 255 255 20</Setting>
-            <Setting name="renderPlaneHashes">0</Setting>
-            <Setting name="snapToGrid">1</Setting>
-            <Setting name="planeDim">500</Setting>
-            <Setting name="renderPlane">0</Setting>
-        </Group>
-    </Group>
-    <Group name="MeshRoadEditor">
-        <Setting name="SelectedSplineColor">0 255 0 255</Setting>
-        <Setting name="HoverNodeColor">255 255 255 255</Setting>
-        <Setting name="DefaultDepth">5</Setting>
-        <Setting name="DefaultNormal">0 0 1</Setting>
-        <Setting name="HoverSplineColor">255 0 0 255</Setting>
-        <Setting name="topMaterialName">DefaultRoadMaterialTop</Setting>
-        <Setting name="DefaultWidth">10</Setting>
-        <Setting name="sideMaterialName">DefaultRoadMaterialOther</Setting>
-        <Setting name="bottomMaterialName">DefaultRoadMaterialOther</Setting>
-    </Group>
-    <Group name="RiverEditor">
-        <Setting name="DefaultDepth">5</Setting>
-        <Setting name="DefaultWidth">10</Setting>
-        <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="SelectedSplineColor">0 255 0 255</Setting>
-    </Group>
-    <Group name="NavEditor">
-        <Setting name="SpawnClass">AIPlayer</Setting>
-        <Setting name="spawnDatablock">DefaultPlayerData</Setting>
-        <Setting name="backgroundBuild">1</Setting>
-    </Group>
-    <Group name="DatablockEditor">
-        <Setting name="libraryTab">0</Setting>
-    </Group>
-    <Group name="LevelInformation">
-        <Group name="levels">
-            <Group name="EmptyLevel.mis">
-                <Setting name="cameraSpeed">25</Setting>
-            </Group>
-            <Group name="BlankRoom.mis">
-                <Setting name="cameraSpeed">25</Setting>
-            </Group>
-            <Group name="Empty_Room.mis">
-                <Setting name="cameraSpeed">25</Setting>
-            </Group>
-            <Group name="Empty Terrain.mis">
-                <Setting name="cameraSpeed">25</Setting>
-            </Group>
-        </Group>
-    </Group>
-    <Group name="ConvexEditor">
-        <Setting name="materialName">Grid512_OrangeLines_Mat</Setting>
-    </Group>
-</EditorSettings>

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

@@ -49,7 +49,8 @@ function initializeWorldEditor()
    exec("./scripts/menus.ed.cs");
    exec("./scripts/menuHandlers.ed.cs");
    exec("./scripts/editor.ed.cs");
-   exec("./scripts/editor.bind.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");

Templates/BaseGame/game/tools/worldEditor/scripts/editor.keybinds.cs

@@ -20,51 +20,51 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-if ( isObject( editorMoveMap ) )
-   editorMoveMap.delete();
+if ( isObject( EditorMap ) )
+   EditorMap.delete();
    
-new ActionMap(editorMoveMap);
+new ActionMap(EditorMap);
 
 //------------------------------------------------------------------------------
 // Non-remapable binds
 //------------------------------------------------------------------------------
-editorMoveMap.bindCmd(keyboard, "escape", "", "Canvas.pushDialog(PauseMenu);");
+EditorMap.bindCmd(keyboard, "escape", "", "Canvas.pushDialog(PauseMenu);");
 
 //------------------------------------------------------------------------------
 // Movement Keys
 //------------------------------------------------------------------------------
-editorMoveMap.bind( keyboard, a, editorMoveleft );
-editorMoveMap.bind( keyboard, d, editorMoveright );
-editorMoveMap.bind( keyboard, left, editorMoveleft );
-editorMoveMap.bind( keyboard, right, editorMoveright );
+EditorMap.bind( keyboard, a, editorMoveleft );
+EditorMap.bind( keyboard, d, editorMoveright );
+EditorMap.bind( keyboard, left, editorMoveleft );
+EditorMap.bind( keyboard, right, editorMoveright );
 
-editorMoveMap.bind( keyboard, w, editorMoveforward );
-editorMoveMap.bind( keyboard, s, editorMovebackward );
-editorMoveMap.bind( keyboard, up, editorMoveforward );
-editorMoveMap.bind( keyboard, down, editorMovebackward );
+EditorMap.bind( keyboard, w, editorMoveforward );
+EditorMap.bind( keyboard, s, editorMovebackward );
+EditorMap.bind( keyboard, up, editorMoveforward );
+EditorMap.bind( keyboard, down, editorMovebackward );
 
-editorMoveMap.bind( keyboard, e, editorMoveup );
-editorMoveMap.bind( keyboard, c, editorMovedown );
+EditorMap.bind( keyboard, e, editorMoveup );
+EditorMap.bind( keyboard, c, editorMovedown );
 
-editorMoveMap.bind( mouse, xaxis, editorYaw );
-editorMoveMap.bind( mouse, yaxis, editorPitch );
+EditorMap.bind( mouse, xaxis, editorYaw );
+EditorMap.bind( mouse, yaxis, editorPitch );
 
 //------------------------------------------------------------------------------
 // Mouse Trigger
 //------------------------------------------------------------------------------
-editorMoveMap.bind( mouse, button0, editorClick );
-editorMoveMap.bind( mouse, button1, editorRClick );
+EditorMap.bind( mouse, button0, editorClick );
+EditorMap.bind( mouse, button1, editorRClick );
 
 //------------------------------------------------------------------------------
 // Camera & View functions
 //------------------------------------------------------------------------------
-editorMoveMap.bind(keyboard, "alt c", toggleCamera);
+EditorMap.bind(keyboard, "alt c", toggleCamera);
 
 //------------------------------------------------------------------------------
 // Helper Functions
 //------------------------------------------------------------------------------
-editorMoveMap.bind(keyboard, "F8", dropCameraAtPlayer);
-editorMoveMap.bind(keyboard, "F7", dropPlayerAtCamera);
+EditorMap.bind(keyboard, "F8", dropCameraAtPlayer);
+EditorMap.bind(keyboard, "F7", dropPlayerAtCamera);
 
 //------------------------------------------------------------------------------
 // Debugging Functions
@@ -77,4 +77,4 @@ GlobalActionMap.bind(keyboard, "ctrl F3", doProfile);
 //------------------------------------------------------------------------------
 GlobalActionMap.bind(keyboard, "tilde", toggleConsole);
 
-editorMoveMap.bind( mouse, "alt zaxis", editorWheelFadeScroll );
+EditorMap.bind( mouse, "alt zaxis", editorWheelFadeScroll );