/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,
29
33
              self.maze2.playerScale = 0.5
30
34
              self.maze3.playerScale = 1
31
35
 
 
36
              self.goals = {}
 
37
              the.goalsAchieved = 0
 
38
              for _, obj in ipairs(self.objects.sprites) do
 
39
                 if obj:instanceOf(Goal) then
 
40
                    obj.visible = false
 
41
                    self.goals[tonumber(obj.map)] = obj
 
42
                 end
 
43
              end
 
44
 
32
45
              --the.interface = Group:new()
33
46
 
34
47
              --self:add(the.interface)
35
48
 
36
49
              self:switchMaze()
37
50
 
 
51
              -- profiling...
 
52
              --the.profiler = newProfiler()
 
53
              --the.profiler:start()
 
54
 
38
55
              self.gameStart = love.timer.getMicroTime()
39
56
              self.lastChange = love.timer.getMicroTime()
40
57
           end,
45
62
                 end
46
63
 
47
64
                 if not (DEBUG and the.console.visible) then
48
 
                    the.activeMaze:collide(the.player)
 
65
                    --the.player.collider:collide(the.activeMaze)
 
66
                    the.player.collider:collide(the.activeGoal)
49
67
                 end
50
68
 
51
 
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
52
 
                 --    if not mirror.of then
53
 
                 --       print('mirror:' .. inspect(mirror))
54
 
                 --       error('mirror OF NOTHING')
55
 
                 --    end
56
 
                 -- 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
57
74
              end,
58
75
   switchMaze = function(self)
59
76
                   if the.activeMaze then
66
83
 
67
84
                      the.activeBg.visible = false
68
85
                      the.activeBg = self.bgs[newMaze]
 
86
 
 
87
                      if the.activeGoal then
 
88
                         the.activeGoal.visible = false
 
89
                      end
 
90
                      the.activeGoal = self.goals[newMaze]
69
91
                   else
70
92
                      the.activeMaze = self.maze2
71
93
                      the.activeBg = self.bg
 
94
                      the.activeGoal = self.goals[2]
72
95
                   end
73
96
 
74
97
                   the.activeMaze:revive()
75
98
                   the.activeBg.visible = true
 
99
                   if the.activeGoal then
 
100
                      the.activeGoal.visible = true
 
101
                   end
76
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
77
105
 
78
106
                   self._fx = {0,0,0,0}
79
107
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')
108
136
 
109
137
              if DEBUG then
110
138
                 self.console:watch('VERSION', 'VERSION')
 
139
                 self.console:watch('player.x', 'the.player.x')
 
140
                 self.console:watch('player.y', 'the.player.y')
111
141
 
112
142
                 -- back off that dark overlay a bit
113
143
                 self.console.fill.fill[4] = 75
114
144
              end
115
145
           end,
116
146
   onUpdate = function (self, dt)
117
 
                 if the.keys:justPressed('escape') then
118
 
                    self.quit()
119
 
                 end
120
147
              end
121
148
}