/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: 2015-09-05 20:31:03 UTC
  • Revision ID: josh@9ix.org-20150905203103-hgxn36kuk5fm739l
catch <1080p scaling case

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
1
 
STRICT = true
2
 
DEBUG = true
3
 
 
 
1
STRICT = false
 
2
DEBUG = false
 
3
 
 
4
if SDL then
 
5
  print = SDL.log
 
6
end
 
7
 
 
8
--lovebird = require 'lovebird'
4
9
require 'zoetrope'
5
10
--require 'pepperprof'
6
11
--inspect = require 'inspect'
22
27
              self.focus = the.player
23
28
              self:clampTo(self.bg)
24
29
 
 
30
              the.app:setScaling(self)
 
31
 
25
32
              self.mazes = {self.maze1, self.maze2, self.maze3}
26
33
              self.bgs = {self.bg, self.bg, self.bg2}
27
34
              for _, maze in ipairs(self.mazes) do maze:die() end
34
41
              self.maze2.playerScale = 0.5
35
42
              self.maze3.playerScale = 1
36
43
 
37
 
              self.goals = {}
 
44
              self.goals = {{},{},{}}
38
45
              the.goalsAchieved = 0
39
46
              for _, obj in ipairs(self.objects.sprites) do
40
47
                 if obj:instanceOf(Goal) then
41
48
                    obj.visible = false
42
 
                    self.goals[tonumber(obj.map)] = obj
 
49
                    table.insert(self.goals[tonumber(obj.map)], obj)
43
50
                 end
44
51
              end
45
52
 
60
67
              --the.profiler = newProfiler()
61
68
              --the.profiler:start()
62
69
 
63
 
              self.gameStart = love.timer.getMicroTime()
64
 
              self.lastChange = love.timer.getMicroTime()
 
70
              self.gameStart = love.timer.getTime()
 
71
              self.lastChange = love.timer.getTime()
65
72
           end,
66
73
   onUpdate = function(self, dt)
67
 
                 if the.player.active and love.timer.getMicroTime() > self.lastChange + 10 then
 
74
                 if the.player.active and love.timer.getTime() > self.lastChange + 10 then
68
75
                    -- switch maze
69
76
                    self:switchMaze()
70
77
                 end
71
78
 
72
79
                 if not (DEBUG and the.console.visible) then
73
 
                    --the.player.collider:collide(the.activeMaze)
74
 
                    the.player.collider:collide(the.activeGoal)
 
80
                    for _, goal in ipairs(the.activeGoals) do
 
81
                       the.player.collider:collide(goal)
 
82
                    end
75
83
                 end
76
84
 
77
85
                 if the.keys:justPressed('escape', 'q') then
92
100
                      the.activeBg.visible = false
93
101
                      the.activeBg = self.bgs[newMaze]
94
102
 
95
 
                      if the.activeGoal then
96
 
                         the.activeGoal.visible = false
 
103
                      for _, goal in ipairs(the.activeGoals) do
 
104
                         goal.visible = false
97
105
                      end
98
 
                      the.activeGoal = self.goals[newMaze]
 
106
                      the.activeGoals = self.goals[newMaze]
99
107
 
100
108
                      love.audio.play(self.switchSounds[math.random(#self.switchSounds)])
101
109
                   else
102
110
                      the.activeMaze = self.maze2
103
111
                      the.activeBg = self.bg
104
 
                      the.activeGoal = self.goals[2]
 
112
                      the.activeGoals = self.goals[2]
105
113
                   end
106
114
 
107
115
                   the.activeMaze:revive()
108
116
                   the.activeBg.visible = true
109
 
                   if the.activeGoal then
110
 
                      the.activeGoal.visible = true
 
117
                   for _, goal in ipairs(the.activeGoals) do
 
118
                      goal.visible = true
111
119
                   end
112
120
                   the.player.scale = the.activeMaze.playerScale
113
121
                   the.player.collider.width = the.player.width * the.activeMaze.playerScale
116
124
                   self._fx = {0,0,0,0}
117
125
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')
118
126
 
119
 
                   self.lastChange = love.timer.getMicroTime()
 
127
                   self.lastChange = love.timer.getTime()
120
128
                end,
121
129
   onEndFrame = function(self)
122
130
                   --the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
127
135
MenuScreen = View:extend {
128
136
   bg = Tile:new{image = 'data/intro.png', x = 0, y = 0},
129
137
   onNew = function(self)
 
138
              the.app:setScaling(self)
 
139
 
130
140
              self:add(self.bg)
131
141
              --self.title:centerAround(400, 200)
132
142
 
133
143
              local nr = 'data/NewRocker-Regular.otf'
134
144
              self:add(Text:new{
135
 
                          text = 'Name Of Game',
 
145
                          text = 'Treasures of the Decimaze',
136
146
                          --x = 0,
137
147
                          y = 100,
138
148
                          width = self.bg.width,
171
181
 
172
182
           end,
173
183
   onUpdate = function(self, elapsed)
174
 
                 if the.keys:allJustPressed() then
175
 
                    the.app.view = GameView:new()
176
 
                 end
177
 
              end
 
184
     if the.keys:allJustPressed() or the.mouse:pressed() then
 
185
       the.app.view = GameView:new()
 
186
     end
 
187
   end
178
188
}
179
189
 
180
190
the.app = App:new {
 
191
   width = 800,
 
192
   height = 600,
 
193
   name = "Treasures of the Decimaze",
181
194
   onRun = function (self)
182
195
              print('Version: ' .. VERSION)
183
196
 
184
197
              self.view = MenuScreen:new()
 
198
              self:setScaling()
185
199
 
186
200
              if DEBUG then
187
201
                 self.console:watch('VERSION', 'VERSION')
193
207
              end
194
208
           end,
195
209
   onUpdate = function (self, dt)
196
 
              end
 
210
                 if the.keys:justPressed('f1') then
 
211
                    local ss = love.graphics.newScreenshot()
 
212
                    ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
213
                 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
197
257
}
 
258
 
 
259
function love.resize(w, h)
 
260
  print('love.resize')
 
261
  the.app:setScaling()
 
262
end