To get this branch, use:
bzr branch
http://9ix.org/bzr/traderous
« back to all changes in this revision
Viewing changes to main.lua
- browse files at revision 23
- compare with another revision
- download diff
- download tarball
- view history from revision 23
- Committer: Josh C
- Date: 2013-05-13 21:25:26 UTC
- Revision ID: josh@9ix.org-20130513212526-3q6md6n9xzhcmoa6
and that fixes the corner bug
- files removed:
- boom.lua
- files modified:
- bullet.lua
added
removed
main.lua
2
2
DEBUG = true
3
3
4
4
require 'zoetrope'
5
--__ = require 'underscore'
5
6
vector = require 'vector'
6
7
7
require 'group'
8
9
8
require 'version'
10
9
require 'wrap_tile'
11
require 'mirror'
12
10
require 'player'
13
11
require 'enemy'
14
12
require 'cursor'
15
13
require 'bullet'
16
require 'rock'
17
require 'boom'
18
14
19
15
util = {
20
16
signOf = function(value)
23
19
else
24
20
return -1
25
21
end
26
end,
27
shortestVector = function(from, to)
28
if STRICT then
29
if from.x < the.app.width / 2 or
30
from.x > the.bg.width - the.app.width / 2 or
31
from.y < the.app.height / 2 or
32
from.y > the.bg.height - the.app.height / 2 then
33
error('"from" coordinate out of bounds: X='..from.x..' Y='..from.y)
34
end
35
36
if to.x < the.app.width / 2 or
37
to.x > the.bg.width - the.app.width / 2 or
38
to.y < the.app.height / 2 or
39
to.y > the.bg.height - the.app.height / 2 then
40
error('"to" coordinate out of bounds: X='..to.x..' Y='..to.y)
41
end
42
end
43
44
-- normalize grid to account for mirror zones
45
local fx = from.x - the.app.width / 2
46
local fy = from.y - the.app.height / 2
47
local tx = to.x - the.app.width / 2
48
local ty = to.y - the.app.height / 2
49
50
local short = {}
51
52
-- pick shorter x
53
if math.abs(tx - fx) < math.abs(tx - fx - (the.bg.width - the.app.width)) then
54
-- straight path is shorter
55
short.x = tx - fx
56
else
57
short.x = tx - fx - (the.bg.width - the.app.width)
58
end
59
60
-- pick shorter y
61
if math.abs(ty - fy) < math.abs(ty - fy - (the.bg.height - the.app.height)) then
62
-- straight path is shorter
63
short.y = ty - fy
64
else
65
short.y = ty - fy - (the.bg.height - the.app.height)
66
end
67
68
return vector.new(short.x, short.y)
69
end
22
end
70
23
}
71
24
72
25
GameView = View:extend {
73
lastRock = 0,
74
rockInterval = 1,
75
gameStart = 0,
76
26
onNew = function (self)
77
27
-- for x = 1,30 do
78
28
-- for y = 1,30 do
83
33
-- end
84
34
-- end
85
35
86
the.rockColliders = Group:new()
87
the.bullets = Group:new()
88
the.mirrors = Group:new()
89
the.rocks = Group:new()
90
91
36
the.bg = Tile:new{
92
37
image = 'data/stars3.png',
93
38
-- 1366x768 * 3
100
45
the.player = SpacePlayer:new{x=1366,y=768}
101
46
self:add(the.player)
102
47
103
--self:add(Enemy:new{x=400, y=300})
104
105
self:add(the.bullets)
106
self:add(the.rockColliders)
107
self:add(the.mirrors)
108
self:add(the.rocks)
48
self:add(Enemy:new{x=400, y=300})
109
49
110
50
the.cursor = Cursor:new()
111
51
self:add(the.cursor)
112
52
113
the.score = Text:new{
114
width = the.app.width,
115
align = 'center',
116
font = 25}
117
self:add(the.score)
118
119
53
love.mouse.setGrab(true)
120
54
love.mouse.setVisible(false)
121
love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
122
55
123
56
--self:loadLayers('data/map.lua')
124
57
self.focus = the.player
125
58
--self:clampTo(self.map)
126
127
self.gameStart = love.timer.getTime()
128
59
end,
129
onUpdate = function(self, dt)
130
if love.timer.getTime() > self.lastRock + self.rockInterval then
131
local unseenRock = nil
132
while not unseenRock do
133
local rock = Rock:new{
134
x = math.random(the.app.width / 2,
135
the.bg.width - the.app.width / 2),
136
y = math.random(the.app.height / 2,
137
the.bg.height - the.app.height / 2),
138
velocity = {
139
x = math.random(-300, 300),
140
y = math.random(-300, 300),
141
rotation = math.random(-7, 7)
142
},
143
scale = math.random() + 0.5
144
}
145
146
local rockToPlayer = util.shortestVector(rock, the.player)
147
if math.abs(rockToPlayer.x) > the.app.width / 2 + rock.width * rock.scale and
148
math.abs(rockToPlayer.y) > the.app.height / 2 + rock.height * rock.scale then
149
unseenRock = rock
150
end
151
end
152
153
the.rocks:add(unseenRock)
154
155
self.lastRock = love.timer.getTime()
156
end
157
158
the.bullets:collide(the.rockColliders)
159
end,
160
onEndFrame = function(self)
161
if the.player.active then
162
local t = love.timer.getTime() - self.gameStart
163
local m = t / 60
164
local s = t % 60
165
166
the.score.text = string.format('Score: %d:%02d', m, s)
167
the.score.y = the.player.y - the.app.height / 2 + the.player.height
168
the.score.x = the.player.x - the.app.width / 2
169
end
170
end,
171
60
draw = function (self, x, y)
172
61
View.draw(self, x, y)
173
62
love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
191
80
the.app = App:new {
192
81
onRun = function (self)
193
82
print('Version: ' .. VERSION)
194
195
math.randomseed(os.time())
196
197
83
self.view = GameView:new()
198
84
if DEBUG then
199
85
self.console:watch('VERSION', 'VERSION')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1