/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-10 21:55:44 UTC
  • Revision ID: josh@9ix.org-20130310215544-iqzp3x2l10h9247f
reorganize code - separate X and Y physics so we can collide in each 
direction separately

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 {
12
12
   sequences = {
13
13
      stand = { frames = { 1 }, fps = 1 },
14
14
      walk = { frames = { 2, 3 }, fps = 5 },
15
 
      jump = { frames = { 4 }, fps = 1 },
16
 
      climbLeft = { frames = { 5, 6 }, fps = 5 },
17
 
      climbRight = { frames = { 7, 8 }, fps = 5 }
 
15
      jump = { frames = { 4 }, fps = 1 }
18
16
   },
19
 
   collisions = {},
20
 
   onWall = false,
21
17
   onNew = function (self)
22
18
              self.velocity.y = 0
23
19
              self.maxVelocity.y = 400
37
33
                     assert(drag, 'active sprite has no drag property')
38
34
                     assert(minVel, 'active sprite has no minVelocity property')
39
35
                     assert(maxVel, 'active sprite has no maxVelocity property')
40
 
                     assert(__.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
 
36
                     assert(_.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
41
37
                  end
42
38
 
43
39
                  vel.x = vel.x or 0
74
70
                     if self.falling then self.jumping = false end
75
71
                     --print(self.jumping, self.falling)
76
72
 
77
 
                     if (not self.onGround) and (not self.onWall) then
 
73
                     if not self.onGround then
78
74
                        self:play('jump')
79
75
                     end
80
76
 
 
77
                     self.velocity.x = 0
81
78
                     self.acceleration.y = 800
82
79
 
83
 
                     if self.onWall then
84
 
                        self.acceleration.y = 0
85
 
 
86
 
                        if self.onWall == 'right' then
87
 
                           self:play('climbRight')
88
 
                        elseif self.onWall == 'left' then
89
 
                           self:play('climbLeft')
90
 
                        end
91
 
 
92
 
                        if the.keys:pressed('up') then
93
 
                           self.velocity.y = -200
94
 
                        elseif the.keys:pressed('down') then
95
 
                           self.velocity.y = 200
96
 
                        else
97
 
                           self.velocity.y = 0
98
 
                           self:freeze(self.sequences[self.currentName].frames[1])
99
 
                        end
100
 
                     end
101
 
 
102
80
                     if the.keys:pressed('left') then
103
81
                        self.velocity.x = -200
104
82
                        if self.onGround then self:play('walk') end
105
 
                        if self.onWall == 'right' then self.onWall = false end
106
83
                     elseif the.keys:pressed('right') then
107
84
                        self.velocity.x = 200
108
85
                        if self.onGround then self:play('walk') end
109
 
                        if self.onWall == 'left' then self.onWall = false end
110
86
                     else
111
 
                        if not self.onWall then
112
 
                           if self.onGround then self:play('stand') end
113
 
                           self.velocity.x = 0
114
 
                        end
 
87
                        if self.onGround then self:play('stand') end
115
88
                     end
116
89
 
117
90
                     if the.keys:justPressed('up') and self.onGround then
123
96
               -- NOTE: this is an override, not a callback
124
97
 
125
98
               self:doPhysics('x', elapsed)
126
 
               self:collide(the.view.map)
127
 
 
128
 
               -- handle X collisions
129
 
               self.onWall = false
130
 
               for _, col in ipairs(self.collisions) do
131
 
                  col.other:displaceDir(self, 'x')
132
 
                  if self.velocity.x > 0 then
133
 
                     self.onWall = 'right'
134
 
                  elseif self.velocity.x < 0 then
135
 
                     self.onWall = 'left'
136
 
                  else
137
 
                     print 'x ??'
138
 
                  end
139
 
               end
140
99
 
141
100
               self.onGround = false -- right before Y collision callbacks
142
101
               self:doPhysics('y', elapsed)
 
102
 
143
103
               self:collide(the.view.map)
144
 
 
145
 
               -- handle Y collisions
146
 
               for _, col in ipairs(self.collisions) do
147
 
                  if self.velocity.y > 0 then
148
 
                     self.onGround = true
149
 
                  end
150
 
 
151
 
                  col.other:displaceDir(self, 'y')
152
 
                  self.velocity.y = 0
153
 
                  self.jumping = false
154
 
               end
155
 
 
156
 
               Animation.update(self, elapsed)
157
104
            end,
158
 
   collide = function (self, ...)
159
 
                self.collisions = {}
160
 
                Animation.collide(self, ...)
161
 
                -- I could return a true/false value here if I wanted to...
162
 
             end,
163
105
   onCollide = function (self, other, xOverlap, yOverlap)
 
106
                  -- seriously, why does this even fire?
164
107
                  if other == the.view.map then return end
165
108
 
166
 
                  table.insert(self.collisions, {other = other,
167
 
                                                 xOverlap = xOverlap,
168
 
                                                 yOverlap = yOverlap })
169
 
               end
 
109
                  --print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
 
110
                  --print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
 
111
 
 
112
                  -- assumption: any other collision is with a solid map tile
 
113
                  if yOverlap > xOverlap then
 
114
                     other:displace(self)
 
115
 
 
116
                     if self.velocity.x > 0 then
 
117
                        self.onWall = 'right'
 
118
                     elseif self.velocity.x < 0 then
 
119
                        self.onWall = 'left'
 
120
                     else
 
121
                        print 'x ??'
 
122
                     end
 
123
                  elseif xOverlap > yOverlap then
 
124
                     -- check if we've moved since collisions were generated
 
125
                     local xov, yov = self:overlap(other.x, other.y,
 
126
                                                   other.width, other.height)
 
127
                     if xov ~= 0 and yov ~= 0 then
 
128
                        --print('y collision')
 
129
                        if self.velocity.y > 0 then
 
130
                           self.onGround = true
 
131
                        end
 
132
 
 
133
                        self.velocity.y = 0
 
134
                        other:displace(self)
 
135
                        self.jumping = false
 
136
                     end
 
137
                  else
 
138
                     print('xy ??')
 
139
                  end
 
140
 
 
141
               end,
170
142
}
171
143
 
172
 
function Sprite:displaceDir(other, dir)
173
 
   if not self.solid or self == other or not other.solid then return end
174
 
   if STRICT then assert(other:instanceOf(Sprite), 'asked to displace a non-sprite') end
175
 
 
176
 
   if other.sprites then
177
 
      -- handle groups
178
 
 
179
 
      for _, spr in pairs(other.sprites) do
180
 
         self:displace(spr, dir)
181
 
      end
182
 
   else
183
 
      -- handle sprites
184
 
      local dim
185
 
      if dir == 'x' then
186
 
         dim = 'width'
187
 
      elseif dir == 'y' then
188
 
         dim = 'height'
189
 
      else
190
 
         print 'dir ??'
191
 
      end
192
 
 
193
 
      local negMove = (other[dir] - self[dir]) + other[dim]
194
 
      local posMove = (self[dir] + self[dim]) - other[dir]
195
 
 
196
 
      -- TODO: re-add hinting?
197
 
      if negMove < posMove then
198
 
         chg = - negMove
199
 
      else
200
 
         chg = posMove
201
 
      end
202
 
   end
203
 
 
204
 
   other[dir] = other[dir] + chg
205
 
end
206
 
 
207
144
GameView = View:extend {
208
145
   onNew = function (self)
209
146
              self:loadLayers('data/map.lua')
221
157
the.app = App:new {
222
158
   onRun = function (self)
223
159
              self.view = GameView:new()
 
160
              --print(inspect(_(the.app):keys()))
224
161
              self.console:watch('onGround', 'the.player.onGround')
225
162
              self.console:watch('onWall', 'the.player.onWall')
226
163
           end,