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 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
7
8
8
Player = Animation:extend {
12
12
sequences = {
13
13
stand = { frames = { 1 }, fps = 1 },
14
14
walk = { frames = { 2, 3 }, fps = 5 },
15
jump = { frames = { 4 }, fps = 1 },
16
climbLeft = { frames = { 5, 6 }, fps = 5 },
17
climbRight = { frames = { 7, 8 }, fps = 5 }
15
jump = { frames = { 4 }, fps = 1 }
18
16
},
19
collisions = {},
20
onWall = false,
21
leftWallAt = 0,
22
17
onNew = function (self)
23
18
self.velocity.y = 0
24
19
self.maxVelocity.y = 400
38
33
assert(drag, 'active sprite has no drag property')
39
34
assert(minVel, 'active sprite has no minVelocity property')
40
35
assert(maxVel, 'active sprite has no maxVelocity property')
41
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')
42
37
end
43
38
44
39
vel.x = vel.x or 0
75
70
if self.falling then self.jumping = false end
76
71
--print(self.jumping, self.falling)
77
72
78
if (not self.onGround) and (not self.onWall) then
73
if not self.onGround then
79
74
self:play('jump')
80
75
end
81
76
77
self.velocity.x = 0
82
78
self.acceleration.y = 800
83
79
84
if self.onWall then
85
self.acceleration.y = 0
86
87
if self.onWall == 'right' then
88
self:play('climbRight')
89
elseif self.onWall == 'left' then
90
self:play('climbLeft')
91
end
92
93
if the.keys:pressed('up') then
94
self.velocity.y = -200
95
elseif the.keys:pressed('down') then
96
self.velocity.y = 200
97
else
98
self.velocity.y = 0
99
self:freeze(self.sequences[self.currentName].frames[1])
100
end
101
end
102
103
80
if the.keys:pressed('left') then
104
81
self.velocity.x = -200
105
82
if self.onGround then self:play('walk') end
106
if self.onWall == 'right' then
107
self.onWall = false
108
self.leftWallAt = love.timer.getTime()
109
end
110
83
elseif the.keys:pressed('right') then
111
84
self.velocity.x = 200
112
85
if self.onGround then self:play('walk') end
113
if self.onWall == 'left' then
114
self.onWall = false
115
self.leftWallAt = love.timer.getTime()
116
end
117
86
else
118
if not self.onWall then
119
if self.onGround then self:play('stand') end
120
self.velocity.x = 0
121
end
87
if self.onGround then self:play('stand') end
122
88
end
123
89
124
if the.keys:justPressed('up') and
125
(self.onGround or
126
(love.timer.getTime() - self.leftWallAt < .1) ) then
90
if the.keys:justPressed('up') and self.onGround then
127
91
self.velocity.y = -400
128
92
self.jumping = true
129
93
end
132
96
-- NOTE: this is an override, not a callback
133
97
134
98
self:doPhysics('x', elapsed)
135
self:collide(the.view.map)
136
137
-- handle X collisions
138
self.onWall = false
139
for _, col in ipairs(self.collisions) do
140
col.other:displaceDir(self, 'x')
141
if self.velocity.x > 0 then
142
self.onWall = 'right'
143
elseif self.velocity.x < 0 then
144
self.onWall = 'left'
145
else
146
print 'x ??'
147
end
148
end
149
99
150
100
self.onGround = false -- right before Y collision callbacks
151
101
self:doPhysics('y', elapsed)
102
152
103
self:collide(the.view.map)
153
154
-- handle Y collisions
155
for _, col in ipairs(self.collisions) do
156
if self.velocity.y > 0 then
157
self.onGround = true
158
end
159
160
col.other:displaceDir(self, 'y')
161
self.velocity.y = 0
162
self.jumping = false
163
end
164
165
Animation.update(self, elapsed)
166
104
end,
167
collide = function (self, ...)
168
self.collisions = {}
169
Animation.collide(self, ...)
170
-- I could return a true/false value here if I wanted to...
171
end,
172
105
onCollide = function (self, other, xOverlap, yOverlap)
106
-- seriously, why does this even fire?
173
107
if other == the.view.map then return end
174
108
175
table.insert(self.collisions, {other = other,
176
xOverlap = xOverlap,
177
yOverlap = yOverlap })
178
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,
179
142
}
180
143
181
function Sprite:displaceDir(other, dir)
182
if not self.solid or self == other or not other.solid then return end
183
if STRICT then assert(other:instanceOf(Sprite), 'asked to displace a non-sprite') end
184
185
if other.sprites then
186
-- handle groups
187
188
for _, spr in pairs(other.sprites) do
189
self:displace(spr, dir)
190
end
191
else
192
-- handle sprites
193
local dim
194
if dir == 'x' then
195
dim = 'width'
196
elseif dir == 'y' then
197
dim = 'height'
198
else
199
print 'dir ??'
200
end
201
202
local negMove = (other[dir] - self[dir]) + other[dim]
203
local posMove = (self[dir] + self[dim]) - other[dir]
204
205
-- TODO: re-add hinting?
206
if negMove < posMove then
207
chg = - negMove
208
else
209
chg = posMove
210
end
211
end
212
213
other[dir] = other[dir] + chg
214
end
215
216
144
GameView = View:extend {
217
145
onNew = function (self)
218
146
self:loadLayers('data/map.lua')
230
157
the.app = App:new {
231
158
onRun = function (self)
232
159
self.view = GameView:new()
160
--print(inspect(_(the.app):keys()))
233
161
self.console:watch('onGround', 'the.player.onGround')
234
162
self.console:watch('onWall', 'the.player.onWall')
235
163
end,
Loggerhead is a web-based interface for Breezy
Version: 2.0.1