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:
- underscore.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'
6
--_ = require 'underscore'
7
7
8
8
Player = Animation:extend {
9
9
image = 'data/player.png',
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
17
onNew = function (self)
22
18
self.velocity.y = 0
23
19
self.maxVelocity.y = 400
24
20
end,
25
doPhysics = function (self, dir, elapsed)
26
local vel = self.velocity
27
local acc = self.acceleration
28
local drag = self.drag
29
local minVel = self.minVelocity
30
local maxVel = self.maxVelocity
31
32
-- check existence of properties
33
34
if STRICT then
35
assert(vel, 'active sprite has no velocity property')
36
assert(acc, 'active sprite has no acceleration property')
37
assert(drag, 'active sprite has no drag property')
38
assert(minVel, 'active sprite has no minVelocity property')
39
assert(maxVel, 'active sprite has no maxVelocity property')
40
assert(__.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
41
end
42
43
vel.x = vel.x or 0
44
vel.y = vel.y or 0
45
vel.rotation = vel.rotation or 0
46
47
-- physics
48
49
if acc[dir] and acc[dir] ~= 0 then
50
vel[dir] = vel[dir] + acc[dir] * elapsed
51
else
52
if drag[dir] then
53
if vel[dir] > 0 then
54
vel[dir] = vel[dir] - drag[dir] * elapsed
55
if vel[dir] < 0 then vel[dir] = 0 end
56
elseif vel[dir] < 0 then
57
vel[dir] = vel[dir] + drag[dir] * elapsed
58
if vel[dir] > 0 then vel[dir] = 0 end
59
end
60
end
61
end
62
63
if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
64
if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
65
66
if vel[dir] ~= 0 then self[dir] = self[dir] + vel[dir] * elapsed end
67
end,
68
21
onStartFrame = function (self)
69
22
-- this is all in startframe so it happens before
70
23
-- physics calc at beginning of update
74
27
if self.falling then self.jumping = false end
75
28
--print(self.jumping, self.falling)
76
29
77
if (not self.onGround) and (not self.onWall) then
30
if not self.onGround then
78
31
self:play('jump')
79
32
end
80
33
34
self.velocity.x = 0
81
35
self.acceleration.y = 800
82
36
83
if self.onWall then
84
self.acceleration.y = 0
85
86
if self.onWall == 'right' then
87
self:play('climbRight')
88
elseif self.onWall == 'left' then
89
self:play('climbLeft')
90
end
91
92
if the.keys:pressed('up') then
93
self.velocity.y = -200
94
elseif the.keys:pressed('down') then
95
self.velocity.y = 200
96
else
97
self.velocity.y = 0
98
self:freeze(self.sequences[self.currentName].frames[1])
99
end
100
end
101
102
37
if the.keys:pressed('left') then
103
38
self.velocity.x = -200
104
39
if self.onGround then self:play('walk') end
105
if self.onWall == 'right' then self.onWall = false end
106
40
elseif the.keys:pressed('right') then
107
41
self.velocity.x = 200
108
42
if self.onGround then self:play('walk') end
109
if self.onWall == 'left' then self.onWall = false end
110
43
else
111
if not self.onWall then
112
if self.onGround then self:play('stand') end
113
self.velocity.x = 0
114
end
44
if self.onGround then self:play('stand') end
115
45
end
116
46
117
47
if the.keys:justPressed('up') and self.onGround then
119
49
self.jumping = true
120
50
end
121
51
end,
122
update = function (self, elapsed)
123
-- NOTE: this is an override, not a callback
124
125
self:doPhysics('x', elapsed)
126
self:collide(the.view.map)
127
128
-- handle X collisions
129
self.onWall = false
130
for _, col in ipairs(self.collisions) do
131
col.other:displaceDir(self, 'x')
132
if self.velocity.x > 0 then
133
self.onWall = 'right'
134
elseif self.velocity.x < 0 then
135
self.onWall = 'left'
136
else
137
print 'x ??'
138
end
139
end
140
141
self.onGround = false -- right before Y collision callbacks
142
self:doPhysics('y', elapsed)
143
self:collide(the.view.map)
144
145
-- handle Y collisions
146
for _, col in ipairs(self.collisions) do
147
if self.velocity.y > 0 then
148
self.onGround = true
149
end
150
151
col.other:displaceDir(self, 'y')
152
self.velocity.y = 0
153
self.jumping = false
154
end
155
156
Animation.update(self, elapsed)
157
end,
158
collide = function (self, ...)
159
self.collisions = {}
160
Animation.collide(self, ...)
161
-- I could return a true/false value here if I wanted to...
162
end,
52
onUpdate = function (self)
53
-- needs to happen right before collision
54
self.onGround = false
55
end,
163
56
onCollide = function (self, other, xOverlap, yOverlap)
57
-- seriously, why does this even fire?
164
58
if other == the.view.map then return end
165
59
166
table.insert(self.collisions, {other = other,
167
xOverlap = xOverlap,
168
yOverlap = yOverlap })
169
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,
170
93
}
171
94
172
function Sprite:displaceDir(other, dir)
173
if not self.solid or self == other or not other.solid then return end
174
if STRICT then assert(other:instanceOf(Sprite), 'asked to displace a non-sprite') end
175
176
if other.sprites then
177
-- handle groups
178
179
for _, spr in pairs(other.sprites) do
180
self:displace(spr, dir)
181
end
182
else
183
-- handle sprites
184
local dim
185
if dir == 'x' then
186
dim = 'width'
187
elseif dir == 'y' then
188
dim = 'height'
189
else
190
print 'dir ??'
191
end
192
193
local negMove = (other[dir] - self[dir]) + other[dim]
194
local posMove = (self[dir] + self[dim]) - other[dir]
195
196
-- TODO: re-add hinting?
197
if negMove < posMove then
198
chg = - negMove
199
else
200
chg = posMove
201
end
202
end
203
204
other[dir] = other[dir] + chg
205
end
206
207
95
GameView = View:extend {
208
96
onNew = function (self)
209
97
self:loadLayers('data/map.lua')
213
100
end,
214
101
onUpdate = function (self)
215
102
--print('tick')
216
--the.player:collide(self.map)
103
the.player:collide(self.map)
217
104
--self.map:collide(the.player)
218
105
end
219
106
}
221
108
the.app = App:new {
222
109
onRun = function (self)
223
110
self.view = GameView:new()
111
--print(inspect(_(the.app):keys()))
224
112
self.console:watch('onGround', 'the.player.onGround')
225
113
self.console:watch('onWall', 'the.player.onWall')
226
114
end,
227
115
onUpdate = function (self, dt)
228
116
if the.keys:justPressed('escape') and
229
117
not self.console.visible then
230
self.quit()
118
love.event.quit()
231
119
end
232
120
end
233
121
}
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1