bzr branch
http://9ix.org/bzr/zoeplat
|
2
by Josh C
basic tiles, map, player, movement |
1 |
STRICT = true |
2 |
DEBUG = true |
|
3 |
||
4 |
require 'zoetrope' |
|
|
20
by Josh C
fairly major overhaul of collision handling to track whether we're on a |
5 |
__ = require 'underscore' |
|
12
by Josh C
only jump when you're on the ground |
6 |
--inspect = require 'inspect' |
|
24
by Josh C
profiling and analysis |
7 |
require 'pepperprof' |
|
2
by Josh C
basic tiles, map, player, movement |
8 |
|
|
10
by Josh C
make player an animation |
9 |
Player = Animation:extend {
|
|
2
by Josh C
basic tiles, map, player, movement |
10 |
image = 'data/player.png', |
|
10
by Josh C
make player an animation |
11 |
height = 32, |
12 |
width = 32, |
|
13 |
sequences = {
|
|
14 |
stand = { frames = { 1 }, fps = 1 },
|
|
15 |
walk = { frames = { 2, 3 }, fps = 5 },
|
|
|
22
by Josh C
climbing animation |
16 |
jump = { frames = { 4 }, fps = 1 },
|
17 |
climbLeft = { frames = { 5, 6 }, fps = 5 },
|
|
18 |
climbRight = { frames = { 7, 8 }, fps = 5 }
|
|
|
10
by Josh C
make player an animation |
19 |
}, |
|
20
by Josh C
fairly major overhaul of collision handling to track whether we're on a |
20 |
collisions = {},
|
21 |
onWall = false, |
|
|
23
by Josh C
wall jump |
22 |
leftWallAt = 0, |
|
3
by Josh C
jump |
23 |
onNew = function (self) |
24 |
self.velocity.y = 0 |
|
|
5
by Josh C
use built-in maxVelocity system |
25 |
self.maxVelocity.y = 400 |
|
3
by Josh C
jump |
26 |
end, |
|
17
by Josh C
reorganize code - separate X and Y physics so we can collide in each |
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') |
|
|
20
by Josh C
fairly major overhaul of collision handling to track whether we're on a |
42 |
assert(__.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
|
|
17
by Josh C
reorganize code - separate X and Y physics so we can collide in each |
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, |
|
|
4
by Josh C
fix jitter caused by focus shift happening in the wrong order. Looks |
70 |
onStartFrame = function (self) |
71 |
-- this is all in startframe so it happens before |
|
72 |
-- physics calc at beginning of update |
|
|
3
by Josh C
jump |
73 |
|
|
12
by Josh C
only jump when you're on the ground |
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 |
||
|
19
by Josh C
climb walls |
79 |
if (not self.onGround) and (not self.onWall) then |
|
13
by Josh C
reapply jump animation after Y collision. (there's a frame of no |
80 |
self:play('jump')
|
81 |
end |
|
82 |
||
|
6
by Josh C
whitespace cleanup |
83 |
self.acceleration.y = 800 |
84 |
||
|
19
by Josh C
climb walls |
85 |
if self.onWall then |
86 |
self.acceleration.y = 0 |
|
87 |
||
|
22
by Josh C
climbing animation |
88 |
if self.onWall == 'right' then |
89 |
self:play('climbRight')
|
|
90 |
elseif self.onWall == 'left' then |
|
91 |
self:play('climbLeft')
|
|
92 |
end |
|
93 |
||
|
19
by Josh C
climb walls |
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 |
|
|
22
by Josh C
climbing animation |
100 |
self:freeze(self.sequences[self.currentName].frames[1]) |
|
19
by Josh C
climb walls |
101 |
end |
102 |
end |
|
103 |
||
|
6
by Josh C
whitespace cleanup |
104 |
if the.keys:pressed('left') then
|
105 |
self.velocity.x = -200 |
|
|
15
by Josh C
more reliable onGround calc |
106 |
if self.onGround then self:play('walk') end
|
|
23
by Josh C
wall jump |
107 |
if self.onWall == 'right' then |
108 |
self.onWall = false |
|
109 |
self.leftWallAt = love.timer.getTime() |
|
110 |
end |
|
|
6
by Josh C
whitespace cleanup |
111 |
elseif the.keys:pressed('right') then
|
112 |
self.velocity.x = 200 |
|
|
15
by Josh C
more reliable onGround calc |
113 |
if self.onGround then self:play('walk') end
|
|
23
by Josh C
wall jump |
114 |
if self.onWall == 'left' then |
115 |
self.onWall = false |
|
116 |
self.leftWallAt = love.timer.getTime() |
|
117 |
end |
|
|
10
by Josh C
make player an animation |
118 |
else |
|
21
by Josh C
really easy version of knowing when we reached the top of a wall. |
119 |
if not self.onWall then |
|
22
by Josh C
climbing animation |
120 |
if self.onGround then self:play('stand') end
|
|
21
by Josh C
really easy version of knowing when we reached the top of a wall. |
121 |
self.velocity.x = 0 |
122 |
end |
|
|
6
by Josh C
whitespace cleanup |
123 |
end |
124 |
||
|
23
by Josh C
wall jump |
125 |
if the.keys:justPressed('up') and
|
|
25
by Josh C
build more level |
126 |
(self.onGround or the.console.visible or |
|
23
by Josh C
wall jump |
127 |
(love.timer.getTime() - self.leftWallAt < .1) ) then |
|
6
by Josh C
whitespace cleanup |
128 |
self.velocity.y = -400 |
|
12
by Josh C
only jump when you're on the ground |
129 |
self.jumping = true |
|
6
by Josh C
whitespace cleanup |
130 |
end |
131 |
end, |
|
|
17
by Josh C
reorganize code - separate X and Y physics so we can collide in each |
132 |
update = function (self, elapsed) |
133 |
-- NOTE: this is an override, not a callback |
|
134 |
||
135 |
self:doPhysics('x', elapsed)
|
|
|
20
by Josh C
fairly major overhaul of collision handling to track whether we're on a |
136 |
self:collide(the.view.map) |
137 |
||
138 |
-- handle X collisions |
|
|
21
by Josh C
really easy version of knowing when we reached the top of a wall. |
139 |
self.onWall = false |
|
20
by Josh C
fairly major overhaul of collision handling to track whether we're on a |
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 |
|
|
17
by Josh C
reorganize code - separate X and Y physics so we can collide in each |
150 |
|
151 |
self.onGround = false -- right before Y collision callbacks |
|
152 |
self:doPhysics('y', elapsed)
|
|
153 |
self:collide(the.view.map) |
|
|
18
by Josh C
call Animation.update so we actually get animations |
154 |
|
|
20
by Josh C
fairly major overhaul of collision handling to track whether we're on a |
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 |
||
|
18
by Josh C
call Animation.update so we actually get animations |
166 |
Animation.update(self, elapsed) |
|
17
by Josh C
reorganize code - separate X and Y physics so we can collide in each |
167 |
end, |
|
20
by Josh C
fairly major overhaul of collision handling to track whether we're on a |
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, |
|
|
8
by Josh C
some basic collision (and workarounds) |
173 |
onCollide = function (self, other, xOverlap, yOverlap) |
174 |
if other == the.view.map then return end |
|
175 |
||
|
20
by Josh C
fairly major overhaul of collision handling to track whether we're on a |
176 |
table.insert(self.collisions, {other = other,
|
177 |
xOverlap = xOverlap, |
|
178 |
yOverlap = yOverlap }) |
|
179 |
end |
|
|
2
by Josh C
basic tiles, map, player, movement |
180 |
} |
181 |
||
|
20
by Josh C
fairly major overhaul of collision handling to track whether we're on a |
182 |
-- displace on a specific axis (monkey patch Sprite) |
183 |
function Sprite:displaceDir(other, dir) |
|
184 |
if not self.solid or self == other or not other.solid then return end |
|
185 |
if STRICT then assert(other:instanceOf(Sprite), 'asked to displace a non-sprite') end |
|
186 |
||
187 |
if other.sprites then |
|
188 |
-- handle groups |
|
189 |
||
190 |
for _, spr in pairs(other.sprites) do |
|
191 |
self:displace(spr, dir) |
|
192 |
end |
|
193 |
else |
|
194 |
-- handle sprites |
|
195 |
local dim |
|
196 |
if dir == 'x' then |
|
197 |
dim = 'width' |
|
198 |
elseif dir == 'y' then |
|
199 |
dim = 'height' |
|
200 |
else |
|
201 |
print 'dir ??' |
|
202 |
end |
|
203 |
||
204 |
local negMove = (other[dir] - self[dir]) + other[dim] |
|
205 |
local posMove = (self[dir] + self[dim]) - other[dir] |
|
206 |
||
207 |
-- TODO: re-add hinting? |
|
208 |
if negMove < posMove then |
|
209 |
chg = - negMove |
|
210 |
else |
|
211 |
chg = posMove |
|
212 |
end |
|
213 |
end |
|
214 |
||
215 |
other[dir] = other[dir] + chg |
|
216 |
end |
|
217 |
||
|
2
by Josh C
basic tiles, map, player, movement |
218 |
GameView = View:extend {
|
219 |
onNew = function (self) |
|
220 |
self:loadLayers('data/map.lua')
|
|
221 |
self.focus = the.player |
|
222 |
self:clampTo(self.map) |
|
|
8
by Josh C
some basic collision (and workarounds) |
223 |
end, |
224 |
onUpdate = function (self) |
|
225 |
--print('tick')
|
|
|
17
by Josh C
reorganize code - separate X and Y physics so we can collide in each |
226 |
--the.player:collide(self.map) |
|
8
by Josh C
some basic collision (and workarounds) |
227 |
--self.map:collide(the.player) |
228 |
end |
|
|
2
by Josh C
basic tiles, map, player, movement |
229 |
} |
230 |
||
231 |
the.app = App:new {
|
|
232 |
onRun = function (self) |
|
233 |
self.view = GameView:new() |
|
|
15
by Josh C
more reliable onGround calc |
234 |
self.console:watch('onGround', 'the.player.onGround')
|
|
16
by Josh C
try to track X collisions. break out Sprite's physics in prep for |
235 |
self.console:watch('onWall', 'the.player.onWall')
|
|
24
by Josh C
profiling and analysis |
236 |
self.console:watch('updateTook', 'the.updateTook')
|
237 |
self.console:watch('drawTook', 'the.drawTook')
|
|
238 |
||
239 |
--the.profiler = newProfiler('time', 2000)
|
|
240 |
--the.profiler = newProfiler() |
|
241 |
--the.profiler:start() |
|
|
2
by Josh C
basic tiles, map, player, movement |
242 |
end, |
243 |
onUpdate = function (self, dt) |
|
|
24
by Josh C
profiling and analysis |
244 |
if the.keys:justPressed('escape') then
|
245 |
if the.profiler then |
|
246 |
the.profiler:stop() |
|
247 |
local outfile = io.open( "profile.txt", "w+" ) |
|
248 |
the.profiler:report( outfile ) |
|
249 |
outfile:close() |
|
250 |
end |
|
251 |
||
|
17
by Josh C
reorganize code - separate X and Y physics so we can collide in each |
252 |
self.quit() |
|
12
by Josh C
only jump when you're on the ground |
253 |
end |
|
24
by Josh C
profiling and analysis |
254 |
end, |
255 |
update = function (self, dt) |
|
256 |
the.updateStart = love.timer.getMicroTime() |
|
257 |
App.update(self, dt) |
|
258 |
if the.updateStart then |
|
259 |
the.updateTook = love.timer.getMicroTime() - the.updateStart |
|
260 |
end |
|
261 |
end |
|
262 |
} |