sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed some cloneForSpatial() methods that weren't doing anything

Browse Source 
that the super class would do.
Adding @Override to cloneForSpatial() methods in jme3-core controls
and CloneableTracks.
This commit is contained in:
Paul Speed 2016-03-11 05:46:31 -05:00
parent eb2e2f4cdc
commit f83c7006f0
12 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jme3-core/src/main/java/com/jme3/animation/AnimControl.java
View File

@ -108,6 +108,7 @@ public final class AnimControl extends AbstractControl implements Cloneable {
/**
* Internal use only.
*/
@Override
public Control cloneForSpatial(Spatial spatial) {
try {
AnimControl clone = (AnimControl) super.clone();

1
jme3-core/src/main/java/com/jme3/animation/AudioTrack.java
View File

@ -174,6 +174,7 @@ public class AudioTrack implements ClonableTrack {
* @param spatial the Spatial holding the AnimControl
* @return the cloned Track with proper reference
*/
@Override
public Track cloneForSpatial(Spatial spatial) {
AudioTrack audioTrack = new AudioTrack();
audioTrack.length = this.length;

1
jme3-core/src/main/java/com/jme3/animation/EffectTrack.java
View File

@ -263,6 +263,7 @@ public class EffectTrack implements ClonableTrack {
* @param spatial the Spatial holding the AnimControl
* @return the cloned Track with proper reference
*/
@Override
public Track cloneForSpatial(Spatial spatial) {
EffectTrack effectTrack = new EffectTrack();
effectTrack.particlesPerSeconds = this.particlesPerSeconds;

1
jme3-core/src/main/java/com/jme3/animation/SkeletonControl.java
View File

@ -345,6 +345,7 @@ public class SkeletonControl extends AbstractControl implements Cloneable {
}
}
@Override
public Control cloneForSpatial(Spatial spatial) {
Node clonedNode = (Node) spatial;
SkeletonControl clone = new SkeletonControl();

1
jme3-core/src/main/java/com/jme3/app/StatsView.java
View File

@ -115,6 +115,7 @@ public class StatsView extends Node implements Control {
//statistics.clearFrame();
}
@Override
public Control cloneForSpatial(Spatial spatial) {
return (Control) spatial;
}

1
jme3-core/src/main/java/com/jme3/cinematic/events/MotionEvent.java
View File

@ -274,6 +274,7 @@ public class MotionEvent extends AbstractCinematicEvent implements Control {
* @param spatial
* @return
*/
@Override
public Control cloneForSpatial(Spatial spatial) {
MotionEvent control = new MotionEvent(spatial, path);
control.playState = playState;

1
jme3-core/src/main/java/com/jme3/effect/ParticleEmitter.java
View File

@ -119,6 +119,7 @@ public class ParticleEmitter extends Geometry {
this.parentEmitter = parentEmitter;
}
@Override
public Control cloneForSpatial(Spatial spatial) {
return this; // WARNING: Sets wrong control on spatial. Will be
// fixed automatically by ParticleEmitter.clone() method.

1
jme3-core/src/main/java/com/jme3/input/ChaseCamera.java
View File

@ -567,6 +567,7 @@ public class ChaseCamera implements ActionListener, AnalogListener, Control {
* @param spatial
* @return
*/
@Override
public Control cloneForSpatial(Spatial spatial) {
ChaseCamera cc = new ChaseCamera(cam, spatial, inputManager);
cc.setMaxDistance(getMaxDistance());

13
jme3-core/src/main/java/com/jme3/scene/control/BillboardControl.java
View File

@ -86,12 +86,13 @@ public class BillboardControl extends AbstractControl {
alignment = Alignment.Screen;
}
public Control cloneForSpatial(Spatial spatial) {
BillboardControl control = new BillboardControl();
control.alignment = this.alignment;
control.setSpatial(spatial);
return control;
}
// default implementation from AbstractControl is equivalent
//public Control cloneForSpatial(Spatial spatial) {
// BillboardControl control = new BillboardControl();
// control.alignment = this.alignment;
// control.setSpatial(spatial);
// return control;
//}
@Override
protected void controlUpdate(float tpf) {

15
jme3-core/src/main/java/com/jme3/scene/control/CameraControl.java
View File

@ -136,13 +136,14 @@ public class CameraControl extends AbstractControl {
// nothing to do
}
@Override
public Control cloneForSpatial(Spatial newSpatial) {
CameraControl control = new CameraControl(camera, controlDir);
control.setSpatial(newSpatial);
control.setEnabled(isEnabled());
return control;
}
// default implementation from AbstractControl is equivalent
//@Override
//public Control cloneForSpatial(Spatial newSpatial) {
// CameraControl control = new CameraControl(camera, controlDir);
// control.setSpatial(newSpatial);
// control.setEnabled(isEnabled());
// return control;
//}
private static final String CONTROL_DIR_NAME = "controlDir";
private static final String CAMERA_NAME = "camera";

15
jme3-core/src/main/java/com/jme3/scene/control/LightControl.java
View File

@ -167,13 +167,14 @@ public class LightControl extends AbstractControl {
// nothing to do
}
@Override
public Control cloneForSpatial(Spatial newSpatial) {
LightControl control = new LightControl(light, controlDir);
control.setSpatial(newSpatial);
control.setEnabled(isEnabled());
return control;
}
// default implementation from AbstractControl is equivalent
//@Override
//public Control cloneForSpatial(Spatial newSpatial) {
// LightControl control = new LightControl(light, controlDir);
// control.setSpatial(newSpatial);
// control.setEnabled(isEnabled());
// return control;
//}
private static final String CONTROL_DIR_NAME = "controlDir";
private static final String LIGHT_NAME = "light";

1
jme3-core/src/main/java/com/jme3/scene/control/UpdateControl.java
View File

@ -85,6 +85,7 @@ public class UpdateControl extends AbstractControl {
}
@Override
public Control cloneForSpatial(Spatial newSpatial) {
UpdateControl control = new UpdateControl();
control.setSpatial(newSpatial);