Skip to content

Commit 90e6cd8

Browse files
committed
renamed mask
1 parent 83c95e5 commit 90e6cd8

1 file changed

Lines changed: 15 additions & 15 deletions

File tree

jme3-core/src/main/java/com/jme3/anim/AlertArmatureMask.java renamed to jme3-core/src/main/java/com/jme3/anim/SingleLayerInfluenceMask.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
*
4040
* @author codex
4141
*/
42-
public class AlertArmatureMask extends ArmatureMask {
42+
public class SingleLayerInfluenceMask extends ArmatureMask {
4343

4444
private final String layer;
4545
private final AnimComposer anim;
@@ -52,7 +52,7 @@ public class AlertArmatureMask extends ArmatureMask {
5252
* can use {@link makeLayer} to ensure this.
5353
* @param spatial Spatial containing necessary controls ({@link AnimComposer} and {@link SkinningControl})
5454
*/
55-
public AlertArmatureMask(String layer, Spatial spatial) {
55+
public SingleLayerInfluenceMask(String layer, Spatial spatial) {
5656
super();
5757
this.layer = layer;
5858
anim = spatial.getControl(AnimComposer.class);
@@ -65,7 +65,7 @@ public AlertArmatureMask(String layer, Spatial spatial) {
6565
* @param anim anim composer this mask is assigned to
6666
* @param skin skinning control complimenting the anim composer.
6767
*/
68-
public AlertArmatureMask(String layer, AnimComposer anim, SkinningControl skin) {
68+
public SingleLayerInfluenceMask(String layer, AnimComposer anim, SkinningControl skin) {
6969
super();
7070
this.layer = layer;
7171
this.anim = anim;
@@ -83,7 +83,7 @@ public void makeLayer() {
8383
* Adds all joints to this mask.
8484
* @return this.instance
8585
*/
86-
public AlertArmatureMask addAll() {
86+
public SingleLayerInfluenceMask addAll() {
8787
for (Joint j : skin.getArmature().getJointList()) {
8888
super.addBones(skin.getArmature(), j.getName());
8989
}
@@ -95,7 +95,7 @@ public AlertArmatureMask addAll() {
9595
* @param joint
9696
* @return this instance
9797
*/
98-
public AlertArmatureMask addFromJoint(String joint) {
98+
public SingleLayerInfluenceMask addFromJoint(String joint) {
9999
super.addFromJoint(skin.getArmature(), joint);
100100
return this;
101101
}
@@ -105,7 +105,7 @@ public AlertArmatureMask addFromJoint(String joint) {
105105
* @param joints
106106
* @return this instance
107107
*/
108-
public AlertArmatureMask addJoints(String... joints) {
108+
public SingleLayerInfluenceMask addJoints(String... joints) {
109109
super.addBones(skin.getArmature(), joints);
110110
return this;
111111
}
@@ -118,7 +118,7 @@ public AlertArmatureMask addJoints(String... joints) {
118118
* @param check
119119
* @return this instance
120120
*/
121-
public AlertArmatureMask setCheckUpperLayers(boolean check) {
121+
public SingleLayerInfluenceMask setCheckUpperLayers(boolean check) {
122122
checkUpperLayers = check;
123123
return this;
124124
}
@@ -180,9 +180,9 @@ private boolean isAffectedByUpperLayers(Object target) {
180180
AnimLayer lyr = anim.getLayer(name);
181181
// if there is no action playing, no joints are used, so we can skip
182182
if (lyr.getCurrentAction() == null) continue;
183-
if (lyr.getMask() instanceof AlertArmatureMask) {
183+
if (lyr.getMask() instanceof SingleLayerInfluenceMask) {
184184
// dodge some needless recursion by calling a simpler method
185-
if (((AlertArmatureMask)lyr.getMask()).simpleContains(target)) {
185+
if (((SingleLayerInfluenceMask)lyr.getMask()).simpleContains(target)) {
186186
return true;
187187
}
188188
}
@@ -194,24 +194,24 @@ else if (lyr.getMask().contains(target)) {
194194
}
195195

196196
/**
197-
* Creates an {@code AlertArmatureMask} for all joints.
197+
* Creates an {@code SingleLayerInfluenceMask} for all joints.
198198
* @param layer layer the returned mask is, or will be, be assigned to
199199
* @param spatial spatial containing anim composer and skinning control
200200
* @return new mask
201201
*/
202-
public static AlertArmatureMask all(String layer, Spatial spatial) {
203-
return new AlertArmatureMask(layer, spatial).addAll();
202+
public static SingleLayerInfluenceMask all(String layer, Spatial spatial) {
203+
return new SingleLayerInfluenceMask(layer, spatial).addAll();
204204
}
205205

206206
/**
207-
* Creates an {@code AlertArmatureMask} for all joints.
207+
* Creates an {@code SingleLayerInfluenceMask} for all joints.
208208
* @param layer layer the returned mask is, or will be, assigned to
209209
* @param anim anim composer
210210
* @param skin skinning control
211211
* @return new mask
212212
*/
213-
public static AlertArmatureMask all(String layer, AnimComposer anim, SkinningControl skin) {
214-
return new AlertArmatureMask(layer, anim, skin).addAll();
213+
public static SingleLayerInfluenceMask all(String layer, AnimComposer anim, SkinningControl skin) {
214+
return new SingleLayerInfluenceMask(layer, anim, skin).addAll();
215215
}
216216

217217
}

0 commit comments

Comments
 (0)