Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RTSS: fix use of non-unit light direction when scaling is present #2055

Merged
merged 1 commit into from Jun 1, 2021
Merged

RTSS: fix use of non-unit light direction when scaling is present #2055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Components/RTShaderSystem/src/OgreShaderExPerPixelLighting.cpp
View file
Open in desktop
Expand Up @@ -137,7 +137,7 @@ bool PerPixelLighting::resolvePerLightParameters(ProgramSet* programSet)
switch (mLightParamsList[i].mType)
{
case Light::LT_DIRECTIONAL:
mLightParamsList[i].mDirection = psProgram->resolveParameter(GpuProgramParameters::ACT_LIGHT_POSITION_VIEW_SPACE, i);
mLightParamsList[i].mDirection = psProgram->resolveParameter(GpuProgramParameters::ACT_LIGHT_DIRECTION_VIEW_SPACE, i);
mLightParamsList[i].mPSInDirection = mLightParamsList[i].mDirection;
needViewPos = mSpecularEnable || needViewPos;
break;
Expand All @@ -151,7 +151,7 @@ bool PerPixelLighting::resolvePerLightParameters(ProgramSet* programSet)

case Light::LT_SPOTLIGHT:
mLightParamsList[i].mPosition = psProgram->resolveParameter(GpuProgramParameters::ACT_LIGHT_POSITION_VIEW_SPACE, i);
mLightParamsList[i].mDirection = psProgram->resolveParameter(GCT_FLOAT4, -1, (uint16)GPV_LIGHTS, "light_direction_view_space");
mLightParamsList[i].mDirection = psProgram->resolveParameter(GpuProgramParameters::ACT_LIGHT_DIRECTION_VIEW_SPACE, i);
mLightParamsList[i].mPSInDirection = mLightParamsList[i].mDirection;
mLightParamsList[i].mAttenuatParams = psProgram->resolveParameter(GpuProgramParameters::ACT_LIGHT_ATTENUATION, i);
mLightParamsList[i].mSpotParams = psProgram->resolveParameter(GpuProgramParameters::ACT_SPOTLIGHT_PARAMS, i);
Expand Down
9 changes: 3 additions & 6 deletions Components/RTShaderSystem/src/OgreShaderFFPLighting.cpp
View file
Open in desktop
Expand Up @@ -106,10 +106,7 @@ void FFPLighting::updateGpuProgramsParams(Renderable* rend, const Pass* pass, co
curParams.mPosition->updateExtraInfo(j);
curParams.mAttenuatParams->updateExtraInfo(j);
curParams.mSpotParams->updateExtraInfo(j);

Vector3 vec3;
vec3 = source->getInverseTransposeViewMatrix().linear() * source->getLightDirection(j);
curParams.mDirection->setGpuParameter(Vector4(-vec3.normalisedCopy(), 0));
curParams.mDirection->updateExtraInfo(j);
}
break;
}
Expand Down Expand Up @@ -177,7 +174,7 @@ bool FFPLighting::resolveParameters(ProgramSet* programSet)
switch (mLightParamsList[i].mType)
{
case Light::LT_DIRECTIONAL:
mLightParamsList[i].mDirection = vsProgram->resolveParameter(GpuProgramParameters::ACT_LIGHT_POSITION_VIEW_SPACE, i);
mLightParamsList[i].mDirection = vsProgram->resolveParameter(GpuProgramParameters::ACT_LIGHT_DIRECTION_VIEW_SPACE, i);
mLightParamsList[i].mPSInDirection = mLightParamsList[i].mDirection;
break;

Expand All @@ -194,7 +191,7 @@ bool FFPLighting::resolveParameters(ProgramSet* programSet)
mLightParamsList[i].mPosition = vsProgram->resolveParameter(GpuProgramParameters::ACT_LIGHT_POSITION_VIEW_SPACE, i);
mLightParamsList[i].mAttenuatParams = vsProgram->resolveParameter(GpuProgramParameters::ACT_LIGHT_ATTENUATION, i);

mLightParamsList[i].mDirection = vsProgram->resolveParameter(GCT_FLOAT4, -1, (uint16)GPV_LIGHTS, "light_direction_view_space");
mLightParamsList[i].mDirection = vsProgram->resolveParameter(GpuProgramParameters::ACT_LIGHT_DIRECTION_VIEW_SPACE, i);
mLightParamsList[i].mPSInDirection = mLightParamsList[i].mDirection;

mLightParamsList[i].mSpotParams = vsProgram->resolveParameter(GpuProgramParameters::ACT_SPOTLIGHT_PARAMS, i);
Expand Down
2 changes: 1 addition & 1 deletion Components/Terrain/src/OgreTerrainMaterialShaderHelperGLSL.cpp
View file
Open in desktop
Expand Up @@ -390,7 +390,7 @@ namespace Ogre

outStream <<
" vec3 lightDir = \n"
" lightPosObjSpace.xyz - (oPosObj.xyz * lightPosObjSpace.w);\n"
" -(lightPosObjSpace.xyz - (oPosObj.xyz * lightPosObjSpace.w));\n"
" vec3 eyeDir = eyePosObjSpace - oPosObj.xyz;\n"

// set up accumulation areas
Expand Down
18 changes: 9 additions & 9 deletions Media/RTShaderLib/GLSL/SGXLib_PerPixelLighting.glsl
View file
Open in desktop
Expand Up @@ -48,12 +48,12 @@ void SGX_FetchNormal(in sampler2D s,
//-----------------------------------------------------------------------------
void SGX_Light_Directional_Diffuse(
in vec3 vNormal,
in vec3 vNegLightDirView,
in vec3 vLightDirView,
in vec3 vDiffuseColour,
inout vec3 vOut)
{
vec3 vNormalView = normalize(vNormal);
float nDotL = dot(vNormalView, vNegLightDirView);
float nDotL = dot(vNormalView, -vLightDirView);

vOut += vDiffuseColour * clamp(nDotL, 0.0, 1.0);
vOut = clamp(vOut, 0.0, 1.0);
Expand All @@ -63,17 +63,17 @@ void SGX_Light_Directional_Diffuse(
void SGX_Light_Directional_DiffuseSpecular(
in vec3 vNormal,
in vec3 vViewDir,
in vec3 vNegLightDirView,
in vec3 vLightDirView,
in vec3 vDiffuseColour,
in vec3 vSpecularColour,
in float fSpecularPower,
inout vec3 vOutDiffuse,
inout vec3 vOutSpecular)
{
vec3 vNormalView = normalize(vNormal);
float nDotL = dot(vNormalView, vNegLightDirView);
float nDotL = dot(vNormalView, -vLightDirView);
vec3 vView = normalize(vViewDir);
vec3 vHalfWay = normalize(vView + vNegLightDirView);
vec3 vHalfWay = normalize(vView + -vLightDirView);
float nDotH = dot(vNormalView, vHalfWay);

if (nDotL > 0.0)
Expand Down Expand Up @@ -150,7 +150,7 @@ void SGX_Light_Point_DiffuseSpecular(
void SGX_Light_Spot_Diffuse(
in vec3 vNormal,
in vec3 vLightView,
in vec3 vNegLightDirView,
in vec3 vLightDirView,
in vec4 vAttParams,
in vec3 vSpotParams,
in vec3 vDiffuseColour,
Expand All @@ -164,7 +164,7 @@ void SGX_Light_Spot_Diffuse(
if (nDotL > 0.0 && fLightD <= vAttParams.x)
{
float fAtten = 1.0 / (vAttParams.y + vAttParams.z*fLightD + vAttParams.w*fLightD*fLightD);
float rho = dot(vNegLightDirView, vLightView);
float rho = dot(-vLightDirView, vLightView);
float fSpotE = clamp((rho - vSpotParams.y) / (vSpotParams.x - vSpotParams.y), 0.0, 1.0);
float fSpotT = pow(fSpotE, vSpotParams.z);

Expand All @@ -178,7 +178,7 @@ void SGX_Light_Spot_DiffuseSpecular(
in vec3 vNormal,
in vec3 vViewDir,
in vec3 vLightView,
in vec3 vNegLightDirView,
in vec3 vLightDirView,
in vec4 vAttParams,
in vec3 vSpotParams,
in vec3 vDiffuseColour,
Expand All @@ -199,7 +199,7 @@ void SGX_Light_Spot_DiffuseSpecular(
vec3 vHalfWay = normalize(vView + vLightView);
float nDotH = dot(vNormalView, vHalfWay);
float fAtten = 1.0 / (vAttParams.y + vAttParams.z*fLightD + vAttParams.w*fLightD*fLightD);
float rho = dot(vNegLightDirView, vLightView);
float rho = dot(-vLightDirView, vLightView);
float fSpotE = clamp((rho - vSpotParams.y) / (vSpotParams.x - vSpotParams.y), 0.0, 1.0);
float fSpotT = pow(fSpotE, vSpotParams.z);

Expand Down