/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:04:52 UTC
  • Revision ID: josh@9ix.org-20130825020452-py8fijli8m5te5gv
improve performance with (sketchy, experimental) sprite batches

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.lua
8
8
require 'version'
9
9
--require 'wrap_tile'
10
10
require 'player'
 
11
require 'goal'
11
12
 
12
13
GameView = View:extend {
13
14
   gameStart = 0,
16
17
              self.focus = the.player
17
18
              self:clampTo(self.bg)
18
19
 
19
 
              self.mazes = {self.maze1, self.maze2}
20
 
              --self.maze1:revive()
21
 
              --self.maze2:die()
22
 
              the.activeMaze = self.maze1
 
20
              self.mazes = {self.maze1, self.maze2, self.maze3}
 
21
              self.bgs = {self.bg, self.bg, self.bg2}
 
22
              for _, maze in ipairs(self.mazes) do maze:die() end
 
23
              for _, bg in ipairs(self.bgs) do bg.visible = false end
 
24
 
 
25
              self.maze1.moveMod = 1
 
26
              self.maze2.moveMod = 0.55
 
27
              self.maze3.moveMod = -1
 
28
              self.maze1.playerScale = 1
 
29
              self.maze2.playerScale = 0.5
 
30
              self.maze3.playerScale = 1
 
31
 
 
32
              self.goals = {}
 
33
              for _, obj in ipairs(self.objects.sprites) do
 
34
                 if obj:instanceOf(Goal) then
 
35
                    obj.visible = false
 
36
                    self.goals[tonumber(obj.map)] = obj
 
37
                 end
 
38
              end
23
39
 
24
40
              --the.interface = Group:new()
25
41
 
36
52
                    self:switchMaze()
37
53
                 end
38
54
 
39
 
                 the.activeMaze:collide(the.player)
40
 
 
 
55
                 if not (DEBUG and the.console.visible) then
 
56
                    the.activeMaze:collide(the.player)
 
57
                    the.player:collide(the.activeGoal)
 
58
                 end
41
59
 
42
60
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
43
61
                 --    if not mirror.of then
47
65
                 -- end
48
66
              end,
49
67
   switchMaze = function(self)
50
 
                   the.activeMaze:die()
51
 
                   if the.activeMaze == self.maze1 then
 
68
                   if the.activeMaze then
 
69
                      repeat
 
70
                         newMaze = math.random(3)
 
71
                      until self.mazes[newMaze] ~= the.activeMaze
 
72
 
 
73
                      the.activeMaze:die()
 
74
                      the.activeMaze = self.mazes[newMaze]
 
75
 
 
76
                      the.activeBg.visible = false
 
77
                      the.activeBg = self.bgs[newMaze]
 
78
 
 
79
                      if the.activeGoal then
 
80
                         the.activeGoal.visible = false
 
81
                      end
 
82
                      the.activeGoal = self.goals[newMaze]
 
83
                   else
52
84
                      the.activeMaze = self.maze2
53
 
                   else
54
 
                      the.activeMaze = self.maze1
 
85
                      the.activeBg = self.bg
 
86
                      the.activeGoal = self.goals[2]
55
87
                   end
 
88
 
56
89
                   the.activeMaze:revive()
 
90
                   the.activeBg.visible = true
 
91
                   if the.activeGoal then
 
92
                      the.activeGoal.visible = true
 
93
                   end
 
94
                   the.player.scale = the.activeMaze.playerScale
57
95
 
58
96
                   self._fx = {0,0,0,0}
59
 
                   self.tween:start(self._fx, 4, 150, 10, 'quadIn')
 
97
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')
60
98
 
61
99
                   self.lastChange = love.timer.getMicroTime()
62
100
                end,