/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
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
5
 
--__ = require 'underscore'
 
5
__ = require 'underscore'
6
6
--inspect = require 'inspect'
7
7
require 'pepperprof'
8
 
require 'getopt_alt'
9
 
 
10
 
require 'sprite'
11
 
require 'animation'
12
 
require 'player'
13
 
require 'balloon'
14
 
require 'version'
15
 
 
16
 
util = {
17
 
   dim = function(dir)
 
8
 
 
9
Player = Animation:extend {
 
10
   image = 'data/player.png',
 
11
   height = 32,
 
12
   width = 32,
 
13
   sequences = {
 
14
      stand = { frames = { 1 }, fps = 1 },
 
15
      walk = { frames = { 2, 3 }, fps = 5 },
 
16
      jump = { frames = { 4 }, fps = 1 },
 
17
      climbLeft = { frames = { 5, 6 }, fps = 5 },
 
18
      climbRight = { frames = { 7, 8 }, fps = 5 }
 
19
   },
 
20
   collisions = {},
 
21
   onWall = false,
 
22
   leftWallAt = 0,
 
23
   onNew = function (self)
 
24
              self.velocity.y = 0
 
25
              self.maxVelocity.y = 400
 
26
           end,
 
27
   doPhysics = function (self, dir, elapsed)
 
28
                  local vel = self.velocity
 
29
                  local acc = self.acceleration
 
30
                  local drag = self.drag
 
31
                  local minVel = self.minVelocity
 
32
                  local maxVel = self.maxVelocity
 
33
 
 
34
                  -- check existence of properties
 
35
 
 
36
                  if STRICT then
 
37
                     assert(vel, 'active sprite has no velocity property')
 
38
                     assert(acc, 'active sprite has no acceleration property')
 
39
                     assert(drag, 'active sprite has no drag property')
 
40
                     assert(minVel, 'active sprite has no minVelocity property')
 
41
                     assert(maxVel, 'active sprite has no maxVelocity property')
 
42
                     assert(__.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
 
43
                  end
 
44
 
 
45
                  vel.x = vel.x or 0
 
46
                  vel.y = vel.y or 0
 
47
                  vel.rotation = vel.rotation or 0
 
48
 
 
49
                  -- physics
 
50
 
 
51
                  if acc[dir] and acc[dir] ~= 0 then
 
52
                     vel[dir] = vel[dir] + acc[dir] * elapsed
 
53
                  else
 
54
                     if drag[dir] then
 
55
                        if vel[dir] > 0 then
 
56
                           vel[dir] = vel[dir] - drag[dir] * elapsed
 
57
                           if vel[dir] < 0 then vel[dir] = 0 end
 
58
                        elseif vel[dir] < 0 then
 
59
                           vel[dir] = vel[dir] + drag[dir] * elapsed
 
60
                           if vel[dir] > 0 then vel[dir] = 0 end
 
61
                        end
 
62
                     end
 
63
                  end
 
64
 
 
65
                  if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
 
66
                  if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
 
67
 
 
68
                  if vel[dir] ~= 0 then self[dir] = self[dir] + vel[dir] * elapsed end
 
69
               end,
 
70
   onStartFrame = function (self)
 
71
                     -- this is all in startframe so it happens before
 
72
                     -- physics calc at beginning of update
 
73
 
 
74
                     -- jumping/falling updates could go in EndFrame...
 
75
                     self.falling = self.velocity.y > 0
 
76
                     if self.falling then self.jumping = false end
 
77
                     --print(self.jumping, self.falling)
 
78
 
 
79
                     if (not self.onGround) and (not self.onWall) then
 
80
                        self:play('jump')
 
81
                     end
 
82
 
 
83
                     self.acceleration.y = 800
 
84
 
 
85
                     if self.onWall then
 
86
                        self.acceleration.y = 0
 
87
 
 
88
                        if self.onWall == 'right' then
 
89
                           self:play('climbRight')
 
90
                        elseif self.onWall == 'left' then
 
91
                           self:play('climbLeft')
 
92
                        end
 
93
 
 
94
                        if the.keys:pressed('up') then
 
95
                           self.velocity.y = -200
 
96
                        elseif the.keys:pressed('down') then
 
97
                           self.velocity.y = 200
 
98
                        else
 
99
                           self.velocity.y = 0
 
100
                           self:freeze(self.sequences[self.currentName].frames[1])
 
101
                        end
 
102
                     end
 
103
 
 
104
                     if the.keys:pressed('left') then
 
105
                        self.velocity.x = -200
 
106
                        if self.onGround then self:play('walk') end
 
107
                        if self.onWall == 'right' then
 
108
                           self.onWall = false
 
109
                           self.leftWallAt = love.timer.getTime()
 
110
                        end
 
111
                     elseif the.keys:pressed('right') then
 
112
                        self.velocity.x = 200
 
113
                        if self.onGround then self:play('walk') end
 
114
                        if self.onWall == 'left' then
 
115
                           self.onWall = false
 
116
                           self.leftWallAt = love.timer.getTime()
 
117
                        end
 
118
                     else
 
119
                        if not self.onWall then
 
120
                           if self.onGround then self:play('stand') end
 
121
                           self.velocity.x = 0
 
122
                        end
 
123
                     end
 
124
 
 
125
                     if the.keys:justPressed('up') and
 
126
                      (self.onGround or
 
127
                       (love.timer.getTime() - self.leftWallAt < .1) ) then
 
128
                        self.velocity.y = -400
 
129
                        self.jumping = true
 
130
                     end
 
131
                  end,
 
132
   update = function (self, elapsed)
 
133
               -- NOTE: this is an override, not a callback
 
134
 
 
135
               self:doPhysics('x', elapsed)
 
136
               self:collide(the.view.map)
 
137
 
 
138
               -- handle X collisions
 
139
               self.onWall = false
 
140
               for _, col in ipairs(self.collisions) do
 
141
                  col.other:displaceDir(self, 'x')
 
142
                  if self.velocity.x > 0 then
 
143
                     self.onWall = 'right'
 
144
                  elseif self.velocity.x < 0 then
 
145
                     self.onWall = 'left'
 
146
                  else
 
147
                     print 'x ??'
 
148
                  end
 
149
               end
 
150
 
 
151
               self.onGround = false -- right before Y collision callbacks
 
152
               self:doPhysics('y', elapsed)
 
153
               self:collide(the.view.map)
 
154
 
 
155
               -- handle Y collisions
 
156
               for _, col in ipairs(self.collisions) do
 
157
                  if self.velocity.y > 0 then
 
158
                     self.onGround = true
 
159
                  end
 
160
 
 
161
                  col.other:displaceDir(self, 'y')
 
162
                  self.velocity.y = 0
 
163
                  self.jumping = false
 
164
               end
 
165
 
 
166
               Animation.update(self, elapsed)
 
167
            end,
 
168
   collide = function (self, ...)
 
169
                self.collisions = {}
 
170
                Animation.collide(self, ...)
 
171
                -- I could return a true/false value here if I wanted to...
 
172
             end,
 
173
   onCollide = function (self, other, xOverlap, yOverlap)
 
174
                  if other == the.view.map then return end
 
175
 
 
176
                  table.insert(self.collisions, {other = other,
 
177
                                                 xOverlap = xOverlap,
 
178
                                                 yOverlap = yOverlap })
 
179
               end
 
180
}
 
181
 
 
182
-- displace on a specific axis (monkey patch Sprite)
 
183
function Sprite:displaceDir(other, dir)
 
184
   if not self.solid or self == other or not other.solid then return end
 
185
   if STRICT then assert(other:instanceOf(Sprite), 'asked to displace a non-sprite') end
 
186
 
 
187
   if other.sprites then
 
188
      -- handle groups
 
189
 
 
190
      for _, spr in pairs(other.sprites) do
 
191
         self:displace(spr, dir)
 
192
      end
 
193
   else
 
194
      -- handle sprites
 
195
      local dim
18
196
      if dir == 'x' then
19
 
         return 'width'
 
197
         dim = 'width'
20
198
      elseif dir == 'y' then
21
 
         return 'height'
22
 
      else
23
 
         if STRICT then error('dir '..dir) end
 
199
         dim = 'height'
 
200
      else
 
201
         print 'dir ??'
 
202
      end
 
203
 
 
204
      local negMove = (other[dir] - self[dir]) + other[dim]
 
205
      local posMove = (self[dir] + self[dim]) - other[dir]
 
206
 
 
207
      -- TODO: re-add hinting?
 
208
      if negMove < posMove then
 
209
         chg = - negMove
 
210
      else
 
211
         chg = posMove
24
212
      end
25
213
   end
26
 
}
 
214
 
 
215
   other[dir] = other[dir] + chg
 
216
end
27
217
 
28
218
GameView = View:extend {
29
219
   onNew = function (self)
30
220
              self:loadLayers('data/map.lua')
31
221
              self.focus = the.player
32
222
              self:clampTo(self.map)
33
 
 
34
 
              the.recorder = Recorder:new{mousePosInterval = 9999}
35
 
              the.app.meta:add(the.recorder)
36
 
              if the.app.record then
37
 
                 the.recorder:startRecording()
38
 
              elseif the.app.playback then
39
 
                 local storage = Storage:new{filename = 'record.lua'}
40
 
                 storage:load()
41
 
                 --print(inspect(storage.data))
42
 
                 the.recorder.record = storage.data
43
 
                 the.recorder:startPlaying()
44
 
              end
45
223
           end,
46
224
   onUpdate = function (self)
47
 
                 --print('drawTook: ', the.drawTook)
48
225
                 --print('tick')
49
226
                 --the.player:collide(self.map)
50
227
                 --self.map:collide(the.player)
51
 
              end,
52
 
   -- draw = function (self, x, y)
53
 
   --           View.draw(self, x, y)
54
 
 
55
 
   --           love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
56
 
   --        end
57
 
}
58
 
 
59
 
MenuScreen = View:extend {
60
 
   --title = Text:new{text = "Test Platform Game", font = 48, wordWrap = false},
61
 
   title = Tile:new{image = 'data/title.png', x = 0, y = 0},
62
 
   onNew = function(self)
63
 
              self:add(self.title)
64
 
              --self.title:centerAround(400, 200)
65
 
           end,
66
 
   onUpdate = function(self, elapsed)
67
 
                 if the.keys:allJustPressed() then
68
 
                    the.app.view = GameView:new()
69
 
                 end
70
228
              end
71
229
}
72
230
 
73
231
the.app = App:new {
74
 
   record = true,
75
232
   onRun = function (self)
76
 
              self.view = MenuScreen:new()
77
 
              if DEBUG then
78
 
                 self.console:watch('VERSION', 'VERSION')
79
 
                 self.console:watch('onGround', 'the.player.onGround')
80
 
                 self.console:watch('onWall', 'the.player.onWall')
81
 
                 self.console:watch('updateTook', 'the.updateTook')
82
 
                 self.console:watch('drawTook', 'the.drawTook')
83
 
                 self.console:watch('recorder state', 'the.recorder.state')
84
 
              end
 
233
              self.view = GameView:new()
 
234
              self.console:watch('onGround', 'the.player.onGround')
 
235
              self.console:watch('onWall', 'the.player.onWall')
 
236
              self.console:watch('updateTook', 'the.updateTook')
 
237
              self.console:watch('drawTook', 'the.drawTook')
85
238
 
86
239
              --the.profiler = newProfiler('time', 2000)
87
240
              --the.profiler = newProfiler()
96
249
                       outfile:close()
97
250
                    end
98
251
 
99
 
                    if self.record and the.recorder then
100
 
                       if not love.filesystem.remove('record.lua') then
101
 
                          print('could not remove record.lua')
102
 
                       end
103
 
                       local storage = Storage:new{
104
 
                          data = the.recorder.record,
105
 
                          filename = 'record.lua'
106
 
                       }
107
 
                       storage:save(false)
108
 
                       --print(inspect(the.recorder.record))
109
 
                    end
110
 
 
111
252
                    self.quit()
112
253
                 end
113
254
              end,
119
260
               end
120
261
            end
121
262
}
122
 
 
123
 
function love.load (arg)
124
 
   opts = getopt(arg, '')
125
 
   if opts['p'] then
126
 
      the.app.playback = true
127
 
      the.app.record = false
128
 
   elseif opts['r'] then
129
 
      the.app.record = true
130
 
   end
131
 
 
132
 
   the.app:run()
133
 
end
 
 
b'\\ No newline at end of file'