Use JSON for position

Author: Batiste Bieler

chat/views.py

@@ -24,9 +24,13 @@ def __init__(self, room_id):
     def main(self, request):
         room_map = Map.objects.get(pk=self.pk)
         content = room_map.content.replace("\n", "")
+        key = request.COOKIES.get('rpg_key', False)
+        player = self.get_player(key)
+        print player
         return render_to_response(
             'index.html',
             {
+                'player':player,
                 'map':room_map,
                 'map_content':content,
                 'MEDIA_URL': settings.MEDIA_URL
@@ -82,9 +86,8 @@ def player_new(self, request):
     def player_update_position(self, request):
         key = request.COOKIES['rpg_key']
         player = self.get_player(key)
-        position = request.POST['body']
-        player['position'] = position
-        self.new_room_event(['update_player_position', [key, position]])
+        player['position'] = simplejson.loads(request.POST['body'])
+        self.new_room_event(['update_player_position', [key, player['position']]])
         return json_response([1])
 
     def message_new(self, request):
@@ -129,20 +132,18 @@ def change_room(self, request):
         key = request.COOKIES['rpg_key']
         direction = request.POST.get('direction')
         player = self.remove_player(key)
-        px, py = player['position'].split(',')
-        px = int(px); py = int(py)
         x = 0; y = 0
         if direction == 'left':
-            player['position'] = str(34 * 16) + ',' + str(py)
+            player['position'][0] = 34 * 16
             x = -1
         if direction == 'right':
-            player['position'] = str(0) + ',' + str(py)
+            player['position'][0] = 0
             x = +1
         if direction == 'top':
-            player['position'] = str(px) + ',' + str(29 * 16)
+            player['position'][1] = 28 * 16
             y = -1
         if direction == 'bottom':
-            player['position'] = str(px) + ',' + str(0)
+            player['position'] = 0
             y = +1
         old_map = Map.objects.get(pk=self.pk)
         room_map, created = Map.objects.get_or_create(x=old_map.x+x, y=old_map.y+y)

static/game.js

@@ -37,17 +37,11 @@ $(function() {
         },
 
         onSuccess: function(response) {
-            //try {
-                var mapdata = $.evalJSON(response);
-                $.receive_data(mapdata)
-                //var pos = mapdata['players'][0]['position'].split(',');
-                //$.player_target_position[0] = parseInt(pos[0])
-                //$.player_target_position[1] = parseInt(pos[1])
-
-            //} catch (e) {
-            //    updater.onError();
-            //    return;
-            //}
+            var json = $.evalJSON(response);
+            for(var i=0; i <json.length; i++) {
+                handle_event(json[i]);
+            };
+    
             updater.errorSleepTime = 500;
             window.setTimeout(updater.poll, 0);
         },
@@ -237,7 +231,6 @@ $(function() {
 
     map.click(function(e) {
         grid1.paint_bloc($(e.target));
-        $('#grid-serialized').val($.toJSON(grid));
     });
 
     map.mousedown(function(e) {
@@ -372,11 +365,13 @@ $(function() {
 
     player.prototype.send_position = function () {
         if(this.last_sent_position[0] != this.target_position[0]
-            || this.last_sent_position[1] != this.target_position[1]) {
-                this.last_sent_position[0] = this.target_position[0];
-                this.last_sent_position[1] = this.target_position[1];
-                $.postJSON("/a/player/update_position", {
-                    'body':this.target_position[0]+','+this.target_position[1]
+            || this.last_sent_position[1] != this.target_position[1])
+        {
+            var pos = $.toJSON(this.target_position)
+            this.last_sent_position[0] = this.target_position[0];
+            this.last_sent_position[1] = this.target_position[1];
+            $.postJSON("/a/player/update_position", {
+                    'body':pos
                 },
                 function(response) {}
             );
@@ -449,20 +444,12 @@ $(function() {
     };
     setInterval(_player_send_position, 1000);
 
-    $.receive_data = function(json) {
-        for(var i=0; i <json.length; i++) {
-            handle_event(json[i]);
-        };
-    };
-
     function handle_event(event) {
         if(event[0] == 'update_player_position') {
             var p = get_player(event[1][0]);
             if(event[1][0] == personnal_key)
                 return;
-            var _pos = event[1][1].split(',');
-            var pos = [parseInt(_pos[0]), parseInt(_pos[1])];
-            p.target_position = pos;
+            p.target_position = event[1][1];
         }
         if(event[0] == 'new_player') {
             var item = event[1];

templates/index.html

@@ -27,6 +27,7 @@
     </div>
     <script>
         var map_content = "{{ map_content }}";
+        var player_position = "{{ player.position }}";
     </script>
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3/jquery.min.js" type="text/javascript"></script>
     <script src="http://jquery-json.googlecode.com/files/jquery.json-2.2.js"></script>