TargetTrackerCamera: fix crash if enabled too early in log mode

closes #92
magmaOffenburg · Jul 28, 2016 · 9cd885f · 9cd885f
1 parent 39a551b
commit 9cd885f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/src/rv/ui/view/TargetTrackerCamera.java b/src/rv/ui/view/TargetTrackerCamera.java
@@ -45,7 +45,7 @@ public TargetTrackerCamera(ISelectable target, FPCamera camera, GameState gs) {
     }
 
     public void update() {
-        if (!enabled)
+        if (!enabled || target.getPosition() == null)
             return;
 
         float scale = (float) (1 - (0.02f * playbackSpeed));

diff --git a/src/rv/world/objects/Ball.java b/src/rv/world/objects/Ball.java
@@ -49,28 +49,30 @@ public void update(SceneGraph sg) {
         if (node == null)
             return;
 
+        Model model = content.getModel(node.getName());
+        if (!model.isLoaded()) {
+            return;
+        }
+
         Vec3f min = new Vec3f(Float.POSITIVE_INFINITY);
         Vec3f max = new Vec3f(Float.NEGATIVE_INFINITY);
 
-        Model model = content.getModel(node.getName());
-        if (model.isLoaded()) {
-            Vec3f[] corners = model.getMesh().getBounds().getCorners();
-            Matrix modelMat = WorldModel.COORD_TFN.times(node.getWorldTransform());
-            for (int j = 0; j < 8; j++) {
-                Vec3f v = modelMat.transform(corners[j]);
-                if (v.x < min.x)
-                    min.x = v.x;
-                if (v.y < min.y)
-                    min.y = v.y;
-                if (v.z < min.z)
-                    min.z = v.z;
-                if (v.x > max.x)
-                    max.x = v.x;
-                if (v.y > max.y)
-                    max.y = v.y;
-                if (v.z > max.z)
-                    max.z = v.z;
-            }
+        Vec3f[] corners = model.getMesh().getBounds().getCorners();
+        Matrix modelMat = WorldModel.COORD_TFN.times(node.getWorldTransform());
+        for (int j = 0; j < 8; j++) {
+            Vec3f v = modelMat.transform(corners[j]);
+            if (v.x < min.x)
+                min.x = v.x;
+            if (v.y < min.y)
+                min.y = v.y;
+            if (v.z < min.z)
+                min.z = v.z;
+            if (v.x > max.x)
+                max.x = v.x;
+            if (v.y > max.y)
+                max.y = v.y;
+            if (v.z > max.z)
+                max.z = v.z;
         }
 
         bounds = new BoundingBox(min, max);