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 39
- compare with another revision
- download diff
- download tarball
- view history from revision 39
- Committer: Josh C
- Date: 2013-04-19 01:35:57 UTC
- Revision ID: josh@9ix.org-20130419013557-jbmje9kqsagj0x3j
title screen
- files added:
- animation.lua
- files modified:
- main.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
7
require 'pepperprof'
8
require 'getopt_alt'
9
10
require 'sprite'
11
require 'animation'
12
require 'player'
13
require 'balloon'
10
14
11
15
util = {
12
16
dim = function(dir)
20
24
end
21
25
}
22
26
23
Player = Animation:extend {
24
image = 'data/player.png',
25
height = 32,
26
width = 32,
27
sequences = {
28
stand = { frames = { 1 }, fps = 1 },
29
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 }
33
},
34
collisions = {},
35
onWall = false,
36
leftWallAt = 0,
37
onNew = function (self)
38
self.velocity.y = 0
39
self.maxVelocity.y = 400
40
end,
41
doPhysics = function (self, dir, elapsed)
42
local vel = self.velocity
43
local acc = self.acceleration
44
local drag = self.drag
45
local minVel = self.minVelocity
46
local maxVel = self.maxVelocity
47
48
-- check existence of properties
49
50
if STRICT then
51
assert(vel, 'active sprite has no velocity property')
52
assert(acc, 'active sprite has no acceleration property')
53
assert(drag, 'active sprite has no drag property')
54
assert(minVel, 'active sprite has no minVelocity property')
55
assert(maxVel, 'active sprite has no maxVelocity property')
56
assert(__.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
57
end
58
59
vel.x = vel.x or 0
60
vel.y = vel.y or 0
61
vel.rotation = vel.rotation or 0
62
63
-- physics
64
65
if acc[dir] and acc[dir] ~= 0 then
66
vel[dir] = vel[dir] + acc[dir] * elapsed
67
else
68
if drag[dir] then
69
if vel[dir] > 0 then
70
vel[dir] = vel[dir] - drag[dir] * elapsed
71
if vel[dir] < 0 then vel[dir] = 0 end
72
elseif vel[dir] < 0 then
73
vel[dir] = vel[dir] + drag[dir] * elapsed
74
if vel[dir] > 0 then vel[dir] = 0 end
75
end
76
end
77
end
78
79
if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
80
if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
81
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
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
end,
96
onStartFrame = function (self)
97
-- this is all in startframe so it happens before
98
-- physics calc at beginning of update
99
100
-- jumping/falling updates could go in EndFrame...
101
self.falling = self.velocity.y > 0
102
if self.falling then self.jumping = false end
103
--print(self.jumping, self.falling)
104
105
if (not self.onGround) and (not self.onWall) then
106
self:play('jump')
107
end
108
109
self.acceleration.y = 800
110
111
if self.onWall then
112
self.acceleration.y = 0
113
114
if self.onWall == 'right' then
115
self:play('climbRight')
116
elseif self.onWall == 'left' then
117
self:play('climbLeft')
118
end
119
120
if the.keys:pressed('up') then
121
self.velocity.y = -200
122
elseif the.keys:pressed('down') then
123
self.velocity.y = 200
124
else
125
self.velocity.y = 0
126
self:freeze(self.sequences[self.currentName].frames[1])
127
end
128
end
129
130
if the.keys:pressed('left') then
131
self.velocity.x = -200
132
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
137
elseif the.keys:pressed('right') then
138
self.velocity.x = 200
139
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
144
else
145
if not self.onWall then
146
if self.onGround then self:play('stand') end
147
self.velocity.x = 0
148
end
149
end
150
151
if the.keys:justPressed('up') and
152
(self.onGround or the.console.visible or
153
(love.timer.getTime() - self.leftWallAt < .1) ) then
154
self.velocity.y = -400
155
self.jumping = true
156
end
157
end,
158
update = function (self, elapsed)
159
-- NOTE: this is an override, not a callback
160
161
self:doPhysics('x', elapsed)
162
self:collide(the.view.map)
163
164
-- handle X collisions
165
self.onWall = false
166
for _, col in ipairs(self.collisions) do
167
col.other:displaceDir(self, 'x')
168
if self.velocity.x > 0 then
169
self.onWall = 'right'
170
elseif self.velocity.x < 0 then
171
self.onWall = 'left'
172
else
173
print 'x ??'
174
end
175
end
176
177
self.onGround = false -- right before Y collision callbacks
178
self:doPhysics('y', elapsed)
179
self:collide(the.view.map)
180
181
-- handle Y collisions
182
for _, col in ipairs(self.collisions) do
183
if self.velocity.y > 0 then
184
self.onGround = true
185
end
186
187
col.other:displaceDir(self, 'y')
188
self.velocity.y = 0
189
self.jumping = false
190
end
191
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
Animation.update(self, elapsed)
208
end,
209
collide = function (self, ...)
210
self.collisions = {}
211
Animation.collide(self, ...)
212
-- I could return a true/false value here if I wanted to...
213
end,
214
onCollide = function (self, other, xOverlap, yOverlap)
215
if other == the.view.map then return end
216
217
table.insert(self.collisions, {other = other,
218
xOverlap = xOverlap,
219
yOverlap = yOverlap })
220
end
221
}
222
223
function Sprite:displaceDir(other, dir)
224
if not self.solid or self == other or not other.solid then return end
225
if STRICT then assert(other:instanceOf(Sprite), 'asked to displace a non-sprite') end
226
227
if other.sprites then
228
-- handle groups
229
230
for _, spr in pairs(other.sprites) do
231
self:displace(spr, dir)
232
end
233
else
234
-- handle sprites
235
local dim = util.dim(dir)
236
237
local negMove = (other[dir] - self[dir]) + other[dim]
238
local posMove = (self[dir] + self[dim]) - other[dir]
239
240
-- TODO: re-add hinting?
241
if negMove < posMove then
242
chg = - negMove
243
else
244
chg = posMove
245
end
246
end
247
248
other[dir] = other[dir] + chg
249
end
250
251
function Sprite:update (elapsed)
252
if self.onUpdate then self:onUpdate(elapsed) end
253
end
254
255
27
GameView = View:extend {
256
28
onNew = function (self)
257
29
self:loadLayers('data/map.lua')
262
32
263
33
the.recorder = Recorder:new{mousePosInterval = 9999}
264
34
the.app.meta:add(the.recorder)
265
if RECORD then
35
if the.app.record then
266
36
the.recorder:startRecording()
267
elseif PLAYBACK then
37
elseif the.app.playback then
268
38
local storage = Storage:new{filename = 'record.lua'}
269
39
storage:load()
270
40
--print(inspect(storage.data))
285
55
-- end
286
56
}
287
57
58
MenuScreen = View:extend {
59
--title = Text:new{text = "Test Platform Game", font = 48, wordWrap = false},
60
title = Tile:new{image = 'data/title.png', x = 0, y = 0},
61
onNew = function(self)
62
self:add(self.title)
63
--self.title:centerAround(400, 200)
64
end,
65
onUpdate = function(self, elapsed)
66
if the.keys:allJustPressed() then
67
the.app.view = GameView:new()
68
end
69
end
70
}
71
288
72
the.app = App:new {
73
record = true,
289
74
onRun = function (self)
290
self.view = GameView:new()
291
self.console:watch('onGround', 'the.player.onGround')
292
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')
75
self.view = MenuScreen:new()
76
if DEBUG then
77
self.console:watch('onGround', 'the.player.onGround')
78
self.console:watch('onWall', 'the.player.onWall')
79
self.console:watch('updateTook', 'the.updateTook')
80
self.console:watch('drawTook', 'the.drawTook')
81
self.console:watch('recorder state', 'the.recorder.state')
82
end
296
83
297
84
--the.profiler = newProfiler('time', 2000)
298
85
--the.profiler = newProfiler()
307
94
outfile:close()
308
95
end
309
96
310
if RECORD then
97
if self.record and the.recorder then
311
98
if not love.filesystem.remove('record.lua') then
312
error('could not remove record.lua')
99
print('could not remove record.lua')
313
100
end
314
101
local storage = Storage:new{
315
102
data = the.recorder.record,
330
117
end
331
118
end
332
119
}
120
121
function love.load (arg)
122
opts = getopt(arg, '')
123
if opts['p'] then
124
the.app.playback = true
125
the.app.record = false
126
elseif opts['r'] then
127
the.app.record = true
128
end
129
130
the.app:run()
131
end
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1