/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:41:57 UTC
  • Revision ID: josh@9ix.org-20140703144157-xydxt62xzcdq6bdk
cluke009 zoetrope + my spritebatch changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
1
1
STRICT = true
2
 
DEBUG = false
 
2
DEBUG = true
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
 
 
27
25
              self.mazes = {self.maze1, self.maze2, self.maze3}
28
26
              self.bgs = {self.bg, self.bg, self.bg2}
29
27
              for _, maze in ipairs(self.mazes) do maze:die() end
62
60
              --the.profiler = newProfiler()
63
61
              --the.profiler:start()
64
62
 
65
 
              self.gameStart = love.timer.getTime()
66
 
              self.lastChange = love.timer.getTime()
 
63
              self.gameStart = love.timer.getMicroTime()
 
64
              self.lastChange = love.timer.getMicroTime()
67
65
           end,
68
66
   onUpdate = function(self, dt)
69
 
                 if the.player.active and love.timer.getTime() > self.lastChange + 10 then
 
67
                 if the.player.active and love.timer.getMicroTime() > self.lastChange + 10 then
70
68
                    -- switch maze
71
69
                    self:switchMaze()
72
70
                 end
119
117
                   self._fx = {0,0,0,0}
120
118
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')
121
119
 
122
 
                   self.lastChange = love.timer.getTime()
 
120
                   self.lastChange = love.timer.getMicroTime()
123
121
                end,
124
122
   onEndFrame = function(self)
125
123
                   --the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
130
128
MenuScreen = View:extend {
131
129
   bg = Tile:new{image = 'data/intro.png', x = 0, y = 0},
132
130
   onNew = function(self)
133
 
              self.scale = the.app.scale
134
 
 
135
131
              self:add(self.bg)
136
132
              --self.title:centerAround(400, 200)
137
133
 
183
179
}
184
180
 
185
181
the.app = App:new {
186
 
   width = 800,
187
 
   height = 600,
188
182
   name = "Treasures of the Decimaze",
189
183
   onRun = function (self)
190
184
              print('Version: ' .. VERSION)
191
185
 
192
186
              self.view = MenuScreen:new()
193
 
              self:setScaling()
194
187
 
195
188
              if DEBUG then
196
189
                 self.console:watch('VERSION', 'VERSION')
206
199
                    local ss = love.graphics.newScreenshot()
207
200
                    ss:encode('screenshot-' ..love.timer.getTime()..'.png')
208
201
                 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
 
202
              end
241
203
}
242
 
 
243
 
function love.resize(w, h)
244
 
  print('love.resize')
245
 
  the.app:setScaling()
246
 
end