From 0d864f509ac33b4969bb797c5423a7784ef74c5c Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Tue, 24 Mar 2009 16:33:28 +0000 Subject: [PATCH] Removed rootNode from environment --- src/sg/SpaceGame.java | 2 +- src/sg/env/Environment.java | 2 +- src/sg/states/InGameState.java | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/sg/SpaceGame.java b/src/sg/SpaceGame.java index 2615ac4..9f28100 100644 --- a/src/sg/SpaceGame.java +++ b/src/sg/SpaceGame.java @@ -38,7 +38,7 @@ public class SpaceGame extends SimplePhysicsGame { rootNode.attachChild(shipNode); //environment - environment = new Environment(rootNode, getPhysicsSpace()); + environment = new Environment(getPhysicsSpace()); rootNode.attachChild(environment); //light diff --git a/src/sg/env/Environment.java b/src/sg/env/Environment.java index 711cda9..a48e39b 100644 --- a/src/sg/env/Environment.java +++ b/src/sg/env/Environment.java @@ -22,7 +22,7 @@ public class Environment extends Node { * */ private Node localNode; - public Environment(Node parentNode, PhysicsSpace physicsSpace){ + public Environment(PhysicsSpace physicsSpace){ buildLocalNode(); buildEnvoriment(physicsSpace); } diff --git a/src/sg/states/InGameState.java b/src/sg/states/InGameState.java index 6f9a434..1990aa4 100644 --- a/src/sg/states/InGameState.java +++ b/src/sg/states/InGameState.java @@ -50,7 +50,7 @@ public class InGameState extends CameraGameState { rootNode.attachChild(staticNode); // environment - environment = new Environment(rootNode, physicsSpace); + environment = new Environment(physicsSpace); rootNode.attachChild(environment); // ship @@ -103,16 +103,16 @@ public class InGameState extends CameraGameState { } public void stateUpdate(float tpf) { - input.update(tpf); - - environment.update(); - if ( tpf > 0.2 || Float.isNaN( tpf ) ) { Logger.getLogger( PhysicsSpace.LOGGER_NAME ).warning( "Maximum physics update interval is 0.2 seconds - capped." ); physicsSpace.update( 0.2f * physicsSpeed ); } else physicsSpace.update( tpf * physicsSpeed ); + input.update(tpf); + + environment.update(); + //passManager.updatePasses(tpf); }