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 37
- compare with another revision
- download diff
- download tarball
- view history from revision 37
- Committer: Josh C
- Date: 2013-04-11 02:07:08 UTC
- Revision ID: josh@9ix.org-20130411020708-psrxtdnm8xe4pz7d
text balloon system
- 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
6
--inspect = require 'inspect'
6
--_ = require 'underscore'
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
onStartFrame = function (self)
22
-- this is all in startframe so it happens before
23
-- physics calc at beginning of update
24
25
-- jumping/falling updates could go in EndFrame...
26
self.falling = self.velocity.y > 0
27
if self.falling then self.jumping = false end
28
--print(self.jumping, self.falling)
29
30
if not self.onGround then
31
self:play('jump')
32
end
33
34
self.velocity.x = 0
35
self.acceleration.y = 800
36
37
if the.keys:pressed('left') then
38
self.velocity.x = -200
39
if self.onGround then self:play('walk') end
40
elseif the.keys:pressed('right') then
41
self.velocity.x = 200
42
if self.onGround then self:play('walk') end
43
else
44
if self.onGround then self:play('stand') end
45
end
46
47
if the.keys:justPressed('up') and self.onGround then
48
self.velocity.y = -400
49
self.jumping = true
50
end
51
end,
52
onUpdate = function (self)
53
-- needs to happen right before collision
54
self.onGround = false
55
end,
56
onCollide = function (self, other, xOverlap, yOverlap)
57
-- seriously, why does this even fire?
58
if other == the.view.map then return end
59
60
--print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
61
--print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
62
63
-- assumption: any other collision is with a solid map tile
64
if yOverlap > xOverlap then
65
other:displace(self)
66
elseif xOverlap > yOverlap then
67
-- check if we've moved since collisions were generated
68
local xov, yov = self:overlap(other.x, other.y,
69
other.width, other.height)
70
if xov ~= 0 and yov ~= 0 then
71
--print('y collision')
72
if self.velocity.y > 0 then
73
self.onGround = true
74
end
75
76
self.velocity.y = 0
77
other:displace(self)
78
self.jumping = false
79
end
80
else
81
print('??')
82
end
83
84
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
85
25
}
86
26
87
27
GameView = View:extend {
89
29
self:loadLayers('data/map.lua')
90
30
self.focus = the.player
91
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
92
44
end,
93
45
onUpdate = function (self)
46
--print('drawTook: ', the.drawTook)
94
47
--print('tick')
95
the.player:collide(self.map)
48
--the.player:collide(self.map)
96
49
--self.map:collide(the.player)
97
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
98
56
}
99
57
100
58
the.app = App:new {
59
record = true,
101
60
onRun = function (self)
102
61
self.view = GameView:new()
103
--print(inspect(_(the.app):keys()))
104
self.console:watch('onGround', 'the.player.onGround')
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()
105
73
end,
106
74
onUpdate = function (self, dt)
107
if the.keys:justPressed('escape') and
108
not self.console.visible then
109
love.event.quit()
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
95
self.quit()
110
96
end
111
end
112
}
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