/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-05 16:38:21 UTC
  • Revision ID: josh@9ix.org-20130305163821-kw70drafjsh7329k
fix jitter caused by focus shift happening in the wrong order.  Looks 
like this is fixed in: 
https://bitbucket.org/klembot/zoetrope/commits/5e67ba491768caab0da8b9afc9954c072851e143

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
5
 
__ = require 'underscore'
6
 
--inspect = require 'inspect'
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
 
5
 
 
6
TERM_VEL = 400
 
7
 
 
8
Player = Tile:extend {
 
9
   image = 'data/player.png',
 
10
   onNew = function (self)
 
11
              self.velocity.y = 0
 
12
           end,
 
13
   onStartFrame = function (self)
 
14
                     -- this is all in startframe so it happens before
 
15
                     -- physics calc at beginning of update
 
16
 
 
17
                 self.velocity.x = 0
 
18
                 -- TODO: this can be replaced with sprite.maxVel.y    
 
19
                 if self.velocity.y >= TERM_VEL then
 
20
                    self.velocity.y = TERM_VEL
 
21
                    self.acceleration.y = 0
 
22
                 else
 
23
                    self.acceleration.y = 800
 
24
                 end
 
25
 
 
26
                 if the.keys:pressed('left') then
 
27
                    self.velocity.x = -200
 
28
                 elseif the.keys:pressed('right') then
 
29
                    self.velocity.x = 200
 
30
                 end
 
31
 
 
32
                 if the.keys:justPressed('up') then
 
33
                    self.velocity.y = -400
 
34
                 end
 
35
              end,
 
36
   onUpdate = function (self)
 
37
                 -- this is called after physics, so this makes sense here
 
38
                 the.view.map:subdisplace(self)
 
39
              end
20
40
}
21
41
 
22
42
GameView = View:extend {
24
44
              self:loadLayers('data/map.lua')
25
45
              self.focus = the.player
26
46
              self:clampTo(self.map)
27
 
 
28
 
              the.recorder = Recorder:new{mousePosInterval = 9999}
29
 
              the.app.meta:add(the.recorder)
30
 
              if the.app.record then
31
 
                 the.recorder:startRecording()
32
 
              elseif the.app.playback then
33
 
                 local storage = Storage:new{filename = 'record.lua'}
34
 
                 storage:load()
35
 
                 --print(inspect(storage.data))
36
 
                 the.recorder.record = storage.data
37
 
                 the.recorder:startPlaying()
38
 
              end
39
 
           end,
40
 
   onUpdate = function (self)
41
 
                 --print('drawTook: ', the.drawTook)
42
 
                 --print('tick')
43
 
                 --the.player:collide(self.map)
44
 
                 --self.map:collide(the.player)
45
 
              end,
46
 
   -- draw = function (self, x, y)
47
 
   --           View.draw(self, x, y)
48
 
 
49
 
   --           love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
50
 
   --        end
 
47
           end
51
48
}
52
49
 
53
50
the.app = App:new {
54
 
   record = true,
55
51
   onRun = function (self)
56
52
              self.view = GameView:new()
57
 
              self.console:watch('onGround', 'the.player.onGround')
58
 
              self.console:watch('onWall', 'the.player.onWall')
59
 
              self.console:watch('updateTook', 'the.updateTook')
60
 
              self.console:watch('drawTook', 'the.drawTook')
61
 
              self.console:watch('recorder state', 'the.recorder.state')
62
 
 
63
 
              --the.profiler = newProfiler('time', 2000)
64
 
              --the.profiler = newProfiler()
65
 
              --the.profiler:start()
66
53
           end,
67
54
   onUpdate = function (self, dt)
68
55
                 if the.keys:justPressed('escape') then
69
 
                    if the.profiler then
70
 
                       the.profiler:stop()
71
 
                       local outfile = io.open( "profile.txt", "w+" )
72
 
                       the.profiler:report( outfile )
73
 
                       outfile:close()
74
 
                    end
75
 
 
76
 
                    if self.record then
77
 
                       if not love.filesystem.remove('record.lua') then
78
 
                          print('could not remove record.lua')
79
 
                       end
80
 
                       local storage = Storage:new{
81
 
                          data = the.recorder.record,
82
 
                          filename = 'record.lua'
83
 
                       }
84
 
                       storage:save(false)
85
 
                       --print(inspect(the.recorder.record))
86
 
                    end
87
 
 
88
 
                    self.quit()
 
56
                    love.event.quit()
89
57
                 end
90
 
              end,
91
 
   update = function (self, dt)
92
 
               the.updateStart = love.timer.getMicroTime()
93
 
               App.update(self, dt)
94
 
               if the.updateStart then
95
 
                  the.updateTook = love.timer.getMicroTime() - the.updateStart
96
 
               end
97
 
            end
98
 
}
99
 
 
100
 
function love.load (arg)
101
 
   opts = getopt(arg, '')
102
 
   if opts['p'] then
103
 
      the.app.playback = true
104
 
      the.app.record = false
105
 
   elseif opts['r'] then
106
 
      the.app.record = true
107
 
   end
108
 
 
109
 
   the.app:run()
110
 
end
 
 
b'\\ No newline at end of file'
 
58
              end
 
59
}
 
 
b'\\ No newline at end of file'