/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
3
 
LOVEBIRD = false
4
 
 
5
 
if SDL then
6
 
  print = SDL.log
7
 
end
 
2
DEBUG = true
8
3
 
9
4
require 'zoetrope'
10
5
--require 'pepperprof'
21
16
 
22
17
GameView = View:extend {
23
18
   gameStart = 0,
24
 
   switchSounds = {},
25
19
   onNew = function (self)
26
20
              self:loadLayers('data/map.lua')
27
21
              self.focus = the.player
28
22
              self:clampTo(self.bg)
29
23
 
30
 
              the.app:setScaling(self)
31
 
 
32
24
              self.mazes = {self.maze1, self.maze2, self.maze3}
33
25
              self.bgs = {self.bg, self.bg, self.bg2}
34
26
              for _, maze in ipairs(self.mazes) do maze:die() end
41
33
              self.maze2.playerScale = 0.5
42
34
              self.maze3.playerScale = 1
43
35
 
44
 
              self.goals = {{},{},{}}
 
36
              self.goals = {}
45
37
              the.goalsAchieved = 0
46
38
              for _, obj in ipairs(self.objects.sprites) do
47
39
                 if obj:instanceOf(Goal) then
48
40
                    obj.visible = false
49
 
                    table.insert(self.goals[tonumber(obj.map)], obj)
 
41
                    self.goals[tonumber(obj.map)] = obj
50
42
                 end
51
43
              end
52
44
 
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
 
 
60
45
              --the.interface = Group:new()
61
46
 
62
47
              --self:add(the.interface)
67
52
              --the.profiler = newProfiler()
68
53
              --the.profiler:start()
69
54
 
70
 
              self.gameStart = love.timer.getTime()
71
 
              self.lastChange = love.timer.getTime()
 
55
              self.gameStart = love.timer.getMicroTime()
 
56
              self.lastChange = love.timer.getMicroTime()
72
57
           end,
73
58
   onUpdate = function(self, dt)
74
 
                 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
75
60
                    -- switch maze
76
61
                    self:switchMaze()
77
62
                 end
78
63
 
79
64
                 if not (DEBUG and the.console.visible) then
80
 
                    for _, goal in ipairs(the.activeGoals) do
81
 
                       the.player.collider:collide(goal)
82
 
                    end
 
65
                    --the.player.collider:collide(the.activeMaze)
 
66
                    the.player.collider:collide(the.activeGoal)
83
67
                 end
84
68
 
85
69
                 if the.keys:justPressed('escape', 'q') then
100
84
                      the.activeBg.visible = false
101
85
                      the.activeBg = self.bgs[newMaze]
102
86
 
103
 
                      for _, goal in ipairs(the.activeGoals) do
104
 
                         goal.visible = false
 
87
                      if the.activeGoal then
 
88
                         the.activeGoal.visible = false
105
89
                      end
106
 
                      the.activeGoals = self.goals[newMaze]
107
 
 
108
 
                      love.audio.play(self.switchSounds[math.random(#self.switchSounds)])
 
90
                      the.activeGoal = self.goals[newMaze]
109
91
                   else
110
92
                      the.activeMaze = self.maze2
111
93
                      the.activeBg = self.bg
112
 
                      the.activeGoals = self.goals[2]
 
94
                      the.activeGoal = self.goals[2]
113
95
                   end
114
96
 
115
97
                   the.activeMaze:revive()
116
98
                   the.activeBg.visible = true
117
 
                   for _, goal in ipairs(the.activeGoals) do
118
 
                      goal.visible = true
 
99
                   if the.activeGoal then
 
100
                      the.activeGoal.visible = true
119
101
                   end
120
102
                   the.player.scale = the.activeMaze.playerScale
121
103
                   the.player.collider.width = the.player.width * the.activeMaze.playerScale
124
106
                   self._fx = {0,0,0,0}
125
107
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')
126
108
 
127
 
                   self.lastChange = love.timer.getTime()
 
109
                   self.lastChange = love.timer.getMicroTime()
128
110
                end,
129
111
   onEndFrame = function(self)
130
112
                   --the.interface.translate.x = the.player.x - the.app.width / 2 + the.player.width / 2
133
115
}
134
116
 
135
117
MenuScreen = View:extend {
136
 
   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},
137
120
   onNew = function(self)
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
 
 
 
121
              self:add(self.title)
 
122
              self.title:centerAround(400, 200)
182
123
           end,
183
124
   onUpdate = function(self, elapsed)
184
125
                 if the.keys:allJustPressed() then
188
129
}
189
130
 
190
131
the.app = App:new {
191
 
   width = 800,
192
 
   height = 600,
193
 
   name = "Treasures of the Decimaze",
194
132
   onRun = function (self)
195
133
              print('Version: ' .. VERSION)
196
134
 
197
 
              self.view = MenuScreen:new()
198
 
              self:setScaling()
 
135
              self.view = GameView:new()
199
136
 
200
137
              if DEBUG then
201
138
                 self.console:watch('VERSION', 'VERSION')
207
144
              end
208
145
           end,
209
146
   onUpdate = function (self, dt)
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
 
       require('lovebird').update()
218
 
     end
219
 
     App.update(self, dt)
220
 
   end,
221
 
   setScaling = function(self, view)
222
 
     local view = view or the.app.view
223
 
 
224
 
     local winw, winh = love.window.getMode()
225
 
     --if love.window.getFullscreen() then
226
 
     if winw == self.width and winh == self.height then
227
 
       self.scale = 1
228
 
       view.realTranslate = { x=0, y=0 }
229
 
       love.graphics.setScissor()
230
 
     else
231
 
       --self.scale = math.min(
232
 
       --  math.floor(winw / the.app.viewWidth),
233
 
       --  math.floor(winh / the.app.viewHeight)
234
 
       --)
235
 
       if winh >= 1050 then
236
 
         self.scale = 1.5
237
 
       elseif winh < the.app.height then
238
 
         self.scale = winh / the.app.height
239
 
       end
240
 
       view.realTranslate.x = math.floor((winw - self.width * self.scale) / 2)
241
 
       view.realTranslate.y = math.floor((winh - self.height * self.scale) / 2)
242
 
       --print('translate: ' .. view.realTranslate.x .. ', ' .. view.realTranslate.y)
243
 
 
244
 
       love.graphics.setColor(0,0,0)
245
 
       love.graphics.rectangle('fill', 0, 0, winw, winh)
246
 
       love.graphics.setScissor( view.realTranslate.x,
247
 
                                 view.realTranslate.y,
248
 
                                 self.width * self.scale,
249
 
                                 self.height * self.scale)
250
 
     end
251
 
 
252
 
     view.scale = self.scale
253
 
   end
 
147
              end
254
148
}
255
 
 
256
 
function love.resize(w, h)
257
 
  print('love.resize')
258
 
  the.app:setScaling()
259
 
end