From 44613f71407862d404e89b3c65298dfb7a9837a0 Mon Sep 17 00:00:00 2001
From: Webeled <webeled@gmail.com>
Date: Mon, 14 Oct 2013 13:40:02 +0100
Subject: [PATCH] Should resolve the conflict

---
 examples/tilemaps/wip1.php | 71 ++++++++++++++++++++++++++------------
 1 file changed, 49 insertions(+), 22 deletions(-)

diff --git a/examples/tilemaps/wip1.php b/examples/tilemaps/wip1.php
index 731ba5c9..eae717d7 100644
--- a/examples/tilemaps/wip1.php
+++ b/examples/tilemaps/wip1.php
@@ -10,54 +10,81 @@
 
     function preload() {
 
-        game.load.tilemap('cybernoidLevel3', 'assets/maps/cybernoid.json', null, Phaser.Tilemap.JSON);
-        game.load.tileset('cybernoidTiles', 'assets/maps/cybernoid.png', 16, 16);
+        game.load.tilemap('level3', 'assets/maps/cybernoid.json', null, Phaser.Tilemap.TILED_JSON);
+        game.load.tileset('tiles', 'assets/maps/cybernoid.png', 16, 16);
 
     }
 
     var layer;
+    var cursors;
+    var sprite2;
 
     function create() {
 
         game.stage.backgroundColor = '#3d3d3d';
 
+        var map = new Phaser.Tilemap(game, 'level3');
 
+        //  This is a bit nuts, ought to find a way to automate it, but it looks cool :)
+        map.debugMap = [ '#000000', 
+            '#e40058', '#e40058', '#e40058', '#80d010', '#bcbcbc', '#e40058', '#000000', '#0070ec', '#bcbcbc', '#bcbcbc', '#bcbcbc',
+            '#bcbcbc', '#bcbcbc', '#e40058', '#e40058', '#0070ec', '#0070ec', '#80d010', '#80d010', '#80d010', '#bcbcbc', '#bcbcbc', 
+            '#bcbcbc', '#80d010', '#80d010', '#80d010', '#0070ec', '#0070ec', '#80d010', '#80d010', '#80d010', '#80d010', '#0070ec',
+            '#0070ec', '#24188c', '#24188c', '#80d010', '#80d010', '#80d010', '#bcbcbc', '#80d010', '#80d010', '#80d010', '#e40058',
+            '#e40058', '#bcbcbc', '#e40058', '#bcbcbc', '#e40058', '#bcbcbc', '#80d010', '#bcbcbc', '#80d010', '#000000', '#80d010', 
+            '#80d010', '#80d010', '#bcbcbc', '#e40058', '#80d010', '#80d010', '#e40058', '#e40058', '#bcbcbc', '#bcbcbc', '#bcbcbc',
+            '#0070ec', '#0070ec', '#bcbcbc', '#bcbcbc', '#0070ec', '#0070ec', '#bcbcbc', '#bcbcbc', '#bcbcbc', '#bcbcbc', '#bcbcbc', 
+            '#bcbcbc', '#bcbcbc'
+        ];
 
-        // layer = new Phaser.TilemapLayer(game, 0, 0, 500, 500, [], 'snes');
+        // map.dump();
 
-        // layer = new Phaser.TilemapLayer(game, 0, 0, 500, 500);
+        // layer = new Phaser.TilemapLayer(game, 0, 0, 640, 400);
+        layer = new Phaser.TilemapLayer(game, 0, 0, 320, 200);
+        layer.updateTileset('tiles');
+        layer.updateMapData(map, 0);
 
+        // layer.sprite.anchor.setTo(0.5, 0.5);
 
-        //  layer.load(mapData, tileset);
-        //  layer.create(mapWidth, mapHeight, [tileset]);
+        game.world.add(layer.sprite);
 
-        // layer.updateTileset('cybernoidTiles'); // can change on the fly
+        // layer.sprite.scale.setTo(2, 2);
 
+        //  Works a treat :)
+        // game.add.sprite(320, 0, layer.texture, layer.frame);
+        // game.add.sprite(0, 200, layer.texture, layer.frame);
+        // game.add.sprite(320, 200, layer.texture, layer.frame);
 
-        // layer.context.fillStyle = 'rgb(255,0,0)';
-        // layer.context.fillRect(0, 0, 200, 300);
-
-        /*
-        game.world._container.addChild(layer.sprite);
-
-        layer.create(10, 10);
-
-        layer.putTile(0, 0, 3);
-        layer.putTile(0, 1, 4);
-
-        layer.render();
-
-        layer.dump();
-        */
+        cursors = game.input.keyboard.createCursorKeys();
     }
 
     function update() {
 
+        // layer.sprite.angle += 0.5;
+
+        if (cursors.up.isDown)
+        {
+            layer.y -= 4;
+        }
+        else if (cursors.down.isDown)
+        {
+            layer.y += 4;
+        }
+
+        if (cursors.left.isDown)
+        {
+            layer.x -= 4;
+        }
+        else if (cursors.right.isDown)
+        {
+            layer.x += 4;
+        }
 
     }
 
     function render() {
 
+        layer.render();
 
     }