Move the common shader and postFX stuff to core, and moved the debug visualizers to the world editor, where they're actually used.

Templates/BaseGame/game/core/globals.cs

@@ -72,7 +72,7 @@ $pref::Video::autoDetect = 1;
 
 // This is the path used by ShaderGen to cache procedural shaders.  If left
 // blank ShaderGen will only cache shaders to memory and not to disk.
-$shaderGen::cachePath = "";
+$shaderGen::cachePath = "data/shaders";
 
 // Uncomment to disable ShaderGen, useful when debugging
 //$ShaderGen::GenNewShaders = false;

Templates/BaseGame/game/core/lighting/advanced/deferredShading.cs

@@ -1,21 +1,21 @@
 singleton ShaderData( ClearGBufferShader )
 {
-   DXVertexShaderFile = "data/shaders/common/postFx/postFxV.hlsl";
+   DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile  = "data/shaders/common/lighting/advanced/deferredClearGBufferP.hlsl";
+   DXPixelShaderFile  = $Core::CommonShaderPath @ "/lighting/advanced/deferredClearGBufferP.hlsl";
 
-   OGLVertexShaderFile = "data/shaders/common/postFx/gl/postFxV.glsl";
+   OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
-   OGLPixelShaderFile  = "data/shaders/common/lighting/advanced/gl/deferredClearGBufferP.glsl";
+   OGLPixelShaderFile  = $Core::CommonShaderPath @ "/lighting/advanced/gl/deferredClearGBufferP.glsl";
 
    pixVersion = 2.0;   
 };
 
 singleton ShaderData( DeferredColorShader )
 {
-   DXVertexShaderFile = "data/shaders/common/lighting/advanced/deferredClearGBufferV.hlsl";
+   DXVertexShaderFile = $Core::CommonShaderPath @ "/lighting/advanced/deferredClearGBufferV.hlsl";
-   DXPixelShaderFile  = "data/shaders/common/lighting/advanced/deferredColorShaderP.hlsl";
+   DXPixelShaderFile  = $Core::CommonShaderPath @ "/lighting/advanced/deferredColorShaderP.hlsl";
    
-   OGLVertexShaderFile = "data/shaders/common/postFx/gl/postFxV.glsl";
+   OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
-   OGLPixelShaderFile  = "data/shaders/common/lighting/advanced/gl/deferredColorShaderP.glsl";
+   OGLPixelShaderFile  = $Core::CommonShaderPath @ "/lighting/advanced/gl/deferredColorShaderP.glsl";
 
    pixVersion = 2.0;   
 };
@@ -39,11 +39,11 @@ new GFXStateBlockData( AL_DeferredShadingState : PFX_DefaultStateBlock )
 
 new ShaderData( AL_DeferredShader )
 {
-   DXVertexShaderFile = "data/shaders/common/postFx/postFxV.hlsl";
+   DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile  = "data/shaders/common/lighting/advanced/deferredShadingP.hlsl";
+   DXPixelShaderFile  = $Core::CommonShaderPath @ "/lighting/advanced/deferredShadingP.hlsl";
    
-   OGLVertexShaderFile = "data/shaders/common/postFx/gl/postFxV.glsl";
+   OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
-   OGLPixelShaderFile  = "data/shaders/common/lighting/advanced/gl/deferredShadingP.glsl";
+   OGLPixelShaderFile  = $Core::CommonShaderPath @ "/lighting/advanced/gl/deferredShadingP.glsl";
 
    samplerNames[0] = "colorBufferTex";
    samplerNames[1] = "lightPrePassTex";
@@ -68,80 +68,3 @@ singleton PostEffect( AL_DeferredShading )
    renderPriority = 10000;
    allowReflectPass = true;
 };
-
-// Debug Shaders.
-new ShaderData( AL_ColorBufferShader )
-{
-   DXVertexShaderFile = "data/shaders/common/postFx/postFxV.hlsl";
-   DXPixelShaderFile  = "data/shaders/common/lighting/advanced/dbgColorBufferP.hlsl";
-   
-   OGLVertexShaderFile = "data/shaders/common/postFx/gl/postFxV.glsl";
-   OGLPixelShaderFile  = "data/shaders/common/lighting/advanced/gl/dbgColorBufferP.glsl";
-
-   samplerNames[0] = "colorBufferTex";
-   pixVersion = 2.0;
-};
-
-singleton PostEffect( AL_ColorBufferVisualize )
-{   
-   shader = AL_ColorBufferShader;
-   stateBlock = AL_DefaultVisualizeState;
-   texture[0] = "#color";
-   target = "$backBuffer";
-   renderPriority = 9999;
-};
-
-/// Toggles the visualization of the AL lighting specular power buffer.
-function toggleColorBufferViz( %enable )
-{   
-   if ( %enable $= "" )
-   {
-      $AL_ColorBufferShaderVar = AL_ColorBufferVisualize.isEnabled() ? false : true;
-      AL_ColorBufferVisualize.toggle();
-   }
-   else if ( %enable )
-   {
-      AL_DeferredShading.disable();
-      AL_ColorBufferVisualize.enable();
-   }
-   else if ( !%enable )
-   {
-      AL_ColorBufferVisualize.disable();    
-      AL_DeferredShading.enable();
-   }
-}
-
-new ShaderData( AL_SpecMapShader )
-{
-   DXVertexShaderFile = "data/shaders/common/postFx/postFxV.hlsl";
-   DXPixelShaderFile  = "data/shaders/common/lighting/advanced/dbgSpecMapVisualizeP.hlsl";
-
-   OGLVertexShaderFile = "data/shaders/common/postFx/gl/postFxV.glsl";
-   OGLPixelShaderFile  = "data/shaders/common/lighting/advanced/gl/dbgSpecMapVisualizeP.glsl";
-
-   samplerNames[0] = "matinfoTex";
-   pixVersion = 2.0;
-};
-
-singleton PostEffect( AL_SpecMapVisualize )
-{   
-   shader = AL_SpecMapShader;
-   stateBlock = AL_DefaultVisualizeState;
-   texture[0] = "#matinfo";
-   target = "$backBuffer";
-   renderPriority = 9999;
-};
-
-/// Toggles the visualization of the AL lighting specular power buffer.
-function toggleSpecMapViz( %enable )
-{   
-   if ( %enable $= "" )
-   {
-      $AL_SpecMapShaderVar = AL_SpecMapVisualize.isEnabled() ? false : true;
-      AL_SpecMapVisualize.toggle();
-   }
-   else if ( %enable )
-      AL_SpecMapVisualize.enable();
-   else if ( !%enable )
-      AL_SpecMapVisualize.disable();    
-}

Templates/BaseGame/game/core/lighting/advanced/init.cs

@@ -40,9 +40,6 @@ $pref::LightManager::sgUseToneMapping = "";
 */
 
 exec( "./shaders.cs" );
-exec( "./lightViz.cs" );
-exec( "./shadowViz.cs" );
-exec( "./shadowViz.gui" );
 exec( "./deferredShading.cs" );
 
 function onActivateAdvancedLM()

Templates/BaseGame/game/core/lighting/basic/init.cs

@@ -40,11 +40,11 @@ singleton GFXStateBlockData( BL_ProjectedShadowSBData )
 
 singleton ShaderData( BL_ProjectedShadowShaderData )
 {
-   DXVertexShaderFile     = "data/shaders/common/projectedShadowV.hlsl";
+   DXVertexShaderFile     = $Core::CommonShaderPath @ "/projectedShadowV.hlsl";
-   DXPixelShaderFile      = "data/shaders/common/projectedShadowP.hlsl";   
+   DXPixelShaderFile      = $Core::CommonShaderPath @ "/projectedShadowP.hlsl";   
    
-   OGLVertexShaderFile     = "data/shaders/common/gl/projectedShadowV.glsl";
+   OGLVertexShaderFile     = $Core::CommonShaderPath @ "/gl/projectedShadowV.glsl";
-   OGLPixelShaderFile      = "data/shaders/common/gl/projectedShadowP.glsl";   
+   OGLPixelShaderFile      = $Core::CommonShaderPath @ "/gl/projectedShadowP.glsl";   
       
    samplerNames[0] = "inputTex";
    

Templates/BaseGame/game/core/lighting/basic/shadowFilter.cs

@@ -23,11 +23,11 @@
 
 singleton ShaderData( BL_ShadowFilterShaderV )
 {   
-   DXVertexShaderFile 	= "data/shaders/common/lighting/basic/shadowFilterV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/lighting/basic/shadowFilterV.hlsl";
-   DXPixelShaderFile 	= "data/shaders/common/lighting/basic/shadowFilterP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/lighting/basic/shadowFilterP.hlsl";
    
-   OGLVertexShaderFile  = "data/shaders/common/lighting/basic/gl/shadowFilterV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/lighting/basic/gl/shadowFilterV.glsl";
-   OGLPixelShaderFile   = "data/shaders/common/lighting/basic/gl/shadowFilterP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/lighting/basic/gl/shadowFilterP.glsl";
 
    samplerNames[0] = "$diffuseMap";
 

Templates/BaseGame/game/core/lighting/shadowMaps/init.cs

@@ -23,10 +23,10 @@
 
 new ShaderData(BlurDepthShader)
 {
-   DXVertexShaderFile = "data/shaders/common/lighting/shadowMap/boxFilterV.hlsl";
+   DXVertexShaderFile = $Core::CommonShaderPath @ "/lighting/shadowMap/boxFilterV.hlsl";
-   DXPixelShaderFile  = "data/shaders/common/lighting/shadowMap/boxFilterP.hlsl";
+   DXPixelShaderFile  = $Core::CommonShaderPath @ "/lighting/shadowMap/boxFilterP.hlsl";
    
-   OGLVertexShaderFile = "data/shaders/common/lighting/shadowMap/gl/boxFilterV.glsl";
+   OGLVertexShaderFile = $Core::CommonShaderPath @ "/lighting/shadowMap/gl/boxFilterV.glsl";
-   OGLPixelShaderFile = "data/shaders/common/lighting/shadowMap/gl/boxFilterP.glsl";
+   OGLPixelShaderFile = $Core::CommonShaderPath @ "/lighting/shadowMap/gl/boxFilterP.glsl";
    pixVersion = 2.0;
 };

Templates/BaseGame/game/core/main.cs

@@ -39,7 +39,7 @@
 $Core::MissingTexturePath = "core/images/missingTexture";
 $Core::UnAvailableTexturePath = "core/images/unavailable";
 $Core::WarningTexturePath = "core/images/warnMat";
-$Core::CommonShaderPath = "data/shaders/common";
+$Core::CommonShaderPath = "core/shaders";
 
 /// This is the path used by ShaderGen to cache procedural
 /// shaders.  If left blank ShaderGen will only cache shaders

Templates/BaseGame/game/core/postFX/GammaPostFX.cs

@@ -22,11 +22,11 @@
 
 singleton ShaderData( GammaShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/gammaP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/gammaP.hlsl";
 
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/gl/gammaP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/gl/gammaP.glsl";
    
    samplerNames[0] = "$backBuffer";
    samplerNames[1] = "$colorCorrectionTex";

Templates/BaseGame/game/core/postFX/MLAA.cs

@@ -44,11 +44,11 @@ singleton GFXStateBlockData( MLAA_EdgeDetectStateBlock : PFX_DefaultStateBlock )
 
 singleton ShaderData( MLAA_EdgeDetectionShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/mlaa/offsetV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/mlaa/offsetV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/mlaa/edgeDetectionP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/mlaa/edgeDetectionP.hlsl";
 
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/mlaa/gl/offsetV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/mlaa/gl/offsetV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/mlaa/gl/edgeDetectionP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/mlaa/gl/edgeDetectionP.glsl";
 
    samplerNames[0] = "$colorMapG";
    samplerNames[1] = "$prepassMap";
@@ -73,11 +73,11 @@ singleton GFXStateBlockData( MLAA_BlendWeightCalculationStateBlock : PFX_Default
 
 singleton ShaderData( MLAA_BlendWeightCalculationShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/mlaa/passthruV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/mlaa/passthruV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/mlaa/blendWeightCalculationP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/mlaa/blendWeightCalculationP.hlsl";
 
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/mlaa/gl/passthruV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/mlaa/gl/passthruV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/mlaa/gl/blendWeightCalculationP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/mlaa/gl/blendWeightCalculationP.glsl";
 
    samplerNames[0] = "$edgesMap";
    samplerNames[1] = "$edgesMapL";
@@ -103,11 +103,11 @@ singleton GFXStateBlockData( MLAA_NeighborhoodBlendingStateBlock : PFX_DefaultSt
 
 singleton ShaderData( MLAA_NeighborhoodBlendingShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFx/mlaa/offsetV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/mlaa/offsetV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFx/mlaa/neighborhoodBlendingP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/mlaa/neighborhoodBlendingP.hlsl";
    
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFx/mlaa/gl/offsetV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/mlaa/gl/offsetV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/postFx/mlaa/gl/neighborhoodBlendingP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/mlaa/gl/neighborhoodBlendingP.glsl";
 
    samplerNames[0] = "$blendMap";
    samplerNames[1] = "$colorMapL";
@@ -162,7 +162,7 @@ singleton PostEffect( MLAAFx )
 
       texture[0] = "$inTex"; // Edges mask    
       texture[1] = "$inTex"; // Edges mask 
-      texture[2] = "data/postFX/art/AreaMap33.dds";
+      texture[2] = "core/images/AreaMap33.dds";
    };
 
    new PostEffect()

Templates/BaseGame/game/core/postFX/MotionBlurFx.cs

@@ -22,11 +22,11 @@
 
 singleton ShaderData( PFX_MotionBlurShader )  
 {     
-   DXVertexShaderFile   = $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";  //we use the bare-bones postFxV.hlsl
+   DXVertexShaderFile   = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";  //we use the bare-bones postFxV.hlsl
-   DXPixelShaderFile    = $Core::CommonShaderPath @ "/postFx/motionBlurP.hlsl";  //new pixel shader
+   DXPixelShaderFile    = $Core::CommonShaderPath @ "/postFX/motionBlurP.hlsl";  //new pixel shader
    
-   OGLVertexShaderFile   = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile   = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile    = $Core::CommonShaderPath @ "/postFx/gl/motionBlurP.glsl";
+   OGLPixelShaderFile    = $Core::CommonShaderPath @ "/postFX/gl/motionBlurP.glsl";
    
    samplerNames[0] = "$backBuffer";
    samplerNames[1] = "$prepassTex";

Templates/BaseGame/game/core/postFX/caustics.cs

@@ -35,11 +35,11 @@ singleton GFXStateBlockData( PFX_CausticsStateBlock : PFX_DefaultStateBlock )
 
 singleton ShaderData( PFX_CausticsShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/caustics/causticsP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/caustics/causticsP.hlsl";
          
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/caustics/gl/causticsP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/caustics/gl/causticsP.glsl";
       
    samplerNames[0] = "$prepassTex";
    samplerNames[1] = "$causticsTex0";
@@ -58,7 +58,7 @@ singleton PostEffect( CausticsPFX )
    shader = PFX_CausticsShader;
    stateBlock = PFX_CausticsStateBlock;
    texture[0] = "#prepass";
-   texture[1] = "data/postFX/art/caustics_1";
+   texture[1] = "core/images/caustics_1";
-   texture[2] = "data/postFX/art/caustics_2";
+   texture[2] = "core/images/caustics_2";
    target = "$backBuffer";
 };

Templates/BaseGame/game/core/postFX/chromaticLens.cs

@@ -45,11 +45,11 @@ singleton GFXStateBlockData( PFX_DefaultChromaticLensStateBlock )
 
 singleton ShaderData( PFX_ChromaticLensShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/chromaticLens.hlsl"; 
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/chromaticLens.hlsl"; 
    
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/gl/chromaticLens.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/gl/chromaticLens.glsl";
    
    samplerNames[0] = "$backBuffer";
    

Templates/BaseGame/game/core/postFX/default.postfxpreset.cs

@@ -69,4 +69,4 @@ $PostFXManager::Settings::SSAO::sNormalPow = "1";
 $PostFXManager::Settings::SSAO::sNormalTol = "0";
 $PostFXManager::Settings::SSAO::sRadius = "0.1";
 $PostFXManager::Settings::SSAO::sStrength = "6";
-$PostFXManager::Settings::ColorCorrectionRamp = "data/postFX/art/null_color_ramp.png";
+$PostFXManager::Settings::ColorCorrectionRamp = "core/images/null_color_ramp.png";

Templates/BaseGame/game/core/postFX/dof.cs

@@ -318,11 +318,11 @@ singleton GFXStateBlockData( PFX_DOFFinalStateBlock )
 
 singleton ShaderData( PFX_DOFDownSampleShader )
 {      
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/dof/DOF_DownSample_V.hlsl";   
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/dof/DOF_DownSample_V.hlsl";   
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/dof/DOF_DownSample_P.hlsl";            
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/dof/DOF_DownSample_P.hlsl";            
    
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_DownSample_V.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/dof/gl/DOF_DownSample_V.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_DownSample_P.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/dof/gl/DOF_DownSample_P.glsl";
    
    samplerNames[0] = "$colorSampler";
    samplerNames[1] = "$depthSampler";
@@ -332,11 +332,11 @@ singleton ShaderData( PFX_DOFDownSampleShader )
 
 singleton ShaderData( PFX_DOFBlurYShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/dof/DOF_Gausian_V.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/dof/DOF_Gausian_V.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/dof/DOF_Gausian_P.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/dof/DOF_Gausian_P.hlsl";
    
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_Gausian_V.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/dof/gl/DOF_Gausian_V.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_Gausian_P.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/dof/gl/DOF_Gausian_P.glsl";
    
    samplerNames[0] = "$diffuseMap";
    
@@ -351,11 +351,11 @@ singleton ShaderData( PFX_DOFBlurXShader : PFX_DOFBlurYShader )
 
 singleton ShaderData( PFX_DOFCalcCoCShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/dof/DOF_CalcCoC_V.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/dof/DOF_CalcCoC_V.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/dof/DOF_CalcCoC_P.hlsl";         
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/dof/DOF_CalcCoC_P.hlsl";         
    
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_CalcCoC_V.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/dof/gl/DOF_CalcCoC_V.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_CalcCoC_P.glsl"; 
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/dof/gl/DOF_CalcCoC_P.glsl"; 
 
    samplerNames[0] = "$shrunkSampler";
    samplerNames[1] = "$blurredSampler";
@@ -365,11 +365,11 @@ singleton ShaderData( PFX_DOFCalcCoCShader )
 
 singleton ShaderData( PFX_DOFSmallBlurShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/dof/DOF_SmallBlur_V.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/dof/DOF_SmallBlur_V.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/dof/DOF_SmallBlur_P.hlsl";            
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/dof/DOF_SmallBlur_P.hlsl";            
    
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_SmallBlur_V.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/dof/gl/DOF_SmallBlur_V.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_SmallBlur_P.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/dof/gl/DOF_SmallBlur_P.glsl";
 
    samplerNames[0] = "$colorSampler";
    
@@ -378,11 +378,11 @@ singleton ShaderData( PFX_DOFSmallBlurShader )
 
 singleton ShaderData( PFX_DOFFinalShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/dof/DOF_Final_V.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/dof/DOF_Final_V.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/dof/DOF_Final_P.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/dof/DOF_Final_P.hlsl";
    
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_Final_V.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/dof/gl/DOF_Final_V.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_Final_P.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/dof/gl/DOF_Final_P.glsl";
    
    samplerNames[0] = "$colorSampler";
    samplerNames[1] = "$smallBlurSampler";

Templates/BaseGame/game/core/postFX/edgeAA.cs

@@ -34,11 +34,11 @@ singleton GFXStateBlockData( PFX_DefaultEdgeAAStateBlock )
 
 singleton ShaderData( PFX_EdgeAADetectShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/edgeaa/edgeDetectP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/edgeaa/edgeDetectP.hlsl";
          
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/edgeaa/gl/edgeDetectP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/edgeaa/gl/edgeDetectP.glsl";
       
    samplerNames[0] = "$prepassBuffer";
    
@@ -47,11 +47,11 @@ singleton ShaderData( PFX_EdgeAADetectShader )
 
 singleton ShaderData( PFX_EdgeAAShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/edgeaa/edgeAAV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/edgeaa/edgeAAV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/edgeaa/edgeAAP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/edgeaa/edgeAAP.hlsl";
          
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/edgeaa/gl/edgeAAV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/edgeaa/gl/edgeAAV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/edgeaa/gl/edgeAAP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/edgeaa/gl/edgeAAP.glsl";
       
    samplerNames[0] = "$edgeBuffer";
    samplerNames[1] = "$backBuffer";
@@ -61,11 +61,11 @@ singleton ShaderData( PFX_EdgeAAShader )
 
 singleton ShaderData( PFX_EdgeAADebugShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/edgeaa/dbgEdgeDisplayP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/edgeaa/dbgEdgeDisplayP.hlsl";
          
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/edgeaa/gl/dbgEdgeDisplayP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/edgeaa/gl/dbgEdgeDisplayP.glsl";
       
    samplerNames[0] = "$edgeBuffer";
    

Templates/BaseGame/game/core/postFX/flash.cs

@@ -22,11 +22,11 @@
 
 singleton ShaderData( PFX_FlashShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/flashP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/flashP.hlsl";
    
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/gl/flashP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/gl/flashP.glsl";
    
    samplerNames[0] = "$backBuffer";
 

Templates/BaseGame/game/core/postFX/fog.cs

@@ -26,11 +26,11 @@
 
 singleton ShaderData( FogPassShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/fogP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/fogP.hlsl";
          
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/gl/fogP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/gl/fogP.glsl";
             
    samplerNames[0] = "$prepassTex";
    
@@ -73,11 +73,11 @@ singleton PostEffect( FogPostFx )
 
 singleton ShaderData( UnderwaterFogPassShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/underwaterFogP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/underwaterFogP.hlsl";
          
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/gl/underwaterFogP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/gl/underwaterFogP.glsl";
             
    samplerNames[0] = "$prepassTex";
    samplerNames[1] = "$backbuffer";

Templates/BaseGame/game/core/postFX/fxaa.cs

@@ -36,11 +36,11 @@ singleton GFXStateBlockData( FXAA_StateBlock : PFX_DefaultStateBlock )
 
 singleton ShaderData( FXAA_ShaderData )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/fxaa/fxaaV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/fxaa/fxaaV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/fxaa/fxaaP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/fxaa/fxaaP.hlsl";
    
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/fxaa/gl/fxaaV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/fxaa/gl/fxaaV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/fxaa/gl/fxaaP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/fxaa/gl/fxaaP.glsl";
    
    samplerNames[0] = "$colorTex";
 

Templates/BaseGame/game/core/postFX/glow.cs

@@ -23,11 +23,11 @@
 
 singleton ShaderData( PFX_GlowBlurVertShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/glowBlurV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/glowBlurV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/glowBlurP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/glowBlurP.hlsl";
    
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/gl/glowBlurV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/gl/glowBlurV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/gl/glowBlurP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/gl/glowBlurP.glsl";
       
    defines = "BLUR_DIR=float2(0.0,1.0)";
 
@@ -109,11 +109,11 @@ singleton PostEffect( GlowPostFx )
 
 singleton ShaderData( PFX_VolFogGlowBlurVertShader )
 {
-	DXVertexShaderFile = $Core::CommonShaderPath @ "/postFx/glowBlurV.hlsl";
+	DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/glowBlurV.hlsl";
-	DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/VolFogGlowP.hlsl";
+	DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/VolFogGlowP.hlsl";
 	
-	OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/gl/glowBlurV.glsl";
+	OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/glowBlurV.glsl";
-	OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/gl/VolFogGlowP.glsl";	
+	OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/gl/VolFogGlowP.glsl";	
 	
 	defines = "BLUR_DIR=float2(0.0,1.0)";
 	samplerNames[0] = "$diffuseMap";
@@ -121,11 +121,11 @@ singleton ShaderData( PFX_VolFogGlowBlurVertShader )
 };
 singleton ShaderData( PFX_VolFogGlowBlurHorzShader : PFX_VolFogGlowBlurVertShader )
 {
-	DXVertexShaderFile = $Core::CommonShaderPath @ "/postFx/glowBlurV.hlsl";
+	DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/glowBlurV.hlsl";
-	DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/VolFogGlowP.hlsl";
+	DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/VolFogGlowP.hlsl";
 	
-	OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/gl/glowBlurV.glsl";
+	OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/glowBlurV.glsl";
-	OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/gl/VolFogGlowP.glsl";
+	OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/gl/VolFogGlowP.glsl";
 	
 	defines = "BLUR_DIR=float2(1.0,0.0)";
 };

Templates/BaseGame/game/core/postFX/hdr.cs

@@ -70,15 +70,15 @@ $HDRPostFX::gaussStdDev = 0.8;
 /// The 1x255 color correction ramp texture used
 /// by both the HDR shader and the GammaPostFx shader
 /// for doing full screen color correction. 
-$HDRPostFX::colorCorrectionRamp = "data/postFX/art/null_color_ramp.png";
+$HDRPostFX::colorCorrectionRamp = "core/images/null_color_ramp.png";
 
 
 singleton ShaderData( HDR_BrightPassShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/hdr/brightPassFilterP.hlsl";   
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/hdr/brightPassFilterP.hlsl";   
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/hdr/gl/brightPassFilterP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/hdr/gl/brightPassFilterP.glsl";
    
    samplerNames[0] = "$inputTex";
    samplerNames[1] = "$luminanceTex";
@@ -88,10 +88,10 @@ singleton ShaderData( HDR_BrightPassShader )
 
 singleton ShaderData( HDR_DownScale4x4Shader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/hdr/downScale4x4V.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/hdr/downScale4x4V.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/hdr/downScale4x4P.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/hdr/downScale4x4P.hlsl";
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/hdr/gl/downScale4x4V.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/hdr/gl/downScale4x4V.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/hdr/gl/downScale4x4P.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/hdr/gl/downScale4x4P.glsl";
    
    samplerNames[0] = "$inputTex";
    
@@ -100,10 +100,10 @@ singleton ShaderData( HDR_DownScale4x4Shader )
 
 singleton ShaderData( HDR_BloomGaussBlurHShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/hdr/bloomGaussBlurHP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/hdr/bloomGaussBlurHP.hlsl";
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/hdr/gl/bloomGaussBlurHP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/hdr/gl/bloomGaussBlurHP.glsl";
    
    samplerNames[0] = "$inputTex";
    
@@ -112,10 +112,10 @@ singleton ShaderData( HDR_BloomGaussBlurHShader )
 
 singleton ShaderData( HDR_BloomGaussBlurVShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/hdr/bloomGaussBlurVP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/hdr/bloomGaussBlurVP.hlsl";
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/hdr/gl/bloomGaussBlurVP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/hdr/gl/bloomGaussBlurVP.glsl";
    
    samplerNames[0] = "$inputTex";
    
@@ -124,10 +124,10 @@ singleton ShaderData( HDR_BloomGaussBlurVShader )
 
 singleton ShaderData( HDR_SampleLumShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/hdr/sampleLumInitialP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/hdr/sampleLumInitialP.hlsl";
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/hdr/gl/sampleLumInitialP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/hdr/gl/sampleLumInitialP.glsl";
    
    samplerNames[0] = "$inputTex";
    
@@ -136,10 +136,10 @@ singleton ShaderData( HDR_SampleLumShader )
 
 singleton ShaderData( HDR_DownSampleLumShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/hdr/sampleLumIterativeP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/hdr/sampleLumIterativeP.hlsl";
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/hdr/gl/sampleLumIterativeP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/hdr/gl/sampleLumIterativeP.glsl";
    
    samplerNames[0] = "$inputTex";
    
@@ -148,10 +148,10 @@ singleton ShaderData( HDR_DownSampleLumShader )
 
 singleton ShaderData( HDR_CalcAdaptedLumShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/hdr/calculateAdaptedLumP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/hdr/calculateAdaptedLumP.hlsl";
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/hdr/gl/calculateAdaptedLumP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/hdr/gl/calculateAdaptedLumP.glsl";
    
    samplerNames[0] = "$currLum";
    samplerNames[1] = "$lastAdaptedLum";
@@ -161,10 +161,10 @@ singleton ShaderData( HDR_CalcAdaptedLumShader )
 
 singleton ShaderData( HDR_CombineShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/hdr/finalPassCombineP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/hdr/finalPassCombineP.hlsl";
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/hdr/gl/finalPassCombineP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/hdr/gl/finalPassCombineP.glsl";
    
    samplerNames[0] = "$sceneTex";
    samplerNames[1] = "$luminanceTex";
@@ -475,10 +475,10 @@ singleton PostEffect( HDRPostFX )
 
 singleton ShaderData( LuminanceVisShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/hdr/luminanceVisP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/hdr/luminanceVisP.hlsl";
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/hdr/gl/luminanceVisP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/hdr/gl/luminanceVisP.glsl";
    
    samplerNames[0] = "$inputTex";
    

Templates/BaseGame/game/core/postFX/lightRay.cs

@@ -32,11 +32,11 @@ $LightRayPostFX::resolutionScale = 1.0;
 
 singleton ShaderData( LightRayOccludeShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/lightRay/lightRayOccludeP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/lightRay/lightRayOccludeP.hlsl";
    
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/lightRay/gl/lightRayOccludeP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/lightRay/gl/lightRayOccludeP.glsl";
    
    samplerNames[0] = "$backBuffer";
    samplerNames[1] = "$prepassTex";
@@ -46,11 +46,11 @@ singleton ShaderData( LightRayOccludeShader )
 
 singleton ShaderData( LightRayShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/lightRay/lightRayP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/lightRay/lightRayP.hlsl";
    
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/lightRay/gl/lightRayP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/lightRay/gl/lightRayP.glsl";
    
    samplerNames[0] = "$frameSampler";
    samplerNames[1] = "$backBuffer";

Templates/BaseGame/game/core/postFX/ovrBarrelDistortion.cs

@@ -30,11 +30,11 @@ if(!isFunction(isOculusVRDeviceActive))
 
 singleton ShaderData( OVRMonoToStereoShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/oculusvr/monoToStereoP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/oculusvr/monoToStereoP.hlsl";
    
-   //OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/gl/postFxV.hlsl";
+   //OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/gl/postFxV.hlsl";
-   //OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/oculusvr/gl/monoToStereoP.glsl";
+   //OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/oculusvr/gl/monoToStereoP.glsl";
    
    samplerNames[0] = "$backBuffer";
 
@@ -43,11 +43,11 @@ singleton ShaderData( OVRMonoToStereoShader )
 
 singleton ShaderData( OVRBarrelDistortionShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/oculusvr/barrelDistortionP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/oculusvr/barrelDistortionP.hlsl";
    
-   //OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/gl/postFxV.glsl";
+   //OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
-   //OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/oculusvr/gl/barrelDistortionP.glsl";
+   //OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/oculusvr/gl/barrelDistortionP.glsl";
    
    samplerNames[0] = "$backBuffer";
 
@@ -56,8 +56,8 @@ singleton ShaderData( OVRBarrelDistortionShader )
 
 singleton ShaderData( OVRBarrelDistortionChromaShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/oculusvr/barrelDistortionChromaP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/oculusvr/barrelDistortionChromaP.hlsl";
 
    pixVersion = 2.0;   
 };

Templates/BaseGame/game/core/postFX/postFxManager.gui

@@ -2526,7 +2526,7 @@
                sinkAllKeyEvents = "0";
                password = "0";
                passwordMask = "*";
-               text = "data/postFX/art/null_color_ramp.png";
+               text = "core/images/null_color_ramp.png";
                maxLength = "1024";
                margin = "0 0 0 0";
                padding = "0 0 0 0";

Templates/BaseGame/game/core/postFX/postFxManager.gui.cs

@@ -437,7 +437,7 @@ function ppColorCorrection_selectFile()
 function ppColorCorrection_selectFileHandler( %filename )
 {
    if ( %filename $= "" || !isFile( %filename ) )
-      %filename = "data/postFX/art/null_color_ramp.png";
+      %filename = "core/images/null_color_ramp.png";
    else
       %filename = makeRelativePath( %filename, getMainDotCsDir() );
             

Templates/BaseGame/game/core/postFX/postFxManager.gui.settings.cs

@@ -20,7 +20,7 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-$PostFXManager::defaultPreset  = "data/postFX/scripts/client/default.postfxpreset.cs";
+$PostFXManager::defaultPreset  = "core/postFX/default.postfxpreset.cs";
 
 function PostFXManager::settingsSetEnabled(%this, %bEnablePostFX)
 {

Templates/BaseGame/game/core/postFX/ssao.cs

@@ -150,11 +150,11 @@ singleton GFXStateBlockData( SSAOBlurStateBlock : PFX_DefaultStateBlock )
 
 singleton ShaderData( SSAOShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/ssao/SSAO_P.hlsl";            
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/ssao/SSAO_P.hlsl";            
    
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/ssao/gl/SSAO_P.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/ssao/gl/SSAO_P.glsl";
 
    samplerNames[0] = "$prepassMap";
    samplerNames[1] = "$randNormalTex";
@@ -165,11 +165,11 @@ singleton ShaderData( SSAOShader )
 
 singleton ShaderData( SSAOBlurYShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/ssao/SSAO_Blur_V.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/ssao/SSAO_Blur_V.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/ssao/SSAO_Blur_P.hlsl";   
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/ssao/SSAO_Blur_P.hlsl";   
    
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/ssao/gl/SSAO_Blur_V.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/ssao/gl/SSAO_Blur_V.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/ssao/gl/SSAO_Blur_P.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/ssao/gl/SSAO_Blur_P.glsl";
    
    samplerNames[0] = "$occludeMap";
    samplerNames[1] = "$prepassMap";
@@ -200,7 +200,7 @@ singleton PostEffect( SSAOPostFx )
    stateBlock = SSAOStateBlock;
          
    texture[0] = "#prepass";         
-   texture[1] = "data/postFX/art/noise.png";
+   texture[1] = "core/images/noise.png";
    texture[2] = "#ssao_pow_table";
    
    target = "$outTex";
@@ -279,11 +279,11 @@ singleton PostEffect( SSAOVizPostFx )
 
 singleton ShaderData( SSAOPowTableShader )
 {
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/ssao/SSAO_PowerTable_V.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/ssao/SSAO_PowerTable_V.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/ssao/SSAO_PowerTable_P.hlsl";            
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/ssao/SSAO_PowerTable_P.hlsl";            
    
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/ssao/gl/SSAO_PowerTable_V.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/ssao/gl/SSAO_PowerTable_V.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/ssao/gl/SSAO_PowerTable_P.glsl";   
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/ssao/gl/SSAO_PowerTable_P.glsl";   
    
    pixVersion = 2.0;
 };

Templates/BaseGame/game/core/postFX/turbulence.cs

@@ -32,11 +32,11 @@ singleton GFXStateBlockData( PFX_TurbulenceStateBlock : PFX_DefaultStateBlock)
   
 singleton ShaderData( PFX_TurbulenceShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/turbulenceP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/turbulenceP.hlsl";
            
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/gl/turbulenceP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/gl/turbulenceP.glsl";
            
    samplerNames[0] = "$inputTex";
    pixVersion = 3.0;

Templates/BaseGame/game/core/postFX/vignette.cs

@@ -25,11 +25,11 @@ $VignettePostEffect::VMin = 0.2;
 
 singleton ShaderData( VignetteShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/vignette/VignetteP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/vignette/VignetteP.hlsl";
    
-   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/vignette/gl/VignetteP.glsl";
+   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/vignette/gl/VignetteP.glsl";
    
    samplerNames[0] = "$backBuffer";
    

Templates/BaseGame/game/core/postFx.cs

@@ -22,17 +22,42 @@
 
 singleton ShaderData( PFX_PassthruShader )
 {   
-   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFx/postFxV.hlsl";
+   DXVertexShaderFile 	= $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
-   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFx/passthruP.hlsl";
+   DXPixelShaderFile 	= $Core::CommonShaderPath @ "/postFX/passthruP.hlsl";
          
-//   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFx/postFxV.glsl";
+//   OGLVertexShaderFile  = $Core::CommonShaderPath @ "/postFX/postFxV.glsl";
-//   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFx/gl/passthruP.glsl";
+//   OGLPixelShaderFile   = $Core::CommonShaderPath @ "/postFX/gl/passthruP.glsl";
       
    samplerNames[0] = "$inputTex";
    
    pixVersion = 2.0;
 };
 
+function postFXInit()
+{
+   exec("./postFX/postFxManager.gui");
+   
+   //Load the core postFX files themselves
+   if (!$Server::Dedicated)
+   {
+      //init the postFX
+      %pattern = "core/postFX/*.cs";   
+      %file = findFirstFile( %pattern );
+      if ( %file $= "" )
+      {
+         // Try for DSOs next.
+         %pattern = "core/postFX/*.cs.dso";
+         %file = findFirstFile( %pattern );
+      }
+      
+      while( %file !$= "" )
+      {      
+         exec( %file );
+         %file = findNextFile( %pattern );
+      }
+   }
+}
+
 function PostEffect::inspectVars( %this )
 {
    %name = %this.getName();