/ld27

To get this branch, use:
bzr branch http://9ix.org/bzr/ld27

« back to all changes in this revision

Viewing changes to zoetrope/core/sprite.lua

  • Committer: Josh C
  • Date: 2013-08-25 02:38:46 UTC
  • Revision ID: josh@9ix.org-20130825023846-wgea9oh4n0o16gct
separate collision box for player so it can scale

Show diffs side-by-side

added added

removed removed

Lines of Context:
zoetrope/core/sprite.lua
58
58
        -- Property: height
59
59
        -- Height in pixels.
60
60
 
61
 
        -- Property: origin
62
 
        -- Sets the origin to use when rotating and scaling this sprite, in pixels
63
 
        -- from the top left corner of the sprite. If either x or y property is
64
 
        -- nil, this uses the center of the sprite.
65
 
        origin = {},
66
 
 
67
61
        -- Property: rotation
68
62
        -- Rotation of drawn sprite in radians. This does not affect the bounds
69
63
        -- used during collision checking.
246
240
                local xChange = 0
247
241
                local yChange = 0
248
242
 
249
 
                if other.members then
 
243
                if other.sprites then
250
244
                        -- handle groups
251
245
 
252
 
                        for _, spr in other:members() do
 
246
                        for _, spr in pairs(other.sprites) do
253
247
                                self:displace(spr, xHint, yHint)
254
248
                        end
255
249
                else