/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-12 15:08:32 UTC
  • Revision ID: josh@9ix.org-20130312150832-ue1q4xuq4weypqc2
fairly major overhaul of collision handling to track whether we're on a 
wall.  also monkey patch Sprite to displace on only one axis

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
 
}
21
7
 
22
8
Player = Animation:extend {
23
9
   image = 'data/player.png',
26
12
   sequences = {
27
13
      stand = { frames = { 1 }, fps = 1 },
28
14
      walk = { frames = { 2, 3 }, fps = 5 },
29
 
      jump = { frames = { 4 }, fps = 1 },
30
 
      climbLeft = { frames = { 5, 6 }, fps = 5 },
31
 
      climbRight = { frames = { 7, 8 }, fps = 5 }
 
15
      jump = { frames = { 4 }, fps = 1 }
32
16
   },
33
17
   collisions = {},
34
18
   onWall = false,
35
 
   leftWallAt = 0,
36
19
   onNew = function (self)
37
20
              self.velocity.y = 0
38
21
              self.maxVelocity.y = 400
78
61
                  if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
79
62
                  if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
80
63
 
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
 
 
87
64
                  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
94
65
               end,
95
66
   onStartFrame = function (self)
96
67
                     -- this is all in startframe so it happens before
105
76
                        self:play('jump')
106
77
                     end
107
78
 
 
79
                     self.velocity.x = 0
108
80
                     self.acceleration.y = 800
109
81
 
110
82
                     if self.onWall then
111
83
                        self.acceleration.y = 0
112
84
 
113
 
                        if self.onWall == 'right' then
114
 
                           self:play('climbRight')
115
 
                        elseif self.onWall == 'left' then
116
 
                           self:play('climbLeft')
117
 
                        end
118
 
 
119
85
                        if the.keys:pressed('up') then
120
86
                           self.velocity.y = -200
 
87
                           self:play('stand')
121
88
                        elseif the.keys:pressed('down') then
122
89
                           self.velocity.y = 200
 
90
                           self:play('stand')
123
91
                        else
124
92
                           self.velocity.y = 0
125
 
                           self:freeze(self.sequences[self.currentName].frames[1])
 
93
                           self:play('stand')
126
94
                        end
127
95
                     end
128
96
 
129
97
                     if the.keys:pressed('left') then
130
98
                        self.velocity.x = -200
131
99
                        if self.onGround then self:play('walk') end
132
 
                        if self.onWall == 'right' then
133
 
                           self.onWall = false
134
 
                           self.leftWallAt = love.timer.getTime()
135
 
                        end
 
100
                        if self.onWall == 'right' then self.onWall = false end
 
101
                        if self.onWall == 'right' then self.onWall = false end
136
102
                     elseif the.keys:pressed('right') then
137
103
                        self.velocity.x = 200
138
104
                        if self.onGround then self:play('walk') end
139
 
                        if self.onWall == 'left' then
140
 
                           self.onWall = false
141
 
                           self.leftWallAt = love.timer.getTime()
142
 
                        end
 
105
                        if self.onWall == 'left' then self.onWall = false end
143
106
                     else
144
 
                        if not self.onWall then
145
 
                           if self.onGround then self:play('stand') end
146
 
                           self.velocity.x = 0
147
 
                        end
 
107
                        if self.onGround then self:play('stand') end
148
108
                     end
149
109
 
150
 
                     if the.keys:justPressed('up') and
151
 
                      (self.onGround or the.console.visible or
152
 
                       (love.timer.getTime() - self.leftWallAt < .1) ) then
 
110
                     if the.keys:justPressed('up') and self.onGround then
153
111
                        self.velocity.y = -400
154
112
                        self.jumping = true
155
113
                     end
161
119
               self:collide(the.view.map)
162
120
 
163
121
               -- handle X collisions
164
 
               self.onWall = false
165
122
               for _, col in ipairs(self.collisions) do
166
123
                  col.other:displaceDir(self, 'x')
167
124
                  if self.velocity.x > 0 then
188
145
                  self.jumping = false
189
146
               end
190
147
 
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
 
 
206
148
               Animation.update(self, elapsed)
207
149
            end,
208
150
   collide = function (self, ...)
232
174
      end
233
175
   else
234
176
      -- handle sprites
235
 
      local dim = util.dim(dir)
 
177
      local dim
 
178
      if dir == 'x' then
 
179
         dim = 'width'
 
180
      elseif dir == 'y' then
 
181
         dim = 'height'
 
182
      else
 
183
         print 'dir ??'
 
184
      end
236
185
 
237
186
      local negMove = (other[dir] - self[dir]) + other[dim]
238
187
      local posMove = (self[dir] + self[dim]) - other[dir]
248
197
   other[dir] = other[dir] + chg
249
198
end
250
199
 
251
 
function Sprite:update (elapsed)
252
 
   if self.onUpdate then self:onUpdate(elapsed) end
253
 
end
254
 
 
255
200
GameView = View:extend {
256
201
   onNew = function (self)
257
202
              self:loadLayers('data/map.lua')
258
203
              self.focus = the.player
259
204
              self:clampTo(self.map)
260
 
 
261
 
              the.recorder = Recorder:new{mousePosInterval = 9999}
262
 
              the.app.meta:add(the.recorder)
263
 
              if the.app.record then
264
 
                 the.recorder:startRecording()
265
 
              elseif the.app.playback then
266
 
                 local storage = Storage:new{filename = 'record.lua'}
267
 
                 storage:load()
268
 
                 --print(inspect(storage.data))
269
 
                 the.recorder.record = storage.data
270
 
                 the.recorder:startPlaying()
271
 
              end
272
205
           end,
273
206
   onUpdate = function (self)
274
 
                 --print('drawTook: ', the.drawTook)
275
207
                 --print('tick')
276
208
                 --the.player:collide(self.map)
277
209
                 --self.map:collide(the.player)
278
 
              end,
279
 
   -- draw = function (self, x, y)
280
 
   --           View.draw(self, x, y)
281
 
 
282
 
   --           love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
283
 
   --        end
 
210
              end
284
211
}
285
212
 
286
213
the.app = App:new {
287
 
   record = true,
288
214
   onRun = function (self)
289
215
              self.view = GameView:new()
290
216
              self.console:watch('onGround', 'the.player.onGround')
291
217
              self.console:watch('onWall', 'the.player.onWall')
292
 
              self.console:watch('updateTook', 'the.updateTook')
293
 
              self.console:watch('drawTook', 'the.drawTook')
294
 
              self.console:watch('recorder state', 'the.recorder.state')
295
 
 
296
 
              --the.profiler = newProfiler('time', 2000)
297
 
              --the.profiler = newProfiler()
298
 
              --the.profiler:start()
299
218
           end,
300
219
   onUpdate = function (self, dt)
301
 
                 if the.keys:justPressed('escape') then
302
 
                    if the.profiler then
303
 
                       the.profiler:stop()
304
 
                       local outfile = io.open( "profile.txt", "w+" )
305
 
                       the.profiler:report( outfile )
306
 
                       outfile:close()
307
 
                    end
308
 
 
309
 
                    if self.record then
310
 
                       if not love.filesystem.remove('record.lua') then
311
 
                          print('could not remove record.lua')
312
 
                       end
313
 
                       local storage = Storage:new{
314
 
                          data = the.recorder.record,
315
 
                          filename = 'record.lua'
316
 
                       }
317
 
                       storage:save(false)
318
 
                       --print(inspect(the.recorder.record))
319
 
                    end
320
 
 
 
220
                 if the.keys:justPressed('escape') and 
 
221
                   not self.console.visible then
321
222
                    self.quit()
322
223
                 end
323
 
              end,
324
 
   update = function (self, dt)
325
 
               the.updateStart = love.timer.getMicroTime()
326
 
               App.update(self, dt)
327
 
               if the.updateStart then
328
 
                  the.updateTook = love.timer.getMicroTime() - the.updateStart
329
 
               end
330
 
            end
331
 
}
332
 
 
333
 
function love.load (arg)
334
 
   opts = getopt(arg, '')
335
 
   if opts['p'] then
336
 
      the.app.playback = true
337
 
      the.app.record = false
338
 
   elseif opts['r'] then
339
 
      the.app.record = true
340
 
   end
341
 
 
342
 
   the.app:run()
343
 
end
 
 
b'\\ No newline at end of file'
 
224
              end
 
225
}
 
 
b'\\ No newline at end of file'