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
91
91
the.storage.data = {highScore = 0}
92
92
end
93
93
94
--the.rockColliders = Group:new()
94
the.rockColliders = Group:new()
95
95
the.bullets = Group:new()
96
96
the.mirrors = Group:new()
97
--the.rocks = Group:new()
97
the.rocks = Group:new()
98
98
the.interface = Group:new()
99
the.planets = Group:new()
100
the.indicators = Group:new()
101
99
102
100
the.bg = Tile:new{
103
101
image = 'data/stars3.png',
104
width = 13660,
105
height = 7680
102
-- 1366x768 * 3
103
width = 4098,
104
height = 2304
106
105
}
107
106
self:add(the.bg)
108
107
109
self:add(the.planets)
110
111
108
--the.player = CrystalPlayer:new{x=400,y=300}
112
109
the.player = SpacePlayer:new{x=1366,y=768}
113
110
self:add(the.player)
116
113
--self:add(Enemy:new{x=400, y=300})
117
114
118
115
self:add(the.bullets)
119
--self:add(the.rockColliders)
116
self:add(the.rockColliders)
120
117
self:add(the.mirrors)
121
--self:add(the.rocks)
122
self:add(the.indicators)
118
self:add(the.rocks)
123
119
self:add(the.interface)
124
120
125
for _ = 1, math.random(6) do
126
local planet = Tile:new{
127
image = 'data/planet1.png',
128
x = math.random(the.app.width / 2,
129
the.bg.width - the.app.width / 2),
130
y = math.random(the.app.height / 2,
131
the.bg.height - the.app.height / 2),
132
rotation = math.random() * math.pi
133
}
134
the.planets:add(planet)
135
136
planet.indicator = Tile:new{
137
image = 'data/planet1ind.png',
138
}
139
the.indicators:add(planet.indicator)
140
end
141
142
121
the.cursor = Cursor:new()
143
122
self:add(the.cursor)
144
123
148
127
width = the.app.width,
149
128
--align = 'center',
150
129
font = 25}
151
--the.interface:add(the.score)
130
the.interface:add(the.score)
152
131
153
132
local hs = the.storage.data.highScore
154
133
local m = hs / 60
162
141
font = 25,
163
142
text = string.format('High Score: %d:%02d', m, s)
164
143
}
165
--the.interface:add(the.highScore)
144
the.interface:add(the.highScore)
166
145
167
146
the.over = Text:new{
168
147
y = the.app.height / 2,
196
175
self.gameStart = love.timer.getTime()
197
176
end,
198
177
onUpdate = function(self, dt)
199
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
200
179
local unseenRock = nil
201
180
while not unseenRock do
202
181
local rock = Rock:new{
226
205
227
206
the.bullets:collide(the.rockColliders)
228
207
229
-- this should really go somewhere else...
230
for _, planet in ipairs(the.planets.sprites) do
231
local indx, indy
232
local pvec = vector.new(
233
planet.x - the.player.x + planet.width / 2,
234
planet.y - the.player.y + planet.height / 2 )
235
236
-- TODO: is there a better way to specify the
237
-- screen rectangle?
238
if planet:intersects(the.player.x - the.app.width / 2,
239
the.player.y - the.app.height / 2,
240
the.app.width,
241
the.app.height) then
242
-- planet is on the screen
243
planet.indicator.visible = false
244
else
245
planet.indicator.visible = true
246
247
if math.abs(pvec.x) / math.abs(pvec.y) > the.app.width / the.app.height then
248
indx = the.app.width / 2 * util.signOf(pvec.x) + 8
249
indy = the.app.width / 2 * pvec.y / math.abs(pvec.x)
250
else
251
indy = the.app.height / 2 * util.signOf(pvec.y) + 8
252
indx = the.app.height / 2 * pvec.x / math.abs(pvec.y)
253
end
254
255
planet.indicator.x = the.player.x + indx
256
planet.indicator.y = the.player.y + indy
257
end
258
end
259
260
208
-- for _, mirror in ipairs(the.mirrors.sprites) do
261
209
-- if not mirror.of then
262
210
-- print('mirror:' .. inspect(mirror))
312
260
313
261
self.view = GameView:new()
314
262
263
-- try going fullscreen. should fail silently if it
264
-- can't go to fullscreen.
265
love.graphics.toggleFullscreen()
266
315
267
if DEBUG then
316
268
self.console:watch('VERSION', 'VERSION')
317
269
self.console:watch('updateTook', 'the.updateTook')
321
273
self.console:watch('the.app.height', 'the.app.height')
322
274
self.console:watch('num mirrors', '#the.mirrors.sprites')
323
275
self.console:watch('num rocks', '#the.rocks.sprites')
324
self.console:watch('num planets', '#the.planets.sprites')
325
276
--self.console:watch('drawTook', 'the.drawTook')
326
277
327
278
-- back off that dark overlay a bit
329
280
end
330
281
end,
331
282
onUpdate = function (self, dt)
332
if not (DEBUG and the.console.visible) then
333
if the.keys:justPressed('q') then
334
self.quit()
335
elseif the.keys:justPressed('return') then
336
if the.keys:pressed('alt') then
337
love.graphics.toggleFullscreen()
338
else
339
self.view = GameView:new()
340
end
341
elseif the.keys:justPressed('f1') then
342
local ss = love.graphics.newScreenshot()
343
ss:encode('screenshot-' ..love.timer.getTime()..'.png')
344
elseif the.keys:justPressed('f11') then
345
love.graphics.toggleFullscreen()
346
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')
347
290
end
348
291
end,
349
292
update = function (self, dt)
354
297
end
355
298
end
356
299
}
357
358
realRun = love.run
359
function love.run()
360
-- should fail silently if it can't go to fullscreen...
361
love.graphics.toggleFullscreen()
362
363
realRun()
364
end
b'\\ No newline at end of file'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1