/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,
19
 
   switchSounds = {},
20
15
   onNew = function (self)
21
16
              self:loadLayers('data/map.lua')
22
17
              self.focus = the.player
34
29
              self.maze2.playerScale = 0.5
35
30
              self.maze3.playerScale = 1
36
31
 
37
 
              self.goals = {{},{},{}}
38
 
              the.goalsAchieved = 0
 
32
              self.goals = {}
39
33
              for _, obj in ipairs(self.objects.sprites) do
40
34
                 if obj:instanceOf(Goal) then
41
35
                    obj.visible = false
42
 
                    table.insert(self.goals[tonumber(obj.map)], obj)
 
36
                    self.goals[tonumber(obj.map)] = obj
43
37
                 end
44
38
              end
45
39
 
46
 
              local sndFiles = {'data/Explosion2.wav', 'data/Explosion3.wav', 'data/Hit_Hurt3.wav'}
47
 
 
48
 
              for _, sndFile in ipairs(sndFiles) do
49
 
                 local snd = love.audio.newSource(sndFile, 'static')
50
 
                 table.insert(self.switchSounds, snd)
51
 
              end
52
 
 
53
40
              --the.interface = Group:new()
54
41
 
55
42
              --self:add(the.interface)
56
43
 
57
44
              self:switchMaze()
58
45
 
59
 
              -- profiling...
60
 
              --the.profiler = newProfiler()
61
 
              --the.profiler:start()
62
 
 
63
46
              self.gameStart = love.timer.getMicroTime()
64
47
              self.lastChange = love.timer.getMicroTime()
65
48
           end,
70
53
                 end
71
54
 
72
55
                 if not (DEBUG and the.console.visible) then
73
 
                    for _, goal in ipairs(the.activeGoals) do
74
 
                       the.player.collider:collide(goal)
75
 
                    end
 
56
                    the.activeMaze:collide(the.player)
 
57
                    the.player:collide(the.activeGoal)
76
58
                 end
77
59
 
78
 
                 if the.keys:justPressed('escape', 'q') then
79
 
                    PauseView:new():activate()
80
 
                 --elseif the.keys:justPressed('w') then
81
 
                 --   WinView:new():activate()
82
 
                 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
83
66
              end,
84
67
   switchMaze = function(self)
85
68
                   if the.activeMaze then
93
76
                      the.activeBg.visible = false
94
77
                      the.activeBg = self.bgs[newMaze]
95
78
 
96
 
                      for _, goal in ipairs(the.activeGoals) do
97
 
                         goal.visible = false
 
79
                      if the.activeGoal then
 
80
                         the.activeGoal.visible = false
98
81
                      end
99
 
                      the.activeGoals = self.goals[newMaze]
100
 
 
101
 
                      love.audio.play(self.switchSounds[math.random(#self.switchSounds)])
 
82
                      the.activeGoal = self.goals[newMaze]
102
83
                   else
103
84
                      the.activeMaze = self.maze2
104
85
                      the.activeBg = self.bg
105
 
                      the.activeGoals = self.goals[2]
 
86
                      the.activeGoal = self.goals[2]
106
87
                   end
107
88
 
108
89
                   the.activeMaze:revive()
109
90
                   the.activeBg.visible = true
110
 
                   for _, goal in ipairs(the.activeGoals) do
111
 
                      goal.visible = true
 
91
                   if the.activeGoal then
 
92
                      the.activeGoal.visible = true
112
93
                   end
113
94
                   the.player.scale = the.activeMaze.playerScale
114
 
                   the.player.collider.width = the.player.width * the.activeMaze.playerScale
115
 
                   the.player.collider.height = the.player.height * the.activeMaze.playerScale
116
95
 
117
96
                   self._fx = {0,0,0,0}
118
97
                   self.tween:start(self._fx, 4, 175, 10, 'quadIn')
126
105
}
127
106
 
128
107
MenuScreen = View:extend {
129
 
   bg = Tile:new{image = 'data/intro.png', x = 0, y = 0},
 
108
   title = Text:new{text = "Press a key to start", font = 48, wordWrap = false},
 
109
   --title = Tile:new{image = 'data/title.png', x = 0, y = 0},
130
110
   onNew = function(self)
131
 
              self:add(self.bg)
132
 
              --self.title:centerAround(400, 200)
133
 
 
134
 
              local nr = 'data/NewRocker-Regular.otf'
135
 
              self:add(Text:new{
136
 
                          text = 'Treasures of the Decimaze',
137
 
                          --x = 0,
138
 
                          y = 100,
139
 
                          width = self.bg.width,
140
 
                          font = {nr, 48},
141
 
                          align = 'center',
142
 
                          tint = {0,0,0}
143
 
                       })
144
 
 
145
 
              self:add(Text:new{
146
 
                          text = 'Find the 4 lost shinies!',
147
 
                          y = 170,
148
 
                          width = self.bg.width,
149
 
                          font = {nr, 28},
150
 
                          align = 'center',
151
 
                          tint = {0,0,0}
152
 
                       })
153
 
 
154
 
              self:add(Text:new{
155
 
                          text = 'Use the arrow keys to move',
156
 
                          y = 375,
157
 
                          width = self.bg.width,
158
 
                          font = {nr, 24},
159
 
                          align = 'center',
160
 
                          tint = {0,0,0}
161
 
                       })
162
 
 
163
 
              self:add(Text:new{
164
 
                          text = 'Press a key to start',
165
 
                          y = 425,
166
 
                          width = self.bg.width,
167
 
                          font = {nr, 24},
168
 
                          align = 'center',
169
 
                          tint = {0,0,0}
170
 
                       })
171
 
 
172
 
 
 
111
              self:add(self.title)
 
112
              self.title:centerAround(400, 200)
173
113
           end,
174
114
   onUpdate = function(self, elapsed)
175
115
                 if the.keys:allJustPressed() then
179
119
}
180
120
 
181
121
the.app = App:new {
182
 
   name = "Treasures of the Decimaze",
183
122
   onRun = function (self)
184
123
              print('Version: ' .. VERSION)
185
124
 
186
 
              self.view = MenuScreen:new()
 
125
              self.view = GameView:new()
187
126
 
188
127
              if DEBUG then
189
128
                 self.console:watch('VERSION', 'VERSION')
190
 
                 self.console:watch('player.x', 'the.player.x')
191
 
                 self.console:watch('player.y', 'the.player.y')
192
129
 
193
130
                 -- back off that dark overlay a bit
194
131
                 self.console.fill.fill[4] = 75
195
132
              end
196
133
           end,
197
134
   onUpdate = function (self, dt)
198
 
                 if the.keys:justPressed('f1') then
199
 
                    local ss = love.graphics.newScreenshot()
200
 
                    ss:encode('screenshot-' ..love.timer.getTime()..'.png')
 
135
                 if the.keys:justPressed('escape') then
 
136
                    self.quit()
201
137
                 end
202
138
              end
203
139
}