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 38
- compare with another revision
- download diff
- download tarball
- view history from revision 38
- Committer: Josh C
- Date: 2013-04-16 00:27:10 UTC
- Revision ID: josh@9ix.org-20130416002710-4soqj70ln7hdrzdb
testing audio
- files added:
- animation.lua
- files modified:
- data/map.lua
added
removed
main.lua
2
2
DEBUG = true
3
3
4
4
require 'zoetrope'
5
_ = require 'underscore'
5
__ = require 'underscore'
6
6
--inspect = require 'inspect'
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
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,
7
require 'pepperprof'
8
require 'getopt_alt'
9
10
require 'sprite'
11
require 'animation'
12
require 'player'
13
require 'balloon'
14
15
util = {
16
dim = function(dir)
17
if dir == 'x' then
18
return 'width'
19
elseif dir == 'y' then
20
return 'height'
21
else
22
if STRICT then error('dir '..dir) end
23
end
24
end
142
25
}
143
26
144
27
GameView = View:extend {
146
29
self:loadLayers('data/map.lua')
147
30
self.focus = the.player
148
31
self:clampTo(self.map)
32
33
the.recorder = Recorder:new{mousePosInterval = 9999}
34
the.app.meta:add(the.recorder)
35
if the.app.record then
36
the.recorder:startRecording()
37
elseif the.app.playback then
38
local storage = Storage:new{filename = 'record.lua'}
39
storage:load()
40
--print(inspect(storage.data))
41
the.recorder.record = storage.data
42
the.recorder:startPlaying()
43
end
149
44
end,
150
45
onUpdate = function (self)
46
--print('drawTook: ', the.drawTook)
151
47
--print('tick')
152
48
--the.player:collide(self.map)
153
49
--self.map:collide(the.player)
154
end
50
end,
51
-- draw = function (self, x, y)
52
-- View.draw(self, x, y)
53
54
-- love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
55
-- end
155
56
}
156
57
157
58
the.app = App:new {
59
record = true,
158
60
onRun = function (self)
159
61
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')
62
if DEBUG then
63
self.console:watch('onGround', 'the.player.onGround')
64
self.console:watch('onWall', 'the.player.onWall')
65
self.console:watch('updateTook', 'the.updateTook')
66
self.console:watch('drawTook', 'the.drawTook')
67
self.console:watch('recorder state', 'the.recorder.state')
68
end
69
70
--the.profiler = newProfiler('time', 2000)
71
--the.profiler = newProfiler()
72
--the.profiler:start()
163
73
end,
164
74
onUpdate = function (self, dt)
165
if the.keys:justPressed('escape') and
166
not self.console.visible then
75
if the.keys:justPressed('escape') then
76
if the.profiler then
77
the.profiler:stop()
78
local outfile = io.open( "profile.txt", "w+" )
79
the.profiler:report( outfile )
80
outfile:close()
81
end
82
83
if self.record then
84
if not love.filesystem.remove('record.lua') then
85
print('could not remove record.lua')
86
end
87
local storage = Storage:new{
88
data = the.recorder.record,
89
filename = 'record.lua'
90
}
91
storage:save(false)
92
--print(inspect(the.recorder.record))
93
end
94
167
95
self.quit()
168
96
end
169
end
170
}
b'\\ No newline at end of file'
97
end,
98
update = function (self, dt)
99
the.updateStart = love.timer.getMicroTime()
100
App.update(self, dt)
101
if the.updateStart then
102
the.updateTook = love.timer.getMicroTime() - the.updateStart
103
end
104
end
105
}
106
107
function love.load (arg)
108
opts = getopt(arg, '')
109
if opts['p'] then
110
the.app.playback = true
111
the.app.record = false
112
elseif opts['r'] then
113
the.app.record = true
114
end
115
116
the.app:run()
117
end
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1