[nacltoons] Roll cocos2dx + two bug fixes

nacltoons/data/res/util.lua

 -- Copyright (c) 2013 The Chromium Authors. All rights reserved.
 -- Use of this source code is governed by a BSD-style license that can be
 -- found in the LICENSE file.
 
 --- Utility functions and constants shared by nacltoons lua code
 
 local yaml = require 'yaml'
 
 local util = {}
 
 util.PTM_RATIO = 32
 
 util.tags = {
     TAG_DYNAMIC_START = 0xff,
 }
 
 -- Convert a value from screen coordinate system to Box2D world coordinates
 function util.ScreenToWorld(value)
     return value / util.PTM_RATIO
 end
 
+function util.WorldToScreen(value)
+    return value * util.PTM_RATIO
+end
+
 --- Log messages to console
-function util.Log(...)
-    print('LUA: ' .. string.format(...))
+function util.Log(arg)
+    print('LUA: ' .. tostring(arg))
 end
 
 function util.PointToString(point)
     return string.format('%dx%d', point.x, point.y)
 end
 
+function util.VecToString(v)
+    return string.format('%dx%d', util.WorldToScreen(v.x), util.WorldToScreen(v.y))
+end
+
 --- Create CCPoint from a lua table containing 2 elements.
 -- This is used to convert point data from .def files into
 -- the cocos2dx coordinate space.
 function util.PointFromLua(point, absolute)
     if absolute == nil then
         absolute = true
     end
-    if abolute then
+    if absolute then
         return ccp(point[1] + game_obj.origin.x, point[2] + game_obj.origin.y)
     else
         return ccp(point[1], point[2])
     end
 end
 
 --- Convert CCPoint to b2Vec.
 function util.b2VecFromCocos(cocos_vec)
     return b2Vec2:new_local(util.ScreenToWorld(cocos_vec.x),
                             util.ScreenToWorld(cocos_vec.y))
@@ skipping 160 matching lines @@
             end
         end
     end
 
     table.insert(sb, string.rep (' ', indent - 2))
     table.insert(sb, '}\n')
     return table.concat(sb)
 end
 
 return util