/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
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
7
require 'pepperprof'
10
8
 
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
 
 
23
9
Player = Animation:extend {
24
10
   image = 'data/player.png',
25
11
   height = 32,
79
65
                  if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
80
66
                  if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
81
67
 
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
68
                  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
69
               end,
96
70
   onStartFrame = function (self)
97
71
                     -- this is all in startframe so it happens before
149
123
                     end
150
124
 
151
125
                     if the.keys:justPressed('up') and
152
 
                      (self.onGround or the.console.visible or
 
126
                      (self.onGround or
153
127
                       (love.timer.getTime() - self.leftWallAt < .1) ) then
154
128
                        self.velocity.y = -400
155
129
                        self.jumping = true
189
163
                  self.jumping = false
190
164
               end
191
165
 
192
 
               -- text blob
193
 
               if not self.text then
194
 
                  self.text = Text:new{wordWrap = true, width = 50, tint = {0,0,0}}
195
 
                  self.textfill = Fill:new{width = 54, border = {0,0,255}}
196
 
                  --the.view:add(self.textfill)
197
 
                  --the.view:add(self.text)
198
 
               end
199
 
               self.text.text = "Blah blah big text etc etc wrapping"
200
 
               self.text:centerAround(self.x+16, self.y+16, 'horizontal')
201
 
               _, texth = self.text:getSize()
202
 
               self.text.y = self.y - texth - 4
203
 
               self.textfill.x = self.text.x - 2
204
 
               self.textfill.y = self.text.y - 2
205
 
               self.textfill.height = texth + 4
206
 
 
207
166
               Animation.update(self, elapsed)
208
167
            end,
209
168
   collide = function (self, ...)
233
192
      end
234
193
   else
235
194
      -- handle sprites
236
 
      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
237
203
 
238
204
      local negMove = (other[dir] - self[dir]) + other[dim]
239
205
      local posMove = (self[dir] + self[dim]) - other[dir]
249
215
   other[dir] = other[dir] + chg
250
216
end
251
217
 
252
 
function Sprite:update (elapsed)
253
 
   if self.onUpdate then self:onUpdate(elapsed) end
254
 
end
255
 
 
256
218
GameView = View:extend {
257
219
   onNew = function (self)
258
220
              self:loadLayers('data/map.lua')
259
221
              self.focus = the.player
260
222
              self:clampTo(self.map)
261
 
 
262
 
              the.recorder = Recorder:new{mousePosInterval = 9999}
263
 
              the.app.meta:add(the.recorder)
264
 
              if RECORD then
265
 
                 the.recorder:startRecording()
266
 
              elseif PLAYBACK then
267
 
                 local storage = Storage:new{filename = 'record.lua'}
268
 
                 storage:load()
269
 
                 --print(inspect(storage.data))
270
 
                 the.recorder.record = storage.data
271
 
                 the.recorder:startPlaying()
272
 
              end
273
223
           end,
274
224
   onUpdate = function (self)
275
 
                 --print('drawTook: ', the.drawTook)
276
225
                 --print('tick')
277
226
                 --the.player:collide(self.map)
278
227
                 --self.map:collide(the.player)
279
 
              end,
280
 
   -- draw = function (self, x, y)
281
 
   --           View.draw(self, x, y)
282
 
 
283
 
   --           love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
284
 
   --        end
 
228
              end
285
229
}
286
230
 
287
231
the.app = App:new {
292
235
              self.console:watch('onWall', 'the.player.onWall')
293
236
              self.console:watch('updateTook', 'the.updateTook')
294
237
              self.console:watch('drawTook', 'the.drawTook')
295
 
              self.console:watch('recorder state', 'the.recorder.state')
296
238
 
297
239
              --the.profiler = newProfiler('time', 2000)
298
240
              --the.profiler = newProfiler()
307
249
                       outfile:close()
308
250
                    end
309
251
 
310
 
                    if RECORD then
311
 
                       if not love.filesystem.remove('record.lua') then
312
 
                          error('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,