Merge branch 'master' of github.com:logsol/chuck.js

.floo

@@ -0,0 +1,3 @@
+{
+    "url": "https://floobits.com/r/logsol/chuck/"
+}

.gitignore

@@ -1,5 +1,3 @@
 node_modules/
 *.log
 .DS_Store
-.floo
-.sublime-project

.sublime-project

@@ -0,0 +1,7 @@
+{
+    "folders": [
+        {
+            "path": "/Users/karlpannek/Work/projects/js/chuck.js"
+        }
+    ]
+}

app/Game/Client/View/ViewController.js

@@ -61,17 +61,10 @@ define(requires, function (DomController, Three, Settings, CameraController) {
         //this.scene.add(directionalLight);
 
 
-        this.createMesh(100, 100, 100, 100, 'static/img/100.png', function (mesh) {
-            self.mesh = mesh;
-            self.scene.add(mesh);
-        });
-/*
-         this.createMesh(50, 50, 200, 100, 'static/img/100.png', function (mesh) {
-            self.scene.add(mesh);
-        });
-*/
-
-        //this.animate(this);
+        //this.createMesh(100, 100, 100, 100, 'static/img/100.png', function (mesh) {
+        //    self.mesh = mesh;
+        //    self.scene.add(mesh);
+        //});
     }
 
     ViewController.prototype.loadMeshes = function(objects) {
@@ -88,6 +81,7 @@ define(requires, function (DomController, Three, Settings, CameraController) {
                 
                 self.createMesh(Settings.TILE_SIZE, Settings.TILE_SIZE, x, y, 'static/img/Tiles/' + material + '/' + o.s + '' + o.r + '.gif', function(mesh) {
                     self.scene.add(mesh);
+                    console.log("img height:", mesh.material.map.image.height);
                     //mesh.rotation.z = rad;
                 });
             })();
@@ -108,27 +102,23 @@ define(requires, function (DomController, Three, Settings, CameraController) {
     }
 
     ViewController.prototype.render = function () {
-
         this.renderer.render(this.scene, this.cameraController.getCamera());
     }
 
     ViewController.prototype.createMesh = function (width, height, x, y, imgPath, callback) {
-        var textureImg = new Image();
-        textureImg.onload = function () { // FIXME: perhaps not needed to load double?
+        var mesh;
         var material = new Three.MeshLambertMaterial({
-                map: Three.ImageUtils.loadTexture(imgPath),
+            map: Three.ImageUtils.loadTexture(imgPath, new THREE.UVMapping(), function(){
+                callback(mesh);
+            }),
             transparent: true
         });
 
-            var mesh = new Three.Mesh(new Three.PlaneGeometry(width, height), material);
+        mesh = new Three.Mesh(new Three.PlaneGeometry(width, height), material);
         mesh.overdraw = true;
-            //mesh.position.z = 1;
         mesh.position.x = x;
         mesh.position.y = y;
-            
-            callback(mesh);
-        };
-        textureImg.src = imgPath;
+        //mesh.position.z = 1;
     }
 
     return ViewController;

snippets/canvas-mouseposition.js

@@ -0,0 +1,6 @@
+var myCanvas = null;
+myCanvas = document.getElementsByTagName('canvas')[0];
+
+myCanvas.onmousemove = function(e){
+	console.log(e.clientX - this.offsetLeft)
+}