/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 15:28:23 UTC
  • Revision ID: josh@9ix.org-20140703152823-4241je58pflhx7ec
scaling

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
1
1
STRICT = true
2
 
DEBUG = true
 
2
DEBUG = false
3
3
 
4
4
require 'zoetrope'
5
5
--require 'pepperprof'
22
22
              self.focus = the.player
23
23
              self:clampTo(self.bg)
24
24
 
 
25
              self.scale = the.app.scale
 
26
 
25
27
              self.mazes = {self.maze1, self.maze2, self.maze3}
26
28
              self.bgs = {self.bg, self.bg, self.bg2}
27
29
              for _, maze in ipairs(self.mazes) do maze:die() end
60
62
              --the.profiler = newProfiler()
61
63
              --the.profiler:start()
62
64
 
63
 
              self.gameStart = love.timer.getMicroTime()
64
 
              self.lastChange = love.timer.getMicroTime()
 
65
              self.gameStart = love.timer.getTime()
 
66
              self.lastChange = love.timer.getTime()
65
67
           end,
66
68
   onUpdate = function(self, dt)
67
 
                 if the.player.active and love.timer.getMicroTime() > self.lastChange + 10 then
 
69
                 if the.player.active and love.timer.getTime() > self.lastChange + 10 then
68
70
                    -- switch maze
69
71
                    self:switchMaze()
70
72
                 end
117
119
                   self._fx = {0,0,0,0}
118
120
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')
119
121
 
120
 
                   self.lastChange = love.timer.getMicroTime()
 
122
                   self.lastChange = love.timer.getTime()
121
123
                end,
122
124
   onEndFrame = function(self)
123
125
                   --the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
128
130
MenuScreen = View:extend {
129
131
   bg = Tile:new{image = 'data/intro.png', x = 0, y = 0},
130
132
   onNew = function(self)
 
133
              self.scale = the.app.scale
 
134
 
131
135
              self:add(self.bg)
132
136
              --self.title:centerAround(400, 200)
133
137
 
179
183
}
180
184
 
181
185
the.app = App:new {
 
186
   width = 800,
 
187
   height = 600,
182
188
   name = "Treasures of the Decimaze",
183
189
   onRun = function (self)
184
190
              print('Version: ' .. VERSION)
185
191
 
186
192
              self.view = MenuScreen:new()
 
193
              self:setScaling()
187
194
 
188
195
              if DEBUG then
189
196
                 self.console:watch('VERSION', 'VERSION')
195
202
              end
196
203
           end,
197
204
   onUpdate = function (self, dt)
198
 
              end
 
205
                 if the.keys:justPressed('f1') then
 
206
                    local ss = love.graphics.newScreenshot()
 
207
                    ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
208
                 end
 
209
              end,
 
210
   setScaling = function(self)
 
211
     local winw, winh = love.window.getMode()
 
212
     --if love.window.getFullscreen() then
 
213
     if winw == self.width and winh == self.height then
 
214
       self.scale = 1
 
215
       self.view.realTranslate = { x=0, y=0 }
 
216
       love.graphics.setScissor()
 
217
     else
 
218
       --self.scale = math.min(
 
219
       --  math.floor(winw / the.app.viewWidth),
 
220
       --  math.floor(winh / the.app.viewHeight)
 
221
       --)
 
222
       if winh >= 1050 then
 
223
         self.scale = 1.5
 
224
       elseif winh < the.app.height then
 
225
         self.scale = winh / the.app.height
 
226
       end
 
227
       self.view.realTranslate.x = math.floor((winw - self.width * self.scale) / 2)
 
228
       self.view.realTranslate.y = math.floor((winh - self.height * self.scale) / 2)
 
229
       --print('translate: ' .. self.view.realTranslate.x .. ', ' .. self.view.realTranslate.y)
 
230
 
 
231
       love.graphics.setColor(0,0,0)
 
232
       love.graphics.rectangle('fill', 0, 0, winw, winh)
 
233
       love.graphics.setScissor( self.view.realTranslate.x,
 
234
                                 self.view.realTranslate.y,
 
235
                                 self.width * self.scale,
 
236
                                 self.height * self.scale)
 
237
     end
 
238
 
 
239
     self.view.scale = self.scale
 
240
   end
199
241
}
 
242
 
 
243
function love.resize(w, h)
 
244
  print('love.resize')
 
245
  the.app:setScaling()
 
246
end