/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-20 01:30:46 UTC
  • Revision ID: josh@9ix.org-20130320013046-da2g35k1jzxdihlz
fps indicator, maybe a new tile

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
6
--inspect = require 'inspect'
6
 
--_ = require 'underscore'
 
7
require 'pepperprof'
 
8
 
 
9
util = {
 
10
   dim = function(dir)
 
11
      if dir == 'x' then
 
12
         return 'width'
 
13
      elseif dir == 'y' then
 
14
         return 'height'
 
15
      else
 
16
         print 'dir ??'
 
17
      end
 
18
   end
 
19
}
7
20
 
8
21
Player = Animation:extend {
9
22
   image = 'data/player.png',
12
25
   sequences = {
13
26
      stand = { frames = { 1 }, fps = 1 },
14
27
      walk = { frames = { 2, 3 }, fps = 5 },
15
 
      jump = { frames = { 4 }, fps = 1 }
 
28
      jump = { frames = { 4 }, fps = 1 },
 
29
      climbLeft = { frames = { 5, 6 }, fps = 5 },
 
30
      climbRight = { frames = { 7, 8 }, fps = 5 }
16
31
   },
 
32
   collisions = {},
 
33
   onWall = false,
 
34
   leftWallAt = 0,
17
35
   onNew = function (self)
18
36
              self.velocity.y = 0
19
37
              self.maxVelocity.y = 400
20
38
           end,
 
39
   doPhysics = function (self, dir, elapsed)
 
40
                  local vel = self.velocity
 
41
                  local acc = self.acceleration
 
42
                  local drag = self.drag
 
43
                  local minVel = self.minVelocity
 
44
                  local maxVel = self.maxVelocity
 
45
 
 
46
                  -- check existence of properties
 
47
 
 
48
                  if STRICT then
 
49
                     assert(vel, 'active sprite has no velocity property')
 
50
                     assert(acc, 'active sprite has no acceleration property')
 
51
                     assert(drag, 'active sprite has no drag property')
 
52
                     assert(minVel, 'active sprite has no minVelocity property')
 
53
                     assert(maxVel, 'active sprite has no maxVelocity property')
 
54
                     assert(__.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
 
55
                  end
 
56
 
 
57
                  vel.x = vel.x or 0
 
58
                  vel.y = vel.y or 0
 
59
                  vel.rotation = vel.rotation or 0
 
60
 
 
61
                  -- physics
 
62
 
 
63
                  if acc[dir] and acc[dir] ~= 0 then
 
64
                     vel[dir] = vel[dir] + acc[dir] * elapsed
 
65
                  else
 
66
                     if drag[dir] then
 
67
                        if vel[dir] > 0 then
 
68
                           vel[dir] = vel[dir] - drag[dir] * elapsed
 
69
                           if vel[dir] < 0 then vel[dir] = 0 end
 
70
                        elseif vel[dir] < 0 then
 
71
                           vel[dir] = vel[dir] + drag[dir] * elapsed
 
72
                           if vel[dir] > 0 then vel[dir] = 0 end
 
73
                        end
 
74
                     end
 
75
                  end
 
76
 
 
77
                  if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
 
78
                  if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
 
79
 
 
80
                  -- ugly hack for falling through floor on really slow frames
 
81
                  if math.abs(vel[dir] * elapsed) > 32 then
 
82
                     print('skip')
 
83
                     return
 
84
                  end
 
85
 
 
86
                  if vel[dir] ~= 0 then self[dir] = self[dir] + vel[dir] * elapsed end
 
87
 
 
88
                  if self[dir] < 0 then self[dir] = 0 end
 
89
                  local edge = the.view.map[util.dim(dir)] -
 
90
                               the.player[util.dim(dir)]
 
91
                  -- TODO: take map position into account
 
92
                  if self[dir] > edge then self[dir] = edge end
 
93
               end,
21
94
   onStartFrame = function (self)
22
95
                     -- this is all in startframe so it happens before
23
96
                     -- physics calc at beginning of update
27
100
                     if self.falling then self.jumping = false end
28
101
                     --print(self.jumping, self.falling)
29
102
 
30
 
                     if not self:onGround() then
 
103
                     if (not self.onGround) and (not self.onWall) then
31
104
                        self:play('jump')
32
105
                     end
33
106
 
34
 
                     self.velocity.x = 0
35
107
                     self.acceleration.y = 800
36
108
 
 
109
                     if self.onWall then
 
110
                        self.acceleration.y = 0
 
111
 
 
112
                        if self.onWall == 'right' then
 
113
                           self:play('climbRight')
 
114
                        elseif self.onWall == 'left' then
 
115
                           self:play('climbLeft')
 
116
                        end
 
117
 
 
118
                        if the.keys:pressed('up') then
 
119
                           self.velocity.y = -200
 
120
                        elseif the.keys:pressed('down') then
 
121
                           self.velocity.y = 200
 
122
                        else
 
123
                           self.velocity.y = 0
 
124
                           self:freeze(self.sequences[self.currentName].frames[1])
 
125
                        end
 
126
                     end
 
127
 
37
128
                     if the.keys:pressed('left') then
38
129
                        self.velocity.x = -200
39
 
                        if self:onGround() then self:play('walk') end
 
130
                        if self.onGround then self:play('walk') end
 
131
                        if self.onWall == 'right' then
 
132
                           self.onWall = false
 
133
                           self.leftWallAt = love.timer.getTime()
 
134
                        end
40
135
                     elseif the.keys:pressed('right') then
41
136
                        self.velocity.x = 200
42
 
                        if self:onGround() then self:play('walk') end
 
137
                        if self.onGround then self:play('walk') end
 
138
                        if self.onWall == 'left' then
 
139
                           self.onWall = false
 
140
                           self.leftWallAt = love.timer.getTime()
 
141
                        end
43
142
                     else
44
 
                        if self:onGround() then self:play('stand') end
 
143
                        if not self.onWall then
 
144
                           if self.onGround then self:play('stand') end
 
145
                           self.velocity.x = 0
 
146
                        end
45
147
                     end
46
148
 
47
 
                     if the.keys:justPressed('up') and self:onGround() then
 
149
                     if the.keys:justPressed('up') and
 
150
                      (self.onGround or the.console.visible or
 
151
                       (love.timer.getTime() - self.leftWallAt < .1) ) then
48
152
                        self.velocity.y = -400
49
153
                        self.jumping = true
50
154
                     end
51
155
                  end,
52
 
   onEndFrame = function (self)
53
 
                   --print(self.velocity.y)
54
 
                end,
 
156
   update = function (self, elapsed)
 
157
               -- NOTE: this is an override, not a callback
 
158
 
 
159
               self:doPhysics('x', elapsed)
 
160
               self:collide(the.view.map)
 
161
 
 
162
               -- handle X collisions
 
163
               self.onWall = false
 
164
               for _, col in ipairs(self.collisions) do
 
165
                  col.other:displaceDir(self, 'x')
 
166
                  if self.velocity.x > 0 then
 
167
                     self.onWall = 'right'
 
168
                  elseif self.velocity.x < 0 then
 
169
                     self.onWall = 'left'
 
170
                  else
 
171
                     print 'x ??'
 
172
                  end
 
173
               end
 
174
 
 
175
               self.onGround = false -- right before Y collision callbacks
 
176
               self:doPhysics('y', elapsed)
 
177
               self:collide(the.view.map)
 
178
 
 
179
               -- handle Y collisions
 
180
               for _, col in ipairs(self.collisions) do
 
181
                  if self.velocity.y > 0 then
 
182
                     self.onGround = true
 
183
                  end
 
184
 
 
185
                  col.other:displaceDir(self, 'y')
 
186
                  self.velocity.y = 0
 
187
                  self.jumping = false
 
188
               end
 
189
 
 
190
               Animation.update(self, elapsed)
 
191
            end,
 
192
   collide = function (self, ...)
 
193
                self.collisions = {}
 
194
                Animation.collide(self, ...)
 
195
                -- I could return a true/false value here if I wanted to...
 
196
             end,
55
197
   onCollide = function (self, other, xOverlap, yOverlap)
56
 
                  -- seriously, why does this even fire?
57
198
                  if other == the.view.map then return end
58
199
 
59
 
                  --print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
60
 
                  --print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
61
 
 
62
 
                  -- assumption: any other collision is with a solid map tile
63
 
                  if yOverlap > xOverlap then
64
 
                     other:displace(self)
65
 
                  elseif xOverlap > yOverlap then
66
 
                     -- check if we've moved since collisions were generated
67
 
                     local xov, yov = self:overlap(other.x, other.y,
68
 
                                                   other.width, other.height)
69
 
                     if xov ~= 0 and yov ~= 0 then
70
 
                        self.velocity.y = 0
71
 
                        other:displace(self)
72
 
                        self.jumping = false
73
 
                     end
74
 
                  else
75
 
                     print('??')
76
 
                  end
77
 
 
78
 
               end,
79
 
   onGround = function (self)
80
 
                 return (not self.jumping) and (not self.falling)
81
 
              end
 
200
                  table.insert(self.collisions, {other = other,
 
201
                                                 xOverlap = xOverlap,
 
202
                                                 yOverlap = yOverlap })
 
203
               end
82
204
}
83
205
 
 
206
-- displace on a specific axis (monkey patch Sprite)
 
207
function Sprite:displaceDir(other, dir)
 
208
   if not self.solid or self == other or not other.solid then return end
 
209
   if STRICT then assert(other:instanceOf(Sprite), 'asked to displace a non-sprite') end
 
210
 
 
211
   if other.sprites then
 
212
      -- handle groups
 
213
 
 
214
      for _, spr in pairs(other.sprites) do
 
215
         self:displace(spr, dir)
 
216
      end
 
217
   else
 
218
      -- handle sprites
 
219
      local dim = util.dim(dir)
 
220
 
 
221
      local negMove = (other[dir] - self[dir]) + other[dim]
 
222
      local posMove = (self[dir] + self[dim]) - other[dir]
 
223
 
 
224
      -- TODO: re-add hinting?
 
225
      if negMove < posMove then
 
226
         chg = - negMove
 
227
      else
 
228
         chg = posMove
 
229
      end
 
230
   end
 
231
 
 
232
   other[dir] = other[dir] + chg
 
233
end
 
234
 
 
235
-- don't use zoetrope physics
 
236
function Sprite:update (elapsed)
 
237
   if self.onUpdate then self:onUpdate(elapsed) end
 
238
end
 
239
 
84
240
GameView = View:extend {
85
241
   onNew = function (self)
86
242
              self:loadLayers('data/map.lua')
88
244
              self:clampTo(self.map)
89
245
           end,
90
246
   onUpdate = function (self)
 
247
                 --print('drawTook: ', the.drawTook)
91
248
                 --print('tick')
92
 
                 the.player:collide(self.map)
 
249
                 --the.player:collide(self.map)
93
250
                 --self.map:collide(the.player)
94
 
              end
 
251
              end,
 
252
   draw = function (self, x, y)
 
253
             View.draw(self, x, y)
 
254
 
 
255
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
256
          end
95
257
}
96
258
 
97
259
the.app = App:new {
98
260
   onRun = function (self)
99
261
              self.view = GameView:new()
100
 
              --print(inspect(_(the.app):keys()))
 
262
              self.console:watch('onGround', 'the.player.onGround')
 
263
              self.console:watch('onWall', 'the.player.onWall')
 
264
              self.console:watch('updateTook', 'the.updateTook')
 
265
              self.console:watch('drawTook', 'the.drawTook')
 
266
 
 
267
              --the.profiler = newProfiler('time', 2000)
 
268
              --the.profiler = newProfiler()
 
269
              --the.profiler:start()
101
270
           end,
102
271
   onUpdate = function (self, dt)
103
 
                 -- TODO: make this not work if debug console is active
104
272
                 if the.keys:justPressed('escape') then
105
 
                    love.event.quit()
 
273
                    if the.profiler then
 
274
                       the.profiler:stop()
 
275
                       local outfile = io.open( "profile.txt", "w+" )
 
276
                       the.profiler:report( outfile )
 
277
                       outfile:close()
 
278
                    end
 
279
 
 
280
                    self.quit()
106
281
                 end
107
 
              end
108
 
}
 
 
b'\\ No newline at end of file'
 
282
              end,
 
283
   update = function (self, dt)
 
284
               the.updateStart = love.timer.getMicroTime()
 
285
               App.update(self, dt)
 
286
               if the.updateStart then
 
287
                  the.updateTook = love.timer.getMicroTime() - the.updateStart
 
288
               end
 
289
            end
 
290
}