/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:
1
1
STRICT = true
2
2
DEBUG = false
3
 
LOVEBIRD = false
4
 
 
5
 
if SDL then
6
 
  print = SDL.log
7
 
end
8
3
 
9
4
require 'zoetrope'
10
5
--require 'pepperprof'
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
 
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
 
       require('lovebird').update()
218
 
     end
219
 
     App.update(self, dt)
220
 
   end,
221
 
   setScaling = function(self, view)
222
 
     local view = view or the.app.view
223
 
 
224
 
     local winw, winh = love.window.getMode()
225
 
     --if love.window.getFullscreen() then
226
 
     if winw == self.width and winh == self.height then
227
 
       self.scale = 1
228
 
       view.realTranslate = { x=0, y=0 }
229
 
       love.graphics.setScissor()
230
 
     else
231
 
       --self.scale = math.min(
232
 
       --  math.floor(winw / the.app.viewWidth),
233
 
       --  math.floor(winh / the.app.viewHeight)
234
 
       --)
235
 
       if winh >= 1050 then
236
 
         self.scale = 1.5
237
 
       elseif winh < the.app.height then
238
 
         self.scale = winh / the.app.height
239
 
       end
240
 
       view.realTranslate.x = math.floor((winw - self.width * self.scale) / 2)
241
 
       view.realTranslate.y = math.floor((winh - self.height * self.scale) / 2)
242
 
       --print('translate: ' .. view.realTranslate.x .. ', ' .. view.realTranslate.y)
243
 
 
244
 
       love.graphics.setColor(0,0,0)
245
 
       love.graphics.rectangle('fill', 0, 0, winw, winh)
246
 
       love.graphics.setScissor( view.realTranslate.x,
247
 
                                 view.realTranslate.y,
248
 
                                 self.width * self.scale,
249
 
                                 self.height * self.scale)
250
 
     end
251
 
 
252
 
     view.scale = self.scale
253
 
   end
 
202
              end
254
203
}
255
 
 
256
 
function love.resize(w, h)
257
 
  print('love.resize')
258
 
  the.app:setScaling()
259
 
end