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 21
- compare with another revision
- download diff
- download tarball
- view history from revision 21
- Committer: Josh C
- Date: 2013-03-12 17:21:28 UTC
- Revision ID: josh@9ix.org-20130312172128-l336vwqawo81c6sm
really easy version of knowing when we reached the top of a wall.
similar to how we're doing onGround.
similar to how we're doing onGround.
- files removed:
- animation.lua
- files modified:
- build.sh
added
removed
main.lua
4
4
require 'zoetrope'
5
5
__ = require 'underscore'
6
6
--inspect = require 'inspect'
7
require 'pepperprof'
8
require 'getopt_alt'
9
10
require 'sprite'
11
require 'animation'
12
require 'player'
13
require 'balloon'
14
require 'version'
15
16
util = {
17
dim = function(dir)
7
8
Player = Animation:extend {
9
image = 'data/player.png',
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
collisions = {},
18
onWall = false,
19
onNew = function (self)
20
self.velocity.y = 0
21
self.maxVelocity.y = 400
22
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
onStartFrame = function (self)
67
-- this is all in startframe so it happens before
68
-- physics calc at beginning of update
69
70
-- jumping/falling updates could go in EndFrame...
71
self.falling = self.velocity.y > 0
72
if self.falling then self.jumping = false end
73
--print(self.jumping, self.falling)
74
75
if (not self.onGround) and (not self.onWall) then
76
self:play('jump')
77
end
78
79
self.acceleration.y = 800
80
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
if the.keys:pressed('left') then
97
self.velocity.x = -200
98
if self.onGround then self:play('walk') end
99
if self.onWall == 'right' then self.onWall = false end
100
elseif the.keys:pressed('right') then
101
self.velocity.x = 200
102
if self.onGround then self:play('walk') end
103
if self.onWall == 'left' then self.onWall = false end
104
else
105
if self.onGround then self:play('stand') end
106
if not self.onWall then
107
self.velocity.x = 0
108
end
109
end
110
111
if the.keys:justPressed('up') and self.onGround then
112
self.velocity.y = -400
113
self.jumping = true
114
end
115
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,
157
onCollide = function (self, other, xOverlap, yOverlap)
158
if other == the.view.map then return end
159
160
table.insert(self.collisions, {other = other,
161
xOverlap = xOverlap,
162
yOverlap = yOverlap })
163
end
164
}
165
166
-- displace on a specific axis (monkey patch Sprite)
167
function Sprite:displaceDir(other, dir)
168
if not self.solid or self == other or not other.solid then return end
169
if STRICT then assert(other:instanceOf(Sprite), 'asked to displace a non-sprite') end
170
171
if other.sprites then
172
-- handle groups
173
174
for _, spr in pairs(other.sprites) do
175
self:displace(spr, dir)
176
end
177
else
178
-- handle sprites
179
local dim
18
180
if dir == 'x' then
19
return 'width'
181
dim = 'width'
20
182
elseif dir == 'y' then
21
return 'height'
22
else
23
if STRICT then error('dir '..dir) end
183
dim = 'height'
184
else
185
print 'dir ??'
186
end
187
188
local negMove = (other[dir] - self[dir]) + other[dim]
189
local posMove = (self[dir] + self[dim]) - other[dir]
190
191
-- TODO: re-add hinting?
192
if negMove < posMove then
193
chg = - negMove
194
else
195
chg = posMove
24
196
end
25
197
end
26
}
198
199
other[dir] = other[dir] + chg
200
end
27
201
28
202
GameView = View:extend {
29
203
onNew = function (self)
30
204
self:loadLayers('data/map.lua')
31
205
self.focus = the.player
32
206
self:clampTo(self.map)
33
34
the.recorder = Recorder:new{mousePosInterval = 9999}
35
the.app.meta:add(the.recorder)
36
if the.app.record then
37
the.recorder:startRecording()
38
elseif the.app.playback then
39
local storage = Storage:new{filename = 'record.lua'}
40
storage:load()
41
--print(inspect(storage.data))
42
the.recorder.record = storage.data
43
the.recorder:startPlaying()
44
end
45
207
end,
46
208
onUpdate = function (self)
47
--print('drawTook: ', the.drawTook)
48
209
--print('tick')
49
210
--the.player:collide(self.map)
50
211
--self.map:collide(the.player)
51
end,
52
-- draw = function (self, x, y)
53
-- View.draw(self, x, y)
54
55
-- love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
56
-- end
57
}
58
59
MenuScreen = View:extend {
60
--title = Text:new{text = "Test Platform Game", font = 48, wordWrap = false},
61
title = Tile:new{image = 'data/title.png', x = 0, y = 0},
62
onNew = function(self)
63
self:add(self.title)
64
--self.title:centerAround(400, 200)
65
end,
66
onUpdate = function(self, elapsed)
67
if the.keys:allJustPressed() then
68
the.app.view = GameView:new()
69
end
70
212
end
71
213
}
72
214
73
215
the.app = App:new {
74
record = true,
75
216
onRun = function (self)
76
self.view = MenuScreen:new()
77
if DEBUG then
78
self.console:watch('VERSION', 'VERSION')
79
self.console:watch('onGround', 'the.player.onGround')
80
self.console:watch('onWall', 'the.player.onWall')
81
self.console:watch('updateTook', 'the.updateTook')
82
self.console:watch('drawTook', 'the.drawTook')
83
self.console:watch('recorder state', 'the.recorder.state')
84
end
85
86
--the.profiler = newProfiler('time', 2000)
87
--the.profiler = newProfiler()
88
--the.profiler:start()
217
self.view = GameView:new()
218
self.console:watch('onGround', 'the.player.onGround')
219
self.console:watch('onWall', 'the.player.onWall')
89
220
end,
90
221
onUpdate = function (self, dt)
91
if the.keys:justPressed('escape') then
92
if the.profiler then
93
the.profiler:stop()
94
local outfile = io.open( "profile.txt", "w+" )
95
the.profiler:report( outfile )
96
outfile:close()
97
end
98
99
if self.record and the.recorder then
100
if not love.filesystem.remove('record.lua') then
101
print('could not remove record.lua')
102
end
103
local storage = Storage:new{
104
data = the.recorder.record,
105
filename = 'record.lua'
106
}
107
storage:save(false)
108
--print(inspect(the.recorder.record))
109
end
110
222
if the.keys:justPressed('escape') and
223
not self.console.visible then
111
224
self.quit()
112
225
end
113
end,
114
update = function (self, dt)
115
the.updateStart = love.timer.getMicroTime()
116
App.update(self, dt)
117
if the.updateStart then
118
the.updateTook = love.timer.getMicroTime() - the.updateStart
119
end
120
end
121
}
122
123
function love.load (arg)
124
opts = getopt(arg, '')
125
if opts['p'] then
126
the.app.playback = true
127
the.app.record = false
128
elseif opts['r'] then
129
the.app.record = true
130
end
131
132
the.app:run()
133
end
b'\\ No newline at end of file'
226
end
227
}
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1