/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 19:31:02 UTC
  • Revision ID: josh@9ix.org-20130316193102-68imraus0srbj653
don't go off the edge

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
 
 
9
util = {
 
10
   dim = function(dir)
 
11
      if dir == 'x' then
 
12
         return 'width'
 
13
      elseif dir == 'y' then
 
14
         return 'height'
 
15
      else
 
16
         print 'dir ??'
 
17
      end
 
18
   end
 
19
}
7
20
 
8
21
Player = Animation:extend {
9
22
   image = 'data/player.png',
65
78
                  if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
66
79
 
67
80
                  if vel[dir] ~= 0 then self[dir] = self[dir] + vel[dir] * elapsed end
 
81
 
 
82
                  if self[dir] < 0 then self[dir] = 0 end
 
83
                  local edge = the.view.map[util.dim(dir)] -
 
84
                               the.player[util.dim(dir)]
 
85
                  -- TODO: take map position into account
 
86
                  if self[dir] > edge then self[dir] = edge end
68
87
               end,
69
88
   onStartFrame = function (self)
70
89
                     -- this is all in startframe so it happens before
122
141
                     end
123
142
 
124
143
                     if the.keys:justPressed('up') and
125
 
                      (self.onGround or
 
144
                      (self.onGround or the.console.visible or
126
145
                       (love.timer.getTime() - self.leftWallAt < .1) ) then
127
146
                        self.velocity.y = -400
128
147
                        self.jumping = true
191
210
      end
192
211
   else
193
212
      -- 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
 
213
      local dim = util.dim(dir)
202
214
 
203
215
      local negMove = (other[dir] - self[dir]) + other[dim]
204
216
      local posMove = (self[dir] + self[dim]) - other[dir]
232
244
              self.view = GameView:new()
233
245
              self.console:watch('onGround', 'the.player.onGround')
234
246
              self.console:watch('onWall', 'the.player.onWall')
 
247
              self.console:watch('updateTook', 'the.updateTook')
 
248
              self.console:watch('drawTook', 'the.drawTook')
 
249
 
 
250
              --the.profiler = newProfiler('time', 2000)
 
251
              --the.profiler = newProfiler()
 
252
              --the.profiler:start()
235
253
           end,
236
254
   onUpdate = function (self, dt)
237
 
                 if the.keys:justPressed('escape') and 
238
 
                   not self.console.visible then
 
255
                 if the.keys:justPressed('escape') then
 
256
                    if the.profiler then
 
257
                       the.profiler:stop()
 
258
                       local outfile = io.open( "profile.txt", "w+" )
 
259
                       the.profiler:report( outfile )
 
260
                       outfile:close()
 
261
                    end
 
262
 
239
263
                    self.quit()
240
264
                 end
241
 
              end
242
 
}
 
 
b'\\ No newline at end of file'
 
265
              end,
 
266
   update = function (self, dt)
 
267
               the.updateStart = love.timer.getMicroTime()
 
268
               App.update(self, dt)
 
269
               if the.updateStart then
 
270
                  the.updateTook = love.timer.getMicroTime() - the.updateStart
 
271
               end
 
272
            end
 
273
}