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 15
- compare with another revision
- download diff
- download tarball
- view history from revision 15
- Committer: Josh C
- Date: 2013-03-09 05:49:40 UTC
- Revision ID: josh@9ix.org-20130309054940-hg1a3ro2j8yj32p7
more reliable onGround calc
- 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
34
self.velocity.x = 0
79
35
self.acceleration.y = 800
80
36
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
37
if the.keys:pressed('left') then
97
38
self.velocity.x = -200
98
39
if self.onGround then self:play('walk') end
99
if self.onWall == 'right' then self.onWall = false end
100
40
elseif the.keys:pressed('right') then
101
41
self.velocity.x = 200
102
42
if self.onGround then self:play('walk') end
103
if self.onWall == 'left' then self.onWall = false end
104
43
else
105
44
if self.onGround then self:play('stand') end
106
if not self.onWall then
107
self.velocity.x = 0
108
end
109
45
end
110
46
111
47
if the.keys:justPressed('up') and self.onGround then
113
49
self.jumping = true
114
50
end
115
51
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,
52
onUpdate = function (self)
53
-- needs to happen right before collision
54
self.onGround = false
55
end,
157
56
onCollide = function (self, other, xOverlap, yOverlap)
57
-- seriously, why does this even fire?
158
58
if other == the.view.map then return end
159
59
160
table.insert(self.collisions, {other = other,
161
xOverlap = xOverlap,
162
yOverlap = yOverlap })
163
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
elseif xOverlap > yOverlap then
67
-- check if we've moved since collisions were generated
68
local xov, yov = self:overlap(other.x, other.y,
69
other.width, other.height)
70
if xov ~= 0 and yov ~= 0 then
71
--print('y collision')
72
if self.velocity.y > 0 then
73
self.onGround = true
74
end
75
76
self.velocity.y = 0
77
other:displace(self)
78
self.jumping = false
79
end
80
else
81
print('??')
82
end
83
84
end,
164
85
}
165
86
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
87
GameView = View:extend {
202
88
onNew = function (self)
203
89
self:loadLayers('data/map.lua')
207
92
end,
208
93
onUpdate = function (self)
209
94
--print('tick')
210
--the.player:collide(self.map)
95
the.player:collide(self.map)
211
96
--self.map:collide(the.player)
212
97
end
213
98
}
215
100
the.app = App:new {
216
101
onRun = function (self)
217
102
self.view = GameView:new()
103
--print(inspect(_(the.app):keys()))
218
104
self.console:watch('onGround', 'the.player.onGround')
219
self.console:watch('onWall', 'the.player.onWall')
220
105
end,
221
106
onUpdate = function (self, dt)
222
107
if the.keys:justPressed('escape') and
223
108
not self.console.visible then
224
self.quit()
109
love.event.quit()
225
110
end
226
111
end
227
112
}
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1