/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
3
3
 
4
4
require 'zoetrope'
5
5
--require 'pepperprof'
 
6
--inspect = require 'inspect'
6
7
 
7
 
--require 'group'
 
8
require 'sprite'
 
9
require 'util'
8
10
 
9
11
require 'version'
10
 
--require 'wrap_tile'
11
12
require 'player'
12
13
require 'goal'
 
14
require 'pause_view'
 
15
require 'win_view'
13
16
 
14
17
GameView = View:extend {
15
18
   gameStart = 0,
31
34
              self.maze3.playerScale = 1
32
35
 
33
36
              self.goals = {}
 
37
              the.goalsAchieved = 0
34
38
              for _, obj in ipairs(self.objects.sprites) do
35
39
                 if obj:instanceOf(Goal) then
36
40
                    obj.visible = false
58
62
                 end
59
63
 
60
64
                 if not (DEBUG and the.console.visible) then
61
 
                    the.activeMaze:collide(the.player)
62
 
                    the.player:collide(the.activeGoal)
 
65
                    --the.player.collider:collide(the.activeMaze)
 
66
                    the.player.collider:collide(the.activeGoal)
63
67
                 end
64
68
 
65
 
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
66
 
                 --    if not mirror.of then
67
 
                 --       print('mirror:' .. inspect(mirror))
68
 
                 --       error('mirror OF NOTHING')
69
 
                 --    end
70
 
                 -- end
 
69
                 if the.keys:justPressed('escape', 'q') then
 
70
                    PauseView:new():activate()
 
71
                 --elseif the.keys:justPressed('w') then
 
72
                 --   WinView:new():activate()
 
73
                 end
71
74
              end,
72
75
   switchMaze = function(self)
73
76
                   if the.activeMaze then
97
100
                      the.activeGoal.visible = true
98
101
                   end
99
102
                   the.player.scale = the.activeMaze.playerScale
 
103
                   the.player.collider.width = the.player.width * the.activeMaze.playerScale
 
104
                   the.player.collider.height = the.player.height * the.activeMaze.playerScale
100
105
 
101
106
                   self._fx = {0,0,0,0}
102
107
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')
131
136
 
132
137
              if DEBUG then
133
138
                 self.console:watch('VERSION', 'VERSION')
 
139
                 self.console:watch('player.x', 'the.player.x')
 
140
                 self.console:watch('player.y', 'the.player.y')
134
141
 
135
142
                 -- back off that dark overlay a bit
136
143
                 self.console.fill.fill[4] = 75
137
144
              end
138
145
           end,
139
146
   onUpdate = function (self, dt)
140
 
                 if the.keys:justPressed('escape') then
141
 
                    if the.profiler then
142
 
                       the.profiler:stop()
143
 
                       local outfile = io.open( "profile.txt", "w+" )
144
 
                       the.profiler:report( outfile )
145
 
                       outfile:close()
146
 
                    end
147
 
 
148
 
                    self.quit()
149
 
                 end
150
147
              end
151
148
}