/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: 2013-08-25 21:05:20 UTC
  • Revision ID: josh@9ix.org-20130825210520-2of9iq2uemncp336
overhaul collision and physics to fix an annoying collision resolution 
bug

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