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