diff --git a/Templates/BaseGame/game/core/globals.cs b/Templates/BaseGame/game/core/globals.cs index d730d63a4..c78968f11 100644 --- a/Templates/BaseGame/game/core/globals.cs +++ b/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; diff --git a/Templates/BaseGame/game/data/postFX/art/AreaMap33.dds b/Templates/BaseGame/game/core/images/AreaMap33.dds similarity index 100% rename from Templates/BaseGame/game/data/postFX/art/AreaMap33.dds rename to Templates/BaseGame/game/core/images/AreaMap33.dds diff --git a/Templates/BaseGame/game/data/postFX/art/caustics_1.png b/Templates/BaseGame/game/core/images/caustics_1.png similarity index 100% rename from Templates/BaseGame/game/data/postFX/art/caustics_1.png rename to Templates/BaseGame/game/core/images/caustics_1.png diff --git a/Templates/BaseGame/game/data/postFX/art/caustics_2.png b/Templates/BaseGame/game/core/images/caustics_2.png similarity index 100% rename from Templates/BaseGame/game/data/postFX/art/caustics_2.png rename to Templates/BaseGame/game/core/images/caustics_2.png diff --git a/Templates/BaseGame/game/data/postFX/art/noise.png b/Templates/BaseGame/game/core/images/noise.png similarity index 100% rename from Templates/BaseGame/game/data/postFX/art/noise.png rename to Templates/BaseGame/game/core/images/noise.png diff --git a/Templates/BaseGame/game/data/postFX/art/null_color_ramp.png b/Templates/BaseGame/game/core/images/null_color_ramp.png similarity index 100% rename from Templates/BaseGame/game/data/postFX/art/null_color_ramp.png rename to Templates/BaseGame/game/core/images/null_color_ramp.png diff --git a/Templates/BaseGame/game/core/lighting/advanced/deferredShading.cs b/Templates/BaseGame/game/core/lighting/advanced/deferredShading.cs index 3ea6baebc..5a96c30e9 100644 --- a/Templates/BaseGame/game/core/lighting/advanced/deferredShading.cs +++ b/Templates/BaseGame/game/core/lighting/advanced/deferredShading.cs @@ -1,21 +1,21 @@ singleton ShaderData( ClearGBufferShader ) { - DXVertexShaderFile = "data/shaders/common/postFx/postFxV.hlsl"; - DXPixelShaderFile = "data/shaders/common/lighting/advanced/deferredClearGBufferP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/lighting/advanced/deferredClearGBufferP.hlsl"; - OGLVertexShaderFile = "data/shaders/common/postFx/gl/postFxV.glsl"; - OGLPixelShaderFile = "data/shaders/common/lighting/advanced/gl/deferredClearGBufferP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/lighting/advanced/gl/deferredClearGBufferP.glsl"; pixVersion = 2.0; }; singleton ShaderData( DeferredColorShader ) { - DXVertexShaderFile = "data/shaders/common/lighting/advanced/deferredClearGBufferV.hlsl"; - DXPixelShaderFile = "data/shaders/common/lighting/advanced/deferredColorShaderP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/lighting/advanced/deferredClearGBufferV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/lighting/advanced/deferredColorShaderP.hlsl"; - OGLVertexShaderFile = "data/shaders/common/postFx/gl/postFxV.glsl"; - OGLPixelShaderFile = "data/shaders/common/lighting/advanced/gl/deferredColorShaderP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.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"; - DXPixelShaderFile = "data/shaders/common/lighting/advanced/deferredShadingP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/lighting/advanced/deferredShadingP.hlsl"; - OGLVertexShaderFile = "data/shaders/common/postFx/gl/postFxV.glsl"; - OGLPixelShaderFile = "data/shaders/common/lighting/advanced/gl/deferredShadingP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/lighting/advanced/gl/deferredShadingP.glsl"; samplerNames[0] = "colorBufferTex"; samplerNames[1] = "lightPrePassTex"; @@ -67,81 +67,4 @@ singleton PostEffect( AL_DeferredShading ) target = "$backBuffer"; 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(); -} \ No newline at end of file +}; \ No newline at end of file diff --git a/Templates/BaseGame/game/core/lighting/advanced/init.cs b/Templates/BaseGame/game/core/lighting/advanced/init.cs index 0b585aa03..6941138c7 100644 --- a/Templates/BaseGame/game/core/lighting/advanced/init.cs +++ b/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() diff --git a/Templates/BaseGame/game/core/lighting/basic/init.cs b/Templates/BaseGame/game/core/lighting/basic/init.cs index e5fe350f5..f298dfad2 100644 --- a/Templates/BaseGame/game/core/lighting/basic/init.cs +++ b/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"; - DXPixelShaderFile = "data/shaders/common/projectedShadowP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/projectedShadowV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/projectedShadowP.hlsl"; - OGLVertexShaderFile = "data/shaders/common/gl/projectedShadowV.glsl"; - OGLPixelShaderFile = "data/shaders/common/gl/projectedShadowP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/gl/projectedShadowV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/gl/projectedShadowP.glsl"; samplerNames[0] = "inputTex"; diff --git a/Templates/BaseGame/game/core/lighting/basic/shadowFilter.cs b/Templates/BaseGame/game/core/lighting/basic/shadowFilter.cs index cf2788e5f..5aea7b607 100644 --- a/Templates/BaseGame/game/core/lighting/basic/shadowFilter.cs +++ b/Templates/BaseGame/game/core/lighting/basic/shadowFilter.cs @@ -23,11 +23,11 @@ singleton ShaderData( BL_ShadowFilterShaderV ) { - DXVertexShaderFile = "data/shaders/common/lighting/basic/shadowFilterV.hlsl"; - DXPixelShaderFile = "data/shaders/common/lighting/basic/shadowFilterP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/lighting/basic/shadowFilterV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/lighting/basic/shadowFilterP.hlsl"; - OGLVertexShaderFile = "data/shaders/common/lighting/basic/gl/shadowFilterV.glsl"; - OGLPixelShaderFile = "data/shaders/common/lighting/basic/gl/shadowFilterP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/lighting/basic/gl/shadowFilterV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/lighting/basic/gl/shadowFilterP.glsl"; samplerNames[0] = "$diffuseMap"; diff --git a/Templates/BaseGame/game/core/lighting/shadowMaps/init.cs b/Templates/BaseGame/game/core/lighting/shadowMaps/init.cs index eaa46cae7..f4875bf08 100644 --- a/Templates/BaseGame/game/core/lighting/shadowMaps/init.cs +++ b/Templates/BaseGame/game/core/lighting/shadowMaps/init.cs @@ -23,10 +23,10 @@ new ShaderData(BlurDepthShader) { - DXVertexShaderFile = "data/shaders/common/lighting/shadowMap/boxFilterV.hlsl"; - DXPixelShaderFile = "data/shaders/common/lighting/shadowMap/boxFilterP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/lighting/shadowMap/boxFilterV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/lighting/shadowMap/boxFilterP.hlsl"; - OGLVertexShaderFile = "data/shaders/common/lighting/shadowMap/gl/boxFilterV.glsl"; - OGLPixelShaderFile = "data/shaders/common/lighting/shadowMap/gl/boxFilterP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/lighting/shadowMap/gl/boxFilterV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/lighting/shadowMap/gl/boxFilterP.glsl"; pixVersion = 2.0; }; diff --git a/Templates/BaseGame/game/core/main.cs b/Templates/BaseGame/game/core/main.cs index d5c7bf45b..fd9c086b6 100644 --- a/Templates/BaseGame/game/core/main.cs +++ b/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 diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/GammaPostFX.cs b/Templates/BaseGame/game/core/postFX/GammaPostFX.cs similarity index 90% rename from Templates/BaseGame/game/data/postFX/scripts/client/GammaPostFX.cs rename to Templates/BaseGame/game/core/postFX/GammaPostFX.cs index 0b7d98403..1c10b8a70 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/GammaPostFX.cs +++ b/Templates/BaseGame/game/core/postFX/GammaPostFX.cs @@ -22,11 +22,11 @@ singleton ShaderData( GammaShader ) { - DXVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.hlsl"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/gammaP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/gammaP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/gl/gammaP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/gl/gammaP.glsl"; samplerNames[0] = "$backBuffer"; samplerNames[1] = "$colorCorrectionTex"; diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/MLAA.cs b/Templates/BaseGame/game/core/postFX/MLAA.cs similarity index 85% rename from Templates/BaseGame/game/data/postFX/scripts/client/MLAA.cs rename to Templates/BaseGame/game/core/postFX/MLAA.cs index db5fa8f8a..a67696d42 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/MLAA.cs +++ b/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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/mlaa/edgeDetectionP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/mlaa/offsetV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/mlaa/edgeDetectionP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/mlaa/gl/offsetV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/mlaa/gl/edgeDetectionP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/mlaa/gl/offsetV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/mlaa/blendWeightCalculationP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/mlaa/passthruV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/mlaa/blendWeightCalculationP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/mlaa/gl/passthruV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/mlaa/gl/blendWeightCalculationP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/mlaa/gl/passthruV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/postFx/mlaa/neighborhoodBlendingP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/mlaa/offsetV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/mlaa/neighborhoodBlendingP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFx/mlaa/gl/offsetV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/postFx/mlaa/gl/neighborhoodBlendingP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/mlaa/gl/offsetV.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() diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/MotionBlurFx.cs b/Templates/BaseGame/game/core/postFX/MotionBlurFx.cs similarity index 88% rename from Templates/BaseGame/game/data/postFX/scripts/client/MotionBlurFx.cs rename to Templates/BaseGame/game/core/postFX/MotionBlurFx.cs index d6d86f63a..3a319af94 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/MotionBlurFx.cs +++ b/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 - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/motionBlurP.hlsl"; //new pixel shader + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; //we use the bare-bones postFxV.hlsl + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/motionBlurP.hlsl"; //new pixel shader - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/gl/motionBlurP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/gl/motionBlurP.glsl"; samplerNames[0] = "$backBuffer"; samplerNames[1] = "$prepassTex"; diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/caustics.cs b/Templates/BaseGame/game/core/postFX/caustics.cs similarity index 86% rename from Templates/BaseGame/game/data/postFX/scripts/client/caustics.cs rename to Templates/BaseGame/game/core/postFX/caustics.cs index 85267be78..7a455e266 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/caustics.cs +++ b/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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/caustics/causticsP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/caustics/causticsP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/caustics/gl/causticsP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.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[2] = "data/postFX/art/caustics_2"; + texture[1] = "core/images/caustics_1"; + texture[2] = "core/images/caustics_2"; target = "$backBuffer"; }; diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/chromaticLens.cs b/Templates/BaseGame/game/core/postFX/chromaticLens.cs similarity index 91% rename from Templates/BaseGame/game/data/postFX/scripts/client/chromaticLens.cs rename to Templates/BaseGame/game/core/postFX/chromaticLens.cs index fbf52d915..48f6b69f7 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/chromaticLens.cs +++ b/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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/chromaticLens.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/chromaticLens.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/gl/chromaticLens.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/gl/chromaticLens.glsl"; samplerNames[0] = "$backBuffer"; diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/default.postfxpreset.cs b/Templates/BaseGame/game/core/postFX/default.postfxpreset.cs similarity index 97% rename from Templates/BaseGame/game/data/postFX/scripts/client/default.postfxpreset.cs rename to Templates/BaseGame/game/core/postFX/default.postfxpreset.cs index 10f986516..077908ee8 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/default.postfxpreset.cs +++ b/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"; diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/dof.cs b/Templates/BaseGame/game/core/postFX/dof.cs similarity index 93% rename from Templates/BaseGame/game/data/postFX/scripts/client/dof.cs rename to Templates/BaseGame/game/core/postFX/dof.cs index fd47c4ae2..21ba52800 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/dof.cs +++ b/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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/dof/DOF_DownSample_P.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/dof/DOF_DownSample_V.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/dof/DOF_DownSample_P.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_DownSample_V.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_DownSample_P.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/dof/gl/DOF_DownSample_V.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/dof/DOF_Gausian_P.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/dof/DOF_Gausian_V.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/dof/DOF_Gausian_P.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_Gausian_V.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_Gausian_P.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/dof/gl/DOF_Gausian_V.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/dof/DOF_CalcCoC_P.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/dof/DOF_CalcCoC_V.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/dof/DOF_CalcCoC_P.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_CalcCoC_V.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_CalcCoC_P.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/dof/gl/DOF_CalcCoC_V.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/dof/DOF_SmallBlur_P.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/dof/DOF_SmallBlur_V.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/dof/DOF_SmallBlur_P.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_SmallBlur_V.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_SmallBlur_P.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/dof/gl/DOF_SmallBlur_V.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/dof/DOF_Final_P.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/dof/DOF_Final_V.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/dof/DOF_Final_P.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_Final_V.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/dof/gl/DOF_Final_P.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/dof/gl/DOF_Final_V.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/dof/gl/DOF_Final_P.glsl"; samplerNames[0] = "$colorSampler"; samplerNames[1] = "$smallBlurSampler"; diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/edgeAA.cs b/Templates/BaseGame/game/core/postFX/edgeAA.cs similarity index 80% rename from Templates/BaseGame/game/data/postFX/scripts/client/edgeAA.cs rename to Templates/BaseGame/game/core/postFX/edgeAA.cs index 4a5014c62..ea6ed8a7a 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/edgeAA.cs +++ b/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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/edgeaa/edgeDetectP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/edgeaa/edgeDetectP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/edgeaa/gl/edgeDetectP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/edgeaa/edgeAAP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/edgeaa/edgeAAV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/edgeaa/edgeAAP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/edgeaa/gl/edgeAAV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/edgeaa/gl/edgeAAP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/edgeaa/gl/edgeAAV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/edgeaa/dbgEdgeDisplayP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/edgeaa/dbgEdgeDisplayP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/edgeaa/gl/dbgEdgeDisplayP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/edgeaa/gl/dbgEdgeDisplayP.glsl"; samplerNames[0] = "$edgeBuffer"; diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/flash.cs b/Templates/BaseGame/game/core/postFX/flash.cs similarity index 89% rename from Templates/BaseGame/game/data/postFX/scripts/client/flash.cs rename to Templates/BaseGame/game/core/postFX/flash.cs index ff82c37ee..ff93d93a5 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/flash.cs +++ b/Templates/BaseGame/game/core/postFX/flash.cs @@ -22,11 +22,11 @@ singleton ShaderData( PFX_FlashShader ) { - DXVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.hlsl"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/flashP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/flashP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/gl/flashP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/gl/flashP.glsl"; samplerNames[0] = "$backBuffer"; diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/fog.cs b/Templates/BaseGame/game/core/postFX/fog.cs similarity index 87% rename from Templates/BaseGame/game/data/postFX/scripts/client/fog.cs rename to Templates/BaseGame/game/core/postFX/fog.cs index ea1bd805d..ce815c8ba 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/fog.cs +++ b/Templates/BaseGame/game/core/postFX/fog.cs @@ -26,11 +26,11 @@ singleton ShaderData( FogPassShader ) { - DXVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.hlsl"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/fogP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/fogP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/gl/fogP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/underwaterFogP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/underwaterFogP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/gl/underwaterFogP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/gl/underwaterFogP.glsl"; samplerNames[0] = "$prepassTex"; samplerNames[1] = "$backbuffer"; diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/fxaa.cs b/Templates/BaseGame/game/core/postFX/fxaa.cs similarity index 89% rename from Templates/BaseGame/game/data/postFX/scripts/client/fxaa.cs rename to Templates/BaseGame/game/core/postFX/fxaa.cs index 3f741a072..4b81c6e19 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/fxaa.cs +++ b/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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/fxaa/fxaaP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/fxaa/fxaaV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/fxaa/fxaaP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/fxaa/gl/fxaaV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/fxaa/gl/fxaaP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/fxaa/gl/fxaaV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/fxaa/gl/fxaaP.glsl"; samplerNames[0] = "$colorTex"; diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/glow.cs b/Templates/BaseGame/game/core/postFX/glow.cs similarity index 86% rename from Templates/BaseGame/game/data/postFX/scripts/client/glow.cs rename to Templates/BaseGame/game/core/postFX/glow.cs index 3314aa97a..0f062f6f7 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/glow.cs +++ b/Templates/BaseGame/game/core/postFX/glow.cs @@ -23,11 +23,11 @@ singleton ShaderData( PFX_GlowBlurVertShader ) { - DXVertexShaderFile = $Core::CommonShaderPath @ "/postFx/glowBlurV.hlsl"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/glowBlurP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/glowBlurV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/glowBlurP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/gl/glowBlurV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/gl/glowBlurP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/glowBlurV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/VolFogGlowP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/glowBlurV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/VolFogGlowP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/gl/glowBlurV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/gl/VolFogGlowP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/glowBlurV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/VolFogGlowP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/glowBlurV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/VolFogGlowP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/gl/glowBlurV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/gl/VolFogGlowP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/glowBlurV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/gl/VolFogGlowP.glsl"; defines = "BLUR_DIR=float2(1.0,0.0)"; }; diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/hdr.cs b/Templates/BaseGame/game/core/postFX/hdr.cs similarity index 86% rename from Templates/BaseGame/game/data/postFX/scripts/client/hdr.cs rename to Templates/BaseGame/game/core/postFX/hdr.cs index 1ccf07145..21e52183f 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/hdr.cs +++ b/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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/brightPassFilterP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/gl/brightPassFilterP.glsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/hdr/brightPassFilterP.hlsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/downScale4x4P.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/gl/downScale4x4V.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/gl/downScale4x4P.glsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/hdr/downScale4x4V.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/hdr/downScale4x4P.hlsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/hdr/gl/downScale4x4V.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/bloomGaussBlurHP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/gl/bloomGaussBlurHP.glsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/hdr/bloomGaussBlurHP.hlsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/bloomGaussBlurVP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/gl/bloomGaussBlurVP.glsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/hdr/bloomGaussBlurVP.hlsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/sampleLumInitialP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/gl/sampleLumInitialP.glsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/hdr/sampleLumInitialP.hlsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/sampleLumIterativeP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/gl/sampleLumIterativeP.glsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/hdr/sampleLumIterativeP.hlsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/calculateAdaptedLumP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/gl/calculateAdaptedLumP.glsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/hdr/calculateAdaptedLumP.hlsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/finalPassCombineP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/gl/finalPassCombineP.glsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/hdr/finalPassCombineP.hlsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/luminanceVisP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/hdr/gl/luminanceVisP.glsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/hdr/luminanceVisP.hlsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/hdr/gl/luminanceVisP.glsl"; samplerNames[0] = "$inputTex"; diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/lightRay.cs b/Templates/BaseGame/game/core/postFX/lightRay.cs similarity index 87% rename from Templates/BaseGame/game/data/postFX/scripts/client/lightRay.cs rename to Templates/BaseGame/game/core/postFX/lightRay.cs index 14c17885c..acc00a4c8 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/lightRay.cs +++ b/Templates/BaseGame/game/core/postFX/lightRay.cs @@ -32,11 +32,11 @@ $LightRayPostFX::resolutionScale = 1.0; singleton ShaderData( LightRayOccludeShader ) { - DXVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.hlsl"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/lightRay/lightRayOccludeP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/lightRay/lightRayOccludeP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/lightRay/gl/lightRayOccludeP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/lightRay/lightRayP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/lightRay/lightRayP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/lightRay/gl/lightRayP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/lightRay/gl/lightRayP.glsl"; samplerNames[0] = "$frameSampler"; samplerNames[1] = "$backBuffer"; diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/ovrBarrelDistortion.cs b/Templates/BaseGame/game/core/postFX/ovrBarrelDistortion.cs similarity index 89% rename from Templates/BaseGame/game/data/postFX/scripts/client/ovrBarrelDistortion.cs rename to Templates/BaseGame/game/core/postFX/ovrBarrelDistortion.cs index bffde5fce..1ea280863 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/ovrBarrelDistortion.cs +++ b/Templates/BaseGame/game/core/postFX/ovrBarrelDistortion.cs @@ -30,11 +30,11 @@ if(!isFunction(isOculusVRDeviceActive)) singleton ShaderData( OVRMonoToStereoShader ) { - DXVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.hlsl"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/oculusvr/monoToStereoP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/oculusvr/monoToStereoP.hlsl"; - //OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/gl/postFxV.hlsl"; - //OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/oculusvr/gl/monoToStereoP.glsl"; + //OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.hlsl"; + //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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/oculusvr/barrelDistortionP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/oculusvr/barrelDistortionP.hlsl"; - //OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/gl/postFxV.glsl"; - //OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/oculusvr/gl/barrelDistortionP.glsl"; + //OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/oculusvr/barrelDistortionChromaP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/oculusvr/barrelDistortionChromaP.hlsl"; pixVersion = 2.0; }; diff --git a/Templates/BaseGame/game/data/postFX/scripts/gui/postFxManager.gui b/Templates/BaseGame/game/core/postFX/postFxManager.gui similarity index 99% rename from Templates/BaseGame/game/data/postFX/scripts/gui/postFxManager.gui rename to Templates/BaseGame/game/core/postFX/postFxManager.gui index 78248e2ae..e74179374 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/gui/postFxManager.gui +++ b/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"; diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/postFxManager.gui.cs b/Templates/BaseGame/game/core/postFX/postFxManager.gui.cs similarity index 99% rename from Templates/BaseGame/game/data/postFX/scripts/client/postFxManager.gui.cs rename to Templates/BaseGame/game/core/postFX/postFxManager.gui.cs index 8c1c8e8c7..73dbec8b0 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/postFxManager.gui.cs +++ b/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() ); diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/postFxManager.gui.settings.cs b/Templates/BaseGame/game/core/postFX/postFxManager.gui.settings.cs similarity index 99% rename from Templates/BaseGame/game/data/postFX/scripts/client/postFxManager.gui.settings.cs rename to Templates/BaseGame/game/core/postFX/postFxManager.gui.settings.cs index bc28edc70..d0ba2c4ea 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/postFxManager.gui.settings.cs +++ b/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) { diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/postFxManager.persistance.cs b/Templates/BaseGame/game/core/postFX/postFxManager.persistance.cs similarity index 100% rename from Templates/BaseGame/game/data/postFX/scripts/client/postFxManager.persistance.cs rename to Templates/BaseGame/game/core/postFX/postFxManager.persistance.cs diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/ssao.cs b/Templates/BaseGame/game/core/postFX/ssao.cs similarity index 91% rename from Templates/BaseGame/game/data/postFX/scripts/client/ssao.cs rename to Templates/BaseGame/game/core/postFX/ssao.cs index 729e0beea..71706434e 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/ssao.cs +++ b/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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/ssao/SSAO_P.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/ssao/SSAO_P.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/ssao/gl/SSAO_P.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/ssao/SSAO_Blur_P.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/ssao/SSAO_Blur_V.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/ssao/SSAO_Blur_P.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/ssao/gl/SSAO_Blur_V.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/ssao/gl/SSAO_Blur_P.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/ssao/gl/SSAO_Blur_V.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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/ssao/SSAO_PowerTable_P.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/ssao/SSAO_PowerTable_V.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/ssao/SSAO_PowerTable_P.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/ssao/gl/SSAO_PowerTable_V.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/ssao/gl/SSAO_PowerTable_P.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/ssao/gl/SSAO_PowerTable_V.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/ssao/gl/SSAO_PowerTable_P.glsl"; pixVersion = 2.0; }; diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/turbulence.cs b/Templates/BaseGame/game/core/postFX/turbulence.cs similarity index 88% rename from Templates/BaseGame/game/data/postFX/scripts/client/turbulence.cs rename to Templates/BaseGame/game/core/postFX/turbulence.cs index 7842a6429..676f17142 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/turbulence.cs +++ b/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"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/turbulenceP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/turbulenceP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/gl/turbulenceP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/gl/turbulenceP.glsl"; samplerNames[0] = "$inputTex"; pixVersion = 3.0; diff --git a/Templates/BaseGame/game/data/postFX/scripts/client/vignette.cs b/Templates/BaseGame/game/core/postFX/vignette.cs similarity index 89% rename from Templates/BaseGame/game/data/postFX/scripts/client/vignette.cs rename to Templates/BaseGame/game/core/postFX/vignette.cs index c824f5240..844a2e66c 100644 --- a/Templates/BaseGame/game/data/postFX/scripts/client/vignette.cs +++ b/Templates/BaseGame/game/core/postFX/vignette.cs @@ -25,11 +25,11 @@ $VignettePostEffect::VMin = 0.2; singleton ShaderData( VignetteShader ) { - DXVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.hlsl"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/vignette/VignetteP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/vignette/VignetteP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; - OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/vignette/gl/VignetteP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.glsl"; + OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/vignette/gl/VignetteP.glsl"; samplerNames[0] = "$backBuffer"; diff --git a/Templates/BaseGame/game/core/postFx.cs b/Templates/BaseGame/game/core/postFx.cs index bb57edcb0..cd54debb0 100644 --- a/Templates/BaseGame/game/core/postFx.cs +++ b/Templates/BaseGame/game/core/postFx.cs @@ -22,17 +22,42 @@ singleton ShaderData( PFX_PassthruShader ) { - DXVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.hlsl"; - DXPixelShaderFile = $Core::CommonShaderPath @ "/postFx/passthruP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/passthruP.hlsl"; -// OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.glsl"; -// OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFx/gl/passthruP.glsl"; +// OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.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(); diff --git a/Templates/BaseGame/game/data/shaders/common/VolumetricFog/VFogP.hlsl b/Templates/BaseGame/game/core/shaders/VolumetricFog/VFogP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/VolumetricFog/VFogP.hlsl rename to Templates/BaseGame/game/core/shaders/VolumetricFog/VFogP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/VolumetricFog/VFogPreP.hlsl b/Templates/BaseGame/game/core/shaders/VolumetricFog/VFogPreP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/VolumetricFog/VFogPreP.hlsl rename to Templates/BaseGame/game/core/shaders/VolumetricFog/VFogPreP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/VolumetricFog/VFogPreV.hlsl b/Templates/BaseGame/game/core/shaders/VolumetricFog/VFogPreV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/VolumetricFog/VFogPreV.hlsl rename to Templates/BaseGame/game/core/shaders/VolumetricFog/VFogPreV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/VolumetricFog/VFogRefl.hlsl b/Templates/BaseGame/game/core/shaders/VolumetricFog/VFogRefl.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/VolumetricFog/VFogRefl.hlsl rename to Templates/BaseGame/game/core/shaders/VolumetricFog/VFogRefl.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/VolumetricFog/VFogV.hlsl b/Templates/BaseGame/game/core/shaders/VolumetricFog/VFogV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/VolumetricFog/VFogV.hlsl rename to Templates/BaseGame/game/core/shaders/VolumetricFog/VFogV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/VolumetricFog/gl/VFogP.glsl b/Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/VolumetricFog/gl/VFogP.glsl rename to Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/VolumetricFog/gl/VFogPreP.glsl b/Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogPreP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/VolumetricFog/gl/VFogPreP.glsl rename to Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogPreP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/VolumetricFog/gl/VFogPreV.glsl b/Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogPreV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/VolumetricFog/gl/VFogPreV.glsl rename to Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogPreV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/VolumetricFog/gl/VFogRefl.glsl b/Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogRefl.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/VolumetricFog/gl/VFogRefl.glsl rename to Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogRefl.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/VolumetricFog/gl/VFogV.glsl b/Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/VolumetricFog/gl/VFogV.glsl rename to Templates/BaseGame/game/core/shaders/VolumetricFog/gl/VFogV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/basicCloudsP.hlsl b/Templates/BaseGame/game/core/shaders/basicCloudsP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/basicCloudsP.hlsl rename to Templates/BaseGame/game/core/shaders/basicCloudsP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/basicCloudsV.hlsl b/Templates/BaseGame/game/core/shaders/basicCloudsV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/basicCloudsV.hlsl rename to Templates/BaseGame/game/core/shaders/basicCloudsV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/cloudLayerP.hlsl b/Templates/BaseGame/game/core/shaders/cloudLayerP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/cloudLayerP.hlsl rename to Templates/BaseGame/game/core/shaders/cloudLayerP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/cloudLayerV.hlsl b/Templates/BaseGame/game/core/shaders/cloudLayerV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/cloudLayerV.hlsl rename to Templates/BaseGame/game/core/shaders/cloudLayerV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/addColorTextureP.hlsl b/Templates/BaseGame/game/core/shaders/fixedFunction/addColorTextureP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/addColorTextureP.hlsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/addColorTextureP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/addColorTextureV.hlsl b/Templates/BaseGame/game/core/shaders/fixedFunction/addColorTextureV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/addColorTextureV.hlsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/addColorTextureV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/colorP.hlsl b/Templates/BaseGame/game/core/shaders/fixedFunction/colorP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/colorP.hlsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/colorP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/colorV.hlsl b/Templates/BaseGame/game/core/shaders/fixedFunction/colorV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/colorV.hlsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/colorV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/addColorTextureP.glsl b/Templates/BaseGame/game/core/shaders/fixedFunction/gl/addColorTextureP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/addColorTextureP.glsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/gl/addColorTextureP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/addColorTextureV.glsl b/Templates/BaseGame/game/core/shaders/fixedFunction/gl/addColorTextureV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/addColorTextureV.glsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/gl/addColorTextureV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/colorP.glsl b/Templates/BaseGame/game/core/shaders/fixedFunction/gl/colorP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/colorP.glsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/gl/colorP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/colorV.glsl b/Templates/BaseGame/game/core/shaders/fixedFunction/gl/colorV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/colorV.glsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/gl/colorV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/modColorTextureP.glsl b/Templates/BaseGame/game/core/shaders/fixedFunction/gl/modColorTextureP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/modColorTextureP.glsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/gl/modColorTextureP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/modColorTextureV.glsl b/Templates/BaseGame/game/core/shaders/fixedFunction/gl/modColorTextureV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/modColorTextureV.glsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/gl/modColorTextureV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/targetRestoreP.glsl b/Templates/BaseGame/game/core/shaders/fixedFunction/gl/targetRestoreP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/targetRestoreP.glsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/gl/targetRestoreP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/targetRestoreV.glsl b/Templates/BaseGame/game/core/shaders/fixedFunction/gl/targetRestoreV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/targetRestoreV.glsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/gl/targetRestoreV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/textureP.glsl b/Templates/BaseGame/game/core/shaders/fixedFunction/gl/textureP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/textureP.glsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/gl/textureP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/textureV.glsl b/Templates/BaseGame/game/core/shaders/fixedFunction/gl/textureV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/gl/textureV.glsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/gl/textureV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/modColorTextureP.hlsl b/Templates/BaseGame/game/core/shaders/fixedFunction/modColorTextureP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/modColorTextureP.hlsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/modColorTextureP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/modColorTextureV.hlsl b/Templates/BaseGame/game/core/shaders/fixedFunction/modColorTextureV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/modColorTextureV.hlsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/modColorTextureV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/targetRestoreP.hlsl b/Templates/BaseGame/game/core/shaders/fixedFunction/targetRestoreP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/targetRestoreP.hlsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/targetRestoreP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/targetRestoreV.hlsl b/Templates/BaseGame/game/core/shaders/fixedFunction/targetRestoreV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/targetRestoreV.hlsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/targetRestoreV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/textureP.hlsl b/Templates/BaseGame/game/core/shaders/fixedFunction/textureP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/textureP.hlsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/textureP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/fixedFunction/textureV.hlsl b/Templates/BaseGame/game/core/shaders/fixedFunction/textureV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fixedFunction/textureV.hlsl rename to Templates/BaseGame/game/core/shaders/fixedFunction/textureV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/foliage.hlsl b/Templates/BaseGame/game/core/shaders/foliage.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/foliage.hlsl rename to Templates/BaseGame/game/core/shaders/foliage.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/fxFoliageReplicatorP.hlsl b/Templates/BaseGame/game/core/shaders/fxFoliageReplicatorP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fxFoliageReplicatorP.hlsl rename to Templates/BaseGame/game/core/shaders/fxFoliageReplicatorP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/fxFoliageReplicatorV.hlsl b/Templates/BaseGame/game/core/shaders/fxFoliageReplicatorV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/fxFoliageReplicatorV.hlsl rename to Templates/BaseGame/game/core/shaders/fxFoliageReplicatorV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/basicCloudsP.glsl b/Templates/BaseGame/game/core/shaders/gl/basicCloudsP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/basicCloudsP.glsl rename to Templates/BaseGame/game/core/shaders/gl/basicCloudsP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/basicCloudsV.glsl b/Templates/BaseGame/game/core/shaders/gl/basicCloudsV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/basicCloudsV.glsl rename to Templates/BaseGame/game/core/shaders/gl/basicCloudsV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/blurP.glsl b/Templates/BaseGame/game/core/shaders/gl/blurP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/blurP.glsl rename to Templates/BaseGame/game/core/shaders/gl/blurP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/blurV.glsl b/Templates/BaseGame/game/core/shaders/gl/blurV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/blurV.glsl rename to Templates/BaseGame/game/core/shaders/gl/blurV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/cloudLayerP.glsl b/Templates/BaseGame/game/core/shaders/gl/cloudLayerP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/cloudLayerP.glsl rename to Templates/BaseGame/game/core/shaders/gl/cloudLayerP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/cloudLayerV.glsl b/Templates/BaseGame/game/core/shaders/gl/cloudLayerV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/cloudLayerV.glsl rename to Templates/BaseGame/game/core/shaders/gl/cloudLayerV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/foliage.glsl b/Templates/BaseGame/game/core/shaders/gl/foliage.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/foliage.glsl rename to Templates/BaseGame/game/core/shaders/gl/foliage.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/fxFoliageReplicatorP.glsl b/Templates/BaseGame/game/core/shaders/gl/fxFoliageReplicatorP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/fxFoliageReplicatorP.glsl rename to Templates/BaseGame/game/core/shaders/gl/fxFoliageReplicatorP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/fxFoliageReplicatorV.glsl b/Templates/BaseGame/game/core/shaders/gl/fxFoliageReplicatorV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/fxFoliageReplicatorV.glsl rename to Templates/BaseGame/game/core/shaders/gl/fxFoliageReplicatorV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/guiMaterialV.glsl b/Templates/BaseGame/game/core/shaders/gl/guiMaterialV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/guiMaterialV.glsl rename to Templates/BaseGame/game/core/shaders/gl/guiMaterialV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/hlslCompat.glsl b/Templates/BaseGame/game/core/shaders/gl/hlslCompat.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/hlslCompat.glsl rename to Templates/BaseGame/game/core/shaders/gl/hlslCompat.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/imposter.glsl b/Templates/BaseGame/game/core/shaders/gl/imposter.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/imposter.glsl rename to Templates/BaseGame/game/core/shaders/gl/imposter.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/lighting.glsl b/Templates/BaseGame/game/core/shaders/gl/lighting.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/lighting.glsl rename to Templates/BaseGame/game/core/shaders/gl/lighting.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/particleCompositeP.glsl b/Templates/BaseGame/game/core/shaders/gl/particleCompositeP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/particleCompositeP.glsl rename to Templates/BaseGame/game/core/shaders/gl/particleCompositeP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/particleCompositeV.glsl b/Templates/BaseGame/game/core/shaders/gl/particleCompositeV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/particleCompositeV.glsl rename to Templates/BaseGame/game/core/shaders/gl/particleCompositeV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/particlesP.glsl b/Templates/BaseGame/game/core/shaders/gl/particlesP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/particlesP.glsl rename to Templates/BaseGame/game/core/shaders/gl/particlesP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/particlesV.glsl b/Templates/BaseGame/game/core/shaders/gl/particlesV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/particlesV.glsl rename to Templates/BaseGame/game/core/shaders/gl/particlesV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/planarReflectBumpP.glsl b/Templates/BaseGame/game/core/shaders/gl/planarReflectBumpP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/planarReflectBumpP.glsl rename to Templates/BaseGame/game/core/shaders/gl/planarReflectBumpP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/planarReflectBumpV.glsl b/Templates/BaseGame/game/core/shaders/gl/planarReflectBumpV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/planarReflectBumpV.glsl rename to Templates/BaseGame/game/core/shaders/gl/planarReflectBumpV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/planarReflectP.glsl b/Templates/BaseGame/game/core/shaders/gl/planarReflectP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/planarReflectP.glsl rename to Templates/BaseGame/game/core/shaders/gl/planarReflectP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/planarReflectV.glsl b/Templates/BaseGame/game/core/shaders/gl/planarReflectV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/planarReflectV.glsl rename to Templates/BaseGame/game/core/shaders/gl/planarReflectV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/precipP.glsl b/Templates/BaseGame/game/core/shaders/gl/precipP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/precipP.glsl rename to Templates/BaseGame/game/core/shaders/gl/precipP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/precipV.glsl b/Templates/BaseGame/game/core/shaders/gl/precipV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/precipV.glsl rename to Templates/BaseGame/game/core/shaders/gl/precipV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/projectedShadowP.glsl b/Templates/BaseGame/game/core/shaders/gl/projectedShadowP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/projectedShadowP.glsl rename to Templates/BaseGame/game/core/shaders/gl/projectedShadowP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/projectedShadowV.glsl b/Templates/BaseGame/game/core/shaders/gl/projectedShadowV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/projectedShadowV.glsl rename to Templates/BaseGame/game/core/shaders/gl/projectedShadowV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/scatterSkyP.glsl b/Templates/BaseGame/game/core/shaders/gl/scatterSkyP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/scatterSkyP.glsl rename to Templates/BaseGame/game/core/shaders/gl/scatterSkyP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/scatterSkyV.glsl b/Templates/BaseGame/game/core/shaders/gl/scatterSkyV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/scatterSkyV.glsl rename to Templates/BaseGame/game/core/shaders/gl/scatterSkyV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/torque.glsl b/Templates/BaseGame/game/core/shaders/gl/torque.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/torque.glsl rename to Templates/BaseGame/game/core/shaders/gl/torque.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/wavesP.glsl b/Templates/BaseGame/game/core/shaders/gl/wavesP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/wavesP.glsl rename to Templates/BaseGame/game/core/shaders/gl/wavesP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/gl/wind.glsl b/Templates/BaseGame/game/core/shaders/gl/wind.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/gl/wind.glsl rename to Templates/BaseGame/game/core/shaders/gl/wind.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/guiMaterialV.hlsl b/Templates/BaseGame/game/core/shaders/guiMaterialV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/guiMaterialV.hlsl rename to Templates/BaseGame/game/core/shaders/guiMaterialV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/hlslStructs.h b/Templates/BaseGame/game/core/shaders/hlslStructs.h similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/hlslStructs.h rename to Templates/BaseGame/game/core/shaders/hlslStructs.h diff --git a/Templates/BaseGame/game/data/shaders/common/hlslStructs.hlsl b/Templates/BaseGame/game/core/shaders/hlslStructs.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/hlslStructs.hlsl rename to Templates/BaseGame/game/core/shaders/hlslStructs.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/imposter.hlsl b/Templates/BaseGame/game/core/shaders/imposter.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/imposter.hlsl rename to Templates/BaseGame/game/core/shaders/imposter.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting.hlsl b/Templates/BaseGame/game/core/shaders/lighting.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting.hlsl rename to Templates/BaseGame/game/core/shaders/lighting.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/convexGeometryV.hlsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/convexGeometryV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/convexGeometryV.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/convexGeometryV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/deferredClearGBufferP.hlsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/deferredClearGBufferP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/deferredClearGBufferP.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/deferredClearGBufferP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/deferredClearGBufferV.hlsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/deferredClearGBufferV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/deferredClearGBufferV.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/deferredClearGBufferV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/deferredColorShaderP.hlsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/deferredColorShaderP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/deferredColorShaderP.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/deferredColorShaderP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/deferredShadingP.hlsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/deferredShadingP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/deferredShadingP.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/deferredShadingP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/farFrustumQuad.hlsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/farFrustumQuad.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/farFrustumQuad.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/farFrustumQuad.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/farFrustumQuadV.hlsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/farFrustumQuadV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/farFrustumQuadV.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/farFrustumQuadV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/convexGeometryV.glsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/convexGeometryV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/convexGeometryV.glsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/gl/convexGeometryV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/deferredClearGBufferP.glsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/deferredClearGBufferP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/deferredClearGBufferP.glsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/gl/deferredClearGBufferP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/deferredColorShaderP.glsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/deferredColorShaderP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/deferredColorShaderP.glsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/gl/deferredColorShaderP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/deferredShadingP.glsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/deferredShadingP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/deferredShadingP.glsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/gl/deferredShadingP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/farFrustumQuad.glsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/farFrustumQuad.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/farFrustumQuad.glsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/gl/farFrustumQuad.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/farFrustumQuadV.glsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/farFrustumQuadV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/farFrustumQuadV.glsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/gl/farFrustumQuadV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/lightingUtils.glsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/lightingUtils.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/lightingUtils.glsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/gl/lightingUtils.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/pointLightP.glsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/pointLightP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/pointLightP.glsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/gl/pointLightP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/softShadow.glsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/softShadow.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/softShadow.glsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/gl/softShadow.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/spotLightP.glsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/spotLightP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/spotLightP.glsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/gl/spotLightP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/vectorLightP.glsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/gl/vectorLightP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/vectorLightP.glsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/gl/vectorLightP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/lightingUtils.hlsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/lightingUtils.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/lightingUtils.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/lightingUtils.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/particlePointLightP.hlsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/particlePointLightP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/particlePointLightP.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/particlePointLightP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/particlePointLightV.hlsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/particlePointLightV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/particlePointLightV.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/particlePointLightV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/pointLightP.hlsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/pointLightP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/pointLightP.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/pointLightP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/softShadow.hlsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/softShadow.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/softShadow.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/softShadow.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/spotLightP.hlsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/spotLightP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/spotLightP.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/spotLightP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/vectorLightP.hlsl b/Templates/BaseGame/game/core/shaders/lighting/advanced/vectorLightP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/vectorLightP.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/advanced/vectorLightP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/basic/gl/shadowFilterP.glsl b/Templates/BaseGame/game/core/shaders/lighting/basic/gl/shadowFilterP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/basic/gl/shadowFilterP.glsl rename to Templates/BaseGame/game/core/shaders/lighting/basic/gl/shadowFilterP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/basic/gl/shadowFilterV.glsl b/Templates/BaseGame/game/core/shaders/lighting/basic/gl/shadowFilterV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/basic/gl/shadowFilterV.glsl rename to Templates/BaseGame/game/core/shaders/lighting/basic/gl/shadowFilterV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/basic/shadowFilterP.hlsl b/Templates/BaseGame/game/core/shaders/lighting/basic/shadowFilterP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/basic/shadowFilterP.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/basic/shadowFilterP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/basic/shadowFilterV.hlsl b/Templates/BaseGame/game/core/shaders/lighting/basic/shadowFilterV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/basic/shadowFilterV.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/basic/shadowFilterV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/shadowMap/boxFilterP.hlsl b/Templates/BaseGame/game/core/shaders/lighting/shadowMap/boxFilterP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/shadowMap/boxFilterP.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/shadowMap/boxFilterP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/shadowMap/boxFilterV.hlsl b/Templates/BaseGame/game/core/shaders/lighting/shadowMap/boxFilterV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/shadowMap/boxFilterV.hlsl rename to Templates/BaseGame/game/core/shaders/lighting/shadowMap/boxFilterV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/shadowMap/gl/boxFilterP.glsl b/Templates/BaseGame/game/core/shaders/lighting/shadowMap/gl/boxFilterP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/shadowMap/gl/boxFilterP.glsl rename to Templates/BaseGame/game/core/shaders/lighting/shadowMap/gl/boxFilterP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/shadowMap/gl/boxFilterV.glsl b/Templates/BaseGame/game/core/shaders/lighting/shadowMap/gl/boxFilterV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/shadowMap/gl/boxFilterV.glsl rename to Templates/BaseGame/game/core/shaders/lighting/shadowMap/gl/boxFilterV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/shadowMap/shadowMapIO.h b/Templates/BaseGame/game/core/shaders/lighting/shadowMap/shadowMapIO.h similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/shadowMap/shadowMapIO.h rename to Templates/BaseGame/game/core/shaders/lighting/shadowMap/shadowMapIO.h diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/shadowMap/shadowMapIO_GLSL.h b/Templates/BaseGame/game/core/shaders/lighting/shadowMap/shadowMapIO_GLSL.h similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/shadowMap/shadowMapIO_GLSL.h rename to Templates/BaseGame/game/core/shaders/lighting/shadowMap/shadowMapIO_GLSL.h diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/shadowMap/shadowMapIO_HLSL.h b/Templates/BaseGame/game/core/shaders/lighting/shadowMap/shadowMapIO_HLSL.h similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/lighting/shadowMap/shadowMapIO_HLSL.h rename to Templates/BaseGame/game/core/shaders/lighting/shadowMap/shadowMapIO_HLSL.h diff --git a/Templates/BaseGame/game/data/shaders/common/particleCompositeP.hlsl b/Templates/BaseGame/game/core/shaders/particleCompositeP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/particleCompositeP.hlsl rename to Templates/BaseGame/game/core/shaders/particleCompositeP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/particleCompositeV.hlsl b/Templates/BaseGame/game/core/shaders/particleCompositeV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/particleCompositeV.hlsl rename to Templates/BaseGame/game/core/shaders/particleCompositeV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/particlesP.hlsl b/Templates/BaseGame/game/core/shaders/particlesP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/particlesP.hlsl rename to Templates/BaseGame/game/core/shaders/particlesP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/particlesV.hlsl b/Templates/BaseGame/game/core/shaders/particlesV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/particlesV.hlsl rename to Templates/BaseGame/game/core/shaders/particlesV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/planarReflectBumpP.hlsl b/Templates/BaseGame/game/core/shaders/planarReflectBumpP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/planarReflectBumpP.hlsl rename to Templates/BaseGame/game/core/shaders/planarReflectBumpP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/planarReflectBumpV.hlsl b/Templates/BaseGame/game/core/shaders/planarReflectBumpV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/planarReflectBumpV.hlsl rename to Templates/BaseGame/game/core/shaders/planarReflectBumpV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/planarReflectP.hlsl b/Templates/BaseGame/game/core/shaders/planarReflectP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/planarReflectP.hlsl rename to Templates/BaseGame/game/core/shaders/planarReflectP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/planarReflectV.hlsl b/Templates/BaseGame/game/core/shaders/planarReflectV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/planarReflectV.hlsl rename to Templates/BaseGame/game/core/shaders/planarReflectV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/VolFogGlowP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/VolFogGlowP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/VolFogGlowP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/VolFogGlowP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/caustics/causticsP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/caustics/causticsP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/caustics/causticsP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/caustics/causticsP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/caustics/gl/causticsP.glsl b/Templates/BaseGame/game/core/shaders/postFX/caustics/gl/causticsP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/caustics/gl/causticsP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/caustics/gl/causticsP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/chromaticLens.hlsl b/Templates/BaseGame/game/core/shaders/postFX/chromaticLens.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/chromaticLens.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/chromaticLens.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_CalcCoC_P.hlsl b/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_CalcCoC_P.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_CalcCoC_P.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/DOF_CalcCoC_P.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_CalcCoC_V.hlsl b/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_CalcCoC_V.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_CalcCoC_V.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/DOF_CalcCoC_V.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_DownSample_P.hlsl b/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_DownSample_P.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_DownSample_P.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/DOF_DownSample_P.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_DownSample_V.hlsl b/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_DownSample_V.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_DownSample_V.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/DOF_DownSample_V.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_Final_P.hlsl b/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Final_P.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_Final_P.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Final_P.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_Final_V.hlsl b/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Final_V.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_Final_V.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Final_V.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_Gausian_P.hlsl b/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Gausian_P.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_Gausian_P.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Gausian_P.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_Gausian_V.hlsl b/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Gausian_V.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_Gausian_V.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Gausian_V.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_Passthrough_V.hlsl b/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Passthrough_V.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_Passthrough_V.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/DOF_Passthrough_V.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_SmallBlur_P.hlsl b/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_SmallBlur_P.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_SmallBlur_P.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/DOF_SmallBlur_P.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_SmallBlur_V.hlsl b/Templates/BaseGame/game/core/shaders/postFX/dof/DOF_SmallBlur_V.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/DOF_SmallBlur_V.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/DOF_SmallBlur_V.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_CalcCoC_P.glsl b/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_CalcCoC_P.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_CalcCoC_P.glsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_CalcCoC_P.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_CalcCoC_V.glsl b/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_CalcCoC_V.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_CalcCoC_V.glsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_CalcCoC_V.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_DownSample_P.glsl b/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_DownSample_P.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_DownSample_P.glsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_DownSample_P.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_DownSample_V.glsl b/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_DownSample_V.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_DownSample_V.glsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_DownSample_V.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_Final_P.glsl b/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Final_P.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_Final_P.glsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Final_P.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_Final_V.glsl b/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Final_V.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_Final_V.glsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Final_V.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_Gausian_P.glsl b/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Gausian_P.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_Gausian_P.glsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Gausian_P.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_Gausian_V.glsl b/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Gausian_V.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_Gausian_V.glsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Gausian_V.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_Passthrough_V.glsl b/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Passthrough_V.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_Passthrough_V.glsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_Passthrough_V.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_SmallBlur_P.glsl b/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_SmallBlur_P.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_SmallBlur_P.glsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_SmallBlur_P.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_SmallBlur_V.glsl b/Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_SmallBlur_V.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/dof/gl/DOF_SmallBlur_V.glsl rename to Templates/BaseGame/game/core/shaders/postFX/dof/gl/DOF_SmallBlur_V.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/edgeaa/dbgEdgeDisplayP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/edgeaa/dbgEdgeDisplayP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/edgeaa/dbgEdgeDisplayP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/edgeaa/dbgEdgeDisplayP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/edgeaa/edgeAAP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/edgeaa/edgeAAP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/edgeaa/edgeAAP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/edgeaa/edgeAAP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/edgeaa/edgeAAV.hlsl b/Templates/BaseGame/game/core/shaders/postFX/edgeaa/edgeAAV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/edgeaa/edgeAAV.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/edgeaa/edgeAAV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/edgeaa/edgeDetectP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/edgeaa/edgeDetectP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/edgeaa/edgeDetectP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/edgeaa/edgeDetectP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/edgeaa/gl/dbgEdgeDisplayP.glsl b/Templates/BaseGame/game/core/shaders/postFX/edgeaa/gl/dbgEdgeDisplayP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/edgeaa/gl/dbgEdgeDisplayP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/edgeaa/gl/dbgEdgeDisplayP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/edgeaa/gl/edgeAAP.glsl b/Templates/BaseGame/game/core/shaders/postFX/edgeaa/gl/edgeAAP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/edgeaa/gl/edgeAAP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/edgeaa/gl/edgeAAP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/edgeaa/gl/edgeAAV.glsl b/Templates/BaseGame/game/core/shaders/postFX/edgeaa/gl/edgeAAV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/edgeaa/gl/edgeAAV.glsl rename to Templates/BaseGame/game/core/shaders/postFX/edgeaa/gl/edgeAAV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/edgeaa/gl/edgeDetectP.glsl b/Templates/BaseGame/game/core/shaders/postFX/edgeaa/gl/edgeDetectP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/edgeaa/gl/edgeDetectP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/edgeaa/gl/edgeDetectP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/flashP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/flashP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/flashP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/flashP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/fogP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/fogP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/fogP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/fogP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/fxaa/Fxaa3_11.h b/Templates/BaseGame/game/core/shaders/postFX/fxaa/Fxaa3_11.h similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/fxaa/Fxaa3_11.h rename to Templates/BaseGame/game/core/shaders/postFX/fxaa/Fxaa3_11.h diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/fxaa/fxaaP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/fxaa/fxaaP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/fxaa/fxaaP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/fxaa/fxaaP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/fxaa/fxaaV.hlsl b/Templates/BaseGame/game/core/shaders/postFX/fxaa/fxaaV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/fxaa/fxaaV.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/fxaa/fxaaV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/fxaa/gl/fxaaP.glsl b/Templates/BaseGame/game/core/shaders/postFX/fxaa/gl/fxaaP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/fxaa/gl/fxaaP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/fxaa/gl/fxaaP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/fxaa/gl/fxaaV.glsl b/Templates/BaseGame/game/core/shaders/postFX/fxaa/gl/fxaaV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/fxaa/gl/fxaaV.glsl rename to Templates/BaseGame/game/core/shaders/postFX/fxaa/gl/fxaaV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/gammaP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/gammaP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/gammaP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/gammaP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/gl/VolFogGlowP.glsl b/Templates/BaseGame/game/core/shaders/postFX/gl/VolFogGlowP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/gl/VolFogGlowP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/gl/VolFogGlowP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/gl/chromaticLens.glsl b/Templates/BaseGame/game/core/shaders/postFX/gl/chromaticLens.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/gl/chromaticLens.glsl rename to Templates/BaseGame/game/core/shaders/postFX/gl/chromaticLens.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/gl/flashP.glsl b/Templates/BaseGame/game/core/shaders/postFX/gl/flashP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/gl/flashP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/gl/flashP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/gl/fogP.glsl b/Templates/BaseGame/game/core/shaders/postFX/gl/fogP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/gl/fogP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/gl/fogP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/gl/gammaP.glsl b/Templates/BaseGame/game/core/shaders/postFX/gl/gammaP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/gl/gammaP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/gl/gammaP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/gl/glowBlurP.glsl b/Templates/BaseGame/game/core/shaders/postFX/gl/glowBlurP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/gl/glowBlurP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/gl/glowBlurP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/gl/glowBlurV.glsl b/Templates/BaseGame/game/core/shaders/postFX/gl/glowBlurV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/gl/glowBlurV.glsl rename to Templates/BaseGame/game/core/shaders/postFX/gl/glowBlurV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/gl/motionBlurP.glsl b/Templates/BaseGame/game/core/shaders/postFX/gl/motionBlurP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/gl/motionBlurP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/gl/motionBlurP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/gl/passthruP.glsl b/Templates/BaseGame/game/core/shaders/postFX/gl/passthruP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/gl/passthruP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/gl/passthruP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/gl/postFX.glsl b/Templates/BaseGame/game/core/shaders/postFX/gl/postFX.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/gl/postFX.glsl rename to Templates/BaseGame/game/core/shaders/postFX/gl/postFX.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/gl/postFxV.glsl b/Templates/BaseGame/game/core/shaders/postFX/gl/postFxV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/gl/postFxV.glsl rename to Templates/BaseGame/game/core/shaders/postFX/gl/postFxV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/gl/turbulenceP.glsl b/Templates/BaseGame/game/core/shaders/postFX/gl/turbulenceP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/gl/turbulenceP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/gl/turbulenceP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/gl/underwaterFogP.glsl b/Templates/BaseGame/game/core/shaders/postFX/gl/underwaterFogP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/gl/underwaterFogP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/gl/underwaterFogP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/glowBlurP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/glowBlurP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/glowBlurP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/glowBlurP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/glowBlurV.hlsl b/Templates/BaseGame/game/core/shaders/postFX/glowBlurV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/glowBlurV.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/glowBlurV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/bloomGaussBlurHP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/bloomGaussBlurHP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/bloomGaussBlurHP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/bloomGaussBlurHP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/bloomGaussBlurVP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/bloomGaussBlurVP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/bloomGaussBlurVP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/bloomGaussBlurVP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/brightPassFilterP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/brightPassFilterP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/brightPassFilterP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/brightPassFilterP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/calculateAdaptedLumP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/calculateAdaptedLumP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/calculateAdaptedLumP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/calculateAdaptedLumP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/downScale4x4P.hlsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/downScale4x4P.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/downScale4x4P.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/downScale4x4P.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/downScale4x4V.hlsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/downScale4x4V.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/downScale4x4V.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/downScale4x4V.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/finalPassCombineP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/finalPassCombineP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/finalPassCombineP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/finalPassCombineP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/bloomGaussBlurHP.glsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/bloomGaussBlurHP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/bloomGaussBlurHP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/gl/bloomGaussBlurHP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/bloomGaussBlurVP.glsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/bloomGaussBlurVP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/bloomGaussBlurVP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/gl/bloomGaussBlurVP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/brightPassFilterP.glsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/brightPassFilterP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/brightPassFilterP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/gl/brightPassFilterP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/calculateAdaptedLumP.glsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/calculateAdaptedLumP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/calculateAdaptedLumP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/gl/calculateAdaptedLumP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/downScale4x4P.glsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/downScale4x4P.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/downScale4x4P.glsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/gl/downScale4x4P.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/downScale4x4V.glsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/downScale4x4V.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/downScale4x4V.glsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/gl/downScale4x4V.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/finalPassCombineP.glsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/finalPassCombineP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/finalPassCombineP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/gl/finalPassCombineP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/luminanceVisP.glsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/luminanceVisP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/luminanceVisP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/gl/luminanceVisP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/sampleLumInitialP.glsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/sampleLumInitialP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/sampleLumInitialP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/gl/sampleLumInitialP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/sampleLumIterativeP.glsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/gl/sampleLumIterativeP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/gl/sampleLumIterativeP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/gl/sampleLumIterativeP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/luminanceVisP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/luminanceVisP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/luminanceVisP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/luminanceVisP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/sampleLumInitialP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/sampleLumInitialP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/sampleLumInitialP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/sampleLumInitialP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/hdr/sampleLumIterativeP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/hdr/sampleLumIterativeP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/hdr/sampleLumIterativeP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/hdr/sampleLumIterativeP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/lightRay/gl/lightRayOccludeP.glsl b/Templates/BaseGame/game/core/shaders/postFX/lightRay/gl/lightRayOccludeP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/lightRay/gl/lightRayOccludeP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/lightRay/gl/lightRayOccludeP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/lightRay/gl/lightRayP.glsl b/Templates/BaseGame/game/core/shaders/postFX/lightRay/gl/lightRayP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/lightRay/gl/lightRayP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/lightRay/gl/lightRayP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/lightRay/lightRayOccludeP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/lightRay/lightRayOccludeP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/lightRay/lightRayOccludeP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/lightRay/lightRayOccludeP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/lightRay/lightRayP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/lightRay/lightRayP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/lightRay/lightRayP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/lightRay/lightRayP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/mlaa/blendWeightCalculationP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/mlaa/blendWeightCalculationP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/mlaa/blendWeightCalculationP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/mlaa/blendWeightCalculationP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/mlaa/edgeDetectionP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/mlaa/edgeDetectionP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/mlaa/edgeDetectionP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/mlaa/edgeDetectionP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/mlaa/functions.hlsl b/Templates/BaseGame/game/core/shaders/postFX/mlaa/functions.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/mlaa/functions.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/mlaa/functions.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/mlaa/gl/blendWeightCalculationP.glsl b/Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/blendWeightCalculationP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/mlaa/gl/blendWeightCalculationP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/blendWeightCalculationP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/mlaa/gl/edgeDetectionP.glsl b/Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/edgeDetectionP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/mlaa/gl/edgeDetectionP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/edgeDetectionP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/mlaa/gl/functions.glsl b/Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/functions.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/mlaa/gl/functions.glsl rename to Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/functions.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/mlaa/gl/neighborhoodBlendingP.glsl b/Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/neighborhoodBlendingP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/mlaa/gl/neighborhoodBlendingP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/neighborhoodBlendingP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/mlaa/gl/offsetV.glsl b/Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/offsetV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/mlaa/gl/offsetV.glsl rename to Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/offsetV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/mlaa/gl/passthruV.glsl b/Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/passthruV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/mlaa/gl/passthruV.glsl rename to Templates/BaseGame/game/core/shaders/postFX/mlaa/gl/passthruV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/mlaa/neighborhoodBlendingP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/mlaa/neighborhoodBlendingP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/mlaa/neighborhoodBlendingP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/mlaa/neighborhoodBlendingP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/mlaa/offsetV.hlsl b/Templates/BaseGame/game/core/shaders/postFX/mlaa/offsetV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/mlaa/offsetV.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/mlaa/offsetV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/mlaa/passthruV.hlsl b/Templates/BaseGame/game/core/shaders/postFX/mlaa/passthruV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/mlaa/passthruV.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/mlaa/passthruV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/motionBlurP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/motionBlurP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/motionBlurP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/motionBlurP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/oculusvr/barrelDistortionChromaP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/oculusvr/barrelDistortionChromaP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/oculusvr/barrelDistortionChromaP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/oculusvr/barrelDistortionChromaP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/oculusvr/barrelDistortionP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/oculusvr/barrelDistortionP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/oculusvr/barrelDistortionP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/oculusvr/barrelDistortionP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/oculusvr/gl/barrelDistortionChromaP.glsl b/Templates/BaseGame/game/core/shaders/postFX/oculusvr/gl/barrelDistortionChromaP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/oculusvr/gl/barrelDistortionChromaP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/oculusvr/gl/barrelDistortionChromaP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/oculusvr/gl/barrelDistortionP.glsl b/Templates/BaseGame/game/core/shaders/postFX/oculusvr/gl/barrelDistortionP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/oculusvr/gl/barrelDistortionP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/oculusvr/gl/barrelDistortionP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/oculusvr/gl/monoToStereoP.glsl b/Templates/BaseGame/game/core/shaders/postFX/oculusvr/gl/monoToStereoP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/oculusvr/gl/monoToStereoP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/oculusvr/gl/monoToStereoP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/oculusvr/monoToStereoP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/oculusvr/monoToStereoP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/oculusvr/monoToStereoP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/oculusvr/monoToStereoP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/passthruP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/passthruP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/passthruP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/passthruP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/postFx.hlsl b/Templates/BaseGame/game/core/shaders/postFX/postFx.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/postFx.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/postFx.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/postFxV.glsl b/Templates/BaseGame/game/core/shaders/postFX/postFxV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/postFxV.glsl rename to Templates/BaseGame/game/core/shaders/postFX/postFxV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/postFxV.hlsl b/Templates/BaseGame/game/core/shaders/postFX/postFxV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/postFxV.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/postFxV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/ssao/SSAO_Blur_P.hlsl b/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_Blur_P.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/ssao/SSAO_Blur_P.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_Blur_P.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/ssao/SSAO_Blur_V.hlsl b/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_Blur_V.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/ssao/SSAO_Blur_V.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_Blur_V.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/ssao/SSAO_P.hlsl b/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_P.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/ssao/SSAO_P.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_P.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/ssao/SSAO_PowerTable_P.hlsl b/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_PowerTable_P.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/ssao/SSAO_PowerTable_P.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_PowerTable_P.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/ssao/SSAO_PowerTable_V.hlsl b/Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_PowerTable_V.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/ssao/SSAO_PowerTable_V.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_PowerTable_V.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/ssao/gl/SSAO_Blur_P.glsl b/Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_Blur_P.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/ssao/gl/SSAO_Blur_P.glsl rename to Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_Blur_P.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/ssao/gl/SSAO_Blur_V.glsl b/Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_Blur_V.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/ssao/gl/SSAO_Blur_V.glsl rename to Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_Blur_V.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/ssao/gl/SSAO_P.glsl b/Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_P.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/ssao/gl/SSAO_P.glsl rename to Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_P.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/ssao/gl/SSAO_PowerTable_P.glsl b/Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_PowerTable_P.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/ssao/gl/SSAO_PowerTable_P.glsl rename to Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_PowerTable_P.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/ssao/gl/SSAO_PowerTable_V.glsl b/Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_PowerTable_V.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/ssao/gl/SSAO_PowerTable_V.glsl rename to Templates/BaseGame/game/core/shaders/postFX/ssao/gl/SSAO_PowerTable_V.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/turbulenceP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/turbulenceP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/turbulenceP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/turbulenceP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/underwaterFogP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/underwaterFogP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/underwaterFogP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/underwaterFogP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/vignette/VignetteP.hlsl b/Templates/BaseGame/game/core/shaders/postFX/vignette/VignetteP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/vignette/VignetteP.hlsl rename to Templates/BaseGame/game/core/shaders/postFX/vignette/VignetteP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/postFx/vignette/gl/VignetteP.glsl b/Templates/BaseGame/game/core/shaders/postFX/vignette/gl/VignetteP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/postFx/vignette/gl/VignetteP.glsl rename to Templates/BaseGame/game/core/shaders/postFX/vignette/gl/VignetteP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/precipP.hlsl b/Templates/BaseGame/game/core/shaders/precipP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/precipP.hlsl rename to Templates/BaseGame/game/core/shaders/precipP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/precipV.hlsl b/Templates/BaseGame/game/core/shaders/precipV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/precipV.hlsl rename to Templates/BaseGame/game/core/shaders/precipV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/projectedShadowP.hlsl b/Templates/BaseGame/game/core/shaders/projectedShadowP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/projectedShadowP.hlsl rename to Templates/BaseGame/game/core/shaders/projectedShadowP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/projectedShadowV.hlsl b/Templates/BaseGame/game/core/shaders/projectedShadowV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/projectedShadowV.hlsl rename to Templates/BaseGame/game/core/shaders/projectedShadowV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/ribbons/basicRibbonShaderP.hlsl b/Templates/BaseGame/game/core/shaders/ribbons/basicRibbonShaderP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/ribbons/basicRibbonShaderP.hlsl rename to Templates/BaseGame/game/core/shaders/ribbons/basicRibbonShaderP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/ribbons/basicRibbonShaderV.hlsl b/Templates/BaseGame/game/core/shaders/ribbons/basicRibbonShaderV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/ribbons/basicRibbonShaderV.hlsl rename to Templates/BaseGame/game/core/shaders/ribbons/basicRibbonShaderV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/ribbons/gl/basicRibbonShaderP.glsl b/Templates/BaseGame/game/core/shaders/ribbons/gl/basicRibbonShaderP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/ribbons/gl/basicRibbonShaderP.glsl rename to Templates/BaseGame/game/core/shaders/ribbons/gl/basicRibbonShaderP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/ribbons/gl/basicRibbonShaderV.glsl b/Templates/BaseGame/game/core/shaders/ribbons/gl/basicRibbonShaderV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/ribbons/gl/basicRibbonShaderV.glsl rename to Templates/BaseGame/game/core/shaders/ribbons/gl/basicRibbonShaderV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/ribbons/gl/texRibbonShaderP.glsl b/Templates/BaseGame/game/core/shaders/ribbons/gl/texRibbonShaderP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/ribbons/gl/texRibbonShaderP.glsl rename to Templates/BaseGame/game/core/shaders/ribbons/gl/texRibbonShaderP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/ribbons/gl/texRibbonShaderV.glsl b/Templates/BaseGame/game/core/shaders/ribbons/gl/texRibbonShaderV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/ribbons/gl/texRibbonShaderV.glsl rename to Templates/BaseGame/game/core/shaders/ribbons/gl/texRibbonShaderV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/ribbons/texRibbonShaderP.hlsl b/Templates/BaseGame/game/core/shaders/ribbons/texRibbonShaderP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/ribbons/texRibbonShaderP.hlsl rename to Templates/BaseGame/game/core/shaders/ribbons/texRibbonShaderP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/ribbons/texRibbonShaderV.hlsl b/Templates/BaseGame/game/core/shaders/ribbons/texRibbonShaderV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/ribbons/texRibbonShaderV.hlsl rename to Templates/BaseGame/game/core/shaders/ribbons/texRibbonShaderV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/scatterSkyP.hlsl b/Templates/BaseGame/game/core/shaders/scatterSkyP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/scatterSkyP.hlsl rename to Templates/BaseGame/game/core/shaders/scatterSkyP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/scatterSkyV.hlsl b/Templates/BaseGame/game/core/shaders/scatterSkyV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/scatterSkyV.hlsl rename to Templates/BaseGame/game/core/shaders/scatterSkyV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/shaderModel.hlsl b/Templates/BaseGame/game/core/shaders/shaderModel.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/shaderModel.hlsl rename to Templates/BaseGame/game/core/shaders/shaderModel.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/shaderModelAutoGen.hlsl b/Templates/BaseGame/game/core/shaders/shaderModelAutoGen.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/shaderModelAutoGen.hlsl rename to Templates/BaseGame/game/core/shaders/shaderModelAutoGen.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/shdrConsts.h b/Templates/BaseGame/game/core/shaders/shdrConsts.h similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/shdrConsts.h rename to Templates/BaseGame/game/core/shaders/shdrConsts.h diff --git a/Templates/BaseGame/game/data/shaders/common/terrain/blendP.hlsl b/Templates/BaseGame/game/core/shaders/terrain/blendP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/terrain/blendP.hlsl rename to Templates/BaseGame/game/core/shaders/terrain/blendP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/terrain/blendV.hlsl b/Templates/BaseGame/game/core/shaders/terrain/blendV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/terrain/blendV.hlsl rename to Templates/BaseGame/game/core/shaders/terrain/blendV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/terrain/gl/blendP.glsl b/Templates/BaseGame/game/core/shaders/terrain/gl/blendP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/terrain/gl/blendP.glsl rename to Templates/BaseGame/game/core/shaders/terrain/gl/blendP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/terrain/gl/blendV.glsl b/Templates/BaseGame/game/core/shaders/terrain/gl/blendV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/terrain/gl/blendV.glsl rename to Templates/BaseGame/game/core/shaders/terrain/gl/blendV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/terrain/terrain.glsl b/Templates/BaseGame/game/core/shaders/terrain/terrain.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/terrain/terrain.glsl rename to Templates/BaseGame/game/core/shaders/terrain/terrain.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/terrain/terrain.hlsl b/Templates/BaseGame/game/core/shaders/terrain/terrain.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/terrain/terrain.hlsl rename to Templates/BaseGame/game/core/shaders/terrain/terrain.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/torque.hlsl b/Templates/BaseGame/game/core/shaders/torque.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/torque.hlsl rename to Templates/BaseGame/game/core/shaders/torque.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/water/gl/waterBasicP.glsl b/Templates/BaseGame/game/core/shaders/water/gl/waterBasicP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/water/gl/waterBasicP.glsl rename to Templates/BaseGame/game/core/shaders/water/gl/waterBasicP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/water/gl/waterBasicV.glsl b/Templates/BaseGame/game/core/shaders/water/gl/waterBasicV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/water/gl/waterBasicV.glsl rename to Templates/BaseGame/game/core/shaders/water/gl/waterBasicV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/water/gl/waterP.glsl b/Templates/BaseGame/game/core/shaders/water/gl/waterP.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/water/gl/waterP.glsl rename to Templates/BaseGame/game/core/shaders/water/gl/waterP.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/water/gl/waterV.glsl b/Templates/BaseGame/game/core/shaders/water/gl/waterV.glsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/water/gl/waterV.glsl rename to Templates/BaseGame/game/core/shaders/water/gl/waterV.glsl diff --git a/Templates/BaseGame/game/data/shaders/common/water/waterBasicP.hlsl b/Templates/BaseGame/game/core/shaders/water/waterBasicP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/water/waterBasicP.hlsl rename to Templates/BaseGame/game/core/shaders/water/waterBasicP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/water/waterBasicV.hlsl b/Templates/BaseGame/game/core/shaders/water/waterBasicV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/water/waterBasicV.hlsl rename to Templates/BaseGame/game/core/shaders/water/waterBasicV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/water/waterP.hlsl b/Templates/BaseGame/game/core/shaders/water/waterP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/water/waterP.hlsl rename to Templates/BaseGame/game/core/shaders/water/waterP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/water/waterV.hlsl b/Templates/BaseGame/game/core/shaders/water/waterV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/water/waterV.hlsl rename to Templates/BaseGame/game/core/shaders/water/waterV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/wavesP.hlsl b/Templates/BaseGame/game/core/shaders/wavesP.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/wavesP.hlsl rename to Templates/BaseGame/game/core/shaders/wavesP.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/wavesV.hlsl b/Templates/BaseGame/game/core/shaders/wavesV.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/wavesV.hlsl rename to Templates/BaseGame/game/core/shaders/wavesV.hlsl diff --git a/Templates/BaseGame/game/data/shaders/common/wind.hlsl b/Templates/BaseGame/game/core/shaders/wind.hlsl similarity index 100% rename from Templates/BaseGame/game/data/shaders/common/wind.hlsl rename to Templates/BaseGame/game/core/shaders/wind.hlsl diff --git a/Templates/BaseGame/game/data/clientServer/scripts/server/prefs.cs b/Templates/BaseGame/game/data/clientServer/scripts/server/prefs.cs new file mode 100644 index 000000000..d9fc4a687 --- /dev/null +++ b/Templates/BaseGame/game/data/clientServer/scripts/server/prefs.cs @@ -0,0 +1,13 @@ +$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; diff --git a/Templates/BaseGame/game/data/postFX/postFX.cs b/Templates/BaseGame/game/data/postFX/postFX.cs deleted file mode 100644 index 4b443ea97..000000000 --- a/Templates/BaseGame/game/data/postFX/postFX.cs +++ /dev/null @@ -1,45 +0,0 @@ - -// The general flow of a gane - server's creation, loading and hosting clients, and then destruction is as follows: - -// First, a client will always create a server in the event that they want to host a single player -// game. Torque3D treats even single player connections as a soft multiplayer game, with some stuff -// in the networking short-circuited to sidestep around lag and packet transmission times. - -// initServer() is called, loading the default server scripts. -// After that, if this is a dedicated server session, initDedicated() is called, otherwise initClient is called -// to prep a playable client session. - -// When a local game is started - a listen server - via calling StartGame() a server is created and then the client is -// connected to it via createAndConnectToLocalServer(). - -function PostFX::create( %this ) -{ - echo("\n--------- Initializing PostFX Directory: scripts ---------"); - - // Start up in either client, or dedicated server mode - if (!$Server::Dedicated) - { - //postFX stuffs - exec("./scripts/gui/postFxManager.gui"); - - //init the postFX - %pattern = "./scripts/client/*.cs"; - %file = findFirstFile( %pattern ); - if ( %file $= "" ) - { - // Try for DSOs next. - %pattern = "./scripts/client/*.cs.dso"; - %file = findFirstFile( %pattern ); - } - - while( %file !$= "" ) - { - exec( %file ); - %file = findNextFile( %pattern ); - } - } -} - -function PostFX::destroy( %this ) -{ -} \ No newline at end of file diff --git a/Templates/BaseGame/game/data/postFX/postFX.module b/Templates/BaseGame/game/data/postFX/postFX.module deleted file mode 100644 index e5970b9a9..000000000 --- a/Templates/BaseGame/game/data/postFX/postFX.module +++ /dev/null @@ -1,9 +0,0 @@ - - \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/gui/guiDialogs.ed.cs b/Templates/BaseGame/game/tools/gui/guiDialogs.ed.cs index db09e8570..696b98975 100644 --- a/Templates/BaseGame/game/tools/gui/guiDialogs.ed.cs +++ b/Templates/BaseGame/game/tools/gui/guiDialogs.ed.cs @@ -36,3 +36,4 @@ exec("./guiObjectInspector.ed.cs"); exec("./uvEditor.ed.gui"); exec("./objectSelection.ed.cs"); exec("./guiPlatformGenericMenubar.ed.cs"); +exec("./postFxManager.gui"); \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/settings.xml b/Templates/BaseGame/game/tools/settings.xml index 739530e7b..9d10b160b 100644 --- a/Templates/BaseGame/game/tools/settings.xml +++ b/Templates/BaseGame/game/tools/settings.xml @@ -1,31 +1,31 @@ - 1280 1024 E:/gamedev/T3DMIT/CLEAN/My Projects/TemplateTest/game/data/scripts/gui - - 0 - 0 - 0 - + 1280 1024 http://www.garagegames.com/products/torque-3d/documentation/user ../../../Documentation/Official Documentation.html ../../../Documentation/Torque 3D - Script Manual.chm - 1 1 + 1 + + + 0 + 0 + 0 + 0 1 8 1 - 1 1 + 1 2 1 - 0 0 @@ -34,160 +34,160 @@ Categorized - - 0 - 0.1 - 135 - 40 40 - 255 255 255 255 - 180 180 180 255 - 1 - 1 - 1 - 0 - 1 - 0 0 0 100 - 1 - 1 - 45 - WorldEditorInspectorPlugin - screenCenter 50 - 1 0 - 6 40 - - ../../../Documentation/Torque 3D - Script Manual.chm - http://www.garagegames.com/products/torque-3d/forums - http://www.garagegames.com/products/torque-3d/documentation/user - ../../../Documentation/Official Documentation.html - - - 255 255 0 255 - 255 255 255 255 - 100 100 100 255 - 255 0 0 255 - 0 0 255 255 - 255 255 0 255 - 0 255 0 255 - + screenCenter + 1 + 6 - 1 0 - 0 0 2 + 0 100 1 - - - tools/worldEditor/images/LockedHandle - tools/worldEditor/images/SelectHandle - tools/worldEditor/images/DefaultHandle + 1 + 1 51 51 51 100 255 255 255 100 1 102 102 102 100 - 0 + 20 1 255 0 8 - 20 + + + 0 255 0 255 + 255 0 0 255 + 255 255 0 255 + 0 0 255 255 + 255 255 255 255 + 255 255 0 255 + 100 100 100 255 + + + ../../../Documentation/Torque 3D - Script Manual.chm + ../../../Documentation/Official Documentation.html + http://www.garagegames.com/products/torque-3d/documentation/user + http://www.garagegames.com/products/torque-3d/forums - 1 - 1 1 - 1 1 + 1 + 1 + 1 + + tools/worldEditor/images/DefaultHandle + tools/worldEditor/images/LockedHandle + tools/worldEditor/images/SelectHandle + + + + raiseHeight + + 1 + 0 + 90 + 1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000 + 0.1 + 1 + 50 + 100 + 10 + 1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000 + + + 40 40 + ellipse + 1 + 1 1 + 1 + + + + 255 255 255 255 + 1 + 1 + 0 + 135 + 45 + 1 + 0 0 0 100 + 40 40 + 1 + 180 180 180 255 + 0 + 1 + 1 + 0.1 + + + DefaultDecalRoadMaterial + 0 255 0 255 + 10 + 255 255 255 255 + 255 0 0 255 + + + 0 + 0.8 + 1 + 15 + 0.8 + 0 + 100 + + 10 10 10 + 255 255 255 20 + 0 + 1 + 500 + 0 + + + + 0 255 0 255 + 255 255 255 255 + 5 + 0 0 1 + 255 0 0 255 + DefaultRoadMaterialTop + 10 + DefaultRoadMaterialOther + DefaultRoadMaterialOther + + + 5 + 10 + 0 0 1 + 255 255 255 255 + 255 0 0 255 + 0 255 0 255 AIPlayer DefaultPlayerData 1 - - 10 - 255 255 255 255 - 255 0 0 255 - DefaultDecalRoadMaterial - 0 255 0 255 - - - raiseHeight - - 50 - 0 - 1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000 - 90 - 1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000 - 100 - 10 - 1 - 1 - 0.1 - - - 1 - ellipse - 40 40 - 1 - 1 1 - - - - DefaultRoadMaterialOther - DefaultRoadMaterialTop - 255 0 0 255 - 5 - 0 255 0 255 - DefaultRoadMaterialOther - 0 0 1 - 255 255 255 255 - 10 - - - 5 - 255 255 255 255 - 10 - 255 0 0 255 - 0 0 1 - 0 255 0 255 - - - 15 - 0 - 0.8 - 0.8 - 0 - 1 - 100 - - 500 - 0 - 10 10 10 - 255 255 255 20 - 0 - 0 - - 0 - - Grid512_OrangeLines_Mat - + + 25 + 25 @@ -199,4 +199,7 @@ + + Grid512_OrangeLines_Mat + diff --git a/Templates/BaseGame/game/core/lighting/advanced/shadowViz.gui b/Templates/BaseGame/game/tools/worldEditor/gui/shadowViz.gui similarity index 100% rename from Templates/BaseGame/game/core/lighting/advanced/shadowViz.gui rename to Templates/BaseGame/game/tools/worldEditor/gui/shadowViz.gui diff --git a/Templates/BaseGame/game/core/lighting/advanced/depthviz.png b/Templates/BaseGame/game/tools/worldEditor/images/depthviz.png similarity index 100% rename from Templates/BaseGame/game/core/lighting/advanced/depthviz.png rename to Templates/BaseGame/game/tools/worldEditor/images/depthviz.png diff --git a/Templates/BaseGame/game/tools/worldEditor/main.cs b/Templates/BaseGame/game/tools/worldEditor/main.cs index 82b83701a..f876480fd 100644 --- a/Templates/BaseGame/game/tools/worldEditor/main.cs +++ b/Templates/BaseGame/game/tools/worldEditor/main.cs @@ -43,6 +43,7 @@ function initializeWorldEditor() exec("./gui/AddFMODProjectDlg.ed.gui"); exec("./gui/SelectObjectsWindow.ed.gui"); exec("./gui/ProceduralTerrainPainterGui.gui" ); + exec("./gui/shadowViz.gui" ); // Load Scripts. exec("./scripts/menus.ed.cs"); @@ -62,6 +63,8 @@ function initializeWorldEditor() exec("./scripts/AddFMODProjectDlg.ed.cs"); exec("./scripts/SelectObjectsWindow.ed.cs"); exec("./scripts/cameraCommands.ed.cs"); + exec("./scripts/lightViz.cs"); + exec("./scripts/shadowViz.cs"); // Load Custom Editors loadDirectory(expandFilename("./scripts/editors")); diff --git a/Templates/BaseGame/game/core/lighting/advanced/lightViz.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/lightViz.cs similarity index 66% rename from Templates/BaseGame/game/core/lighting/advanced/lightViz.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/lightViz.cs index 75184c16f..aaa46200e 100644 --- a/Templates/BaseGame/game/core/lighting/advanced/lightViz.cs +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/lightViz.cs @@ -19,7 +19,82 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- +// Debug Shaders. +new ShaderData( AL_ColorBufferShader ) +{ + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = "./shaders/dbgColorBufferP.hlsl"; + + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl"; + OGLPixelShaderFile = "./shaders/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 = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = "./shaders/dbgSpecMapVisualizeP.hlsl"; + + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl"; + OGLPixelShaderFile = "./shaders/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(); +} new GFXStateBlockData( AL_DepthVisualizeState ) { @@ -50,11 +125,11 @@ new GFXStateBlockData( AL_DefaultVisualizeState ) new ShaderData( AL_DepthVisualizeShader ) { - DXVertexShaderFile = "data/shaders/common/postFx/postFxV.hlsl"; - DXPixelShaderFile = "data/shaders/common/lighting/advanced/dbgDepthVisualizeP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = "./shaders/dbgDepthVisualizeP.hlsl"; - OGLVertexShaderFile = "data/shaders/common/postFx/gl/postFxV.glsl"; - OGLPixelShaderFile = "data/shaders/common/lighting/advanced/gl/dbgDepthVisualizeP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl"; + OGLPixelShaderFile = "./shaders/dbgDepthVisualizeP.glsl"; samplerNames[0] = "prepassTex"; samplerNames[1] = "depthViz"; @@ -67,7 +142,7 @@ singleton PostEffect( AL_DepthVisualize ) shader = AL_DepthVisualizeShader; stateBlock = AL_DefaultVisualizeState; texture[0] = "#prepass"; - texture[1] = "core/lighting/advanced/depthviz"; + texture[1] = "tools/worldEditor/images/depthviz"; target = "$backBuffer"; renderPriority = 9999; }; @@ -86,11 +161,11 @@ function AL_DepthVisualize::onEnabled( %this ) new ShaderData( AL_GlowVisualizeShader ) { - DXVertexShaderFile = "data/shaders/common/postFx/postFxV.hlsl"; - DXPixelShaderFile = "data/shaders/common/lighting/advanced/dbgGlowVisualizeP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = "./shaders/dbgGlowVisualizeP.hlsl"; - OGLVertexShaderFile = "data/shaders/common/postFx/gl/postFxV.glsl"; - OGLPixelShaderFile = "data/shaders/common/lighting/advanced/gl/dbgGlowVisualizeP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl"; + OGLPixelShaderFile = "./shaders/dbgGlowVisualizeP.glsl"; samplerNames[0] = "glowBuffer"; pixVersion = 2.0; @@ -107,11 +182,11 @@ singleton PostEffect( AL_GlowVisualize ) new ShaderData( AL_NormalsVisualizeShader ) { - DXVertexShaderFile = "data/shaders/common/postFx/postFxV.hlsl"; - DXPixelShaderFile = "data/shaders/common/lighting/advanced/dbgNormalVisualizeP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = "./shaders/dbgNormalVisualizeP.hlsl"; - OGLVertexShaderFile = "data/shaders/common/postFx/gl/postFxV.glsl"; - OGLPixelShaderFile = "data/shaders/common/lighting/advanced/gl/dbgNormalVisualizeP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl"; + OGLPixelShaderFile = "./shaders/dbgNormalVisualizeP.glsl"; samplerNames[0] = "prepassTex"; @@ -143,11 +218,11 @@ function AL_NormalsVisualize::onEnabled( %this ) new ShaderData( AL_LightColorVisualizeShader ) { - DXVertexShaderFile = "data/shaders/common/postFx/postFxV.hlsl"; - DXPixelShaderFile = "data/shaders/common/lighting/advanced/dbgLightColorVisualizeP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = "./shaders/dbgLightColorVisualizeP.hlsl"; - OGLVertexShaderFile = "data/shaders/common/postFx/gl/postFxV.glsl"; - OGLPixelShaderFile = "data/shaders/common/lighting/advanced/gl/dbgLightColorVisualizeP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl"; + OGLPixelShaderFile = "./shaders/dbgLightColorVisualizeP.glsl"; samplerNames[0] = "lightPrePassTex"; @@ -178,11 +253,11 @@ function AL_LightColorVisualize::onEnabled( %this ) new ShaderData( AL_LightSpecularVisualizeShader ) { - DXVertexShaderFile = "data/shaders/common/postFx/postFxV.hlsl"; - DXPixelShaderFile = "data/shaders/common/lighting/advanced/dbgLightSpecularVisualizeP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; + DXPixelShaderFile = "./shaders/dbgLightSpecularVisualizeP.hlsl"; - OGLVertexShaderFile = "data/shaders/common/postFx/gl/postFxV.glsl"; - OGLPixelShaderFile = "data/shaders/common/lighting/advanced/gl/dbgLightSpecularVisualizeP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl"; + OGLPixelShaderFile = "./shaders/dbgLightSpecularVisualizeP.glsl"; samplerNames[0] = "lightPrePassTex"; diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgColorBufferP.glsl b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgColorBufferP.glsl similarity index 97% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgColorBufferP.glsl rename to Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgColorBufferP.glsl index 12962e798..0b7e370bf 100644 --- a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgColorBufferP.glsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgColorBufferP.glsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../../gl/hlslCompat.glsl" +#include "core/shaders/gl/hlslCompat.glsl" in vec2 uv0; uniform sampler2D colorBufferTex; diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgColorBufferP.hlsl b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgColorBufferP.hlsl similarity index 97% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgColorBufferP.hlsl rename to Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgColorBufferP.hlsl index ad3debbaf..e996f840a 100644 --- a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgColorBufferP.hlsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgColorBufferP.hlsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../postfx/postFx.hlsl" +#include "core/shaders/postfx/postFx.hlsl" TORQUE_UNIFORM_SAMPLER2D(colorBufferTex,0); diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgDepthVisualizeP.glsl b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgDepthVisualizeP.glsl similarity index 97% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgDepthVisualizeP.glsl rename to Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgDepthVisualizeP.glsl index 6b9dd72ad..31aa60ef4 100644 --- a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgDepthVisualizeP.glsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgDepthVisualizeP.glsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../../gl/hlslCompat.glsl" +#include "core/shaders/gl/hlslCompat.glsl" #include "shadergen:/autogenConditioners.h" in vec2 uv0; diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgDepthVisualizeP.hlsl b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgDepthVisualizeP.hlsl similarity index 94% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgDepthVisualizeP.hlsl rename to Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgDepthVisualizeP.hlsl index 68df09a78..2f1be62b2 100644 --- a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgDepthVisualizeP.hlsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgDepthVisualizeP.hlsl @@ -20,8 +20,8 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../postfx/postFx.hlsl" -#include "../../shaderModelAutoGen.hlsl" +#include "core/shaders/postfx/postFx.hlsl" +#include "core/shaders/shaderModelAutoGen.hlsl" TORQUE_UNIFORM_SAMPLER2D(prepassTex, 0); TORQUE_UNIFORM_SAMPLER1D(depthViz, 1); diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgGlowVisualizeP.glsl b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgGlowVisualizeP.glsl similarity index 97% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgGlowVisualizeP.glsl rename to Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgGlowVisualizeP.glsl index 355e6ef53..cdc58d7c6 100644 --- a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgGlowVisualizeP.glsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgGlowVisualizeP.glsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../../gl/hlslCompat.glsl" +#include "core/shaders/gl/hlslCompat.glsl" in vec2 uv0; uniform sampler2D glowBuffer; diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgGlowVisualizeP.hlsl b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgGlowVisualizeP.hlsl similarity index 97% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgGlowVisualizeP.hlsl rename to Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgGlowVisualizeP.hlsl index 257383659..b78d29d67 100644 --- a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgGlowVisualizeP.hlsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgGlowVisualizeP.hlsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../postfx/postFx.hlsl" +#include "core/shaders/postfx/postFx.hlsl" TORQUE_UNIFORM_SAMPLER2D(glowBuffer, 0); diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgLightColorVisualizeP.glsl b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgLightColorVisualizeP.glsl similarity index 97% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgLightColorVisualizeP.glsl rename to Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgLightColorVisualizeP.glsl index 3e7de5a66..0b375b646 100644 --- a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgLightColorVisualizeP.glsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgLightColorVisualizeP.glsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../../gl/hlslCompat.glsl" +#include "core/shaders/gl/hlslCompat.glsl" in vec2 uv0; uniform sampler2D lightPrePassTex; diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgLightColorVisualizeP.hlsl b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgLightColorVisualizeP.hlsl similarity index 94% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgLightColorVisualizeP.hlsl rename to Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgLightColorVisualizeP.hlsl index ca6d8d677..7d66e2e69 100644 --- a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgLightColorVisualizeP.hlsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgLightColorVisualizeP.hlsl @@ -20,8 +20,8 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../shaderModelAutoGen.hlsl" -#include "../../postfx/postFx.hlsl" +#include "core/shaders/shaderModelAutoGen.hlsl" +#include "core/shaders/postfx/postFx.hlsl" TORQUE_UNIFORM_SAMPLER2D(lightPrePassTex,0); diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgLightSpecularVisualizeP.glsl b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgLightSpecularVisualizeP.glsl similarity index 97% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgLightSpecularVisualizeP.glsl rename to Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgLightSpecularVisualizeP.glsl index 7b654c936..679c18e16 100644 --- a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgLightSpecularVisualizeP.glsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgLightSpecularVisualizeP.glsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../../gl/hlslCompat.glsl" +#include "core/shaders/gl/hlslCompat.glsl" in vec2 uv0; uniform sampler2D lightPrePassTex; diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgLightSpecularVisualizeP.hlsl b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgLightSpecularVisualizeP.hlsl similarity index 97% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgLightSpecularVisualizeP.hlsl rename to Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgLightSpecularVisualizeP.hlsl index 072f07e00..ed5c268d4 100644 --- a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgLightSpecularVisualizeP.hlsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgLightSpecularVisualizeP.hlsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../postfx/postFx.hlsl" +#include "core/shaders/postfx/postFx.hlsl" TORQUE_UNIFORM_SAMPLER2D(lightPrePassTex,0); diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgNormalVisualizeP.glsl b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgNormalVisualizeP.glsl similarity index 97% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgNormalVisualizeP.glsl rename to Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgNormalVisualizeP.glsl index 84ea4d3fb..2292e3538 100644 --- a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgNormalVisualizeP.glsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgNormalVisualizeP.glsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../../gl/hlslCompat.glsl" +#include "core/shaders/gl/hlslCompat.glsl" #include "shadergen:/autogenConditioners.h" in vec2 uv0; diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgNormalVisualizeP.hlsl b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgNormalVisualizeP.hlsl similarity index 94% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgNormalVisualizeP.hlsl rename to Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgNormalVisualizeP.hlsl index 4f31d2c53..daacee307 100644 --- a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgNormalVisualizeP.hlsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgNormalVisualizeP.hlsl @@ -20,8 +20,8 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../postfx/postFx.hlsl" -#include "../../shaderModelAutoGen.hlsl" +#include "core/shaders/postfx/postFx.hlsl" +#include "core/shaders/shaderModelAutoGen.hlsl" TORQUE_UNIFORM_SAMPLER2D(prepassTex, 0); diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgShadowVisualizeP.glsl b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgShadowVisualizeP.glsl similarity index 97% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgShadowVisualizeP.glsl rename to Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgShadowVisualizeP.glsl index b51e7310a..f73f7812d 100644 --- a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgShadowVisualizeP.glsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgShadowVisualizeP.glsl @@ -19,7 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../../gl/hlslCompat.glsl" +#include "core/shaders/gl/hlslCompat.glsl" in vec2 uv0; uniform sampler2D shadowMap; diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgShadowVisualizeP.hlsl b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgShadowVisualizeP.hlsl similarity index 97% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgShadowVisualizeP.hlsl rename to Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgShadowVisualizeP.hlsl index b54833499..3c56c2abd 100644 --- a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgShadowVisualizeP.hlsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgShadowVisualizeP.hlsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../shaderModel.hlsl" +#include "core/shaders/shaderModel.hlsl" struct MaterialDecoratorConnectV { diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgSpecMapVisualizeP.glsl b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgSpecMapVisualizeP.glsl similarity index 97% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgSpecMapVisualizeP.glsl rename to Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgSpecMapVisualizeP.glsl index 3e5efd675..d391a1963 100644 --- a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/gl/dbgSpecMapVisualizeP.glsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgSpecMapVisualizeP.glsl @@ -19,7 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../../gl/hlslCompat.glsl" +#include "core/shaders/gl/hlslCompat.glsl" in vec2 uv0; uniform sampler2D matinfoTex; diff --git a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgSpecMapVisualizeP.hlsl b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgSpecMapVisualizeP.hlsl similarity index 97% rename from Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgSpecMapVisualizeP.hlsl rename to Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgSpecMapVisualizeP.hlsl index eba38a879..59252cd7b 100644 --- a/Templates/BaseGame/game/data/shaders/common/lighting/advanced/dbgSpecMapVisualizeP.hlsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shaders/dbgSpecMapVisualizeP.hlsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../postfx/postFx.hlsl" +#include "core/shaders/postfx/postFx.hlsl" TORQUE_UNIFORM_SAMPLER2D(matinfoTex,0); diff --git a/Templates/BaseGame/game/core/lighting/advanced/shadowViz.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/shadowViz.cs similarity index 91% rename from Templates/BaseGame/game/core/lighting/advanced/shadowViz.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/shadowViz.cs index c91ae83e8..1bfa88488 100644 --- a/Templates/BaseGame/game/core/lighting/advanced/shadowViz.cs +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/shadowViz.cs @@ -22,11 +22,11 @@ new ShaderData( AL_ShadowVisualizeShader ) { - DXVertexShaderFile = "data/shaders/common/guiMaterialV.hlsl"; - DXPixelShaderFile = "data/shaders/common/lighting/advanced/dbgShadowVisualizeP.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/guiMaterialV.hlsl"; + DXPixelShaderFile = "./shaders/dbgShadowVisualizeP.hlsl"; - OGLVertexShaderFile = "data/shaders/common/gl/guiMaterialV.glsl"; - OGLPixelShaderFile = "data/shaders/common/lighting/advanced/gl/dbgShadowVisualizeP.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/gl/guiMaterialV.glsl"; + OGLPixelShaderFile = "./shaders/dbgShadowVisualizeP.glsl"; samplerNames[0] = "$shadowMap"; samplerNames[1] = "$depthViz"; @@ -40,7 +40,7 @@ new CustomMaterial( AL_ShadowVisualizeMaterial ) stateBlock = AL_DepthVisualizeState; sampler["shadowMap"] = "#AL_ShadowVizTexture"; - sampler["depthViz"] = "depthviz"; + sampler["depthViz"] = "tools/worldEditor/images/depthviz"; pixVersion = 2.0; }; diff --git a/Templates/Empty/game/shaders/procedural/.gitignore b/Templates/Empty/game/shaders/procedural/.gitignore deleted file mode 100644 index 1bc0e838a..000000000 --- a/Templates/Empty/game/shaders/procedural/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Keep directory in git repo diff --git a/Templates/Full/game/Full.torsion.opt b/Templates/Full/game/Full.torsion.opt index 52398bf4d..f41687c47 100644 --- a/Templates/Full/game/Full.torsion.opt +++ b/Templates/Full/game/Full.torsion.opt @@ -8,7 +8,13 @@ art\main.cs core\main.cs -..\..\Empty\game\core\main.cs +..\..\Empty\game\core\main.cs ..\..\BaseGame\game\core\main.cs +core\scripts\client\postFx\MLAA.cs +core\scripts\client\postFx\ssao.cs +core\scripts\client\postFx\hdr.cs +core\scripts\client\postFx\dof.cs +core\scripts\client\postFx\caustics.cs +..\..\..\..\..\RnDBuildTest\My Projects\RnDTest\game\modules\TheFactory\components\FakeGISpotlight.cs diff --git a/Templates/Full/game/shaders/procedural/.gitignore b/Templates/Full/game/shaders/procedural/.gitignore deleted file mode 100644 index 1bc0e838a..000000000 --- a/Templates/Full/game/shaders/procedural/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Keep directory in git repo