/ld27

To get this branch, use:
bzr branch http://9ix.org/bzr/ld27

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2014-07-03 14:43:25 UTC
  • Revision ID: josh@9ix.org-20140703144325-799ow43au3uimguy
zoetrope scaling patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
1
1
STRICT = true
2
 
DEBUG = true
 
2
DEBUG = false
3
3
 
4
4
require 'zoetrope'
5
5
--require 'pepperprof'
60
60
              --the.profiler = newProfiler()
61
61
              --the.profiler:start()
62
62
 
63
 
              self.gameStart = love.timer.getMicroTime()
64
 
              self.lastChange = love.timer.getMicroTime()
 
63
              self.gameStart = love.timer.getTime()
 
64
              self.lastChange = love.timer.getTime()
65
65
           end,
66
66
   onUpdate = function(self, dt)
67
 
                 if the.player.active and love.timer.getMicroTime() > self.lastChange + 10 then
 
67
                 if the.player.active and love.timer.getTime() > self.lastChange + 10 then
68
68
                    -- switch maze
69
69
                    self:switchMaze()
70
70
                 end
117
117
                   self._fx = {0,0,0,0}
118
118
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')
119
119
 
120
 
                   self.lastChange = love.timer.getMicroTime()
 
120
                   self.lastChange = love.timer.getTime()
121
121
                end,
122
122
   onEndFrame = function(self)
123
123
                   --the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2