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 38
- compare with another revision
- download diff
- download tarball
- view history from revision 38
- Committer: Josh C
- Date: 2013-04-16 00:27:10 UTC
- Revision ID: josh@9ix.org-20130416002710-4soqj70ln7hdrzdb
testing audio
- files added:
- animation.lua
- files modified:
- data/map.lua
added
removed
main.lua
5
5
__ = require 'underscore'
6
6
--inspect = require 'inspect'
7
7
require 'pepperprof'
8
9
Player = Animation:extend {
10
image = 'data/player.png',
11
height = 32,
12
width = 32,
13
sequences = {
14
stand = { frames = { 1 }, fps = 1 },
15
walk = { frames = { 2, 3 }, fps = 5 },
16
jump = { frames = { 4 }, fps = 1 },
17
climbLeft = { frames = { 5, 6 }, fps = 5 },
18
climbRight = { frames = { 7, 8 }, fps = 5 }
19
},
20
collisions = {},
21
onWall = false,
22
leftWallAt = 0,
23
onNew = function (self)
24
self.velocity.y = 0
25
self.maxVelocity.y = 400
26
end,
27
doPhysics = function (self, dir, elapsed)
28
local vel = self.velocity
29
local acc = self.acceleration
30
local drag = self.drag
31
local minVel = self.minVelocity
32
local maxVel = self.maxVelocity
33
34
-- check existence of properties
35
36
if STRICT then
37
assert(vel, 'active sprite has no velocity property')
38
assert(acc, 'active sprite has no acceleration property')
39
assert(drag, 'active sprite has no drag property')
40
assert(minVel, 'active sprite has no minVelocity property')
41
assert(maxVel, 'active sprite has no maxVelocity property')
42
assert(__.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
43
end
44
45
vel.x = vel.x or 0
46
vel.y = vel.y or 0
47
vel.rotation = vel.rotation or 0
48
49
-- physics
50
51
if acc[dir] and acc[dir] ~= 0 then
52
vel[dir] = vel[dir] + acc[dir] * elapsed
53
else
54
if drag[dir] then
55
if vel[dir] > 0 then
56
vel[dir] = vel[dir] - drag[dir] * elapsed
57
if vel[dir] < 0 then vel[dir] = 0 end
58
elseif vel[dir] < 0 then
59
vel[dir] = vel[dir] + drag[dir] * elapsed
60
if vel[dir] > 0 then vel[dir] = 0 end
61
end
62
end
63
end
64
65
if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
66
if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
67
68
if vel[dir] ~= 0 then self[dir] = self[dir] + vel[dir] * elapsed end
69
end,
70
onStartFrame = function (self)
71
-- this is all in startframe so it happens before
72
-- physics calc at beginning of update
73
74
-- jumping/falling updates could go in EndFrame...
75
self.falling = self.velocity.y > 0
76
if self.falling then self.jumping = false end
77
--print(self.jumping, self.falling)
78
79
if (not self.onGround) and (not self.onWall) then
80
self:play('jump')
81
end
82
83
self.acceleration.y = 800
84
85
if self.onWall then
86
self.acceleration.y = 0
87
88
if self.onWall == 'right' then
89
self:play('climbRight')
90
elseif self.onWall == 'left' then
91
self:play('climbLeft')
92
end
93
94
if the.keys:pressed('up') then
95
self.velocity.y = -200
96
elseif the.keys:pressed('down') then
97
self.velocity.y = 200
98
else
99
self.velocity.y = 0
100
self:freeze(self.sequences[self.currentName].frames[1])
101
end
102
end
103
104
if the.keys:pressed('left') then
105
self.velocity.x = -200
106
if self.onGround then self:play('walk') end
107
if self.onWall == 'right' then
108
self.onWall = false
109
self.leftWallAt = love.timer.getTime()
110
end
111
elseif the.keys:pressed('right') then
112
self.velocity.x = 200
113
if self.onGround then self:play('walk') end
114
if self.onWall == 'left' then
115
self.onWall = false
116
self.leftWallAt = love.timer.getTime()
117
end
118
else
119
if not self.onWall then
120
if self.onGround then self:play('stand') end
121
self.velocity.x = 0
122
end
123
end
124
125
if the.keys:justPressed('up') and
126
(self.onGround or
127
(love.timer.getTime() - self.leftWallAt < .1) ) then
128
self.velocity.y = -400
129
self.jumping = true
130
end
131
end,
132
update = function (self, elapsed)
133
-- NOTE: this is an override, not a callback
134
135
self:doPhysics('x', elapsed)
136
self:collide(the.view.map)
137
138
-- handle X collisions
139
self.onWall = false
140
for _, col in ipairs(self.collisions) do
141
col.other:displaceDir(self, 'x')
142
if self.velocity.x > 0 then
143
self.onWall = 'right'
144
elseif self.velocity.x < 0 then
145
self.onWall = 'left'
146
else
147
print 'x ??'
148
end
149
end
150
151
self.onGround = false -- right before Y collision callbacks
152
self:doPhysics('y', elapsed)
153
self:collide(the.view.map)
154
155
-- handle Y collisions
156
for _, col in ipairs(self.collisions) do
157
if self.velocity.y > 0 then
158
self.onGround = true
159
end
160
161
col.other:displaceDir(self, 'y')
162
self.velocity.y = 0
163
self.jumping = false
164
end
165
166
Animation.update(self, elapsed)
167
end,
168
collide = function (self, ...)
169
self.collisions = {}
170
Animation.collide(self, ...)
171
-- I could return a true/false value here if I wanted to...
172
end,
173
onCollide = function (self, other, xOverlap, yOverlap)
174
if other == the.view.map then return end
175
176
table.insert(self.collisions, {other = other,
177
xOverlap = xOverlap,
178
yOverlap = yOverlap })
179
end
180
}
181
182
function Sprite:displaceDir(other, dir)
183
if not self.solid or self == other or not other.solid then return end
184
if STRICT then assert(other:instanceOf(Sprite), 'asked to displace a non-sprite') end
185
186
if other.sprites then
187
-- handle groups
188
189
for _, spr in pairs(other.sprites) do
190
self:displace(spr, dir)
191
end
192
else
193
-- handle sprites
194
local dim
8
require 'getopt_alt'
9
10
require 'sprite'
11
require 'animation'
12
require 'player'
13
require 'balloon'
14
15
util = {
16
dim = function(dir)
195
17
if dir == 'x' then
196
dim = 'width'
18
return 'width'
197
19
elseif dir == 'y' then
198
dim = 'height'
199
else
200
print 'dir ??'
201
end
202
203
local negMove = (other[dir] - self[dir]) + other[dim]
204
local posMove = (self[dir] + self[dim]) - other[dir]
205
206
-- TODO: re-add hinting?
207
if negMove < posMove then
208
chg = - negMove
209
else
210
chg = posMove
20
return 'height'
21
else
22
if STRICT then error('dir '..dir) end
211
23
end
212
24
end
213
214
other[dir] = other[dir] + chg
215
end
25
}
216
26
217
27
GameView = View:extend {
218
28
onNew = function (self)
219
29
self:loadLayers('data/map.lua')
220
30
self.focus = the.player
221
31
self:clampTo(self.map)
32
33
the.recorder = Recorder:new{mousePosInterval = 9999}
34
the.app.meta:add(the.recorder)
35
if the.app.record then
36
the.recorder:startRecording()
37
elseif the.app.playback then
38
local storage = Storage:new{filename = 'record.lua'}
39
storage:load()
40
--print(inspect(storage.data))
41
the.recorder.record = storage.data
42
the.recorder:startPlaying()
43
end
222
44
end,
223
45
onUpdate = function (self)
46
--print('drawTook: ', the.drawTook)
224
47
--print('tick')
225
48
--the.player:collide(self.map)
226
49
--self.map:collide(the.player)
227
end
50
end,
51
-- draw = function (self, x, y)
52
-- View.draw(self, x, y)
53
54
-- love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
55
-- end
228
56
}
229
57
230
58
the.app = App:new {
59
record = true,
231
60
onRun = function (self)
232
61
self.view = GameView:new()
233
self.console:watch('onGround', 'the.player.onGround')
234
self.console:watch('onWall', 'the.player.onWall')
235
self.console:watch('updateTook', 'the.updateTook')
236
self.console:watch('drawTook', 'the.drawTook')
62
if DEBUG then
63
self.console:watch('onGround', 'the.player.onGround')
64
self.console:watch('onWall', 'the.player.onWall')
65
self.console:watch('updateTook', 'the.updateTook')
66
self.console:watch('drawTook', 'the.drawTook')
67
self.console:watch('recorder state', 'the.recorder.state')
68
end
237
69
238
70
--the.profiler = newProfiler('time', 2000)
239
71
--the.profiler = newProfiler()
249
80
outfile:close()
250
81
end
251
82
83
if self.record then
84
if not love.filesystem.remove('record.lua') then
85
print('could not remove record.lua')
86
end
87
local storage = Storage:new{
88
data = the.recorder.record,
89
filename = 'record.lua'
90
}
91
storage:save(false)
92
--print(inspect(the.recorder.record))
93
end
94
252
95
self.quit()
253
96
end
254
97
end,
260
103
end
261
104
end
262
105
}
106
107
function love.load (arg)
108
opts = getopt(arg, '')
109
if opts['p'] then
110
the.app.playback = true
111
the.app.record = false
112
elseif opts['r'] then
113
the.app.record = true
114
end
115
116
the.app:run()
117
end
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1