load/graphics.lua

@@ -1,105 +1,17 @@
-named_backgrounds = {
+backgrounds = {
-	"title", "title_no_icon", "title_night",
+	title = love.graphics.newImage("res/backgrounds/title.png"),
-	"snow", "options_input", "options_game"
+	title_no_icon = love.graphics.newImage("res/backgrounds/title-no-icon.jpg"),
+	title_night = love.graphics.newImage("res/backgrounds/title-night.jpg"),
+	snow = love.graphics.newImage("res/backgrounds/snow.png"),
+	input_config = love.graphics.newImage("res/backgrounds/options-input.png"),
+	game_config = love.graphics.newImage("res/backgrounds/options-game.png"),
 }
-current_playing_bgs = {}
-extended_bgs = {}
-image_formats = {".png", ".jpg"}
-bgpath = "res/backgrounds/"
-dir = love.filesystem.getDirectoryItems(bgpath)
 
-local backgrounds = {}
+local i = 0
-
+local bgpath = "res/backgrounds/%d.png"
-local function loadExtendedBgs()
+while love.filesystem.getInfo(bgpath:format(i*100)) do
-	extended_bgs = require("res.backgrounds.extend_section_bg")
+	backgrounds[i] = love.graphics.newImage(bgpath:format(i*100))
-end
+	i = i + 1
-
--- error handling for if there is no extend_section_bg
-if pcall(loadExtendedBgs) then end
-
--- helper method to populate backgrounds
-local function createBackgroundIfExists(name, file_name)
-	local format_index = 1
-
-	-- see if background is an extension of another background
-	if extended_bgs[file_name] ~= nil then
-		copy_bg = extended_bgs[file_name]
-		copy_bg = copy_bg / 100
-		backgrounds[name] = backgrounds[copy_bg]
-		return true
-	end
-
-	-- try creating image backgrounds
-	while format_index <= #image_formats do
-		for num, existing_file in pairs(dir) do
-			if existing_file == (file_name..image_formats[format_index]) then
-				local tempBgPath = bgpath .. file_name .. image_formats[format_index]
-				backgrounds[name] = love.graphics.newImage(tempBgPath)
-				return true
-			end
-		end
-		format_index = format_index + 1
-	end
-
-	-- try creating video background
-	if love.filesystem.getInfo(bgpath .. file_name .. ".ogv") then
-		for num, existing_file in pairs(dir) do
-			if existing_file == (file_name..".ogv") then
-				local tempBgPath = bgpath .. file_name .. ".ogv"
-				backgrounds[name] = love.graphics.newVideo(
-					tempBgPath, {["audio"] = false}
-				)
-				-- you can set audio to true, but the video will not loop
-				-- properly if audio extends beyond video frames
-				return true
-			end
-		end
-	end
-	return false
-end
-
-local function stopOtherBgs(bg)
-	if #current_playing_bgs == 0 and bg:typeOf("Video") then
-		current_playing_bgs[#current_playing_bgs+1] = bg
-	end
-
-	if #current_playing_bgs >= 1 then
-		while current_playing_bgs[1] ~= bg and #current_playing_bgs >= 1 do
-			current_playing_bgs[1]:pause()
-			current_playing_bgs[1]:rewind()
-			table.remove(current_playing_bgs, 1)
-		end
-	end
-
-end
-
-function fetchBackgroundAndLoop(id)
-	bg = backgrounds[id]
-
-	if bg:typeOf("Video") and not bg:isPlaying() then
-		bg:rewind()
-		bg:play()
-	end
-
-	stopOtherBgs(bg)
-
-	return bg
-end
-
--- create section backgrounds
-local section = 0
-while (createBackgroundIfExists(section, section*100)) do
-	section = section + 1
-end
-
--- create named backgrounds
-local nbgIndex = 1
-while nbgIndex <= #named_backgrounds do
-	createBackgroundIfExists(
-		named_backgrounds[nbgIndex],
-		string.gsub(named_backgrounds[nbgIndex], "_", "-")
-	)
-	nbgIndex = nbgIndex + 1
 end
 
 -- in order, the colors are:

res/backgrounds/extend_section_bg.lua

@@ -1,14 +0,0 @@
--- ex: extend_section_bg[100] = 0
---     extend_section_bg[200] = 0
--- the video background associated with section 0 will continue playing into 100 and 200 without restarting.
--- will also cause any existing level 100, 200 backgrounds specified to NOT render.
-
--- please also note that you cannot currently extend any "named" backgrounds, such as "title" and "options-input"
-
-extend_section_bg = {}
-
--- extend_section_bg[100] = 0
--- extend_section_bg[200] = 0
--- remove the dashes 
-
-return extend_section_bg

scene/credits.lua

@@ -31,7 +31,7 @@ function CreditsScene:render()
 
     love.graphics.setColor(1, 1, 1, 1)
 	love.graphics.draw(
-		fetchBackgroundAndLoop(id),
+		backgrounds[19],
 		0, 0, 0,
 		0.5, 0.5
     )

scene/game_config.lua

@@ -46,7 +46,7 @@ end
 function ConfigScene:render()
 	love.graphics.setColor(1, 1, 1, 1)
 	love.graphics.draw(
-		fetchBackgroundAndLoop("options_game"),
+		backgrounds["game_config"],
 		0, 0, 0,
 		0.5, 0.5
 	)

scene/input_config.lua

@@ -21,7 +21,7 @@ function ConfigScene:update() end
 function ConfigScene:render()
     love.graphics.setColor(1, 1, 1, 1)
     love.graphics.draw(
-		fetchBackgroundAndLoop("options_input"),
+		backgrounds["input_config"],
 		0, 0, 0,
 		0.5, 0.5
     )

scene/key_config.lua

@@ -46,7 +46,7 @@ end
 function KeyConfigScene:render()
 	love.graphics.setColor(1, 1, 1, 1)
 	love.graphics.draw(
-		fetchBackgroundAndLoop("input_config"),
+		backgrounds["input_config"],
 		0, 0, 0,
 		0.5, 0.5
 	)

scene/mode_select.lua

@@ -59,7 +59,7 @@ end
 
 function ModeSelectScene:render()
 	love.graphics.draw(
-		fetchBackgroundAndLoop(0),
+		backgrounds[0],
 		0, 0, 0,
 		0.5, 0.5
 	)

scene/replay_select.lua

@@ -14,12 +14,8 @@ function ReplaySelectScene:new()
 	replay_file_list = love.filesystem.getDirectoryItems("replays")
 	for i=1,#replay_file_list do
 		local data = love.filesystem.read("replays/"..replay_file_list[i])
-		local success, new_replay = pcall(
+		local new_replay = binser.deserialize(data)[1]
-			function() return binser.deserialize(data)[1] end
+		replays[#replays + 1] = new_replay
-		)
-		if success then
-			replays[#replays + 1] = new_replay
-		end
 	end
 	table.sort(replays, function(a, b)
 		return a["timestamp"] > b["timestamp"]
@@ -79,7 +75,7 @@ end
 
 function ReplaySelectScene:render()
 	love.graphics.draw(
-		fetchBackgroundAndLoop(0),
+		backgrounds[0],
 		0, 0, 0,
 		0.5, 0.5
 	)

scene/settings.lua

@@ -30,7 +30,7 @@ function SettingsScene:update() end
 function SettingsScene:render()
     love.graphics.setColor(1, 1, 1, 1)
     love.graphics.draw(
-		fetchBackgroundAndLoop("options_game"),
+		backgrounds["game_config"],
 		0, 0, 0,
 		0.5, 0.5
     )

scene/stick_config.lua

@@ -47,7 +47,7 @@ end
 function StickConfigScene:render()
 	love.graphics.setColor(1, 1, 1, 1)
 	love.graphics.draw(
-		fetchBackgroundAndLoop("options_input"),
+		backgrounds["input_config"],
 		0, 0, 0,
 		0.5, 0.5
 	)

scene/title.lua

@@ -74,7 +74,7 @@ function TitleScene:render()
 	love.graphics.setFont(font_3x5_4)
 	love.graphics.setColor(1, 1, 1, 1 - self.snow_bg_opacity)
 	love.graphics.draw(
-		fetchBackgroundAndLoop("title_no_icon"), -- title, title_night
+		backgrounds["title_no_icon"], -- title, title_night
 		0, 0, 0,
 		0.5, 0.5
 	)
@@ -100,7 +100,7 @@ function TitleScene:render()
 	love.graphics.setFont(font_3x5_2)
 	love.graphics.setColor(1, 1, 1, self.snow_bg_opacity)
 	love.graphics.draw(
-		fetchBackgroundAndLoop("snow"),
+		backgrounds["snow"],
 		0, 0, 0,
 		0.5, 0.5
 	)

scene/tuning.lua

@@ -35,7 +35,7 @@ end
 function TuningScene:render()
     love.graphics.setColor(1, 1, 1, 1)
 	love.graphics.draw(
-		fetchBackgroundAndLoop("options_game"),
+		backgrounds["game_config"],
 		0, 0, 0,
 		0.5, 0.5
     )

tetris/modes/gamemode.lua

@@ -980,10 +980,10 @@ end
 
 function GameMode:drawBackground()
 	local id = self:getBackground()
-	-- if type(id) == "number" then id = clamp(id, 0, #backgrounds) end
+	if type(id) == "number" then id = clamp(id, 0, #backgrounds) end
 	love.graphics.setColor(1, 1, 1, 1)
 	love.graphics.draw(
-		fetchBackgroundAndLoop(id),
+		backgrounds[id],
 		0, 0, 0,
 		0.5, 0.5
 	)