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 43
- compare with another revision
- download diff
- download tarball
- view history from revision 43
- Committer: Josh C
- Date: 2013-06-08 00:02:37 UTC
- Revision ID: josh@9ix.org-20130608000237-v50hyqvrinp5g4rs
try to make setting screen resolution more reliable
- files removed:
- data/planet1.png
- files modified:
- bullet.lua
added
removed
main.lua
16
16
require 'bullet'
17
17
require 'rock'
18
18
require 'boom'
19
require 'planet'
20
require 'trade_view'
21
19
22
20
util = {
23
21
signOf = function(value)
93
91
the.storage.data = {highScore = 0}
94
92
end
95
93
96
--the.rockColliders = Group:new()
94
the.rockColliders = Group:new()
97
95
the.bullets = Group:new()
98
96
the.mirrors = Group:new()
99
--the.rocks = Group:new()
97
the.rocks = Group:new()
100
98
the.interface = Group:new()
101
the.planets = Group:new()
102
the.indicators = Group:new()
103
99
104
100
the.bg = Tile:new{
105
101
image = 'data/stars3.png',
106
width = 13660,
107
height = 7680
102
-- 1366x768 * 3
103
width = 4098,
104
height = 2304
108
105
}
109
106
self:add(the.bg)
110
107
111
self:add(the.planets)
112
113
108
--the.player = CrystalPlayer:new{x=400,y=300}
114
the.player = SpacePlayer:new{x=the.bg.width / 2, y=the.bg.height / 2}
109
the.player = SpacePlayer:new{x=1366,y=768}
115
110
self:add(the.player)
116
111
self:add(the.player.thrust)
117
112
118
113
--self:add(Enemy:new{x=400, y=300})
119
114
120
115
self:add(the.bullets)
121
--self:add(the.rockColliders)
116
self:add(the.rockColliders)
122
117
self:add(the.mirrors)
123
--self:add(the.rocks)
124
self:add(the.indicators)
118
self:add(the.rocks)
125
119
self:add(the.interface)
126
120
127
for _ = 1, math.random(6) do
128
local planet = Planet:new{
129
x = math.random(the.app.width / 2,
130
the.bg.width - the.app.width / 2),
131
y = math.random(the.app.height / 2,
132
the.bg.height - the.app.height / 2),
133
rotation = math.random() * math.pi
134
}
135
the.planets:add(planet)
136
end
137
138
121
the.cursor = Cursor:new()
139
122
self:add(the.cursor)
140
123
144
127
width = the.app.width,
145
128
--align = 'center',
146
129
font = 25}
147
--the.interface:add(the.score)
130
the.interface:add(the.score)
148
131
149
132
local hs = the.storage.data.highScore
150
133
local m = hs / 60
158
141
font = 25,
159
142
text = string.format('High Score: %d:%02d', m, s)
160
143
}
161
--the.interface:add(the.highScore)
144
the.interface:add(the.highScore)
162
145
163
146
the.over = Text:new{
164
147
y = the.app.height / 2,
192
175
self.gameStart = love.timer.getTime()
193
176
end,
194
177
onUpdate = function(self, dt)
195
if false and the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
178
if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
196
179
local unseenRock = nil
197
180
while not unseenRock do
198
181
local rock = Rock:new{
222
205
223
206
the.bullets:collide(the.rockColliders)
224
207
225
-- this should really go somewhere else...
226
for _, planet in ipairs(the.planets.sprites) do
227
local indx, indy
228
local pvec = vector.new(
229
planet.x - the.player.x + planet.width / 2,
230
planet.y - the.player.y + planet.height / 2 )
231
232
-- TODO: is there a better way to specify the
233
-- screen rectangle?
234
if planet:intersects(the.player.x - the.app.width / 2,
235
the.player.y - the.app.height / 2,
236
the.app.width,
237
the.app.height) then
238
-- planet is on the screen
239
planet.indicator.visible = false
240
else
241
planet.indicator.visible = true
242
243
if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
244
indx = (the.app.width / 2 - 10) * util.signOf(pvec.x) + 8
245
indy = (the.app.width / 2 - 10) * pvec.y / math.abs(pvec.x)
246
else
247
indy = (the.app.height / 2 - 10) * util.signOf(pvec.y) + 8
248
indx = (the.app.height / 2 - 10) * pvec.x / math.abs(pvec.y)
249
end
250
251
planet.indicator.x = the.player.x + indx
252
planet.indicator.y = the.player.y + indy
253
end
254
end
255
256
208
-- for _, mirror in ipairs(the.mirrors.sprites) do
257
209
-- if not mirror.of then
258
210
-- print('mirror:' .. inspect(mirror))
308
260
309
261
self.view = GameView:new()
310
262
263
-- try going fullscreen. should fail silently if it
264
-- can't go to fullscreen.
265
love.graphics.toggleFullscreen()
266
311
267
if DEBUG then
312
268
self.console:watch('VERSION', 'VERSION')
313
269
self.console:watch('updateTook', 'the.updateTook')
317
273
self.console:watch('the.app.height', 'the.app.height')
318
274
self.console:watch('num mirrors', '#the.mirrors.sprites')
319
275
self.console:watch('num rocks', '#the.rocks.sprites')
320
self.console:watch('num planets', '#the.planets.sprites')
321
276
--self.console:watch('drawTook', 'the.drawTook')
322
277
323
278
-- back off that dark overlay a bit
325
280
end
326
281
end,
327
282
onUpdate = function (self, dt)
328
if not (DEBUG and the.console.visible) then
329
if the.keys:justPressed('q') then
330
self.quit()
331
elseif the.keys:justPressed('return') then
332
if the.keys:pressed('alt') then
333
love.graphics.toggleFullscreen()
334
else
335
self.view = GameView:new()
336
end
337
elseif the.keys:justPressed('f1') then
338
local ss = love.graphics.newScreenshot()
339
ss:encode('screenshot-' ..love.timer.getTime()..'.png')
340
elseif the.keys:justPressed('f11') then
341
love.graphics.toggleFullscreen()
342
end
283
if the.keys:justPressed('q') then
284
self.quit()
285
elseif the.keys:justPressed('return') then
286
self.view = GameView:new()
287
elseif the.keys:justPressed('f1') then
288
local ss = love.graphics.newScreenshot()
289
ss:encode('screenshot-' ..love.timer.getTime()..'.png')
343
290
end
344
291
end,
345
292
update = function (self, dt)
350
297
end
351
298
end
352
299
}
353
354
realRun = love.run
355
function love.run()
356
-- should fail silently if it can't go to fullscreen...
357
love.graphics.toggleFullscreen()
358
359
realRun()
360
end
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1