/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
2
2
DEBUG = true
3
3
 
4
4
require 'zoetrope'
5
 
--require 'pepperprof'
 
5
 
 
6
--require 'group'
6
7
 
7
8
require 'version'
 
9
--require 'wrap_tile'
8
10
require 'player'
9
11
require 'goal'
10
 
require 'pause_view'
11
 
require 'win_view'
12
12
 
13
13
GameView = View:extend {
14
14
   gameStart = 0,
30
30
              self.maze3.playerScale = 1
31
31
 
32
32
              self.goals = {}
33
 
              the.goalsAchieved = 0
34
33
              for _, obj in ipairs(self.objects.sprites) do
35
34
                 if obj:instanceOf(Goal) then
36
35
                    obj.visible = false
44
43
 
45
44
              self:switchMaze()
46
45
 
47
 
              -- profiling...
48
 
              --the.profiler = newProfiler()
49
 
              --the.profiler:start()
50
 
 
51
46
              self.gameStart = love.timer.getMicroTime()
52
47
              self.lastChange = love.timer.getMicroTime()
53
48
           end,
58
53
                 end
59
54
 
60
55
                 if not (DEBUG and the.console.visible) then
61
 
                    the.activeMaze:collide(the.player.collider)
62
 
                    the.player.collider:collide(the.activeGoal)
 
56
                    the.activeMaze:collide(the.player)
 
57
                    the.player:collide(the.activeGoal)
63
58
                 end
64
59
 
65
 
                 if the.keys:justPressed('escape', 'q') then
66
 
                    PauseView:new():activate()
67
 
                 --elseif the.keys:justPressed('w') then
68
 
                 --   WinView:new():activate()
69
 
                 end
 
60
                 -- for _, mirror in ipairs(the.mirrors.sprites) do
 
61
                 --    if not mirror.of then
 
62
                 --       print('mirror:' .. inspect(mirror))
 
63
                 --       error('mirror OF NOTHING')
 
64
                 --    end
 
65
                 -- end
70
66
              end,
71
67
   switchMaze = function(self)
72
68
                   if the.activeMaze then
96
92
                      the.activeGoal.visible = true
97
93
                   end
98
94
                   the.player.scale = the.activeMaze.playerScale
99
 
                   the.player.collider.width = the.player.width * the.activeMaze.playerScale
100
 
                   the.player.collider.height = the.player.height * the.activeMaze.playerScale
101
95
 
102
96
                   self._fx = {0,0,0,0}
103
97
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')
138
132
              end
139
133
           end,
140
134
   onUpdate = function (self, dt)
 
135
                 if the.keys:justPressed('escape') then
 
136
                    self.quit()
 
137
                 end
141
138
              end
142
139
}