/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-04-10 01:20:40 UTC
  • Revision ID: josh@9ix.org-20130410012040-lv7v1sc3vj7ismja
link

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
4
4
require 'zoetrope'
5
5
__ = require 'underscore'
6
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
 
20
}
7
21
 
8
22
Player = Animation:extend {
9
23
   image = 'data/player.png',
18
32
   },
19
33
   collisions = {},
20
34
   onWall = false,
 
35
   leftWallAt = 0,
21
36
   onNew = function (self)
22
37
              self.velocity.y = 0
23
38
              self.maxVelocity.y = 400
63
78
                  if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
64
79
                  if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
65
80
 
 
81
                  -- ugly hack for falling through floor on really slow frames
 
82
                  if math.abs(vel[dir] * elapsed) > 32 then
 
83
                     print('skip')
 
84
                     return
 
85
                  end
 
86
 
66
87
                  if vel[dir] ~= 0 then self[dir] = self[dir] + vel[dir] * elapsed end
 
88
 
 
89
                  if self[dir] < 0 then self[dir] = 0 end
 
90
                  local edge = the.view.map[util.dim(dir)] -
 
91
                               the.player[util.dim(dir)]
 
92
                  -- TODO: take map position into account
 
93
                  if self[dir] > edge then self[dir] = edge end
67
94
               end,
68
95
   onStartFrame = function (self)
69
96
                     -- this is all in startframe so it happens before
102
129
                     if the.keys:pressed('left') then
103
130
                        self.velocity.x = -200
104
131
                        if self.onGround then self:play('walk') end
105
 
                        if self.onWall == 'right' then self.onWall = false end
 
132
                        if self.onWall == 'right' then
 
133
                           self.onWall = false
 
134
                           self.leftWallAt = love.timer.getTime()
 
135
                        end
106
136
                     elseif the.keys:pressed('right') then
107
137
                        self.velocity.x = 200
108
138
                        if self.onGround then self:play('walk') end
109
 
                        if self.onWall == 'left' then self.onWall = false end
 
139
                        if self.onWall == 'left' then
 
140
                           self.onWall = false
 
141
                           self.leftWallAt = love.timer.getTime()
 
142
                        end
110
143
                     else
111
144
                        if not self.onWall then
112
145
                           if self.onGround then self:play('stand') end
114
147
                        end
115
148
                     end
116
149
 
117
 
                     if the.keys:justPressed('up') and self.onGround then
 
150
                     if the.keys:justPressed('up') and
 
151
                      (self.onGround or the.console.visible or
 
152
                       (love.timer.getTime() - self.leftWallAt < .1) ) then
118
153
                        self.velocity.y = -400
119
154
                        self.jumping = true
120
155
                     end
153
188
                  self.jumping = false
154
189
               end
155
190
 
 
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
 
156
206
               Animation.update(self, elapsed)
157
207
            end,
158
208
   collide = function (self, ...)
182
232
      end
183
233
   else
184
234
      -- handle sprites
185
 
      local dim
186
 
      if dir == 'x' then
187
 
         dim = 'width'
188
 
      elseif dir == 'y' then
189
 
         dim = 'height'
190
 
      else
191
 
         print 'dir ??'
192
 
      end
 
235
      local dim = util.dim(dir)
193
236
 
194
237
      local negMove = (other[dir] - self[dir]) + other[dim]
195
238
      local posMove = (self[dir] + self[dim]) - other[dir]
205
248
   other[dir] = other[dir] + chg
206
249
end
207
250
 
 
251
-- don't use zoetrope physics
 
252
function Sprite:update (elapsed)
 
253
   if self.onUpdate then self:onUpdate(elapsed) end
 
254
end
 
255
 
208
256
GameView = View:extend {
209
257
   onNew = function (self)
210
258
              self:loadLayers('data/map.lua')
211
259
              self.focus = the.player
212
260
              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
213
273
           end,
214
274
   onUpdate = function (self)
 
275
                 --print('drawTook: ', the.drawTook)
215
276
                 --print('tick')
216
277
                 --the.player:collide(self.map)
217
278
                 --self.map:collide(the.player)
218
 
              end
 
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
219
285
}
220
286
 
221
287
the.app = App:new {
 
288
   record = true,
222
289
   onRun = function (self)
223
290
              self.view = GameView:new()
224
291
              self.console:watch('onGround', 'the.player.onGround')
225
292
              self.console:watch('onWall', 'the.player.onWall')
 
293
              self.console:watch('updateTook', 'the.updateTook')
 
294
              self.console:watch('drawTook', 'the.drawTook')
 
295
              self.console:watch('recorder state', 'the.recorder.state')
 
296
 
 
297
              --the.profiler = newProfiler('time', 2000)
 
298
              --the.profiler = newProfiler()
 
299
              --the.profiler:start()
226
300
           end,
227
301
   onUpdate = function (self, dt)
228
 
                 if the.keys:justPressed('escape') and 
229
 
                   not self.console.visible then
 
302
                 if the.keys:justPressed('escape') then
 
303
                    if the.profiler then
 
304
                       the.profiler:stop()
 
305
                       local outfile = io.open( "profile.txt", "w+" )
 
306
                       the.profiler:report( outfile )
 
307
                       outfile:close()
 
308
                    end
 
309
 
 
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
 
230
322
                    self.quit()
231
323
                 end
232
 
              end
233
 
}
 
 
b'\\ No newline at end of file'
 
324
              end,
 
325
   update = function (self, dt)
 
326
               the.updateStart = love.timer.getMicroTime()
 
327
               App.update(self, dt)
 
328
               if the.updateStart then
 
329
                  the.updateTook = love.timer.getMicroTime() - the.updateStart
 
330
               end
 
331
            end
 
332
}
 
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'