/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
95
95
              the.bullets = Group:new()
96
96
              the.mirrors = Group:new()
97
97
              the.rocks = Group:new()
 
98
              the.interface = Group:new()
98
99
 
99
100
              the.bg = Tile:new{
100
101
                 image = 'data/stars3.png',
107
108
              --the.player = CrystalPlayer:new{x=400,y=300}
108
109
              the.player = SpacePlayer:new{x=1366,y=768}
109
110
              self:add(the.player)
 
111
              self:add(the.player.thrust)
110
112
 
111
113
              --self:add(Enemy:new{x=400, y=300})
112
114
 
114
116
              self:add(the.rockColliders)
115
117
              self:add(the.mirrors)
116
118
              self:add(the.rocks)
 
119
              self:add(the.interface)
117
120
 
118
121
              the.cursor = Cursor:new()
119
122
              self:add(the.cursor)
120
123
 
121
124
              the.score = Text:new{
 
125
                 x = 8,
 
126
                 y = 8,
122
127
                 width = the.app.width,
123
 
                 align = 'center',
 
128
                 --align = 'center',
124
129
                 font = 25}
125
 
              self:add(the.score)
 
130
              the.interface:add(the.score)
126
131
 
127
132
              local hs = the.storage.data.highScore
128
133
              local m = hs / 60
129
134
              local s = hs % 60
130
135
 
131
136
              the.highScore = Text:new{
 
137
                 x = -8,
 
138
                 y = 8,
132
139
                 width = the.app.width,
133
140
                 align = 'right',
134
141
                 font = 25,
135
142
                 text = string.format('High Score: %d:%02d', m, s)
136
143
              }
137
 
              self:add(the.highScore)
 
144
              the.interface:add(the.highScore)
 
145
 
 
146
              the.over = Text:new{
 
147
                 y = the.app.height / 2,
 
148
                 width = the.app.width,
 
149
                 align = 'center',
 
150
                 font = 25,
 
151
                 text = "Game Over",
 
152
                 visible = false
 
153
              }
 
154
              the.interface:add(the.over)
 
155
 
 
156
 
 
157
              the.instructions = Text:new{
 
158
                 y = the.app.height / 2 + 32,
 
159
                 width = the.app.width,
 
160
                 align = 'center',
 
161
                 font = 12,
 
162
                 text = "Press Enter to start a new game\nPress Q to quit",
 
163
                 visible = false
 
164
              }
 
165
              the.interface:add(the.instructions)
138
166
 
139
167
              love.mouse.setGrab(true)
140
168
              love.mouse.setVisible(false)
147
175
              self.gameStart = love.timer.getTime()
148
176
           end,
149
177
   onUpdate = function(self, dt)
150
 
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
 
178
                 if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
151
179
                    local unseenRock = nil
152
180
                    while not unseenRock do
153
181
                       local rock = Rock:new{
185
213
                 -- end
186
214
              end,
187
215
   onEndFrame = function(self)
 
216
                   the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
 
217
                   the.interface.translate.y = the.player.y - the.app.height / 2 + the.player.height / 2
 
218
 
188
219
                   if the.player.active then
189
 
                      local t = love.timer.getTime() - self.gameStart
190
 
                      local m = t / 60
191
 
                      local s = t % 60
192
 
 
193
 
                      the.score.text = string.format('Score: %d:%02d', m, s)
194
 
                      the.score.y = the.player.y - the.app.height / 2 + the.player.height
195
 
                      the.score.x = the.player.x - the.app.width / 2
 
220
                      self:updateScore()
196
221
                   end
197
 
 
198
 
                   the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
199
 
                   the.highScore.x = the.player.x - the.app.width / 2
200
222
                end,
201
223
   draw = function (self, x, y)
202
224
             View.draw(self, x, y)
203
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
204
 
          end
 
225
             --love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
 
226
          end,
 
227
   updateScore = function(self)
 
228
                    local t = love.timer.getTime() - self.gameStart
 
229
                    local m = t / 60
 
230
                    local s = t % 60
 
231
 
 
232
                    the.score.text = string.format('Score: %d:%02d', m, s)
 
233
                    --the.score.y = the.player.y - the.app.height / 2 + the.player.height
 
234
                    --the.score.x = the.player.x - the.app.width / 2 + the.player.width
 
235
 
 
236
                    --the.highScore.y = the.player.y - the.app.height / 2 + the.player.height
 
237
                    --the.highScore.x = the.player.x - the.app.width / 2
 
238
                 end
205
239
}
206
240
 
207
241
MenuScreen = View:extend {
225
259
              math.randomseed(os.time())
226
260
 
227
261
              self.view = GameView:new()
 
262
 
 
263
              -- try going fullscreen.  should fail silently if it
 
264
              -- can't go to fullscreen.
 
265
              love.graphics.toggleFullscreen()
 
266
 
228
267
              if DEBUG then
229
268
                 self.console:watch('VERSION', 'VERSION')
230
269
                 self.console:watch('updateTook', 'the.updateTook')
233
272
                 self.console:watch('the.app.width', 'the.app.width')
234
273
                 self.console:watch('the.app.height', 'the.app.height')
235
274
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
 
275
                 self.console:watch('num rocks', '#the.rocks.sprites')
236
276
                 --self.console:watch('drawTook', 'the.drawTook')
237
277
 
238
278
                 -- back off that dark overlay a bit
240
280
              end
241
281
           end,
242
282
   onUpdate = function (self, dt)
243
 
                 if the.keys:justPressed('escape') then
 
283
                 if the.keys:justPressed('q') then
244
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')
245
290
                 end
246
291
              end,
247
292
   update = function (self, dt)