/zoeplat

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

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2013-03-12 15:08:32 UTC
  • Revision ID: josh@9ix.org-20130312150832-ue1q4xuq4weypqc2
fairly major overhaul of collision handling to track whether we're on a 
wall.  also monkey patch Sprite to displace on only one axis

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
5
 
_ = require 'underscore'
 
5
__ = require 'underscore'
6
6
--inspect = require 'inspect'
7
7
 
8
8
Player = Animation:extend {
14
14
      walk = { frames = { 2, 3 }, fps = 5 },
15
15
      jump = { frames = { 4 }, fps = 1 }
16
16
   },
 
17
   collisions = {},
 
18
   onWall = false,
17
19
   onNew = function (self)
18
20
              self.velocity.y = 0
19
21
              self.maxVelocity.y = 400
33
35
                     assert(drag, 'active sprite has no drag property')
34
36
                     assert(minVel, 'active sprite has no minVelocity property')
35
37
                     assert(maxVel, 'active sprite has no maxVelocity property')
36
 
                     assert(_.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
 
38
                     assert(__.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
37
39
                  end
38
40
 
39
41
                  vel.x = vel.x or 0
114
116
               -- NOTE: this is an override, not a callback
115
117
 
116
118
               self:doPhysics('x', elapsed)
 
119
               self:collide(the.view.map)
 
120
 
 
121
               -- handle X collisions
 
122
               for _, col in ipairs(self.collisions) do
 
123
                  col.other:displaceDir(self, 'x')
 
124
                  if self.velocity.x > 0 then
 
125
                     self.onWall = 'right'
 
126
                  elseif self.velocity.x < 0 then
 
127
                     self.onWall = 'left'
 
128
                  else
 
129
                     print 'x ??'
 
130
                  end
 
131
               end
117
132
 
118
133
               self.onGround = false -- right before Y collision callbacks
119
134
               self:doPhysics('y', elapsed)
120
 
 
121
135
               self:collide(the.view.map)
122
136
 
 
137
               -- handle Y collisions
 
138
               for _, col in ipairs(self.collisions) do
 
139
                  if self.velocity.y > 0 then
 
140
                     self.onGround = true
 
141
                  end
 
142
 
 
143
                  col.other:displaceDir(self, 'y')
 
144
                  self.velocity.y = 0
 
145
                  self.jumping = false
 
146
               end
 
147
 
123
148
               Animation.update(self, elapsed)
124
149
            end,
 
150
   collide = function (self, ...)
 
151
                self.collisions = {}
 
152
                Animation.collide(self, ...)
 
153
                -- I could return a true/false value here if I wanted to...
 
154
             end,
125
155
   onCollide = function (self, other, xOverlap, yOverlap)
126
 
                  -- seriously, why does this even fire?
127
156
                  if other == the.view.map then return end
128
157
 
129
 
                  --print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
130
 
                  --print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
131
 
 
132
 
                  -- assumption: any other collision is with a solid map tile
133
 
                  if yOverlap > xOverlap then
134
 
                     other:displace(self)
135
 
 
136
 
                     if self.velocity.x > 0 then
137
 
                        self.onWall = 'right'
138
 
                     elseif self.velocity.x < 0 then
139
 
                        self.onWall = 'left'
140
 
                     else
141
 
                        print 'x ??'
142
 
                     end
143
 
                  elseif xOverlap > yOverlap then
144
 
                     -- check if we've moved since collisions were generated
145
 
                     local xov, yov = self:overlap(other.x, other.y,
146
 
                                                   other.width, other.height)
147
 
                     if xov ~= 0 and yov ~= 0 then
148
 
                        --print('y collision')
149
 
                        if self.velocity.y > 0 then
150
 
                           self.onGround = true
151
 
                        end
152
 
 
153
 
                        self.velocity.y = 0
154
 
                        other:displace(self)
155
 
                        self.jumping = false
156
 
                     end
157
 
                  else
158
 
                     print('xy ??')
159
 
                  end
160
 
 
161
 
               end,
 
158
                  table.insert(self.collisions, {other = other,
 
159
                                                 xOverlap = xOverlap,
 
160
                                                 yOverlap = yOverlap })
 
161
               end
162
162
}
163
163
 
 
164
-- displace on a specific axis (monkey patch Sprite)
 
165
function Sprite:displaceDir(other, dir)
 
166
   if not self.solid or self == other or not other.solid then return end
 
167
   if STRICT then assert(other:instanceOf(Sprite), 'asked to displace a non-sprite') end
 
168
 
 
169
   if other.sprites then
 
170
      -- handle groups
 
171
 
 
172
      for _, spr in pairs(other.sprites) do
 
173
         self:displace(spr, dir)
 
174
      end
 
175
   else
 
176
      -- handle sprites
 
177
      local dim
 
178
      if dir == 'x' then
 
179
         dim = 'width'
 
180
      elseif dir == 'y' then
 
181
         dim = 'height'
 
182
      else
 
183
         print 'dir ??'
 
184
      end
 
185
 
 
186
      local negMove = (other[dir] - self[dir]) + other[dim]
 
187
      local posMove = (self[dir] + self[dim]) - other[dir]
 
188
 
 
189
      -- TODO: re-add hinting?
 
190
      if negMove < posMove then
 
191
         chg = - negMove
 
192
      else
 
193
         chg = posMove
 
194
      end
 
195
   end
 
196
 
 
197
   other[dir] = other[dir] + chg
 
198
end
 
199
 
164
200
GameView = View:extend {
165
201
   onNew = function (self)
166
202
              self:loadLayers('data/map.lua')
177
213
the.app = App:new {
178
214
   onRun = function (self)
179
215
              self.view = GameView:new()
180
 
              --print(inspect(_(the.app):keys()))
181
216
              self.console:watch('onGround', 'the.player.onGround')
182
217
              self.console:watch('onWall', 'the.player.onWall')
183
218
           end,