/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-16 15:56:20 UTC
  • Revision ID: josh@9ix.org-20130316155620-q8dze43bqqilhtmu
profiling and analysis

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
5
5
__ = require 'underscore'
6
6
--inspect = require 'inspect'
7
7
require 'pepperprof'
8
 
require 'getopt_alt'
9
 
 
10
 
util = {
11
 
   dim = function(dir)
12
 
      if dir == 'x' then
13
 
         return 'width'
14
 
      elseif dir == 'y' then
15
 
         return 'height'
16
 
      else
17
 
         if STRICT then error('dir '..dir) end
18
 
      end
19
 
   end
20
 
}
21
8
 
22
9
Player = Animation:extend {
23
10
   image = 'data/player.png',
78
65
                  if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
79
66
                  if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
80
67
 
81
 
                  -- ugly hack for falling through floor on really slow frames
82
 
                  if math.abs(vel[dir] * elapsed) > 32 then
83
 
                     print('skip')
84
 
                     return
85
 
                  end
86
 
 
87
68
                  if vel[dir] ~= 0 then self[dir] = self[dir] + vel[dir] * elapsed end
88
 
 
89
 
                  if self[dir] < 0 then self[dir] = 0 end
90
 
                  local edge = the.view.map[util.dim(dir)] -
91
 
                               the.player[util.dim(dir)]
92
 
                  -- TODO: take map position into account
93
 
                  if self[dir] > edge then self[dir] = edge end
94
69
               end,
95
70
   onStartFrame = function (self)
96
71
                     -- this is all in startframe so it happens before
148
123
                     end
149
124
 
150
125
                     if the.keys:justPressed('up') and
151
 
                      (self.onGround or the.console.visible or
 
126
                      (self.onGround or
152
127
                       (love.timer.getTime() - self.leftWallAt < .1) ) then
153
128
                        self.velocity.y = -400
154
129
                        self.jumping = true
188
163
                  self.jumping = false
189
164
               end
190
165
 
191
 
               -- text blob
192
 
               if not self.text then
193
 
                  self.text = Text:new{wordWrap = true, width = 50, tint = {0,0,0}}
194
 
                  self.textfill = Fill:new{width = 54, border = {0,0,255}}
195
 
                  --the.view:add(self.textfill)
196
 
                  --the.view:add(self.text)
197
 
               end
198
 
               self.text.text = "Blah blah big text etc etc wrapping"
199
 
               self.text:centerAround(self.x+16, self.y+16, 'horizontal')
200
 
               _, texth = self.text:getSize()
201
 
               self.text.y = self.y - texth - 4
202
 
               self.textfill.x = self.text.x - 2
203
 
               self.textfill.y = self.text.y - 2
204
 
               self.textfill.height = texth + 4
205
 
 
206
166
               Animation.update(self, elapsed)
207
167
            end,
208
168
   collide = function (self, ...)
232
192
      end
233
193
   else
234
194
      -- handle sprites
235
 
      local dim = util.dim(dir)
 
195
      local dim
 
196
      if dir == 'x' then
 
197
         dim = 'width'
 
198
      elseif dir == 'y' then
 
199
         dim = 'height'
 
200
      else
 
201
         print 'dir ??'
 
202
      end
236
203
 
237
204
      local negMove = (other[dir] - self[dir]) + other[dim]
238
205
      local posMove = (self[dir] + self[dim]) - other[dir]
248
215
   other[dir] = other[dir] + chg
249
216
end
250
217
 
251
 
function Sprite:update (elapsed)
252
 
   if self.onUpdate then self:onUpdate(elapsed) end
253
 
end
254
 
 
255
218
GameView = View:extend {
256
219
   onNew = function (self)
257
220
              self:loadLayers('data/map.lua')
258
221
              self.focus = the.player
259
222
              self:clampTo(self.map)
260
 
 
261
 
              the.recorder = Recorder:new{mousePosInterval = 9999}
262
 
              the.app.meta:add(the.recorder)
263
 
              if the.app.record then
264
 
                 the.recorder:startRecording()
265
 
              elseif the.app.playback then
266
 
                 local storage = Storage:new{filename = 'record.lua'}
267
 
                 storage:load()
268
 
                 --print(inspect(storage.data))
269
 
                 the.recorder.record = storage.data
270
 
                 the.recorder:startPlaying()
271
 
              end
272
223
           end,
273
224
   onUpdate = function (self)
274
 
                 --print('drawTook: ', the.drawTook)
275
225
                 --print('tick')
276
226
                 --the.player:collide(self.map)
277
227
                 --self.map:collide(the.player)
278
 
              end,
279
 
   -- draw = function (self, x, y)
280
 
   --           View.draw(self, x, y)
281
 
 
282
 
   --           love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
283
 
   --        end
 
228
              end
284
229
}
285
230
 
286
231
the.app = App:new {
287
 
   record = true,
288
232
   onRun = function (self)
289
233
              self.view = GameView:new()
290
234
              self.console:watch('onGround', 'the.player.onGround')
291
235
              self.console:watch('onWall', 'the.player.onWall')
292
236
              self.console:watch('updateTook', 'the.updateTook')
293
237
              self.console:watch('drawTook', 'the.drawTook')
294
 
              self.console:watch('recorder state', 'the.recorder.state')
295
238
 
296
239
              --the.profiler = newProfiler('time', 2000)
297
240
              --the.profiler = newProfiler()
307
249
                       outfile:close()
308
250
                    end
309
251
 
310
 
                    if self.record then
311
 
                       if not love.filesystem.remove('record.lua') then
312
 
                          print('could not remove record.lua')
313
 
                       end
314
 
                       local storage = Storage:new{
315
 
                          data = the.recorder.record,
316
 
                          filename = 'record.lua'
317
 
                       }
318
 
                       storage:save(false)
319
 
                       --print(inspect(the.recorder.record))
320
 
                    end
321
 
 
322
252
                    self.quit()
323
253
                 end
324
254
              end,
330
260
               end
331
261
            end
332
262
}
333
 
 
334
 
function love.load (arg)
335
 
   opts = getopt(arg, '')
336
 
   if opts['p'] then
337
 
      the.app.playback = true
338
 
      the.app.record = false
339
 
   elseif opts['r'] then
340
 
      the.app.record = true
341
 
   end
342
 
 
343
 
   the.app:run()
344
 
end
 
 
b'\\ No newline at end of file'