/ld27

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

« back to all changes in this revision

Viewing changes to main.lua

  • Committer: Josh C
  • Date: 2014-07-03 14:43:25 UTC
  • Revision ID: josh@9ix.org-20140703144325-799ow43au3uimguy
zoetrope scaling patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
1
 
STRICT = false
 
1
STRICT = true
2
2
DEBUG = false
3
3
 
4
 
if SDL then
5
 
  print = SDL.log
6
 
end
7
 
 
8
 
--lovebird = require 'lovebird'
9
4
require 'zoetrope'
10
5
--require 'pepperprof'
11
6
--inspect = require 'inspect'
27
22
              self.focus = the.player
28
23
              self:clampTo(self.bg)
29
24
 
30
 
              the.app:setScaling(self)
31
 
 
32
25
              self.mazes = {self.maze1, self.maze2, self.maze3}
33
26
              self.bgs = {self.bg, self.bg, self.bg2}
34
27
              for _, maze in ipairs(self.mazes) do maze:die() end
135
128
MenuScreen = View:extend {
136
129
   bg = Tile:new{image = 'data/intro.png', x = 0, y = 0},
137
130
   onNew = function(self)
138
 
              the.app:setScaling(self)
139
 
 
140
131
              self:add(self.bg)
141
132
              --self.title:centerAround(400, 200)
142
133
 
181
172
 
182
173
           end,
183
174
   onUpdate = function(self, elapsed)
184
 
     if the.keys:allJustPressed() or the.mouse:pressed() then
185
 
       the.app.view = GameView:new()
186
 
     end
187
 
   end
 
175
                 if the.keys:allJustPressed() then
 
176
                    the.app.view = GameView:new()
 
177
                 end
 
178
              end
188
179
}
189
180
 
190
181
the.app = App:new {
191
 
   width = 800,
192
 
   height = 600,
193
182
   name = "Treasures of the Decimaze",
194
183
   onRun = function (self)
195
184
              print('Version: ' .. VERSION)
196
185
 
197
186
              self.view = MenuScreen:new()
198
 
              self:setScaling()
199
187
 
200
188
              if DEBUG then
201
189
                 self.console:watch('VERSION', 'VERSION')
211
199
                    local ss = love.graphics.newScreenshot()
212
200
                    ss:encode('screenshot-' ..love.timer.getTime()..'.png')
213
201
                 end
214
 
              end,
215
 
   update = function(self, dt)
216
 
     if lovebird then
217
 
       fps = love.timer.getFPS()
218
 
       lovebird.update()
219
 
     end
220
 
     App.update(self, dt)
221
 
   end,
222
 
   setScaling = function(self, view)
223
 
     local view = view or the.app.view
224
 
 
225
 
     local winw, winh = love.window.getMode()
226
 
     --if love.window.getFullscreen() then
227
 
     if winw == self.width and winh == self.height then
228
 
       self.scale = 1
229
 
       view.realTranslate = { x=0, y=0 }
230
 
       love.graphics.setScissor()
231
 
     else
232
 
       --self.scale = math.min(
233
 
       --  math.floor(winw / the.app.viewWidth),
234
 
       --  math.floor(winh / the.app.viewHeight)
235
 
       --)
236
 
       if winh >= 1050 then
237
 
         self.scale = 1.5
238
 
       elseif winh < the.app.height then
239
 
         self.scale = winh / the.app.height
240
 
       else
241
 
         self.scale = 1
242
 
       end
243
 
       view.realTranslate.x = math.floor((winw - self.width * self.scale) / 2)
244
 
       view.realTranslate.y = math.floor((winh - self.height * self.scale) / 2)
245
 
       --print('translate: ' .. view.realTranslate.x .. ', ' .. view.realTranslate.y)
246
 
 
247
 
       love.graphics.setColor(0,0,0)
248
 
       love.graphics.rectangle('fill', 0, 0, winw, winh)
249
 
       love.graphics.setScissor( view.realTranslate.x,
250
 
                                 view.realTranslate.y,
251
 
                                 self.width * self.scale,
252
 
                                 self.height * self.scale)
253
 
     end
254
 
 
255
 
     view.scale = self.scale
256
 
   end
 
202
              end
257
203
}
258
 
 
259
 
function love.resize(w, h)
260
 
  print('love.resize')
261
 
  the.app:setScaling()
262
 
end