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

Merge pull request #416 from MeFisto94/CloneLights

Browse Source 
Fixes the bug of shallow copies when cloning lights
This commit is contained in:
Paul Speed 2016-02-17 18:42:26 -05:00
commit 947c576ca8
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jme3-core/src/main/java/com/jme3/light/DirectionalLight.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009-2012, 2015 jMonkeyEngine * Copyright (c) 2009-2012, 2015-2016 jMonkeyEngine
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -146,4 +146,10 @@ public class DirectionalLight extends Light {
direction = (Vector3f) ic.readSavable("direction", null); direction = (Vector3f) ic.readSavable("direction", null);
} }
@Override
public DirectionalLight clone() {
DirectionalLight l = (DirectionalLight)super.clone();
l.direction = direction.clone();
return l;
}
} }

6
jme3-core/src/main/java/com/jme3/light/Light.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009-2012, 2015 jMonkeyEngine * Copyright (c) 2009-2012, 2015-2016 jMonkeyEngine
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -228,7 +228,9 @@ public abstract class Light implements Savable, Cloneable {
@Override @Override
public Light clone(){ public Light clone(){
try { try {
return (Light) super.clone(); Light l = (Light) super.clone();
l.color = color.clone();
return l;
} catch (CloneNotSupportedException ex) { } catch (CloneNotSupportedException ex) {
throw new AssertionError(); throw new AssertionError();
} }

9
jme3-core/src/main/java/com/jme3/light/PointLight.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009-2012, 2015 jMonkeyEngine * Copyright (c) 2009-2012, 2015-2016 jMonkeyEngine
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -241,4 +241,11 @@ public class PointLight extends Light {
this.invRadius = 0; this.invRadius = 0;
} }
} }
@Override
public PointLight clone() {
PointLight p = (PointLight)super.clone();
p.position = position.clone();
return p;
}
} }

10
jme3-core/src/main/java/com/jme3/light/SpotLight.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009-2012, 2015 jMonkeyEngine * Copyright (c) 2009-2012, 2015-2016 jMonkeyEngine
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -448,5 +448,13 @@ public class SpotLight extends Light {
this.invSpotRange = 0; this.invSpotRange = 0;
} }
} }
@Override
public SpotLight clone() {
SpotLight s = (SpotLight)super.clone();
s.direction = direction.clone();
s.position = position.clone();
return s;
}
} }