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 11
- compare with another revision
- download diff
- download tarball
- view history from revision 11
- Committer: Josh C
- Date: 2013-03-09 04:58:45 UTC
- Revision ID: josh@9ix.org-20130309045845-wdcov53ghv2h6iwf
apply acceleration to velocity, THEN apply velocity to position (then do
collision). important for detecting correct velocity
collision). important for detecting correct velocity
- 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
--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)
18
if dir == 'x' then
19
return 'width'
20
elseif dir == 'y' then
21
return 'height'
22
else
23
if STRICT then error('dir '..dir) end
24
end
25
end
5
6
Player = Animation:extend {
7
image = 'data/player.png',
8
height = 32,
9
width = 32,
10
sequences = {
11
stand = { frames = { 1 }, fps = 1 },
12
walk = { frames = { 2, 3 }, fps = 5 },
13
jump = { frames = { 4 }, fps = 1 }
14
},
15
onNew = function (self)
16
self.velocity.y = 0
17
self.maxVelocity.y = 400
18
end,
19
onStartFrame = function (self)
20
-- this is all in startframe so it happens before
21
-- physics calc at beginning of update
22
23
self.velocity.x = 0
24
self.acceleration.y = 800
25
26
if the.keys:pressed('left') then
27
self.velocity.x = -200
28
self:play('walk')
29
elseif the.keys:pressed('right') then
30
self.velocity.x = 200
31
self:play('walk')
32
else
33
self:play('stand')
34
end
35
36
if the.keys:justPressed('up') then
37
self.velocity.y = -400
38
end
39
end,
40
onCollide = function (self, other, xOverlap, yOverlap)
41
-- seriously, why does this even fire?
42
if other == the.view.map then return end
43
44
--print(string.format('col s{x=%i y=%i w=%i h=%i} %s', self.x, self.y, self.width, self.height, tostring(other)))
45
--print('vel.x:'..self.velocity.x.." vel.y:"..self.velocity.y)
46
47
-- assumption: any other collision is with a solid map tile
48
if yOverlap > xOverlap then
49
other:displace(self)
50
elseif xOverlap > yOverlap then
51
-- check if we've moved since collisions were generated
52
local xov, yov = self:overlap(other.x, other.y,
53
other.width, other.height)
54
if xov ~= 0 and yov ~= 0 then
55
self.velocity.y = 0
56
other:displace(self)
57
end
58
else
59
print('??')
60
end
61
62
end
26
63
}
27
64
28
65
GameView = View:extend {
30
67
self:loadLayers('data/map.lua')
31
68
self.focus = the.player
32
69
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
70
end,
46
71
onUpdate = function (self)
47
--print('drawTook: ', the.drawTook)
48
72
--print('tick')
49
--the.player:collide(self.map)
73
the.player:collide(self.map)
50
74
--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
75
end
71
76
}
72
77
73
78
the.app = App:new {
74
record = true,
75
79
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()
80
self.view = GameView:new()
89
81
end,
90
82
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
111
self.quit()
112
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'
83
-- apparently I can do this w/ C-A-q if DEBUG is on
84
-- if the.keys:justPressed('escape') then
85
-- love.event.quit()
86
-- end
87
end
88
}
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1