/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 00:42:25 UTC
  • Revision ID: josh@9ix.org-20130410004225-ok7v6kq2g632mqmv
playing with text (disabled)

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
1
1
STRICT = true
2
2
DEBUG = true
 
3
RECORD = true
 
4
PLAYBACK = false
3
5
 
4
6
require 'zoetrope'
5
7
__ = require 'underscore'
6
8
--inspect = require 'inspect'
 
9
require 'pepperprof'
 
10
 
 
11
util = {
 
12
   dim = function(dir)
 
13
      if dir == 'x' then
 
14
         return 'width'
 
15
      elseif dir == 'y' then
 
16
         return 'height'
 
17
      else
 
18
         if STRICT then error('dir '..dir) end
 
19
      end
 
20
   end
 
21
}
7
22
 
8
23
Player = Animation:extend {
9
24
   image = 'data/player.png',
64
79
                  if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
65
80
                  if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
66
81
 
 
82
                  -- ugly hack for falling through floor on really slow frames
 
83
                  if math.abs(vel[dir] * elapsed) > 32 then
 
84
                     print('skip')
 
85
                     return
 
86
                  end
 
87
 
67
88
                  if vel[dir] ~= 0 then self[dir] = self[dir] + vel[dir] * elapsed end
 
89
 
 
90
                  if self[dir] < 0 then self[dir] = 0 end
 
91
                  local edge = the.view.map[util.dim(dir)] -
 
92
                               the.player[util.dim(dir)]
 
93
                  -- TODO: take map position into account
 
94
                  if self[dir] > edge then self[dir] = edge end
68
95
               end,
69
96
   onStartFrame = function (self)
70
97
                     -- this is all in startframe so it happens before
122
149
                     end
123
150
 
124
151
                     if the.keys:justPressed('up') and
125
 
                      (self.onGround or
 
152
                      (self.onGround or the.console.visible or
126
153
                       (love.timer.getTime() - self.leftWallAt < .1) ) then
127
154
                        self.velocity.y = -400
128
155
                        self.jumping = true
162
189
                  self.jumping = false
163
190
               end
164
191
 
 
192
               -- text blob
 
193
               if not self.text then
 
194
                  self.text = Text:new{wordWrap = true, width = 50, tint = {0,0,0}}
 
195
                  self.textfill = Fill:new{width = 54, border = {0,0,255}}
 
196
                  --the.view:add(self.textfill)
 
197
                  --the.view:add(self.text)
 
198
               end
 
199
               self.text.text = "Blah blah big text etc etc wrapping"
 
200
               self.text:centerAround(self.x+16, self.y+16, 'horizontal')
 
201
               _, texth = self.text:getSize()
 
202
               self.text.y = self.y - texth - 4
 
203
               self.textfill.x = self.text.x - 2
 
204
               self.textfill.y = self.text.y - 2
 
205
               self.textfill.height = texth + 4
 
206
 
165
207
               Animation.update(self, elapsed)
166
208
            end,
167
209
   collide = function (self, ...)
191
233
      end
192
234
   else
193
235
      -- handle sprites
194
 
      local dim
195
 
      if dir == 'x' then
196
 
         dim = 'width'
197
 
      elseif dir == 'y' then
198
 
         dim = 'height'
199
 
      else
200
 
         print 'dir ??'
201
 
      end
 
236
      local dim = util.dim(dir)
202
237
 
203
238
      local negMove = (other[dir] - self[dir]) + other[dim]
204
239
      local posMove = (self[dir] + self[dim]) - other[dir]
214
249
   other[dir] = other[dir] + chg
215
250
end
216
251
 
 
252
-- don't use zoetrope physics
 
253
function Sprite:update (elapsed)
 
254
   if self.onUpdate then self:onUpdate(elapsed) end
 
255
end
 
256
 
217
257
GameView = View:extend {
218
258
   onNew = function (self)
219
259
              self:loadLayers('data/map.lua')
220
260
              self.focus = the.player
221
261
              self:clampTo(self.map)
 
262
 
 
263
              the.recorder = Recorder:new{mousePosInterval = 9999}
 
264
              the.app.meta:add(the.recorder)
 
265
              if RECORD then
 
266
                 the.recorder:startRecording()
 
267
              elseif PLAYBACK then
 
268
                 local storage = Storage:new{filename = 'record.lua'}
 
269
                 storage:load()
 
270
                 --print(inspect(storage.data))
 
271
                 the.recorder.record = storage.data
 
272
                 the.recorder:startPlaying()
 
273
              end
222
274
           end,
223
275
   onUpdate = function (self)
 
276
                 --print('drawTook: ', the.drawTook)
224
277
                 --print('tick')
225
278
                 --the.player:collide(self.map)
226
279
                 --self.map:collide(the.player)
227
 
              end
 
280
              end,
 
281
   -- draw = function (self, x, y)
 
282
   --           View.draw(self, x, y)
 
283
 
 
284
   --           love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
285
   --        end
228
286
}
229
287
 
230
288
the.app = App:new {
232
290
              self.view = GameView:new()
233
291
              self.console:watch('onGround', 'the.player.onGround')
234
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()
235
300
           end,
236
301
   onUpdate = function (self, dt)
237
 
                 if the.keys:justPressed('escape') and 
238
 
                   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 RECORD then
 
311
                       if not love.filesystem.remove('record.lua') then
 
312
                          error('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
 
239
322
                    self.quit()
240
323
                 end
241
 
              end
242
 
}
 
 
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
}