From 8c33378621711d62e8d54cca40c61cf560b89f25 Mon Sep 17 00:00:00 2001
From: XProger <xproger@list.ru>
Date: Tue, 25 Apr 2017 03:02:58 +0300
Subject: [PATCH] #23 braid & blob shadows fix

---
 src/controller.h | 29 ++++++++++++++++++-----------
 src/level.h      |  6 ++++++
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/controller.h b/src/controller.h
index 857f3c9..1f091a0 100644
--- a/src/controller.h
+++ b/src/controller.h
@@ -530,10 +530,24 @@ struct Controller {
         return matrix;
     }
 
-    void renderShadow(MeshBuilder *mesh, const vec3 &pos, const vec3 &offset, const vec3 &size, float angle) {
+    void renderShadow(MeshBuilder *mesh) {
+        TR::Entity &entity = getEntity();
+
+        if (Core::pass != Core::passCompose || !TR::castShadow(entity.type))
+            return;
+
+        TR::Level::FloorInfo info;
+        level->getFloorInfo(entity.room, entity.x, entity.y, entity.z, info);
+
+        Box box = animation.getBoundingBox(vec3(0, 0, 0), 0);
+
+        const vec3 fpos   = vec3(float(entity.x), info.floor - 16.0f, float(entity.z));
+        const vec3 offset = box.center();
+        const vec3 size   = box.size();
+
         mat4 m = Core::mViewProj;
-        m.translate(pos);
-        m.rotateY(angle);
+        m.translate(fpos);
+        m.rotateY(angle.y);
         m.translate(vec3(offset.x, 0.0f, offset.z));
         m.scale(vec3(size.x, 0.0f, size.z) * (1.0f / 1024.0f));        
 
@@ -543,7 +557,7 @@ struct Controller {
         game->setShader(Core::pass, Shader::FLASH, false, false);
         Core::active.shader->setParam(uViewProj, m);
         Core::active.shader->setParam(uBasis, b);
-        float alpha = lerp(0.7f, 0.90f, clamp((pos.y - this->pos.y) / 1024.0f, 0.0f, 1.0f) );
+        float alpha = lerp(0.7f, 0.90f, clamp((fpos.y - pos.y) / 1024.0f, 0.0f, 1.0f) );
         Core::active.shader->setParam(uMaterial, vec4(vec3(0.5f * (1.0f - alpha)), alpha));
         Core::active.shader->setParam(uAmbient, vec3(0.0f));
 
@@ -593,13 +607,6 @@ struct Controller {
         }
 
         frameIndex = Core::stats.frame;
-
-     // blob shadow // TODO: fake AO
-        if (Core::pass == Core::passCompose && TR::castShadow(entity.type)) {
-            TR::Level::FloorInfo info;
-            level->getFloorInfo(entity.room, entity.x, entity.y, entity.z, info);
-            renderShadow(mesh, vec3(float(entity.x), info.floor - 16.0f, float(entity.z)), box.center(), box.size(), angle.y);
-        }    
     }
 };
 
diff --git a/src/level.h b/src/level.h
index 26b77c2..fb91e03 100644
--- a/src/level.h
+++ b/src/level.h
@@ -589,6 +589,12 @@ struct Level : IGame {
         PROFILE_MARKER("ENTITIES");
         for (int i = 0; i < level.entitiesCount; i++)
             renderEntity(level.entities[i]);
+
+        for (int i = 0; i < level.entitiesCount; i++) {
+            TR::Entity &entity = level.entities[i];
+            if (entity.flags.rendered)
+                ((Controller*)entity.controller)->renderShadow(mesh);
+        }
     }
 
     void renderScene(int roomIndex) {