[nacltoons] Roll cocos2dx + two bug fixes

nacltoons/data/res/drawing.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.
 
 -- Functions for drawing new sprites using a brush.
 -- This module defines a single 'drawing' global containing the following
 -- functions:
 --   - SetBrush
 --   - CreateShape
 --   - CreateSprite
@@ skipping 40 matching lines @@
 local brush_color = ccc3(255, 100, 100)
 
 -- Callbacks that are registered for drawn objects.  The game
 -- can register its own callbacks here to add behavior for
 -- drawn objects.
 drawing.handlers = {}
 
 --- Create a b2Vec from a lua list containing 2 elements.
 -- This is used to convert point data from .def files directly
 -- to the box2dx coordinate system
-local function b2VecFromLua(point)
-    return util.b2VecFromCocos(util.PointFromLua(point))
+local function b2VecFromLua(luapoint)
+    ccpoint = util.PointFromLua(luapoint)

[binji, 2013/06/25 22:17:21]

local ccpoint?

[Sam Clegg, 2013/06/26 00:01:25]

Done.

+    rtn = util.b2VecFromCocos(ccpoint)

[binji, 2013/06/25 22:17:21]

local rtn?

[Sam Clegg, 2013/06/26 00:01:25]

Done.

+    return rtn
 end
 
 local function CreateBrushBatch(parent)
     local node = CCSpriteBatchNode:createWithTexture(brush_tex, DEFAULT_BATCH_COUNT)
     assert(node)
     parent:addChild(node, 1, TAG_BATCH_NODE)
     return node
 end
 
 --- Create a fixed pivot point between the world and the given body.
@@ skipping 185 matching lines @@
         end
     elseif shape_def.type == 'line' then
         local pos = util.PointFromLua(shape_def.start)
         shape = CreatePhysicsNode(pos, shape_def.dynamic, shape_def.tag)
         CreateBrushBatch(shape)
         AddChildShape(shape, shape_def, true)
     elseif shape_def.type == 'edge' then
         local body_def = b2BodyDef:new_local()
         local body = level_obj.world:CreateBody(body_def)
         local b2shape = b2EdgeShape:new_local()
-        b2shape:Set(b2VecFromLua(shape_def.start), b2VecFromLua(shape_def.finish))
+        local start = b2VecFromLua(shape_def.start)
+        local finish = b2VecFromLua(shape_def.finish)
+        util.Log('Create edge from: ' .. util.VecToString(start) .. ' to: ' .. util.VecToString(finish))
+        b2shape:Set(start, finish)
         body:CreateFixture(b2shape, 0)
         return
     elseif shape_def.type == 'image' then
         local pos = util.PointFromLua(shape_def.pos)
         shape = CreatePhysicsNode(pos, shape_def.dynamic, shape_def.tag)
         AddChildShape(shape, shape_def, true)
     else
         assert(false, 'invalid shape type: ' .. shape_def.type)
     end
 
@@ skipping 49 matching lines @@
 
     -- Create the box2d physics body to match the sphere.
     local fixture = AddSphereToBody(node:getB2Body(), center, radius, false)
     SetCategory(fixture, DRAWING_CATEGORY)
     return node
 end
 
 function drawing.DrawEndPoint(node, location, color)
     -- Add visible sprite
     local child_sprite = CCSprite:createWithTexture(brush_tex)
-    location = node:convertToNodeSpace(location)
-    child_sprite:setPosition(location)
+    child_sprite:setPosition(node:convertToNodeSpace(location))
     child_sprite:setColor(color)
     node:addChild(child_sprite)
 
     -- Add collision info
     local body = node:getB2Body()
     local fixture = AddSphereToBody(body, location, brush_thickness, false)
     SetCategory(fixture, DRAWING_CATEGORY)
 end
 
 function drawing.AddLineToShape(sprite, from, to, color)
@@ skipping 100 matching lines @@
     MakeBodyDynamic(current_shape.node:getB2Body())
 
     local rtn = current_shape
     last_pos = nil
     start_pos = nil
     current_shape = nil
     return rtn
 end
 
 return drawing