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:
- build.sh
- zoetrope/input
- files removed:
- zoetrope/core/gamepad.lua
- files modified:
- data/map.lua
added
removed
main.lua
2
2
DEBUG = true
3
3
4
4
require 'zoetrope'
5
_ = require 'underscore'
6
--inspect = require 'inspect'
5
7
6
Player = Tile:extend {
8
Player = Animation:extend {
7
9
image = 'data/player.png',
8
onUpdate = function (self)
9
self.velocity.x = 0
10
self.velocity.y = 0
11
12
if the.keys:pressed('left') then
13
self.velocity.x = -200
14
elseif the.keys:pressed('right') then
15
self.velocity.x = 200
16
end
17
end
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
onNew = function (self)
18
self.velocity.y = 0
19
self.maxVelocity.y = 400
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
onStartFrame = function (self)
65
-- this is all in startframe so it happens before
66
-- physics calc at beginning of update
67
68
-- jumping/falling updates could go in EndFrame...
69
self.falling = self.velocity.y > 0
70
if self.falling then self.jumping = false end
71
--print(self.jumping, self.falling)
72
73
if not self.onGround then
74
self:play('jump')
75
end
76
77
self.velocity.x = 0
78
self.acceleration.y = 800
79
80
if the.keys:pressed('left') then
81
self.velocity.x = -200
82
if self.onGround then self:play('walk') end
83
elseif the.keys:pressed('right') then
84
self.velocity.x = 200
85
if self.onGround then self:play('walk') end
86
else
87
if self.onGround then self:play('stand') end
88
end
89
90
if the.keys:justPressed('up') and self.onGround then
91
self.velocity.y = -400
92
self.jumping = true
93
end
94
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,
105
onCollide = function (self, other, xOverlap, yOverlap)
106
-- seriously, why does this even fire?
107
if other == the.view.map then return end
108
109
--print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
110
--print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
111
112
-- assumption: any other collision is with a solid map tile
113
if yOverlap > xOverlap then
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
123
elseif xOverlap > yOverlap then
124
-- check if we've moved since collisions were generated
125
local xov, yov = self:overlap(other.x, other.y,
126
other.width, other.height)
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
133
self.velocity.y = 0
134
other:displace(self)
135
self.jumping = false
136
end
137
else
138
print('xy ??')
139
end
140
141
end,
18
142
}
19
143
20
144
GameView = View:extend {
23
147
self.focus = the.player
24
148
self:clampTo(self.map)
25
149
end,
26
27
onUpdate = function (self, dt)
28
self.map:subdisplace(the.player)
150
onUpdate = function (self)
151
--print('tick')
152
--the.player:collide(self.map)
153
--self.map:collide(the.player)
29
154
end
30
155
}
31
156
32
157
the.app = App:new {
33
158
onRun = function (self)
34
159
self.view = GameView:new()
160
--print(inspect(_(the.app):keys()))
161
self.console:watch('onGround', 'the.player.onGround')
162
self.console:watch('onWall', 'the.player.onWall')
35
163
end,
36
164
onUpdate = function (self, dt)
37
if the.keys:justPressed('escape') then
38
love.event.quit()
165
if the.keys:justPressed('escape') and
166
not self.console.visible then
167
self.quit()
39
168
end
40
169
end
41
170
}
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1