/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'
16
21
 
17
22
GameView = View:extend {
18
23
   gameStart = 0,
 
24
   switchSounds = {},
19
25
   onNew = function (self)
20
26
              self:loadLayers('data/map.lua')
21
27
              self.focus = the.player
22
28
              self:clampTo(self.bg)
23
29
 
 
30
              the.app:setScaling(self)
 
31
 
24
32
              self.mazes = {self.maze1, self.maze2, self.maze3}
25
33
              self.bgs = {self.bg, self.bg, self.bg2}
26
34
              for _, maze in ipairs(self.mazes) do maze:die() end
33
41
              self.maze2.playerScale = 0.5
34
42
              self.maze3.playerScale = 1
35
43
 
36
 
              self.goals = {}
 
44
              self.goals = {{},{},{}}
37
45
              the.goalsAchieved = 0
38
46
              for _, obj in ipairs(self.objects.sprites) do
39
47
                 if obj:instanceOf(Goal) then
40
48
                    obj.visible = false
41
 
                    self.goals[tonumber(obj.map)] = obj
 
49
                    table.insert(self.goals[tonumber(obj.map)], obj)
42
50
                 end
43
51
              end
44
52
 
 
53
              local sndFiles = {'data/Explosion2.wav', 'data/Explosion3.wav', 'data/Hit_Hurt3.wav'}
 
54
 
 
55
              for _, sndFile in ipairs(sndFiles) do
 
56
                 local snd = love.audio.newSource(sndFile, 'static')
 
57
                 table.insert(self.switchSounds, snd)
 
58
              end
 
59
 
45
60
              --the.interface = Group:new()
46
61
 
47
62
              --self:add(the.interface)
52
67
              --the.profiler = newProfiler()
53
68
              --the.profiler:start()
54
69
 
55
 
              self.gameStart = love.timer.getMicroTime()
56
 
              self.lastChange = love.timer.getMicroTime()
 
70
              self.gameStart = love.timer.getTime()
 
71
              self.lastChange = love.timer.getTime()
57
72
           end,
58
73
   onUpdate = function(self, dt)
59
 
                 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
60
75
                    -- switch maze
61
76
                    self:switchMaze()
62
77
                 end
63
78
 
64
79
                 if not (DEBUG and the.console.visible) then
65
 
                    --the.player.collider:collide(the.activeMaze)
66
 
                    the.player.collider:collide(the.activeGoal)
 
80
                    for _, goal in ipairs(the.activeGoals) do
 
81
                       the.player.collider:collide(goal)
 
82
                    end
67
83
                 end
68
84
 
69
85
                 if the.keys:justPressed('escape', 'q') then
84
100
                      the.activeBg.visible = false
85
101
                      the.activeBg = self.bgs[newMaze]
86
102
 
87
 
                      if the.activeGoal then
88
 
                         the.activeGoal.visible = false
 
103
                      for _, goal in ipairs(the.activeGoals) do
 
104
                         goal.visible = false
89
105
                      end
90
 
                      the.activeGoal = self.goals[newMaze]
 
106
                      the.activeGoals = self.goals[newMaze]
 
107
 
 
108
                      love.audio.play(self.switchSounds[math.random(#self.switchSounds)])
91
109
                   else
92
110
                      the.activeMaze = self.maze2
93
111
                      the.activeBg = self.bg
94
 
                      the.activeGoal = self.goals[2]
 
112
                      the.activeGoals = self.goals[2]
95
113
                   end
96
114
 
97
115
                   the.activeMaze:revive()
98
116
                   the.activeBg.visible = true
99
 
                   if the.activeGoal then
100
 
                      the.activeGoal.visible = true
 
117
                   for _, goal in ipairs(the.activeGoals) do
 
118
                      goal.visible = true
101
119
                   end
102
120
                   the.player.scale = the.activeMaze.playerScale
103
121
                   the.player.collider.width = the.player.width * the.activeMaze.playerScale
106
124
                   self._fx = {0,0,0,0}
107
125
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')
108
126
 
109
 
                   self.lastChange = love.timer.getMicroTime()
 
127
                   self.lastChange = love.timer.getTime()
110
128
                end,
111
129
   onEndFrame = function(self)
112
130
                   --the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
115
133
}
116
134
 
117
135
MenuScreen = View:extend {
118
 
   title = Text:new{text = "Press a key to start", font = 48, wordWrap = false},
119
 
   --title = Tile:new{image = 'data/title.png', x = 0, y = 0},
 
136
   bg = Tile:new{image = 'data/intro.png', x = 0, y = 0},
120
137
   onNew = function(self)
121
 
              self:add(self.title)
122
 
              self.title:centerAround(400, 200)
 
138
              the.app:setScaling(self)
 
139
 
 
140
              self:add(self.bg)
 
141
              --self.title:centerAround(400, 200)
 
142
 
 
143
              local nr = 'data/NewRocker-Regular.otf'
 
144
              self:add(Text:new{
 
145
                          text = 'Treasures of the Decimaze',
 
146
                          --x = 0,
 
147
                          y = 100,
 
148
                          width = self.bg.width,
 
149
                          font = {nr, 48},
 
150
                          align = 'center',
 
151
                          tint = {0,0,0}
 
152
                       })
 
153
 
 
154
              self:add(Text:new{
 
155
                          text = 'Find the 4 lost shinies!',
 
156
                          y = 170,
 
157
                          width = self.bg.width,
 
158
                          font = {nr, 28},
 
159
                          align = 'center',
 
160
                          tint = {0,0,0}
 
161
                       })
 
162
 
 
163
              self:add(Text:new{
 
164
                          text = 'Use the arrow keys to move',
 
165
                          y = 375,
 
166
                          width = self.bg.width,
 
167
                          font = {nr, 24},
 
168
                          align = 'center',
 
169
                          tint = {0,0,0}
 
170
                       })
 
171
 
 
172
              self:add(Text:new{
 
173
                          text = 'Press a key to start',
 
174
                          y = 425,
 
175
                          width = self.bg.width,
 
176
                          font = {nr, 24},
 
177
                          align = 'center',
 
178
                          tint = {0,0,0}
 
179
                       })
 
180
 
 
181
 
123
182
           end,
124
183
   onUpdate = function(self, elapsed)
125
 
                 if the.keys:allJustPressed() then
126
 
                    the.app.view = GameView:new()
127
 
                 end
128
 
              end
 
184
     if the.keys:allJustPressed() or the.mouse:pressed() then
 
185
       the.app.view = GameView:new()
 
186
     end
 
187
   end
129
188
}
130
189
 
131
190
the.app = App:new {
 
191
   width = 800,
 
192
   height = 600,
 
193
   name = "Treasures of the Decimaze",
132
194
   onRun = function (self)
133
195
              print('Version: ' .. VERSION)
134
196
 
135
 
              self.view = GameView:new()
 
197
              self.view = MenuScreen:new()
 
198
              self:setScaling()
136
199
 
137
200
              if DEBUG then
138
201
                 self.console:watch('VERSION', 'VERSION')
144
207
              end
145
208
           end,
146
209
   onUpdate = function (self, dt)
147
 
              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
148
257
}
 
258
 
 
259
function love.resize(w, h)
 
260
  print('love.resize')
 
261
  the.app:setScaling()
 
262
end