/traderous

To get this branch, use:
bzr branch http://9ix.org/bzr/traderous

« back to all changes in this revision

Viewing changes to main.lua

  • 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
99
 
101
100
              the.bg = Tile:new{
102
101
                 image = 'data/stars3.png',
103
 
                 width = 13660,
104
 
                 height = 7680
 
102
                 -- 1366x768 * 3
 
103
                 width = 4098,
 
104
                 height = 2304
105
105
              }
106
106
              self:add(the.bg)
107
107
 
108
 
              self:add(the.planets)
109
 
 
110
108
              --the.player = CrystalPlayer:new{x=400,y=300}
111
109
              the.player = SpacePlayer:new{x=1366,y=768}
112
110
              self:add(the.player)
115
113
              --self:add(Enemy:new{x=400, y=300})
116
114
 
117
115
              self:add(the.bullets)
118
 
              --self:add(the.rockColliders)
 
116
              self:add(the.rockColliders)
119
117
              self:add(the.mirrors)
120
 
              --self:add(the.rocks)
 
118
              self:add(the.rocks)
121
119
              self:add(the.interface)
122
120
 
123
 
              for _ = 1, math.random(6) do
124
 
                 local planet = Tile:new{
125
 
                    image = 'data/planet1.png',
126
 
                    x = math.random(the.app.width / 2,
127
 
                                    the.bg.width - the.app.width / 2),
128
 
                    y = math.random(the.app.height / 2,
129
 
                                    the.bg.height - the.app.height / 2),
130
 
                    rotation = math.random() * math.pi
131
 
                 }
132
 
                 the.planets:add(planet)
133
 
              end
134
 
 
135
121
              the.cursor = Cursor:new()
136
122
              self:add(the.cursor)
137
123
 
189
175
              self.gameStart = love.timer.getTime()
190
176
           end,
191
177
   onUpdate = function(self, dt)
192
 
                 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
193
179
                    local unseenRock = nil
194
180
                    while not unseenRock do
195
181
                       local rock = Rock:new{
274
260
 
275
261
              self.view = GameView:new()
276
262
 
277
 
              -- should fail silently if it can't go to fullscreen...
 
263
              -- try going fullscreen.  should fail silently if it
 
264
              -- can't go to fullscreen.
278
265
              love.graphics.toggleFullscreen()
279
266
 
280
267
              if DEBUG then
286
273
                 self.console:watch('the.app.height', 'the.app.height')
287
274
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
288
275
                 self.console:watch('num rocks', '#the.rocks.sprites')
289
 
                 self.console:watch('num planets', '#the.planets.sprites')
290
276
                 --self.console:watch('drawTook', 'the.drawTook')
291
277
 
292
278
                 -- back off that dark overlay a bit
294
280
              end
295
281
           end,
296
282
   onUpdate = function (self, dt)
297
 
                 if not (DEBUG and the.console.visible) then
298
 
                    if the.keys:justPressed('q') then
299
 
                       self.quit()
300
 
                    elseif the.keys:justPressed('return') then
301
 
                       if the.keys:pressed('alt') then
302
 
                          love.graphics.toggleFullscreen()
303
 
                       else
304
 
                          self.view = GameView:new()
305
 
                       end
306
 
                    elseif the.keys:justPressed('f1') then
307
 
                       local ss = love.graphics.newScreenshot()
308
 
                       ss:encode('screenshot-' ..love.timer.getTime()..'.png')
309
 
                    elseif the.keys:justPressed('f11') then
310
 
                       love.graphics.toggleFullscreen()
311
 
                    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')
312
290
                 end
313
291
              end,
314
292
   update = function (self, dt)