/spacey

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

« 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
3
3
 
4
4
require 'zoetrope'
5
5
vector = require 'vector'
 
6
--inspect = require 'inspect'
6
7
 
7
8
require 'group'
8
9
 
83
84
              --    end
84
85
              -- end
85
86
 
 
87
              the.storage = Storage:new{filename = 'scores.lua'}
 
88
              the.storage:load()
 
89
              if not the.storage.data.highScore then
 
90
                 print('initializing storage')
 
91
                 the.storage.data = {highScore = 0}
 
92
              end
 
93
 
86
94
              the.rockColliders = Group:new()
87
95
              the.bullets = Group:new()
88
96
              the.mirrors = Group:new()
89
97
              the.rocks = Group:new()
 
98
              the.interface = Group:new()
90
99
 
91
100
              the.bg = Tile:new{
92
101
                 image = 'data/stars3.png',
99
108
              --the.player = CrystalPlayer:new{x=400,y=300}
100
109
              the.player = SpacePlayer:new{x=1366,y=768}
101
110
              self:add(the.player)
 
111
              self:add(the.player.thrust)
102
112
 
103
113
              --self:add(Enemy:new{x=400, y=300})
104
114
 
106
116
              self:add(the.rockColliders)
107
117
              self:add(the.mirrors)
108
118
              self:add(the.rocks)
 
119
              self:add(the.interface)
109
120
 
110
121
              the.cursor = Cursor:new()
111
122
              self:add(the.cursor)
112
123
 
 
124
              the.score = Text:new{
 
125
                 x = 8,
 
126
                 y = 8,
 
127
                 width = the.app.width,
 
128
                 --align = 'center',
 
129
                 font = 25}
 
130
              the.interface:add(the.score)
 
131
 
 
132
              local hs = the.storage.data.highScore
 
133
              local m = hs / 60
 
134
              local s = hs % 60
 
135
 
 
136
              the.highScore = Text:new{
 
137
                 x = -8,
 
138
                 y = 8,
 
139
                 width = the.app.width,
 
140
                 align = 'right',
 
141
                 font = 25,
 
142
                 text = string.format('High Score: %d:%02d', m, s)
 
143
              }
 
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)
 
166
 
113
167
              love.mouse.setGrab(true)
114
168
              love.mouse.setVisible(false)
 
169
              love.mouse.setPosition(the.app.width / 2, the.app.height / 2)
115
170
 
116
171
              --self:loadLayers('data/map.lua')
117
172
              self.focus = the.player
120
175
              self.gameStart = love.timer.getTime()
121
176
           end,
122
177
   onUpdate = function(self, dt)
123
 
                 if love.timer.getTime() > self.lastRock + self.rockInterval then
 
178
                 if the.player.active and love.timer.getTime() > self.lastRock + self.rockInterval then
124
179
                    local unseenRock = nil
125
180
                    while not unseenRock do
126
181
                       local rock = Rock:new{
149
204
                 end
150
205
 
151
206
                 the.bullets:collide(the.rockColliders)
 
207
 
 
208
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
 
209
                 --    if not mirror.of then
 
210
                 --       print('mirror:' .. inspect(mirror))
 
211
                 --       error('mirror OF NOTHING')
 
212
                 --    end
 
213
                 -- end
152
214
              end,
 
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
 
 
219
                   if the.player.active then
 
220
                      self:updateScore()
 
221
                   end
 
222
                end,
153
223
   draw = function (self, x, y)
154
224
             View.draw(self, x, y)
155
 
             love.graphics.print('FPS:' .. love.timer.getFPS(), 20, 20)
156
 
          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
157
239
}
158
240
 
159
241
MenuScreen = View:extend {
177
259
              math.randomseed(os.time())
178
260
 
179
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
 
180
267
              if DEBUG then
181
268
                 self.console:watch('VERSION', 'VERSION')
182
269
                 self.console:watch('updateTook', 'the.updateTook')
184
271
                 self.console:watch('the.player.y', 'the.player.y')
185
272
                 self.console:watch('the.app.width', 'the.app.width')
186
273
                 self.console:watch('the.app.height', 'the.app.height')
 
274
                 self.console:watch('num mirrors', '#the.mirrors.sprites')
 
275
                 self.console:watch('num rocks', '#the.rocks.sprites')
187
276
                 --self.console:watch('drawTook', 'the.drawTook')
188
277
 
189
278
                 -- back off that dark overlay a bit
191
280
              end
192
281
           end,
193
282
   onUpdate = function (self, dt)
194
 
                 if the.keys:justPressed('escape') then
 
283
                 if the.keys:justPressed('q') then
195
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')
196
290
                 end
197
291
              end,
198
292
   update = function (self, dt)