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 14
- compare with another revision
- download diff
- download tarball
- view history from revision 14
- Committer: Josh C
- Date: 2013-03-09 05:15:15 UTC
- Revision ID: josh@9ix.org-20130309051515-tgd962is9kse7kfo
don't quit w/ escape if debug console is up
- 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',
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,
64
21
onStartFrame = function (self)
65
22
-- this is all in startframe so it happens before
66
23
-- physics calc at beginning of update
70
27
if self.falling then self.jumping = false end
71
28
--print(self.jumping, self.falling)
72
29
73
if not self.onGround then
30
if not self:onGround() then
74
31
self:play('jump')
75
32
end
76
33
79
36
80
37
if the.keys:pressed('left') then
81
38
self.velocity.x = -200
82
if self.onGround then self:play('walk') end
39
if self:onGround() then self:play('walk') end
83
40
elseif the.keys:pressed('right') then
84
41
self.velocity.x = 200
85
if self.onGround then self:play('walk') end
42
if self:onGround() then self:play('walk') end
86
43
else
87
if self.onGround then self:play('stand') end
44
if self:onGround() then self:play('stand') end
88
45
end
89
46
90
if the.keys:justPressed('up') and self.onGround then
47
if the.keys:justPressed('up') and self:onGround() then
91
48
self.velocity.y = -400
92
49
self.jumping = true
93
50
end
94
51
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,
52
onEndFrame = function (self)
53
--print(self.velocity.y)
54
end,
105
55
onCollide = function (self, other, xOverlap, yOverlap)
106
56
-- seriously, why does this even fire?
107
57
if other == the.view.map then return end
112
62
-- assumption: any other collision is with a solid map tile
113
63
if yOverlap > xOverlap then
114
64
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
123
65
elseif xOverlap > yOverlap then
124
66
-- check if we've moved since collisions were generated
125
67
local xov, yov = self:overlap(other.x, other.y,
126
68
other.width, other.height)
127
69
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
133
70
self.velocity.y = 0
134
71
other:displace(self)
135
72
self.jumping = false
136
73
end
137
74
else
138
print('xy ??')
75
print('??')
139
76
end
140
77
141
78
end,
79
onGround = function (self)
80
return (not self.jumping) and (not self.falling)
81
end
142
82
}
143
83
144
84
GameView = View:extend {
149
89
end,
150
90
onUpdate = function (self)
151
91
--print('tick')
152
--the.player:collide(self.map)
92
the.player:collide(self.map)
153
93
--self.map:collide(the.player)
154
94
end
155
95
}
158
98
onRun = function (self)
159
99
self.view = GameView:new()
160
100
--print(inspect(_(the.app):keys()))
161
self.console:watch('onGround', 'the.player.onGround')
162
self.console:watch('onWall', 'the.player.onWall')
163
101
end,
164
102
onUpdate = function (self, dt)
165
103
if the.keys:justPressed('escape') and
166
104
not self.console.visible then
167
self.quit()
105
love.event.quit()
168
106
end
169
107
end
170
108
}
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1