TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 09:04:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

timmy merge work

Browse source
This commit is contained in:
Tim Barnes 2018-11-28 17:51:52 +10:00
parent 5fa2c5b4a6
commit 15aeba20e7
29 changed files with 295 additions and 925 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Templates/Full/game/core/scripts/client/lighting/advanced/shaders.cs
View file

@ -92,7 +92,7 @@ new CustomMaterial( AL_VectorLightMaterial )
sampler["colorBuffer"] = "#color";
sampler["matInfoBuffer"] = "#matinfo";
target = "diffuseLighting";
target = "AL_FormatToken";
pixVersion = 3.0;
};
@ -170,7 +170,7 @@ new CustomMaterial( AL_PointLightMaterial )
sampler["colorBuffer"] = "#color";
sampler["matInfoBuffer"] = "#matinfo";
target = "diffuseLighting";
target = "AL_FormatToken";
pixVersion = 3.0;
};
@ -209,7 +209,7 @@ new CustomMaterial( AL_SpotLightMaterial )
sampler["colorBuffer"] = "#color";
sampler["matInfoBuffer"] = "#matinfo";
target = "diffuseLighting";
target = "AL_FormatToken";
pixVersion = 3.0;
};
@ -375,17 +375,6 @@ new ShaderData( PrefiterCubemapShader )
pixVersion = 3.0;
};
new ShaderData( BRDFLookupShader )
{
DXVertexShaderFile = "shaders/common/lighting/advanced/cubemapV.hlsl";
DXPixelShaderFile = "shaders/common/lighting/advanced/brdfLookupP.hlsl";
OGLVertexShaderFile = "shaders/common/lighting/advanced/gl/cubemapV.glsl";
OGLPixelShaderFile = "shaders/common/lighting/advanced/gl/brdfLookupP.glsl";
pixVersion = 3.0;
};
new ShaderData( SkyLightShader )
{
DXVertexShaderFile = "shaders/common/lighting/advanced/convexGeometryV.hlsl";

13
Templates/Full/game/core/scripts/client/shaders.cs
View file

@ -138,16 +138,3 @@ singleton ShaderData( VolumetricFogReflectionShader )
pixVersion = 3.0;
};
singleton ShaderData( CubemapSaveShader )
{
DXVertexShaderFile = "shaders/common/cubemapSaveV.hlsl";
DXPixelShaderFile = "shaders/common/cubemapSaveP.hlsl";
OGLVertexShaderFile = "shaders/common/gl/cubemapSaveV.glsl";
OGLPixelShaderFile = "shaders/common/gl/cubemapSaveP.glsl";
samplerNames[0] = "$cubemapTex";
pixVersion = 3.0;
};