From 68ea05eaa63b3f30e0d32ba0446f316c80115ed0 Mon Sep 17 00:00:00 2001
From: Stephen Gold <sgold@sonic.net>
Date: Tue, 20 Nov 2018 23:40:19 -0800
Subject: [PATCH] test and fix for JME issue #954 (null bounding volume)

---
 .../src/main/java/com/jme3/scene/Node.java    |  6 ++-
 .../java/com/jme3/scene/TestIssue954.java     | 53 +++++++++++++++++++
 2 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 jme3-core/src/test/java/com/jme3/scene/TestIssue954.java

diff --git a/jme3-core/src/main/java/com/jme3/scene/Node.java b/jme3-core/src/main/java/com/jme3/scene/Node.java
index 3e1482955..fcd6f770c 100644
--- a/jme3-core/src/main/java/com/jme3/scene/Node.java
+++ b/jme3-core/src/main/java/com/jme3/scene/Node.java
@@ -31,15 +31,14 @@
  */
 package com.jme3.scene;
 
+import com.jme3.bounding.BoundingBox;
 import com.jme3.bounding.BoundingVolume;
 import com.jme3.collision.Collidable;
 import com.jme3.collision.CollisionResults;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.Savable;
 import com.jme3.material.Material;
 import com.jme3.util.SafeArrayList;
-import com.jme3.util.TempVars;
 import com.jme3.util.clone.Cloner;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -170,6 +169,9 @@ public class Node extends Spatial {
                 }
             }
         }
+        if (resultBound == null) {
+            resultBound = new BoundingBox(getWorldTranslation(), 0f, 0f, 0f);
+        }
         this.worldBound = resultBound;
     }
 
diff --git a/jme3-core/src/test/java/com/jme3/scene/TestIssue954.java b/jme3-core/src/test/java/com/jme3/scene/TestIssue954.java
new file mode 100644
index 000000000..6b94da664
--- /dev/null
+++ b/jme3-core/src/test/java/com/jme3/scene/TestIssue954.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2018 jMonkeyEngine
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'jMonkeyEngine' nor the names of its contributors
+ *   may be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.jme3.scene;
+
+import org.junit.Test;
+
+/**
+ * Verify that an empty Node gets a valid bounding volume. This was issue #954
+ * at GitHub.
+ *
+ * @author Stephen Gold
+ */
+public class TestIssue954 {
+
+    Node rootNode;
+
+    @Test
+    public void testIssue954() {
+        rootNode = new Node();
+        rootNode.updateLogicalState(0.01f);
+        rootNode.updateGeometricState();
+        assert rootNode.worldBound != null;
+    }
+}