Skip to content

Deprecated light node - #1033 #1042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 23, 2021
Merged

Deprecated light node - #1033 #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b86e2e9
Deprecated light node
grizeldi Mar 18, 2019
e96bfd0
Deleted TestLightNode
grizeldi May 10, 2019
e9268c8
Cleanup of this... mess.
grizeldi May 10, 2019
4104c6c
Removed LightNode usage from TestManyLightsSingle.java
grizeldi Sep 8, 2019
29963a5
Merge origin/master into LightDeprecation
stephengold Mar 23, 2021
e46a816
TestConeVSFrustum: use LightControl, revert some non-essential changes
stephengold Mar 23, 2021
a230c6f
TestManyLightsSingle: revert a non-essential change
stephengold Mar 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions jme3-core/src/main/java/com/jme3/scene/LightNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
* with a {@link Node} object.
*
* @author Tim8Dev
* @deprecated Use a {@link LightControl} attached to a {@link Node} directly.
*/
@Deprecated
public class LightNode extends Node {

private LightControl lightControl;
Expand Down
8 changes: 6 additions & 2 deletions jme3-examples/src/main/java/jme3test/light/TestConeVSFrustum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
import com.jme3.math.*;
import com.jme3.renderer.Camera;
import com.jme3.scene.Geometry;
import com.jme3.scene.LightNode;
import com.jme3.scene.Node;
import com.jme3.scene.Spatial;
import com.jme3.scene.control.LightControl;
import com.jme3.scene.debug.Grid;
import com.jme3.scene.debug.WireFrustum;
import com.jme3.scene.shape.Box;
Expand Down Expand Up @@ -108,8 +108,12 @@ public void simpleInitApp() {
geom.getMaterial().setColor("Diffuse", ColorRGBA.White);
geom.getMaterial().setColor("Ambient", ColorRGBA.DarkGray);
geom.getMaterial().setBoolean("UseMaterialColors", true);
final LightNode ln = new LightNode("lb", spotLight);

final Node ln = new Node("lb");
LightControl lightControl = new LightControl(spotLight);
ln.addControl(lightControl);
ln.attachChild(geom);

geom.setLocalTranslation(0, -spotLight.getSpotRange() / 2f, 0);
geom.rotate(-FastMath.HALF_PI, 0, 0);
rootNode.attachChild(ln);
Expand Down
111 changes: 0 additions & 111 deletions jme3-examples/src/main/java/jme3test/light/TestLightNode.java
View file
Open in desktop

This file was deleted.

11 changes: 1 addition & 10 deletions jme3-examples/src/main/java/jme3test/light/TestManyLightsSingle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
import com.jme3.renderer.RenderManager;
import com.jme3.renderer.ViewPort;
import com.jme3.scene.Geometry;
import com.jme3.scene.LightNode;
import com.jme3.scene.Node;
import com.jme3.scene.Spatial;
import com.jme3.scene.control.AbstractControl;
Expand Down Expand Up @@ -105,27 +104,19 @@ public void simpleInitApp() {
if (nb > 60) {
n.removeLight(light);
} else {

LightNode ln = new LightNode("l", light);
n.attachChild(ln);
ln.setLocalTranslation(p.getPosition());
int rand = FastMath.nextRandomInt(0, 3);
switch (rand) {
case 0:
light.setColor(ColorRGBA.Red);
// ln.addControl(new MoveControl(5f));
break;
case 1:
light.setColor(ColorRGBA.Yellow);
// ln.addControl(new MoveControl(5f));
break;
case 2:
light.setColor(ColorRGBA.Green);
//ln.addControl(new MoveControl(-5f));
break;
case 3:
light.setColor(ColorRGBA.Orange);
//ln.addControl(new MoveControl(-5f));
break;
}
}
Expand Down Expand Up @@ -278,4 +269,4 @@ protected void controlUpdate(float tpf) {
protected void controlRender(RenderManager rm, ViewPort vp) {
}
}
}
}