/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',
12
25
   sequences = {
13
26
      stand = { frames = { 1 }, fps = 1 },
14
27
      walk = { frames = { 2, 3 }, fps = 5 },
15
 
      jump = { frames = { 4 }, fps = 1 }
 
28
      jump = { frames = { 4 }, fps = 1 },
 
29
      climbLeft = { frames = { 5, 6 }, fps = 5 },
 
30
      climbRight = { frames = { 7, 8 }, fps = 5 }
16
31
   },
17
32
   collisions = {},
18
33
   onWall = false,
 
34
   leftWallAt = 0,
19
35
   onNew = function (self)
20
36
              self.velocity.y = 0
21
37
              self.maxVelocity.y = 400
62
78
                  if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
63
79
 
64
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
65
87
               end,
66
88
   onStartFrame = function (self)
67
89
                     -- this is all in startframe so it happens before
81
103
                     if self.onWall then
82
104
                        self.acceleration.y = 0
83
105
 
 
106
                        if self.onWall == 'right' then
 
107
                           self:play('climbRight')
 
108
                        elseif self.onWall == 'left' then
 
109
                           self:play('climbLeft')
 
110
                        end
 
111
 
84
112
                        if the.keys:pressed('up') then
85
113
                           self.velocity.y = -200
86
 
                           self:play('stand')
87
114
                        elseif the.keys:pressed('down') then
88
115
                           self.velocity.y = 200
89
 
                           self:play('stand')
90
116
                        else
91
117
                           self.velocity.y = 0
92
 
                           self:play('stand')
 
118
                           self:freeze(self.sequences[self.currentName].frames[1])
93
119
                        end
94
120
                     end
95
121
 
96
122
                     if the.keys:pressed('left') then
97
123
                        self.velocity.x = -200
98
124
                        if self.onGround then self:play('walk') end
99
 
                        if self.onWall == 'right' then self.onWall = false end
 
125
                        if self.onWall == 'right' then
 
126
                           self.onWall = false
 
127
                           self.leftWallAt = love.timer.getTime()
 
128
                        end
100
129
                     elseif the.keys:pressed('right') then
101
130
                        self.velocity.x = 200
102
131
                        if self.onGround then self:play('walk') end
103
 
                        if self.onWall == 'left' then self.onWall = false end
 
132
                        if self.onWall == 'left' then
 
133
                           self.onWall = false
 
134
                           self.leftWallAt = love.timer.getTime()
 
135
                        end
104
136
                     else
105
 
                        if self.onGround then self:play('stand') end
106
137
                        if not self.onWall then
 
138
                           if self.onGround then self:play('stand') end
107
139
                           self.velocity.x = 0
108
140
                        end
109
141
                     end
110
142
 
111
 
                     if the.keys:justPressed('up') and self.onGround then
 
143
                     if the.keys:justPressed('up') and
 
144
                      (self.onGround or the.console.visible or
 
145
                       (love.timer.getTime() - self.leftWallAt < .1) ) then
112
146
                        self.velocity.y = -400
113
147
                        self.jumping = true
114
148
                     end
176
210
      end
177
211
   else
178
212
      -- handle sprites
179
 
      local dim
180
 
      if dir == 'x' then
181
 
         dim = 'width'
182
 
      elseif dir == 'y' then
183
 
         dim = 'height'
184
 
      else
185
 
         print 'dir ??'
186
 
      end
 
213
      local dim = util.dim(dir)
187
214
 
188
215
      local negMove = (other[dir] - self[dir]) + other[dim]
189
216
      local posMove = (self[dir] + self[dim]) - other[dir]
217
244
              self.view = GameView:new()
218
245
              self.console:watch('onGround', 'the.player.onGround')
219
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()
220
253
           end,
221
254
   onUpdate = function (self, dt)
222
 
                 if the.keys:justPressed('escape') and 
223
 
                   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
 
224
263
                    self.quit()
225
264
                 end
226
 
              end
227
 
}
 
 
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
}