Merge pull request #1442 from Azaezel/shadow_caching

This all seems to work pretty well.
This commit is contained in:
Areloch 2015-11-12 12:49:58 -06:00
commit 92aa785bb2
61 changed files with 1490 additions and 466 deletions

View file

@ -62,9 +62,10 @@ new ShaderData( AL_VectorLightShader )
OGLPixelShaderFile = "shaders/common/lighting/advanced/gl/vectorLightP.glsl";
samplerNames[0] = "$prePassBuffer";
samplerNames[1] = "$ShadowMap";
samplerNames[2] = "$ssaoMask";
samplerNames[3] = "$gTapRotationTex";
samplerNames[1] = "$shadowMap";
samplerNames[2] = "$dynamicShadowMap";
samplerNames[3] = "$ssaoMask";
samplerNames[4] = "$gTapRotationTex";
pixVersion = 3.0;
};
@ -75,7 +76,8 @@ new CustomMaterial( AL_VectorLightMaterial )
stateBlock = AL_VectorLightState;
sampler["prePassBuffer"] = "#prepass";
sampler["ShadowMap"] = "$dynamiclight";
sampler["shadowMap"] = "$dynamiclight";
sampler["dynamicShadowMap"] = "$dynamicShadowMap";
sampler["ssaoMask"] = "#ssaoMask";
target = "lightinfo";
@ -128,8 +130,9 @@ new ShaderData( AL_PointLightShader )
samplerNames[0] = "$prePassBuffer";
samplerNames[1] = "$shadowMap";
samplerNames[2] = "$cookieMap";
samplerNames[3] = "$gTapRotationTex";
samplerNames[2] = "$dynamicShadowMap";
samplerNames[3] = "$cookieMap";
samplerNames[4] = "$gTapRotationTex";
pixVersion = 3.0;
};
@ -141,6 +144,7 @@ new CustomMaterial( AL_PointLightMaterial )
sampler["prePassBuffer"] = "#prepass";
sampler["shadowMap"] = "$dynamiclight";
sampler["dynamicShadowMap"] = "$dynamicShadowMap";
sampler["cookieMap"] = "$dynamiclightmask";
target = "lightinfo";
@ -159,8 +163,9 @@ new ShaderData( AL_SpotLightShader )
samplerNames[0] = "$prePassBuffer";
samplerNames[1] = "$shadowMap";
samplerNames[2] = "$cookieMap";
samplerNames[3] = "$gTapRotationTex";
samplerNames[2] = "$dynamicShadowMap";
samplerNames[3] = "$cookieMap";
samplerNames[4] = "$gTapRotationTex";
pixVersion = 3.0;
};
@ -172,6 +177,7 @@ new CustomMaterial( AL_SpotLightMaterial )
sampler["prePassBuffer"] = "#prepass";
sampler["shadowMap"] = "$dynamiclight";
sampler["dynamicShadowMap"] = "$dynamicShadowMap";
sampler["cookieMap"] = "$dynamiclightmask";
target = "lightinfo";