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 added:
- underscore.lua
- files modified:
- main.lua
added
removed
main.lua
2
2
DEBUG = true
3
3
4
4
require 'zoetrope'
5
_ = require 'underscore'
5
6
--inspect = require 'inspect'
6
--_ = require 'underscore'
7
7
8
8
Player = Animation:extend {
9
9
image = 'data/player.png',
18
18
self.velocity.y = 0
19
19
self.maxVelocity.y = 400
20
20
end,
21
doPhysics = function (self, dir, elapsed)
22
local vel = self.velocity
23
local acc = self.acceleration
24
local drag = self.drag
25
local minVel = self.minVelocity
26
local maxVel = self.maxVelocity
27
28
-- check existence of properties
29
30
if STRICT then
31
assert(vel, 'active sprite has no velocity property')
32
assert(acc, 'active sprite has no acceleration property')
33
assert(drag, 'active sprite has no drag property')
34
assert(minVel, 'active sprite has no minVelocity property')
35
assert(maxVel, 'active sprite has no maxVelocity property')
36
assert(_.include({'x','y','rotation'}, dir), 'direction should be x, y, or rotation')
37
end
38
39
vel.x = vel.x or 0
40
vel.y = vel.y or 0
41
vel.rotation = vel.rotation or 0
42
43
-- physics
44
45
if acc[dir] and acc[dir] ~= 0 then
46
vel[dir] = vel[dir] + acc[dir] * elapsed
47
else
48
if drag[dir] then
49
if vel[dir] > 0 then
50
vel[dir] = vel[dir] - drag[dir] * elapsed
51
if vel[dir] < 0 then vel[dir] = 0 end
52
elseif vel[dir] < 0 then
53
vel[dir] = vel[dir] + drag[dir] * elapsed
54
if vel[dir] > 0 then vel[dir] = 0 end
55
end
56
end
57
end
58
59
if minVel[dir] and vel[dir] < minVel[dir] then vel[dir] = minVel[dir] end
60
if maxVel[dir] and vel[dir] > maxVel[dir] then vel[dir] = maxVel[dir] end
61
62
if vel[dir] ~= 0 then self[dir] = self[dir] + vel[dir] * elapsed end
63
end,
21
64
onStartFrame = function (self)
22
65
-- this is all in startframe so it happens before
23
66
-- physics calc at beginning of update
27
70
if self.falling then self.jumping = false end
28
71
--print(self.jumping, self.falling)
29
72
30
if not self:onGround() then
73
if not self.onGround then
31
74
self:play('jump')
32
75
end
33
76
36
79
37
80
if the.keys:pressed('left') then
38
81
self.velocity.x = -200
39
if self:onGround() then self:play('walk') end
82
if self.onGround then self:play('walk') end
40
83
elseif the.keys:pressed('right') then
41
84
self.velocity.x = 200
42
if self:onGround() then self:play('walk') end
85
if self.onGround then self:play('walk') end
43
86
else
44
if self:onGround() then self:play('stand') end
87
if self.onGround then self:play('stand') end
45
88
end
46
89
47
if the.keys:justPressed('up') and self:onGround() then
90
if the.keys:justPressed('up') and self.onGround then
48
91
self.velocity.y = -400
49
92
self.jumping = true
50
93
end
51
94
end,
52
onEndFrame = function (self)
53
--print(self.velocity.y)
54
end,
95
update = function (self, elapsed)
96
-- NOTE: this is an override, not a callback
97
98
self:doPhysics('x', elapsed)
99
100
self.onGround = false -- right before Y collision callbacks
101
self:doPhysics('y', elapsed)
102
103
self:collide(the.view.map)
104
end,
55
105
onCollide = function (self, other, xOverlap, yOverlap)
56
106
-- seriously, why does this even fire?
57
107
if other == the.view.map then return end
62
112
-- assumption: any other collision is with a solid map tile
63
113
if yOverlap > xOverlap then
64
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
65
123
elseif xOverlap > yOverlap then
66
124
-- check if we've moved since collisions were generated
67
125
local xov, yov = self:overlap(other.x, other.y,
68
126
other.width, other.height)
69
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
70
133
self.velocity.y = 0
71
134
other:displace(self)
72
135
self.jumping = false
73
136
end
74
137
else
75
print('??')
138
print('xy ??')
76
139
end
77
140
78
141
end,
79
onGround = function (self)
80
return (not self.jumping) and (not self.falling)
81
end
82
142
}
83
143
84
144
GameView = View:extend {
89
149
end,
90
150
onUpdate = function (self)
91
151
--print('tick')
92
the.player:collide(self.map)
152
--the.player:collide(self.map)
93
153
--self.map:collide(the.player)
94
154
end
95
155
}
98
158
onRun = function (self)
99
159
self.view = GameView:new()
100
160
--print(inspect(_(the.app):keys()))
161
self.console:watch('onGround', 'the.player.onGround')
162
self.console:watch('onWall', 'the.player.onWall')
101
163
end,
102
164
onUpdate = function (self, dt)
103
-- TODO: make this not work if debug console is active
104
if the.keys:justPressed('escape') then
105
love.event.quit()
165
if the.keys:justPressed('escape') and
166
not self.console.visible then
167
self.quit()
106
168
end
107
169
end
108
170
}
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1