/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-15 01:54:31 UTC
  • Revision ID: josh@9ix.org-20130315015431-torvm0zhbk1rvkn3
wall jump

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
1
1
STRICT = true
2
2
DEBUG = true
3
 
RECORD = true
4
 
PLAYBACK = false
5
3
 
6
4
require 'zoetrope'
7
5
__ = require 'underscore'
8
6
--inspect = require 'inspect'
9
 
require 'pepperprof'
10
 
 
11
 
util = {
12
 
   dim = function(dir)
13
 
      if dir == 'x' then
14
 
         return 'width'
15
 
      elseif dir == 'y' then
16
 
         return 'height'
17
 
      else
18
 
         if STRICT then error('dir '..dir) end
19
 
      end
20
 
   end
21
 
}
22
7
 
23
8
Player = Animation:extend {
24
9
   image = 'data/player.png',
79
64
                  if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
80
65
                  if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
81
66
 
82
 
                  -- ugly hack for falling through floor on really slow frames
83
 
                  if math.abs(vel[dir] * elapsed) > 32 then
84
 
                     print('skip')
85
 
                     return
86
 
                  end
87
 
 
88
67
                  if vel[dir] ~= 0 then self[dir] = self[dir] + vel[dir] * elapsed end
89
 
 
90
 
                  if self[dir] < 0 then self[dir] = 0 end
91
 
                  local edge = the.view.map[util.dim(dir)] -
92
 
                               the.player[util.dim(dir)]
93
 
                  -- TODO: take map position into account
94
 
                  if self[dir] > edge then self[dir] = edge end
95
68
               end,
96
69
   onStartFrame = function (self)
97
70
                     -- this is all in startframe so it happens before
149
122
                     end
150
123
 
151
124
                     if the.keys:justPressed('up') and
152
 
                      (self.onGround or the.console.visible or
 
125
                      (self.onGround or
153
126
                       (love.timer.getTime() - self.leftWallAt < .1) ) then
154
127
                        self.velocity.y = -400
155
128
                        self.jumping = true
218
191
      end
219
192
   else
220
193
      -- handle sprites
221
 
      local dim = util.dim(dir)
 
194
      local dim
 
195
      if dir == 'x' then
 
196
         dim = 'width'
 
197
      elseif dir == 'y' then
 
198
         dim = 'height'
 
199
      else
 
200
         print 'dir ??'
 
201
      end
222
202
 
223
203
      local negMove = (other[dir] - self[dir]) + other[dim]
224
204
      local posMove = (self[dir] + self[dim]) - other[dir]
234
214
   other[dir] = other[dir] + chg
235
215
end
236
216
 
237
 
function Sprite:update (elapsed)
238
 
   if self.onUpdate then self:onUpdate(elapsed) end
239
 
end
240
 
 
241
217
GameView = View:extend {
242
218
   onNew = function (self)
243
219
              self:loadLayers('data/map.lua')
244
220
              self.focus = the.player
245
221
              self:clampTo(self.map)
246
 
 
247
 
              the.recorder = Recorder:new{mousePosInterval = 9999}
248
 
              the.app.meta:add(the.recorder)
249
 
              if RECORD then
250
 
                 the.recorder:startRecording()
251
 
              elseif PLAYBACK then
252
 
                 local storage = Storage:new{filename = 'record.lua'}
253
 
                 storage:load()
254
 
                 --print(inspect(storage.data))
255
 
                 the.recorder.record = storage.data
256
 
                 the.recorder:startPlaying()
257
 
              end
258
222
           end,
259
223
   onUpdate = function (self)
260
 
                 --print('drawTook: ', the.drawTook)
261
224
                 --print('tick')
262
225
                 --the.player:collide(self.map)
263
226
                 --self.map:collide(the.player)
264
 
              end,
265
 
   -- draw = function (self, x, y)
266
 
   --           View.draw(self, x, y)
267
 
 
268
 
   --           love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
269
 
   --        end
 
227
              end
270
228
}
271
229
 
272
230
the.app = App:new {
275
232
              self.view = GameView:new()
276
233
              self.console:watch('onGround', 'the.player.onGround')
277
234
              self.console:watch('onWall', 'the.player.onWall')
278
 
              self.console:watch('updateTook', 'the.updateTook')
279
 
              self.console:watch('drawTook', 'the.drawTook')
280
 
              self.console:watch('recorder state', 'the.recorder.state')
281
 
 
282
 
              --the.profiler = newProfiler('time', 2000)
283
 
              --the.profiler = newProfiler()
284
 
              --the.profiler:start()
285
235
           end,
286
236
   onUpdate = function (self, dt)
287
 
                 if the.keys:justPressed('escape') then
288
 
                    if the.profiler then
289
 
                       the.profiler:stop()
290
 
                       local outfile = io.open( "profile.txt", "w+" )
291
 
                       the.profiler:report( outfile )
292
 
                       outfile:close()
293
 
                    end
294
 
 
295
 
                    if RECORD then
296
 
                       if not love.filesystem.remove('record.lua') then
297
 
                          error('could not remove record.lua')
298
 
                       end
299
 
                       local storage = Storage:new{
300
 
                          data = the.recorder.record,
301
 
                          filename = 'record.lua'
302
 
                       }
303
 
                       storage:save(false)
304
 
                       --print(inspect(the.recorder.record))
305
 
                    end
306
 
 
 
237
                 if the.keys:justPressed('escape') and 
 
238
                   not self.console.visible then
307
239
                    self.quit()
308
240
                 end
309
 
              end,
310
 
   update = function (self, dt)
311
 
               the.updateStart = love.timer.getMicroTime()
312
 
               App.update(self, dt)
313
 
               if the.updateStart then
314
 
                  the.updateTook = love.timer.getMicroTime() - the.updateStart
315
 
               end
316
 
            end
317
 
}
 
241
              end
 
242
}
 
 
b'\\ No newline at end of file'