From 81fe7be743db4d0507bdb8b51beeff454f648b7a Mon Sep 17 00:00:00 2001
From: Jeena <spam@jeenaparadies.net>
Date: Sat, 30 Nov 2013 12:57:40 +0100
Subject: [PATCH] cammera follows player

---
 app/Game/Client/GameController.js        |  1 +
 app/Game/Client/View/CameraController.js |  2 +-
 app/Game/Client/View/ViewController.js   | 10 +++++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Game/Client/GameController.js b/app/Game/Client/GameController.js
index 7405882..63d35ea 100755
--- a/app/Game/Client/GameController.js
+++ b/app/Game/Client/GameController.js
@@ -113,6 +113,7 @@ function (Box2D, Parent, PhysicsEngine, ViewController, PlayerController, Notifi
         //this.onSpawnPlayer(options);
         this.me = this.players[playerId];
         this.me.setPlayerController(new PlayerController(this.me));
+        this.viewController.setPlayer(this.me);
     }
 
     GameController.prototype.onSpawnPlayer = function(options) {
diff --git a/app/Game/Client/View/CameraController.js b/app/Game/Client/View/CameraController.js
index 1b8128d..dad4cc0 100755
--- a/app/Game/Client/View/CameraController.js
+++ b/app/Game/Client/View/CameraController.js
@@ -46,7 +46,7 @@ define(['Lib/Vendor/Three', 'Game/Config/Settings'], function (Three, Settings)
         if(!event) event = window.event; // IE
         if(event.wheelDelta) delta = event.wheelDelta/120;
         else if(event.detail) delta = -event.detail/3;
-        if(delta) this.camera.position.z += delta * 10;
+        if(delta) this.camera.position.z -= delta * 10;
         if(event.preventDefault) event.preventDefault();
         event.returnValue = false;
     };
diff --git a/app/Game/Client/View/ViewController.js b/app/Game/Client/View/ViewController.js
index 2021450..2b88bdd 100755
--- a/app/Game/Client/View/ViewController.js
+++ b/app/Game/Client/View/ViewController.js
@@ -56,7 +56,7 @@ define(requires, function (DomController, Three, Settings, CameraController) {
         var ambientLight = new Three.AmbientLight(0xffffff);
         this.scene.add(ambientLight);
 
- 
+
         //var directionalLight = new Three.DirectionalLight(0xffffff);
         //directionalLight.position.set(1, 0, 10).normalize();
         //this.scene.add(directionalLight);
@@ -107,6 +107,10 @@ define(requires, function (DomController, Three, Settings, CameraController) {
     }
 
     ViewController.prototype.render = function () {
+        if(this.player) {
+            var pos = this.player.getDoll().getBody().GetPosition();
+            this.cameraController.setPosition(pos.x * 35, -(pos.y * 35));
+        }
         this.renderer.render(this.scene, this.cameraController.getCamera());
     }
 
@@ -126,5 +130,9 @@ define(requires, function (DomController, Three, Settings, CameraController) {
         //mesh.position.z = 1;
     }
 
+    ViewController.prototype.setPlayer = function(player) {
+        this.player = player;
+    };
+
     return ViewController;
 });
\ No newline at end of file