/ld27

To get this branch, use:
bzr branch /bzr/ld27

« back to all changes in this revision

Viewing changes to zoetrope/core/sprite.lua

  • Committer: Josh C
  • Date: 2014-07-03 14:41:57 UTC
  • Revision ID: josh@9ix.org-20140703144157-xydxt62xzcdq6bdk
cluke009 zoetrope + my spritebatch changes

Show diffs side-by-side

added added

removed removed

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
 
61
67
        -- Property: rotation
62
68
        -- Rotation of drawn sprite in radians. This does not affect the bounds
63
69
        -- used during collision checking.
240
246
                local xChange = 0
241
247
                local yChange = 0
242
248
 
243
 
                if other.sprites then
 
249
                if other.members then
244
250
                        -- handle groups
245
251
 
246
 
                        for _, spr in pairs(other.sprites) do
 
252
                        for _, spr in other:members() do
247
253
                                self:displace(spr, xHint, yHint)
248
254
                        end
249
255
                else