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 17
- compare with another revision
- download diff
- download tarball
- view history from revision 17
- Committer: Josh C
- Date: 2013-03-10 21:55:44 UTC
- Revision ID: josh@9ix.org-20130310215544-iqzp3x2l10h9247f
reorganize code - separate X and Y physics so we can collide in each
direction separately
direction separately
- 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'
5
_ = require 'underscore'
6
6
--inspect = require 'inspect'
7
require 'pepperprof'
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
39
33
assert(drag, 'active sprite has no drag property')
40
34
assert(minVel, 'active sprite has no minVelocity property')
41
35
assert(maxVel, 'active sprite has no maxVelocity property')
42
assert(__.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
36
assert(_.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
43
37
end
44
38
45
39
vel.x = vel.x or 0
76
70
if self.falling then self.jumping = false end
77
71
--print(self.jumping, self.falling)
78
72
79
if (not self.onGround) and (not self.onWall) then
73
if not self.onGround then
80
74
self:play('jump')
81
75
end
82
76
77
self.velocity.x = 0
83
78
self.acceleration.y = 800
84
79
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
80
if the.keys:pressed('left') then
105
81
self.velocity.x = -200
106
82
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
83
elseif the.keys:pressed('right') then
112
84
self.velocity.x = 200
113
85
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
86
else
119
if not self.onWall then
120
if self.onGround then self:play('stand') end
121
self.velocity.x = 0
122
end
87
if self.onGround then self:play('stand') end
123
88
end
124
89
125
if the.keys:justPressed('up') and
126
(self.onGround or
127
(love.timer.getTime() - self.leftWallAt < .1) ) then
90
if the.keys:justPressed('up') and self.onGround then
128
91
self.velocity.y = -400
129
92
self.jumping = true
130
93
end
133
96
-- NOTE: this is an override, not a callback
134
97
135
98
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
99
151
100
self.onGround = false -- right before Y collision callbacks
152
101
self:doPhysics('y', elapsed)
102
153
103
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
104
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
105
onCollide = function (self, other, xOverlap, yOverlap)
106
-- seriously, why does this even fire?
174
107
if other == the.view.map then return end
175
108
176
table.insert(self.collisions, {other = other,
177
xOverlap = xOverlap,
178
yOverlap = yOverlap })
179
end
109
--print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
110
--print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
111
112
-- assumption: any other collision is with a solid map tile
113
if yOverlap > xOverlap then
114
other:displace(self)
115
116
if self.velocity.x > 0 then
117
self.onWall = 'right'
118
elseif self.velocity.x < 0 then
119
self.onWall = 'left'
120
else
121
print 'x ??'
122
end
123
elseif xOverlap > yOverlap then
124
-- check if we've moved since collisions were generated
125
local xov, yov = self:overlap(other.x, other.y,
126
other.width, other.height)
127
if xov ~= 0 and yov ~= 0 then
128
--print('y collision')
129
if self.velocity.y > 0 then
130
self.onGround = true
131
end
132
133
self.velocity.y = 0
134
other:displace(self)
135
self.jumping = false
136
end
137
else
138
print('xy ??')
139
end
140
141
end,
180
142
}
181
143
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
144
GameView = View:extend {
218
145
onNew = function (self)
219
146
self:loadLayers('data/map.lua')
231
157
the.app = App:new {
232
158
onRun = function (self)
233
159
self.view = GameView:new()
160
--print(inspect(_(the.app):keys()))
234
161
self.console:watch('onGround', 'the.player.onGround')
235
162
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
163
end,
243
164
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
165
if the.keys:justPressed('escape') and
166
not self.console.visible then
252
167
self.quit()
253
168
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
}
169
end
170
}
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1