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 12
- compare with another revision
- download diff
- download tarball
- view history from revision 12
- Committer: Josh C
- Date: 2013-03-09 04:59:50 UTC
- Revision ID: josh@9ix.org-20130309045950-ufjp2txry3c0cc05
only jump when you're on the ground
- files removed:
- animation.lua
- files modified:
- data/map.lua
added
removed
main.lua
2
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 '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
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
self.velocity.x = 0
31
self.acceleration.y = 800
32
33
if the.keys:pressed('left') then
34
self.velocity.x = -200
35
if self:onGround() then self:play('walk') end
36
elseif the.keys:pressed('right') then
37
self.velocity.x = 200
38
if self:onGround() then self:play('walk') end
39
else
40
if self:onGround() then self:play('stand') end
41
end
42
43
if the.keys:justPressed('up') and self:onGround() then
44
self.velocity.y = -400
45
self.jumping = true
46
self:play('jump')
47
end
48
end,
49
onEndFrame = function (self)
50
--print(self.velocity.y)
51
end,
52
onCollide = function (self, other, xOverlap, yOverlap)
53
-- seriously, why does this even fire?
54
if other == the.view.map then return end
55
56
--print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
57
--print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
58
59
-- assumption: any other collision is with a solid map tile
60
if yOverlap > xOverlap then
61
other:displace(self)
62
elseif xOverlap > yOverlap then
63
-- check if we've moved since collisions were generated
64
local xov, yov = self:overlap(other.x, other.y,
65
other.width, other.height)
66
if xov ~= 0 and yov ~= 0 then
67
self.velocity.y = 0
68
other:displace(self)
69
self.jumping = false
70
end
71
else
72
print('??')
73
end
74
75
end,
76
onGround = function (self)
77
return (not self.jumping) and (not self.falling)
78
end
25
79
}
26
80
27
81
GameView = View:extend {
29
83
self:loadLayers('data/map.lua')
30
84
self.focus = the.player
31
85
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
44
86
end,
45
87
onUpdate = function (self)
46
--print('drawTook: ', the.drawTook)
47
88
--print('tick')
48
--the.player:collide(self.map)
89
the.player:collide(self.map)
49
90
--self.map:collide(the.player)
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
56
}
57
58
MenuScreen = View:extend {
59
--title = Text:new{text = "Test Platform Game", font = 48, wordWrap = false},
60
title = Tile:new{image = 'data/title.png', x = 0, y = 0},
61
onNew = function(self)
62
self:add(self.title)
63
--self.title:centerAround(400, 200)
64
end,
65
onUpdate = function(self, elapsed)
66
if the.keys:allJustPressed() then
67
the.app.view = GameView:new()
68
end
69
91
end
70
92
}
71
93
72
94
the.app = App:new {
73
record = true,
74
95
onRun = function (self)
75
self.view = MenuScreen:new()
76
if DEBUG then
77
self.console:watch('onGround', 'the.player.onGround')
78
self.console:watch('onWall', 'the.player.onWall')
79
self.console:watch('updateTook', 'the.updateTook')
80
self.console:watch('drawTook', 'the.drawTook')
81
self.console:watch('recorder state', 'the.recorder.state')
82
end
83
84
--the.profiler = newProfiler('time', 2000)
85
--the.profiler = newProfiler()
86
--the.profiler:start()
96
self.view = GameView:new()
97
--print(inspect(_(the.app):keys()))
87
98
end,
88
99
onUpdate = function (self, dt)
100
-- TODO: make this not work if debug console is active
89
101
if the.keys:justPressed('escape') then
90
if the.profiler then
91
the.profiler:stop()
92
local outfile = io.open( "profile.txt", "w+" )
93
the.profiler:report( outfile )
94
outfile:close()
95
end
96
97
if self.record and the.recorder then
98
if not love.filesystem.remove('record.lua') then
99
print('could not remove record.lua')
100
end
101
local storage = Storage:new{
102
data = the.recorder.record,
103
filename = 'record.lua'
104
}
105
storage:save(false)
106
--print(inspect(the.recorder.record))
107
end
108
109
self.quit()
102
love.event.quit()
110
103
end
111
end,
112
update = function (self, dt)
113
the.updateStart = love.timer.getMicroTime()
114
App.update(self, dt)
115
if the.updateStart then
116
the.updateTook = love.timer.getMicroTime() - the.updateStart
117
end
118
end
119
}
120
121
function love.load (arg)
122
opts = getopt(arg, '')
123
if opts['p'] then
124
the.app.playback = true
125
the.app.record = false
126
elseif opts['r'] then
127
the.app.record = true
128
end
129
130
the.app:run()
131
end
b'\\ No newline at end of file'
104
end
105
}
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1