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