Close #135 refactor SceneNode to Scene

excaliburjs · Jan 29, 2014 · 9d6e4a1 · 9d6e4a1
1 parent 81a13ae
commit 9d6e4a1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/sample-game/ts/game.ts b/sample-game/ts/game.ts
@@ -196,7 +196,7 @@ player.addEventListener('keyup', (e? : ex.KeyUp) => {
 
 
 
-var newScene = new ex.SceneNode();
+var newScene = new ex.Scene();
 newScene.addChild(new ex.Actor(100, 100, 100, 100, new ex.Color(0,0,0,.5)));
 
 game.addEventListener('keydown', (keyDown? : ex.KeyDown)=>{

diff --git a/ts/Core.ts b/ts/Core.ts
@@ -152,9 +152,9 @@ module ex {
       public mouseUp: MouseUp[] = [];
 
       public camera: ICamera;
-      public currentScene: SceneNode;
-      public rootScene: SceneNode;
-      private sceneStack: SceneNode[] = [];
+      public currentScene: Scene;
+      public rootScene: Scene;
+      private sceneStack: Scene[] = [];
 
       private animations: AnimationNode[] = [];
 
@@ -184,7 +184,7 @@ module ex {
 
          this.eventDispatcher = new EventDispatcher(this);
 
-         this.rootScene = this.currentScene = new SceneNode();
+         this.rootScene = this.currentScene = new Scene();
          this.sceneStack.push(this.rootScene);
 
          if (canvasElementId) {
@@ -229,7 +229,7 @@ module ex {
          this.currentScene.removeChild(actor);
       }
 
-      public pushScene(scene: SceneNode) {
+      public pushScene(scene: Scene) {
          if (this.sceneStack.indexOf(scene) === -1) {
             this.sceneStack.push(scene);
             this.currentScene = scene;

diff --git a/ts/Entities.ts b/ts/Entities.ts
@@ -7,7 +7,7 @@ module ex {
       constructor(public x: number, public y: number) { }
    }
 
-   export class SceneNode {
+   export class Scene {
       public children: Actor[] = [];
       private engine: Engine;
       private killQueue: Actor[] = [];
@@ -96,11 +96,11 @@ module ex {
 
       private eventDispatcher: EventDispatcher;
 
-      private sceneNode: SceneNode;
+      private sceneNode: Scene;
 
       private logger: Logger = Logger.getInstance();
 
-      public parent: SceneNode = null;
+      public parent: Scene = null;
 
       public fixed = true;
       public preventCollisions = false;
@@ -122,7 +122,7 @@ module ex {
          this.color = color;
          this.actionQueue = new ex.Internal.Actions.ActionQueue(this);
          this.eventDispatcher = new EventDispatcher(this);
-         this.sceneNode = new SceneNode();
+         this.sceneNode = new Scene();
       }