To get this branch, use:
bzr branch
http://9ix.org/bzr/zoeplat
« back to all changes in this revision
Viewing changes to main.lua
- browse files at revision 23
- compare with another revision
- download diff
- download tarball
- view history from revision 23
- Committer: Josh C
- Date: 2013-03-15 01:54:31 UTC
- Revision ID: josh@9ix.org-20130315015431-torvm0zhbk1rvkn3
wall jump
- files removed:
- data/testmap.tmx
- files modified:
- data/map.lua
added
removed
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',
78
64
if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
79
65
if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
80
66
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
67
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
68
end,
95
69
onStartFrame = function (self)
96
70
-- this is all in startframe so it happens before
148
122
end
149
123
150
124
if the.keys:justPressed('up') and
151
(self.onGround or the.console.visible or
125
(self.onGround or
152
126
(love.timer.getTime() - self.leftWallAt < .1) ) then
153
127
self.velocity.y = -400
154
128
self.jumping = true
188
162
self.jumping = false
189
163
end
190
164
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
165
Animation.update(self, elapsed)
207
166
end,
208
167
collide = function (self, ...)
232
191
end
233
192
else
234
193
-- handle sprites
235
local dim = util.dim(dir)
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
202
237
203
local negMove = (other[dir] - self[dir]) + other[dim]
238
204
local posMove = (self[dir] + self[dim]) - other[dir]
248
214
other[dir] = other[dir] + chg
249
215
end
250
216
251
function Sprite:update (elapsed)
252
if self.onUpdate then self:onUpdate(elapsed) end
253
end
254
255
217
GameView = View:extend {
256
218
onNew = function (self)
257
219
self:loadLayers('data/map.lua')
258
220
self.focus = the.player
259
221
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
222
end,
273
223
onUpdate = function (self)
274
--print('drawTook: ', the.drawTook)
275
224
--print('tick')
276
225
--the.player:collide(self.map)
277
226
--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
227
end
284
228
}
285
229
286
230
the.app = App:new {
287
record = true,
288
231
onRun = function (self)
289
232
self.view = GameView:new()
290
233
self.console:watch('onGround', 'the.player.onGround')
291
234
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
235
end,
300
236
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
237
if the.keys:justPressed('escape') and
238
not self.console.visible then
321
239
self.quit()
322
240
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'
241
end
242
}
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1