/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
5
5
__ = require 'underscore'
6
6
--inspect = require 'inspect'
7
7
require 'pepperprof'
8
 
require 'getopt_alt'
9
8
 
10
9
util = {
11
10
   dim = function(dir)
14
13
      elseif dir == 'y' then
15
14
         return 'height'
16
15
      else
17
 
         if STRICT then error('dir '..dir) end
 
16
         print 'dir ??'
18
17
      end
19
18
   end
20
19
}
188
187
                  self.jumping = false
189
188
               end
190
189
 
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
190
               Animation.update(self, elapsed)
207
191
            end,
208
192
   collide = function (self, ...)
258
242
              self:loadLayers('data/map.lua')
259
243
              self.focus = the.player
260
244
              self:clampTo(self.map)
261
 
 
262
 
              the.recorder = Recorder:new{mousePosInterval = 9999}
263
 
              the.app.meta:add(the.recorder)
264
 
              if the.app.record then
265
 
                 the.recorder:startRecording()
266
 
              elseif the.app.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
245
           end,
274
246
   onUpdate = function (self)
275
247
                 --print('drawTook: ', the.drawTook)
277
249
                 --the.player:collide(self.map)
278
250
                 --self.map:collide(the.player)
279
251
              end,
280
 
   -- draw = function (self, x, y)
281
 
   --           View.draw(self, x, y)
 
252
   draw = function (self, x, y)
 
253
             View.draw(self, x, y)
282
254
 
283
 
   --           love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
284
 
   --        end
 
255
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
256
          end
285
257
}
286
258
 
287
259
the.app = App:new {
288
 
   record = true,
289
260
   onRun = function (self)
290
261
              self.view = GameView:new()
291
262
              self.console:watch('onGround', 'the.player.onGround')
292
263
              self.console:watch('onWall', 'the.player.onWall')
293
264
              self.console:watch('updateTook', 'the.updateTook')
294
265
              self.console:watch('drawTook', 'the.drawTook')
295
 
              self.console:watch('recorder state', 'the.recorder.state')
296
266
 
297
267
              --the.profiler = newProfiler('time', 2000)
298
268
              --the.profiler = newProfiler()
307
277
                       outfile:close()
308
278
                    end
309
279
 
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
280
                    self.quit()
323
281
                 end
324
282
              end,
330
288
               end
331
289
            end
332
290
}
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'