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