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
1
1
STRICT = true
2
2
DEBUG = true
3
RECORD = true
4
PLAYBACK = false
5
3
6
4
require 'zoetrope'
7
5
__ = require 'underscore'
8
6
--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
}
22
7
23
8
Player = Animation:extend {
24
9
image = 'data/player.png',
79
64
if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
80
65
if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
81
66
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
88
67
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
95
68
end,
96
69
onStartFrame = function (self)
97
70
-- this is all in startframe so it happens before
149
122
end
150
123
151
124
if the.keys:justPressed('up') and
152
(self.onGround or the.console.visible or
125
(self.onGround or
153
126
(love.timer.getTime() - self.leftWallAt < .1) ) then
154
127
self.velocity.y = -400
155
128
self.jumping = true
189
162
self.jumping = false
190
163
end
191
164
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
207
165
Animation.update(self, elapsed)
208
166
end,
209
167
collide = function (self, ...)
233
191
end
234
192
else
235
193
-- handle sprites
236
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
237
202
238
203
local negMove = (other[dir] - self[dir]) + other[dim]
239
204
local posMove = (self[dir] + self[dim]) - other[dir]
249
214
other[dir] = other[dir] + chg
250
215
end
251
216
252
function Sprite:update (elapsed)
253
if self.onUpdate then self:onUpdate(elapsed) end
254
end
255
256
217
GameView = View:extend {
257
218
onNew = function (self)
258
219
self:loadLayers('data/map.lua')
259
220
self.focus = the.player
260
221
self:clampTo(self.map)
261
262
the.recorder = Recorder:new{mousePosInterval = 9999}
263
the.app.meta:add(the.recorder)
264
if RECORD then
265
the.recorder:startRecording()
266
elseif PLAYBACK then
267
local storage = Storage:new{filename = 'record.lua'}
268
storage:load()
269
--print(inspect(storage.data))
270
the.recorder.record = storage.data
271
the.recorder:startPlaying()
272
end
273
222
end,
274
223
onUpdate = function (self)
275
--print('drawTook: ', the.drawTook)
276
224
--print('tick')
277
225
--the.player:collide(self.map)
278
226
--self.map:collide(the.player)
279
end,
280
-- draw = function (self, x, y)
281
-- View.draw(self, x, y)
282
283
-- love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
284
-- end
227
end
285
228
}
286
229
287
230
the.app = App:new {
290
232
self.view = GameView:new()
291
233
self.console:watch('onGround', 'the.player.onGround')
292
234
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()
300
235
end,
301
236
onUpdate = function (self, dt)
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
237
if the.keys:justPressed('escape') and
238
not self.console.visible then
322
239
self.quit()
323
240
end
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
}
241
end
242
}
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1