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 16
- compare with another revision
- download diff
- download tarball
- view history from revision 16
- Committer: Josh C
- Date: 2013-03-09 06:03:56 UTC
- Revision ID: josh@9ix.org-20130309060356-qvi2yd0odhfr3e6t
try to track X collisions. break out Sprite's physics in prep for
overriding them completely.
overriding them completely.
- files removed:
- pepperprof.lua
- files modified:
- data/player.png
added
removed
main.lua
2
2
DEBUG = true
3
3
4
4
require 'zoetrope'
5
__ = require 'underscore'
6
5
--inspect = require 'inspect'
7
require 'pepperprof'
6
--_ = require 'underscore'
8
7
9
8
Player = Animation:extend {
10
9
image = 'data/player.png',
13
12
sequences = {
14
13
stand = { frames = { 1 }, fps = 1 },
15
14
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 }
15
jump = { frames = { 4 }, fps = 1 }
19
16
},
20
collisions = {},
21
onWall = false,
22
leftWallAt = 0,
23
17
onNew = function (self)
24
18
self.velocity.y = 0
25
19
self.maxVelocity.y = 400
26
20
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
21
onStartFrame = function (self)
71
22
-- this is all in startframe so it happens before
72
23
-- physics calc at beginning of update
76
27
if self.falling then self.jumping = false end
77
28
--print(self.jumping, self.falling)
78
29
79
if (not self.onGround) and (not self.onWall) then
30
if not self.onGround then
80
31
self:play('jump')
81
32
end
82
33
34
self.velocity.x = 0
83
35
self.acceleration.y = 800
84
36
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
37
if the.keys:pressed('left') then
105
38
self.velocity.x = -200
106
39
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
40
elseif the.keys:pressed('right') then
112
41
self.velocity.x = 200
113
42
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
43
else
119
if not self.onWall then
120
if self.onGround then self:play('stand') end
121
self.velocity.x = 0
122
end
44
if self.onGround then self:play('stand') end
123
45
end
124
46
125
if the.keys:justPressed('up') and
126
(self.onGround or
127
(love.timer.getTime() - self.leftWallAt < .1) ) then
47
if the.keys:justPressed('up') and self.onGround then
128
48
self.velocity.y = -400
129
49
self.jumping = true
130
50
end
131
51
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,
52
onUpdate = function (self)
53
-- needs to happen right before collision
54
self.onGround = false
55
end,
173
56
onCollide = function (self, other, xOverlap, yOverlap)
57
-- seriously, why does this even fire?
174
58
if other == the.view.map then return end
175
59
176
table.insert(self.collisions, {other = other,
177
xOverlap = xOverlap,
178
yOverlap = yOverlap })
179
end
60
--print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
61
--print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
62
63
-- assumption: any other collision is with a solid map tile
64
if yOverlap > xOverlap then
65
other:displace(self)
66
67
if self.velocity.x > 0 then
68
self.onWall = 'right'
69
elseif self.velocity.x < 0 then
70
self.onWall = 'left'
71
else
72
print '??'
73
end
74
elseif xOverlap > yOverlap then
75
-- check if we've moved since collisions were generated
76
local xov, yov = self:overlap(other.x, other.y,
77
other.width, other.height)
78
if xov ~= 0 and yov ~= 0 then
79
--print('y collision')
80
if self.velocity.y > 0 then
81
self.onGround = true
82
end
83
84
self.velocity.y = 0
85
other:displace(self)
86
self.jumping = false
87
end
88
else
89
print('??')
90
end
91
92
end,
180
93
}
181
94
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
195
if dir == 'x' then
196
dim = 'width'
197
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
211
end
212
end
213
214
other[dir] = other[dir] + chg
215
end
216
217
95
GameView = View:extend {
218
96
onNew = function (self)
219
97
self:loadLayers('data/map.lua')
223
100
end,
224
101
onUpdate = function (self)
225
102
--print('tick')
226
--the.player:collide(self.map)
103
the.player:collide(self.map)
227
104
--self.map:collide(the.player)
228
105
end
229
106
}
231
108
the.app = App:new {
232
109
onRun = function (self)
233
110
self.view = GameView:new()
111
--print(inspect(_(the.app):keys()))
234
112
self.console:watch('onGround', 'the.player.onGround')
235
113
self.console:watch('onWall', 'the.player.onWall')
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()
242
114
end,
243
115
onUpdate = function (self, dt)
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
252
self.quit()
116
if the.keys:justPressed('escape') and
117
not self.console.visible then
118
love.event.quit()
253
119
end
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
}
120
end
121
}
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1