/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
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
 
5
--require 'pepperprof'
 
6
--inspect = require 'inspect'
5
7
 
6
 
--require 'group'
 
8
require 'sprite'
 
9
require 'util'
7
10
 
8
11
require 'version'
9
 
--require 'wrap_tile'
10
12
require 'player'
11
13
require 'goal'
 
14
require 'pause_view'
 
15
require 'win_view'
12
16
 
13
17
GameView = View:extend {
14
18
   gameStart = 0,
30
34
              self.maze3.playerScale = 1
31
35
 
32
36
              self.goals = {}
 
37
              the.goalsAchieved = 0
33
38
              for _, obj in ipairs(self.objects.sprites) do
34
39
                 if obj:instanceOf(Goal) then
35
40
                    obj.visible = false
43
48
 
44
49
              self:switchMaze()
45
50
 
 
51
              -- profiling...
 
52
              --the.profiler = newProfiler()
 
53
              --the.profiler:start()
 
54
 
46
55
              self.gameStart = love.timer.getMicroTime()
47
56
              self.lastChange = love.timer.getMicroTime()
48
57
           end,
53
62
                 end
54
63
 
55
64
                 if not (DEBUG and the.console.visible) then
56
 
                    the.activeMaze:collide(the.player)
 
65
                    --the.player.collider:collide(the.activeMaze)
 
66
                    the.player.collider:collide(the.activeGoal)
57
67
                 end
58
68
 
59
 
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
60
 
                 --    if not mirror.of then
61
 
                 --       print('mirror:' .. inspect(mirror))
62
 
                 --       error('mirror OF NOTHING')
63
 
                 --    end
64
 
                 -- 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
65
74
              end,
66
75
   switchMaze = function(self)
67
76
                   if the.activeMaze then
75
84
                      the.activeBg.visible = false
76
85
                      the.activeBg = self.bgs[newMaze]
77
86
 
78
 
                      the.activeGoal.visible = false
 
87
                      if the.activeGoal then
 
88
                         the.activeGoal.visible = false
 
89
                      end
79
90
                      the.activeGoal = self.goals[newMaze]
80
91
                   else
81
92
                      the.activeMaze = self.maze2
85
96
 
86
97
                   the.activeMaze:revive()
87
98
                   the.activeBg.visible = true
88
 
                   the.activeGoal.visible = true
 
99
                   if the.activeGoal then
 
100
                      the.activeGoal.visible = true
 
101
                   end
89
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
90
105
 
91
106
                   self._fx = {0,0,0,0}
92
107
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')
121
136
 
122
137
              if DEBUG then
123
138
                 self.console:watch('VERSION', 'VERSION')
 
139
                 self.console:watch('player.x', 'the.player.x')
 
140
                 self.console:watch('player.y', 'the.player.y')
124
141
 
125
142
                 -- back off that dark overlay a bit
126
143
                 self.console.fill.fill[4] = 75
127
144
              end
128
145
           end,
129
146
   onUpdate = function (self, dt)
130
 
                 if the.keys:justPressed('escape') then
131
 
                    self.quit()
132
 
                 end
133
147
              end
134
148
}