Forráskód Böngészése

add the Spatial.addControlAt() method (#1899)

Stephen Gold 2 éve
szülő
commit
ebf8a8124d

+ 33 - 1
jme3-core/src/main/java/com/jme3/scene/Spatial.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2021 jMonkeyEngine
+ * Copyright (c) 2009-2023 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -784,6 +784,38 @@ public abstract class Spatial implements Savable, Cloneable, Collidable,
         }
     }
 
+    /**
+     * Adds the specified control to the list, at the specified index.  Any
+     * controls with indices greater than or equal to the specified index will
+     * have their indices increased by one.
+     *
+     * @param index the index at which to add the control (0→first, ≥0)
+     * @param control the control to add (not null)
+     * @throws IllegalStateException if the control is already added here
+     */
+    @SuppressWarnings("unchecked")
+    public void addControlAt(int index, Control control) {
+        if (control == null) {
+            throw new IllegalArgumentException("null control");
+        }
+        int numControls = getNumControls();
+        if (index < 0 || index > numControls) {
+            throw new IndexOutOfBoundsException(
+                    "index=" + index + " for numControls=" + numControls);
+        }
+        if (controls.contains(control)) {
+            throw new IllegalStateException("Control is already added here.");
+        }
+
+        addControl(control); // takes care of the bookkeeping
+
+        if (index < numControls) { // re-arrange the list directly
+            boolean success = controls.remove(control);
+            assert success;
+            controls.add(index, control);
+        }
+    }
+
     /**
      * Removes the first control that is an instance of the given class.
      *

+ 122 - 0
jme3-core/src/test/java/com/jme3/scene/SpatialTest.java

@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2023 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 com.jme3.scene.control.UpdateControl;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Tests selected methods of the Spatial class.
+ *
+ * @author Stephen Gold
+ */
+public class SpatialTest {
+
+    /**
+     * Tests addControlAt() with a duplicate Control.
+     */
+    @Test(expected = IllegalStateException.class)
+    public void addControlAtDuplicate() {
+        Spatial testSpatial = new Node("testSpatial");
+        UpdateControl control1 = new UpdateControl();
+        testSpatial.addControlAt(0, control1);
+        testSpatial.addControlAt(1, control1);
+    }
+
+    /**
+     * Tests addControlAt() with a negative index.
+     */
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void addControlAtNegativeIndex() {
+        Spatial testSpatial = new Node("testSpatial");
+        UpdateControl control1 = new UpdateControl();
+        testSpatial.addControlAt(-1, control1);
+    }
+
+    /**
+     * Tests addControlAt() with a null argument.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void addControlAtNullControl() {
+        Spatial testSpatial = new Node("testSpatial");
+        testSpatial.addControlAt(0, null);
+    }
+
+    /**
+     * Tests addControlAt() with an out-of-range positive index.
+     */
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void addControlAtOutOfRange() {
+        Spatial testSpatial = new Node("testSpatial");
+        UpdateControl control1 = new UpdateControl();
+        testSpatial.addControlAt(1, control1);
+    }
+
+    /**
+     * Tests typical uses of addControlAt().
+     */
+    @Test
+    public void testAddControlAt() {
+        Spatial testSpatial = new Node("testSpatial");
+
+        // Add to an empty list.
+        UpdateControl control1 = new UpdateControl();
+        testSpatial.addControlAt(0, control1);
+
+        Assert.assertEquals(1, testSpatial.getNumControls());
+        Assert.assertEquals(control1, testSpatial.getControl(0));
+        Assert.assertEquals(testSpatial, control1.getSpatial());
+
+        // Add at the end of a non-empty list.
+        UpdateControl control2 = new UpdateControl();
+        testSpatial.addControlAt(1, control2);
+
+        Assert.assertEquals(2, testSpatial.getNumControls());
+        Assert.assertEquals(control1, testSpatial.getControl(0));
+        Assert.assertEquals(control2, testSpatial.getControl(1));
+        Assert.assertEquals(testSpatial, control1.getSpatial());
+        Assert.assertEquals(testSpatial, control2.getSpatial());
+
+        // Add at the beginning of a non-empty list.
+        UpdateControl control0 = new UpdateControl();
+        testSpatial.addControlAt(0, control0);
+
+        Assert.assertEquals(3, testSpatial.getNumControls());
+        Assert.assertEquals(control0, testSpatial.getControl(0));
+        Assert.assertEquals(control1, testSpatial.getControl(1));
+        Assert.assertEquals(control2, testSpatial.getControl(2));
+        Assert.assertEquals(testSpatial, control0.getSpatial());
+        Assert.assertEquals(testSpatial, control1.getSpatial());
+        Assert.assertEquals(testSpatial, control2.getSpatial());
+    }
+}