TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

shifts spotlightparams to the actually used float2/vec2 entries (stops debug screaming every frame)

Browse source
This commit is contained in:
AzaezelX 2019-11-07 23:18:14 -06:00
parent 501990c3b6
commit 2e56645f13
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/lighting/lightManager.cpp
View file

@ -333,7 +333,7 @@ void LightManager::_update4LightConsts( const SceneData &sgData,
static AlignedArray<Point4F> lightSpotDirs(MAX_FORWARD_LIGHTS, sizeof(Point4F));
static AlignedArray<Point4F> lightColors(MAX_FORWARD_LIGHTS, sizeof(Point4F));
static AlignedArray<Point4F> lightConfigData(MAX_FORWARD_LIGHTS, sizeof(Point4F)); //type, brightness, range, invSqrRange : rgba
static AlignedArray<Point4F> lightSpotParams(MAX_FORWARD_LIGHTS, sizeof(Point4F));
static AlignedArray<Point2F> lightSpotParams(MAX_FORWARD_LIGHTS, sizeof(Point2F));
dMemset(lightPositions.getBuffer(), 0, lightPositions.getBufferSize());
dMemset(lightSpotDirs.getBuffer(), 0, lightSpotDirs.getBufferSize());

2
Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp
View file

@ -2188,7 +2188,7 @@ void RTLightingFeatGLSL::processPix( Vector<ShaderComponent*> &componentList,
inLightSpotDir->arraySize = 4;
inLightSpotDir->constSortPos = cspPotentialPrimitive;
Var * lightSpotParams = new Var( "lightSpotParams", "vec4" );
Var * lightSpotParams = new Var( "lightSpotParams", "vec2" );
lightSpotParams->uniform = true;
lightSpotParams->arraySize = 4;
lightSpotParams->constSortPos = cspPotentialPrimitive;

2
Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp
View file

@ -2234,7 +2234,7 @@ void RTLightingFeatHLSL::processPix( Vector<ShaderComponent*> &componentList,
inLightSpotDir->arraySize = 4;
inLightSpotDir->constSortPos = cspPotentialPrimitive;
Var * lightSpotParams = new Var( "lightSpotParams", "float4" );
Var * lightSpotParams = new Var( "lightSpotParams", "float2" );
lightSpotParams->uniform = true;
lightSpotParams->arraySize = 4;
lightSpotParams->constSortPos = cspPotentialPrimitive;

2
Templates/BaseGame/game/core/rendering/shaders/gl/lighting.glsl
View file

@ -241,7 +241,7 @@ vec4 compute4Lights( Surface surface,
vec4 inLightConfigData[4],
vec4 inLightColor[4],
vec4 inLightSpotDir[4],
vec4 lightSpotParams[4],
vec2 lightSpotParams[4],
int hasVectorLight,
vec4 vectorLightDirection,
vec4 vectorLightingColor,

2
Templates/BaseGame/game/core/rendering/shaders/lighting.hlsl
View file

@ -247,7 +247,7 @@ float4 compute4Lights( Surface surface,
float4 inLightConfigData[4],
float4 inLightColor[4],
float4 inLightSpotDir[4],
float4 lightSpotParams[4],
float2 lightSpotParams[4],
int hasVectorLight,
float4 vectorLightDirection,
float4 vectorLightingColor,