/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',
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)
 
118
              self:add(the.rocks)
122
119
              self:add(the.interface)
123
120
 
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
 
              }
131
 
              the.planets:add(planet)
132
 
 
133
121
              the.cursor = Cursor:new()
134
122
              self:add(the.cursor)
135
123
 
187
175
              self.gameStart = love.timer.getTime()
188
176
           end,
189
177
   onUpdate = function(self, dt)
190
 
                 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
191
179
                    local unseenRock = nil
192
180
                    while not unseenRock do
193
181
                       local rock = Rock:new{
272
260
 
273
261
              self.view = GameView:new()
274
262
 
275
 
              -- 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.
276
265
              love.graphics.toggleFullscreen()
277
266
 
278
267
              if DEBUG then
294
283
                 if the.keys:justPressed('q') then
295
284
                    self.quit()
296
285
                 elseif the.keys:justPressed('return') then
297
 
                    if the.keys:pressed('alt') then
298
 
                       love.graphics.toggleFullscreen()
299
 
                    else
300
 
                       self.view = GameView:new()
301
 
                    end
 
286
                    self.view = GameView:new()
302
287
                 elseif the.keys:justPressed('f1') then
303
288
                    local ss = love.graphics.newScreenshot()
304
289
                    ss:encode('screenshot-' ..love.timer.getTime()..'.png')
305
 
                 elseif the.keys:justPressed('f11') then
306
 
                    love.graphics.toggleFullscreen()
307
290
                 end
308
291
              end,
309
292
   update = function (self, dt)