Fixing lights and shadows

src/Character.cpp

@@ -903,7 +903,13 @@ void Character::drawGpuSkinningWithShadow(Renderer& renderer, const Eigen::Matri
 
 // ==================== Night pass with point lights ====================
 
-void Character::drawNight(Renderer& renderer, const float* pointLightPosEye, const float* pointLightDirEye, const float* pointLightColors, int pointLightCount, const float* ambientColor, const float* fogColor) {
+void Character::drawNight(Renderer& renderer,
+    const float* pointLightPosEye, const float* pointLightDirEye,
+    const float* pointLightColors, int pointLightCount,
+    const float* pointLightWorldXZ, const float* pointLightLimitXZ,
+    const Eigen::Matrix4f& cameraViewInverse,
+    const float* ambientColor, const float* fogColor)
+{
     if (!enabled) return;
     if (hitSparkEmitter.isConfigured() && hitSparkEmitter.getActiveParticleCount() > 0) {
         hitSparkEmitter.draw(renderer, 1.0f, Environment::width, Environment::height, false);
@@ -915,13 +921,19 @@ void Character::drawNight(Renderer& renderer, const float* pointLightPosEye, con
     //if (!isPlayer && hp <= 0) return;
 
     if (useGpuSkinning) {
-        drawNightGpuSkinning(renderer, pointLightPosEye, pointLightDirEye, pointLightColors, pointLightCount, ambientColor, fogColor);
+        drawNightGpuSkinning(renderer, pointLightPosEye, pointLightDirEye, pointLightColors, pointLightCount,
+            pointLightWorldXZ, pointLightLimitXZ, cameraViewInverse, ambientColor, fogColor);
     } else {
-        drawNightCpu(renderer, pointLightPosEye, pointLightDirEye, pointLightColors, pointLightCount, ambientColor, fogColor);
+        drawNightCpu(renderer, pointLightPosEye, pointLightDirEye, pointLightColors, pointLightCount,
+            pointLightWorldXZ, pointLightLimitXZ, cameraViewInverse, ambientColor, fogColor);
     }
 }
 
-void Character::drawNightGpuSkinning(Renderer& renderer, const float* plPosEye, const float* plDirEye, const float* plColors, int plCount, const float* ambientColor, const float* fogColor) {
+void Character::drawNightGpuSkinning(Renderer& renderer,
+    const float* plPosEye, const float* plDirEye, const float* plColors, int plCount,
+    const float* plWorldXZ, const float* plLimitXZ, const Eigen::Matrix4f& cameraViewInverse,
+    const float* ambientColor, const float* fogColor)
+{
     AnimationState drawState = resolveActiveState();
     auto it = animations.find(drawState);
     if (it == animations.end()) return;
@@ -942,7 +954,10 @@ void Character::drawNightGpuSkinning(Renderer& renderer, const float* plPosEye,
         renderer.RenderUniform3fvArray("uPointLightPos[0]", plCount, plPosEye);
         renderer.RenderUniform3fvArray("uPointLightDir[0]", plCount, plDirEye);
         renderer.RenderUniform3fvArray("uPointLightColor[0]", plCount, plColors);
+        renderer.RenderUniform2fvArray("uPointLightWorldXZ[0]", plCount, plWorldXZ);
+        renderer.RenderUniform2fvArray("uPointLightLimitXZ[0]", plCount, plLimitXZ);
     }
+    renderer.RenderUniformMatrix4fv("uViewInverse", false, cameraViewInverse.data());
 
     renderer.PushPerspectiveProjectionMatrix(1.0 / 1.5,
         static_cast<float>(Environment::width) / static_cast<float>(Environment::height),
@@ -979,6 +994,8 @@ void Character::drawNightGpuSkinning(Renderer& renderer, const float* plPosEye,
         renderer.RenderUniform3fvArray("uPointLightPos[0]", plCount, plPosEye);
         renderer.RenderUniform3fvArray("uPointLightDir[0]", plCount, plDirEye);
         renderer.RenderUniform3fvArray("uPointLightColor[0]", plCount, plColors);
+        renderer.RenderUniform2fvArray("uPointLightWorldXZ[0]", plCount, plWorldXZ);
+        renderer.RenderUniform2fvArray("uPointLightLimitXZ[0]", plCount, plLimitXZ);
     }
     drawAttachedWeapon(renderer);
     renderer.shaderManager.PopShader();
@@ -987,7 +1004,11 @@ void Character::drawNightGpuSkinning(Renderer& renderer, const float* plPosEye,
     renderer.shaderManager.PopShader();
 }
 
-void Character::drawNightCpu(Renderer& renderer, const float* plPosEye, const float* plDirEye, const float* plColors, int plCount, const float* ambientColor, const float* fogColor) {
+void Character::drawNightCpu(Renderer& renderer,
+    const float* plPosEye, const float* plDirEye, const float* plColors, int plCount,
+    const float* plWorldXZ, const float* plLimitXZ, const Eigen::Matrix4f& cameraViewInverse,
+    const float* ambientColor, const float* fogColor)
+{
     AnimationState drawState = resolveActiveState();
     auto it = animations.find(drawState);
     if (it == animations.end()) return;
@@ -1005,6 +1026,8 @@ void Character::drawNightCpu(Renderer& renderer, const float* plPosEye, const fl
         renderer.RenderUniform3fvArray("uPointLightPos[0]", plCount, plPosEye);
         renderer.RenderUniform3fvArray("uPointLightDir[0]", plCount, plDirEye);
         renderer.RenderUniform3fvArray("uPointLightColor[0]", plCount, plColors);
+        renderer.RenderUniform2fvArray("uPointLightWorldXZ[0]", plCount, plWorldXZ);
+        renderer.RenderUniform2fvArray("uPointLightLimitXZ[0]", plCount, plLimitXZ);
     }
 
     renderer.PushPerspectiveProjectionMatrix(1.0 / 1.5,
@@ -1042,7 +1065,10 @@ void Character::drawNightCpu(Renderer& renderer, const float* plPosEye, const fl
 
 void Character::drawNightWithShadow(Renderer& renderer,
     const float* plPosEye, const float* plDirEye, const float* plColors, int plCount,
-    const Eigen::Matrix4f& lightFromCamera, GLuint shadowMapTex, const float* ambientColor, const float* fogColor)
+    const float* plWorldXZ, const float* plLimitXZ,
+    const Eigen::Matrix4f& cameraViewInverse,
+    const Eigen::Matrix4f& lightFromCamera, GLuint shadowMapTex,
+    const float* ambientColor, const float* fogColor)
 {
     if (!enabled) return;
     if (hitSparkEmitter.isConfigured() && hitSparkEmitter.getActiveParticleCount() > 0) {
@@ -1053,15 +1079,22 @@ void Character::drawNightWithShadow(Renderer& renderer,
     //if (!isPlayer && hp <= 0) return;
 
     if (useGpuSkinning) {
-        drawNightGpuSkinningWithShadow(renderer, plPosEye, plDirEye, plColors, plCount, lightFromCamera, shadowMapTex, ambientColor, fogColor);
+        drawNightGpuSkinningWithShadow(renderer, plPosEye, plDirEye, plColors, plCount,
+            plWorldXZ, plLimitXZ, cameraViewInverse,
+            lightFromCamera, shadowMapTex, ambientColor, fogColor);
     } else {
-        drawNightCpuWithShadow(renderer, plPosEye, plDirEye, plColors, plCount, lightFromCamera, shadowMapTex, ambientColor, fogColor);
+        drawNightCpuWithShadow(renderer, plPosEye, plDirEye, plColors, plCount,
+            plWorldXZ, plLimitXZ, cameraViewInverse,
+            lightFromCamera, shadowMapTex, ambientColor, fogColor);
     }
 }
 
 void Character::drawNightGpuSkinningWithShadow(Renderer& renderer,
     const float* plPosEye, const float* plDirEye, const float* plColors, int plCount,
-    const Eigen::Matrix4f& lightFromCamera, GLuint shadowMapTex, const float* ambientColor, const float* fogColor)
+    const float* plWorldXZ, const float* plLimitXZ,
+    const Eigen::Matrix4f& cameraViewInverse,
+    const Eigen::Matrix4f& lightFromCamera, GLuint shadowMapTex,
+    const float* ambientColor, const float* fogColor)
 {
     AnimationState drawState = resolveActiveState();
     auto it = animations.find(drawState);
@@ -1088,6 +1121,9 @@ void Character::drawNightGpuSkinningWithShadow(Renderer& renderer,
         renderer.RenderUniform3fvArray("uPointLightDir[0]", plCount, plDirEye);
         renderer.RenderUniform3fvArray("uPointLightColor[0]", plCount, plColors);
     }
+    renderer.RenderUniform2fvArray("uPointLightWorldXZ[0]", plCount, plWorldXZ);
+    renderer.RenderUniform2fvArray("uPointLightLimitXZ[0]", plCount, plLimitXZ);
+    renderer.RenderUniformMatrix4fv("uViewInverse", false, cameraViewInverse.data());
 
     glActiveTexture(GL_TEXTURE1);
     glBindTexture(GL_TEXTURE_2D, shadowMapTex);
@@ -1133,6 +1169,8 @@ void Character::drawNightGpuSkinningWithShadow(Renderer& renderer,
         renderer.RenderUniform3fvArray("uPointLightDir[0]", plCount, plDirEye);
         renderer.RenderUniform3fvArray("uPointLightColor[0]", plCount, plColors);
     }
+    renderer.RenderUniform2fvArray("uPointLightWorldXZ[0]", plCount, plWorldXZ);
+    renderer.RenderUniform2fvArray("uPointLightLimitXZ[0]", plCount, plLimitXZ);
     drawAttachedWeapon(renderer);
     renderer.shaderManager.PopShader();
 
@@ -1142,7 +1180,10 @@ void Character::drawNightGpuSkinningWithShadow(Renderer& renderer,
 
 void Character::drawNightCpuWithShadow(Renderer& renderer,
     const float* plPosEye, const float* plDirEye, const float* plColors, int plCount,
-    const Eigen::Matrix4f& lightFromCamera, GLuint shadowMapTex, const float* ambientColor, const float* fogColor)
+    const float* plWorldXZ, const float* plLimitXZ,
+    const Eigen::Matrix4f& cameraViewInverse,
+    const Eigen::Matrix4f& lightFromCamera, GLuint shadowMapTex,
+    const float* ambientColor, const float* fogColor)
 {
     AnimationState drawState = resolveActiveState();
     auto it = animations.find(drawState);
@@ -1166,6 +1207,8 @@ void Character::drawNightCpuWithShadow(Renderer& renderer,
         renderer.RenderUniform3fvArray("uPointLightDir[0]", plCount, plDirEye);
         renderer.RenderUniform3fvArray("uPointLightColor[0]", plCount, plColors);
     }
+    renderer.RenderUniform2fvArray("uPointLightWorldXZ[0]", plCount, plWorldXZ);
+    renderer.RenderUniform2fvArray("uPointLightLimitXZ[0]", plCount, plLimitXZ);
 
     glActiveTexture(GL_TEXTURE1);
     glBindTexture(GL_TEXTURE_2D, shadowMapTex);