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 21
- compare with another revision
- download diff
- download tarball
- view history from revision 21
- Committer: Josh C
- Date: 2013-03-12 17:21:28 UTC
- Revision ID: josh@9ix.org-20130312172128-l336vwqawo81c6sm
really easy version of knowing when we reached the top of a wall.
similar to how we're doing onGround.
similar to how we're doing onGround.
- 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',
27
12
sequences = {
28
13
stand = { frames = { 1 }, fps = 1 },
29
14
walk = { frames = { 2, 3 }, fps = 5 },
30
jump = { frames = { 4 }, fps = 1 },
31
climbLeft = { frames = { 5, 6 }, fps = 5 },
32
climbRight = { frames = { 7, 8 }, fps = 5 }
15
jump = { frames = { 4 }, fps = 1 }
33
16
},
34
17
collisions = {},
35
18
onWall = false,
36
leftWallAt = 0,
37
19
onNew = function (self)
38
20
self.velocity.y = 0
39
21
self.maxVelocity.y = 400
79
61
if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
80
62
if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
81
63
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
64
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
65
end,
96
66
onStartFrame = function (self)
97
67
-- this is all in startframe so it happens before
111
81
if self.onWall then
112
82
self.acceleration.y = 0
113
83
114
if self.onWall == 'right' then
115
self:play('climbRight')
116
elseif self.onWall == 'left' then
117
self:play('climbLeft')
118
end
119
120
84
if the.keys:pressed('up') then
121
85
self.velocity.y = -200
86
self:play('stand')
122
87
elseif the.keys:pressed('down') then
123
88
self.velocity.y = 200
89
self:play('stand')
124
90
else
125
91
self.velocity.y = 0
126
self:freeze(self.sequences[self.currentName].frames[1])
92
self:play('stand')
127
93
end
128
94
end
129
95
130
96
if the.keys:pressed('left') then
131
97
self.velocity.x = -200
132
98
if self.onGround then self:play('walk') end
133
if self.onWall == 'right' then
134
self.onWall = false
135
self.leftWallAt = love.timer.getTime()
136
end
99
if self.onWall == 'right' then self.onWall = false end
137
100
elseif the.keys:pressed('right') then
138
101
self.velocity.x = 200
139
102
if self.onGround then self:play('walk') end
140
if self.onWall == 'left' then
141
self.onWall = false
142
self.leftWallAt = love.timer.getTime()
143
end
103
if self.onWall == 'left' then self.onWall = false end
144
104
else
105
if self.onGround then self:play('stand') end
145
106
if not self.onWall then
146
if self.onGround then self:play('stand') end
147
107
self.velocity.x = 0
148
108
end
149
109
end
150
110
151
if the.keys:justPressed('up') and
152
(self.onGround or the.console.visible or
153
(love.timer.getTime() - self.leftWallAt < .1) ) then
111
if the.keys:justPressed('up') and self.onGround then
154
112
self.velocity.y = -400
155
113
self.jumping = true
156
114
end
189
147
self.jumping = false
190
148
end
191
149
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
150
Animation.update(self, elapsed)
208
151
end,
209
152
collide = function (self, ...)
233
176
end
234
177
else
235
178
-- handle sprites
236
local dim = util.dim(dir)
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
237
187
238
188
local negMove = (other[dir] - self[dir]) + other[dim]
239
189
local posMove = (self[dir] + self[dim]) - other[dir]
249
199
other[dir] = other[dir] + chg
250
200
end
251
201
252
function Sprite:update (elapsed)
253
if self.onUpdate then self:onUpdate(elapsed) end
254
end
255
256
202
GameView = View:extend {
257
203
onNew = function (self)
258
204
self:loadLayers('data/map.lua')
259
205
self.focus = the.player
260
206
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
207
end,
274
208
onUpdate = function (self)
275
--print('drawTook: ', the.drawTook)
276
209
--print('tick')
277
210
--the.player:collide(self.map)
278
211
--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
212
end
285
213
}
286
214
287
215
the.app = App:new {
290
217
self.view = GameView:new()
291
218
self.console:watch('onGround', 'the.player.onGround')
292
219
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
220
end,
301
221
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
222
if the.keys:justPressed('escape') and
223
not self.console.visible then
322
224
self.quit()
323
225
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
}
226
end
227
}
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1