Просмотр исходного кода

solve issue #2045 (ArmatureMask.createMask() duplicate code) (#2053)

* Removed redundant for-loop in ArmatureMask.

* Update javadoc.
Ali-RS 2 лет назад
Родитель
Сommit
93a07728a4
1 измененных файлов с 46 добавлено и 3 удалено
  1. 46 3
      jme3-core/src/main/java/com/jme3/anim/ArmatureMask.java

+ 46 - 3
jme3-core/src/main/java/com/jme3/anim/ArmatureMask.java

@@ -1,3 +1,34 @@
+/*
+ * Copyright (c) 2009-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.anim;
 
 import java.util.BitSet;
@@ -49,6 +80,9 @@ public class ArmatureMask implements AnimationMask {
      * @param armature the Armature containing the joints (not null, unaffected)
      * @param jointNames the names of the joints to be removed
      * @return this
+     *
+     * @throws IllegalArgumentException if it can not find the joint
+     *          with the specified name on the provided armature
      */
     public ArmatureMask removeJoints(Armature armature, String... jointNames) {
         for (String jointName : jointNames) {
@@ -72,6 +106,9 @@ public class ArmatureMask implements AnimationMask {
      * @param armature the Armature containing the joints (not null)
      * @param fromJoint the name of the ancestor joint
      * @return a new mask
+     *
+     * @throws IllegalArgumentException if it can not find the joint
+     *          with the specified name on the provided armature
      */
     public static ArmatureMask createMask(Armature armature, String fromJoint) {
         ArmatureMask mask = new ArmatureMask();
@@ -85,13 +122,13 @@ public class ArmatureMask implements AnimationMask {
      * @param armature the Armature containing the joints (not null)
      * @param joints the names of the joints to be included
      * @return a new mask
+     *
+     * @throws IllegalArgumentException if it can not find the joint
+     *          with the specified name on the provided armature
      */
     public static ArmatureMask createMask(Armature armature, String... joints) {
         ArmatureMask mask = new ArmatureMask();
         mask.addBones(armature, joints);
-        for (String joint : joints) {
-            mask.affectedJoints.set(armature.getJoint(joint).getId());
-        }
         return mask;
     }
 
@@ -100,6 +137,9 @@ public class ArmatureMask implements AnimationMask {
      * 
      * @param armature the Armature containing the joints
      * @param jointNames the names of the joints to be influenced
+     *
+     * @throws IllegalArgumentException if it can not find the joint
+     *          with the specified name on the provided armature
      */
     public void addBones(Armature armature, String... jointNames) {
         for (String jointName : jointNames) {
@@ -121,6 +161,9 @@ public class ArmatureMask implements AnimationMask {
      * 
      * @param armature the Armature containing the ancestor joint
      * @param jointName the names of the ancestor joint
+     *
+     * @throws IllegalArgumentException if it can not find the joint
+     *          with the specified name on the provided armature
      */
     public void addFromJoint(Armature armature, String jointName) {
         Joint joint = findJoint(armature, jointName);