/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 02:38:46 UTC
  • Revision ID: josh@9ix.org-20130825023846-wgea9oh4n0o16gct
separate collision box for player so it can scale

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
 
5
--require 'pepperprof'
5
6
 
6
7
--require 'group'
7
8
 
43
44
 
44
45
              self:switchMaze()
45
46
 
 
47
              -- profiling...
 
48
              --the.profiler = newProfiler()
 
49
              --the.profiler:start()
 
50
 
46
51
              self.gameStart = love.timer.getMicroTime()
47
52
              self.lastChange = love.timer.getMicroTime()
48
53
           end,
53
58
                 end
54
59
 
55
60
                 if not (DEBUG and the.console.visible) then
56
 
                    the.activeMaze:collide(the.player)
 
61
                    the.activeMaze:collide(the.player.collider)
 
62
                    the.player.collider:collide(the.activeGoal)
57
63
                 end
58
64
 
59
65
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
75
81
                      the.activeBg.visible = false
76
82
                      the.activeBg = self.bgs[newMaze]
77
83
 
78
 
                      the.activeGoal.visible = false
 
84
                      if the.activeGoal then
 
85
                         the.activeGoal.visible = false
 
86
                      end
79
87
                      the.activeGoal = self.goals[newMaze]
80
88
                   else
81
89
                      the.activeMaze = self.maze2
85
93
 
86
94
                   the.activeMaze:revive()
87
95
                   the.activeBg.visible = true
88
 
                   the.activeGoal.visible = true
 
96
                   if the.activeGoal then
 
97
                      the.activeGoal.visible = true
 
98
                   end
89
99
                   the.player.scale = the.activeMaze.playerScale
 
100
                   the.player.collider.width = the.player.width * the.activeMaze.playerScale
 
101
                   the.player.collider.height = the.player.height * the.activeMaze.playerScale
90
102
 
91
103
                   self._fx = {0,0,0,0}
92
104
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')
128
140
           end,
129
141
   onUpdate = function (self, dt)
130
142
                 if the.keys:justPressed('escape') then
 
143
                    if the.profiler then
 
144
                       the.profiler:stop()
 
145
                       local outfile = io.open( "profile.txt", "w+" )
 
146
                       the.profiler:report( outfile )
 
147
                       outfile:close()
 
148
                    end
 
149
 
131
150
                    self.quit()
132
151
                 end
133
152
              end