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 16
- compare with another revision
- download diff
- download tarball
- view history from revision 16
- Committer: Josh C
- Date: 2013-03-09 06:03:56 UTC
- Revision ID: josh@9ix.org-20130309060356-qvi2yd0odhfr3e6t
try to track X collisions. break out Sprite's physics in prep for
overriding them completely.
overriding them completely.
- files removed:
- conf.lua
- files modified:
- data/map.lua
added
removed
main.lua
1
1
STRICT = true
2
DEBUG = false
2
DEBUG = true
3
3
4
4
require 'zoetrope'
5
__ = require 'underscore'
6
5
--inspect = require 'inspect'
7
require 'pepperprof'
8
require 'getopt_alt'
9
10
require 'sprite'
11
require 'player'
12
13
util = {
14
dim = function(dir)
15
if dir == 'x' then
16
return 'width'
17
elseif dir == 'y' then
18
return 'height'
19
else
20
if STRICT then error('dir '..dir) end
21
end
22
end
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
67
if self.velocity.x > 0 then
68
self.onWall = 'right'
69
elseif self.velocity.x < 0 then
70
self.onWall = 'left'
71
else
72
print '??'
73
end
74
elseif xOverlap > yOverlap then
75
-- check if we've moved since collisions were generated
76
local xov, yov = self:overlap(other.x, other.y,
77
other.width, other.height)
78
if xov ~= 0 and yov ~= 0 then
79
--print('y collision')
80
if self.velocity.y > 0 then
81
self.onGround = true
82
end
83
84
self.velocity.y = 0
85
other:displace(self)
86
self.jumping = false
87
end
88
else
89
print('??')
90
end
91
92
end,
23
93
}
24
94
25
95
GameView = View:extend {
27
97
self:loadLayers('data/map.lua')
28
98
self.focus = the.player
29
99
self:clampTo(self.map)
30
31
the.recorder = Recorder:new{mousePosInterval = 9999}
32
the.app.meta:add(the.recorder)
33
if the.app.record then
34
the.recorder:startRecording()
35
elseif the.app.playback then
36
local storage = Storage:new{filename = 'record.lua'}
37
storage:load()
38
--print(inspect(storage.data))
39
the.recorder.record = storage.data
40
the.recorder:startPlaying()
41
end
42
100
end,
43
101
onUpdate = function (self)
44
--print('drawTook: ', the.drawTook)
45
102
--print('tick')
46
--the.player:collide(self.map)
103
the.player:collide(self.map)
47
104
--self.map:collide(the.player)
48
end,
49
-- draw = function (self, x, y)
50
-- View.draw(self, x, y)
51
52
-- love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
53
-- end
105
end
54
106
}
55
107
56
108
the.app = App:new {
57
record = true,
58
109
onRun = function (self)
59
110
self.view = GameView:new()
60
if DEBUG then
61
self.console:watch('onGround', 'the.player.onGround')
62
self.console:watch('onWall', 'the.player.onWall')
63
self.console:watch('updateTook', 'the.updateTook')
64
self.console:watch('drawTook', 'the.drawTook')
65
self.console:watch('recorder state', 'the.recorder.state')
66
end
67
68
--the.profiler = newProfiler('time', 2000)
69
--the.profiler = newProfiler()
70
--the.profiler:start()
111
--print(inspect(_(the.app):keys()))
112
self.console:watch('onGround', 'the.player.onGround')
113
self.console:watch('onWall', 'the.player.onWall')
71
114
end,
72
115
onUpdate = function (self, dt)
73
if the.keys:justPressed('escape') then
74
if the.profiler then
75
the.profiler:stop()
76
local outfile = io.open( "profile.txt", "w+" )
77
the.profiler:report( outfile )
78
outfile:close()
79
end
80
81
if self.record then
82
if not love.filesystem.remove('record.lua') then
83
print('could not remove record.lua')
84
end
85
local storage = Storage:new{
86
data = the.recorder.record,
87
filename = 'record.lua'
88
}
89
storage:save(false)
90
--print(inspect(the.recorder.record))
91
end
92
93
self.quit()
116
if the.keys:justPressed('escape') and
117
not self.console.visible then
118
love.event.quit()
94
119
end
95
end,
96
update = function (self, dt)
97
the.updateStart = love.timer.getMicroTime()
98
App.update(self, dt)
99
if the.updateStart then
100
the.updateTook = love.timer.getMicroTime() - the.updateStart
101
end
102
end
103
}
104
105
function love.load (arg)
106
opts = getopt(arg, '')
107
if opts['p'] then
108
the.app.playback = true
109
the.app.record = false
110
elseif opts['r'] then
111
the.app.record = true
112
end
113
114
the.app:run()
115
end
b'\\ No newline at end of file'
120
end
121
}
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1