Fixing lights and shadows

src/Character.h

@@ -51,10 +51,18 @@ public:
     void draw(Renderer& renderer);
     void drawShadowDepth(Renderer& renderer);
     void drawWithShadow(Renderer& renderer, const Eigen::Matrix4f& lightFromCamera, GLuint shadowMapTex, const Eigen::Vector3f& lightDirCamera);
-    void drawNight(Renderer& renderer, const float* pointLightPosEye, const float* pointLightDirEye, const float* pointLightColors, int pointLightCount, const float* ambientColor, const float* fogColor);
+    void 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);
     void 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);
 
 	// Character-to-character collision (XZ-plane). Used by Location to keep
 	// player/NPCs from walking through each other.
@@ -217,14 +225,22 @@ private:
     void drawGpuSkinningWithShadow(Renderer& renderer, const Eigen::Matrix4f& lightFromCamera, GLuint shadowMapTex, const Eigen::Vector3f& lightDirCamera);
     void drawCpuWithShadow(Renderer& renderer, const Eigen::Matrix4f& lightFromCamera, GLuint shadowMapTex, const Eigen::Vector3f& lightDirCamera);
     // Night: draw with spot-light shaders
-    void drawNightGpuSkinning(Renderer& renderer, const float* plPosEye, const float* plDirEye, const float* plColors, int plCount, const float* ambientColor, const float* fogColor);
-    void drawNightCpu(Renderer& renderer, const float* plPosEye, const float* plDirEye, const float* plColors, int plCount, const float* ambientColor, const float* fogColor);
+    void 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);
+    void 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);
     // Night: draw with spot-light + shadow shaders
     void drawNightGpuSkinningWithShadow(Renderer& renderer,
         const float* plPosEye, const float* plDirEye, const float* plColors, int plCount,
+        const float* plWorldXZ, const float* plLimitXZ, const Eigen::Matrix4f& cameraViewInverse,
         const Eigen::Matrix4f& lightFromCamera, GLuint shadowMapTex, const float* ambientColor, const float* fogColor);
     void drawNightCpuWithShadow(Renderer& renderer,
         const float* plPosEye, const float* plDirEye, const float* plColors, int plCount,
+        const float* plWorldXZ, const float* plLimitXZ, const Eigen::Matrix4f& cameraViewInverse,
         const Eigen::Matrix4f& lightFromCamera, GLuint shadowMapTex, const float* ambientColor, const float* fogColor);
 };