Merge pull request #699 from Areloch/CoreInitCleanup

Cleans up some core execution behavior

Templates/BaseGame/game/core/gameObjects/shapes/materials.tscript

@@ -55,23 +55,6 @@ singleton Material(CameraMat)
 };
 
 //--- camera.dts MATERIALS END ---
-//--- noshape.dts MATERIALS BEGIN ---
-singleton Material(noshape_NoShape)
-{
-   mapTo = "NoShape";
-
-	diffuseMapAsset[0] = "";
-
-	diffuseColor[0] = "0.8 0.003067 0 .8";
-	emissive[0] = 0;
-
-	doubleSided = false;
-	translucent = 1;
-	translucentBlendOp = "LerpAlpha";
-	castShadows = false;
-};
-
-//--- noshape.dts MATERIALS END ---
 
 //--- noshapetext.dae MATERIALS BEGIN ---
 singleton Material(noshapetext_lambert1)

Templates/BaseGame/game/core/postFX/images/materials.tscript

@@ -1,32 +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 Material( Empty )
-{
-};
-
-singleton Material(WarningMaterial) {
-   detailMapAsset[0] = "Core_PostFX:missingTexture_image";
-   diffuseColor[0] = "25 16 0";
-   emissive[0] = false;
-   translucent = false;
-};

Templates/BaseGame/game/core/postFX/scripts/postFx.tscript

@@ -20,21 +20,21 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-singleton ShaderData( PFX_PassthruShader )
-{   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/passthruP.hlsl";
+function postFXInit()
+{
+   singleton ShaderData( PFX_PassthruShader )
+   {   
+      DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
+      DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/passthruP.hlsl";
+            
+      OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
+      OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/gl/passthruP.glsl";
          
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/gl/passthruP.glsl";
+      samplerNames[0] = "$inputTex";
       
-   samplerNames[0] = "$inputTex";
-   
-   pixVersion = 2.0;
-};
+      pixVersion = 2.0;
+   };
 
-function postFXInit()
-{
    //Load the core postFX files themselves
    if (!$Server::Dedicated)
    {

Templates/BaseGame/game/core/rendering/Core_Rendering.tscript

@@ -59,11 +59,11 @@ function Core_Rendering::initClient(%this)
    
    configureCanvas();
    
+   postFXInit();
+   
    //Autodetect settings if it's our first time
    if($pref::Video::autoDetect)
       AutodetectGraphics();
-
-   postFXInit();
    
    closeSplashWindow();
    

Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.tscript

@@ -811,7 +811,7 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem )
    PostFXManager.settingsEffectSetEnabled(HDRPostFX, $pref::PostFX::EnableHDR);
    PostFXManager.settingsEffectSetEnabled(DepthOfFieldPostFX, $pref::PostFX::EnableDOF);
    PostFXManager.settingsEffectSetEnabled(LightRayPostFX, $pref::PostFX::EnableLightRays);
-   PostFXManager.settingsEffectSetEnabled(VignettePostEffect, $pref::PostFX::EnableVignette);
+   PostFXManager.settingsEffectSetEnabled(VignettePostFX, $pref::PostFX::EnableVignette);
    
    echo("Graphics quality settings have been auto detected.");
 }

Templates/BaseGame/game/core/utility/scripts/module.tscript

@@ -44,6 +44,9 @@ function loadModuleMaterials(%moduleGroup)
          if(%module.group !$= %moduleGroup)
             continue;  
       }
+
+      if(%module.ModuleId $= "CoreModule") //the core container module is a special case that has some path complications
+         continue;                  //so we'll skip it so it doesn't complicate the other core modules' path tests
       
       %modulePath = %module.ModulePath;