polyadvent

commit 01d0daa893b97a9cc877f776a3431855c252547a
parent faab8b9abdfd959905a53a5aac36677540e15761
Author: William Casarin <jb55@jb55.com>
Date:   Mon, 29 Jul 2019 23:40:47 -0700

camera: quick fix when terrain is gone

Diffstat:
M
src/update.c
 | 
24
+++++++++++++-----------

1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/update.c b/src/update.c
@@ -326,23 +326,25 @@ void orbit_update_from_mouse(struct orbit *camera, struct input *input,
 
 static void camera_keep_above_ground(struct terrain *terrain,
                                      struct node *camera) {
-    float move[3], above[3];
+    if (static_entities()[entity_terrain].flags & ENT_INVISIBLE)
+        return;
+    float move[3];
     float *camworld = node_world(camera);
     float pen;
     static const float penlim = 1.0;
     struct tri *tri = collide_terrain(terrain, camworld, move, &pen);
+
     if (!tri)
         return;
-    if (!(get_entity(&terrain->entity_id)->flags & ENT_INVISIBLE)) {
-        if (pen < penlim) {
-            float dir[3];
-            vec3_normalize(move, dir);
-            vec3_scale(dir, pen < 0 ? penlim : -penlim, above);
-            vec3_add(camworld, move, camworld);
-            vec3_add(camworld, above, camworld);
-            /* vec3_add(move, above, move); */
-            /* vec3_add(camworld, move, camworld); */
-        }
+
+    if (pen < penlim) {
+        float dir[3], above[3];
+        vec3_normalize(move, dir);
+        vec3_scale(dir, pen < 0 ? penlim : -penlim, above);
+        vec3_add(camworld, move, camworld);
+        vec3_add(camworld, above, camworld);
+        /* vec3_add(move, above, move); */
+        /* vec3_add(camworld, move, camworld); */
     }
 }