Bump version to v0.3.4

load/graphics.lua

@@ -8,7 +8,7 @@ image_formats = {".png", ".jpg"}
 bgpath = "res/backgrounds/"
 dir = love.filesystem.getDirectoryItems(bgpath)
 
-local backgrounds = {}
+backgrounds = {}
 
 local function loadExtendedBgs()
 	extended_bgs = require("res.backgrounds.extend_section_bg")
@@ -197,4 +197,17 @@ misc_graphics = {
 	strike = love.graphics.newImage("res/img/strike.png"),
 	santa = love.graphics.newImage("res/img/santa.png"),
 	icon = love.graphics.newImage("res/img/cambridge_transparent.png")
-}
+}
+
+-- utility function to allow any size background to be used
+-- this will stretch the background to 4:3 aspect ratio
+function drawBackground(id)
+	local bg_object = fetchBackgroundAndLoop(id)
+	local width = bg_object:getWidth()
+	local height = bg_object:getHeight()
+	love.graphics.draw(
+		bg_object,
+		0, 0, 0,
+		640 / width, 480 / height
+	)
+end

load/version.lua

@@ -1 +1 @@
-version = "v0.3.3.2"
+version = "v0.3.4"

scene/credits.lua

@@ -30,11 +30,7 @@ function CreditsScene:render()
     local offset = self.frames / self.scroll_speed
 
     love.graphics.setColor(1, 1, 1, 1)
-	love.graphics.draw(
+	drawBackground(19)
-		fetchBackgroundAndLoop(id),
-		0, 0, 0,
-		0.5, 0.5
-    )
 
     love.graphics.setFont(font_3x5_4)
     love.graphics.print("Cambridge Credits", 320, 500 - offset)

scene/game_config.lua

@@ -45,11 +45,7 @@ end
 
 function ConfigScene:render()
 	love.graphics.setColor(1, 1, 1, 1)
-	love.graphics.draw(
+	drawBackground("options_game")
-		fetchBackgroundAndLoop("options_game"),
-		0, 0, 0,
-		0.5, 0.5
-	)
 
 	love.graphics.setFont(font_3x5_4)
 	love.graphics.print("GAME SETTINGS", 80, 40)

scene/input_config.lua

@@ -20,11 +20,7 @@ function ConfigScene:update() end
 
 function ConfigScene:render()
     love.graphics.setColor(1, 1, 1, 1)
-    love.graphics.draw(
+    drawBackground("options_input")
-		fetchBackgroundAndLoop("options_input"),
-		0, 0, 0,
-		0.5, 0.5
-    )
 
     love.graphics.setFont(font_3x5_4)
     love.graphics.print("INPUT CONFIG", 80, 40)

scene/key_config.lua

@@ -45,11 +45,7 @@ end
 
 function KeyConfigScene:render()
 	love.graphics.setColor(1, 1, 1, 1)
-	love.graphics.draw(
+	drawBackground("input_config")
-		fetchBackgroundAndLoop("input_config"),
-		0, 0, 0,
-		0.5, 0.5
-	)
 
 	love.graphics.setFont(font_3x5_2)
 	for i, input in ipairs(configurable_inputs) do

scene/mode_select.lua

@@ -58,11 +58,7 @@ function ModeSelectScene:update()
 end
 
 function ModeSelectScene:render()
-	love.graphics.draw(
+	drawBackground(0)
-		fetchBackgroundAndLoop(0),
-		0, 0, 0,
-		0.5, 0.5
-	)
 
 	love.graphics.draw(misc_graphics["select_mode"], 20, 40)
 

scene/replay_select.lua

@@ -78,11 +78,7 @@ function ReplaySelectScene:update()
 end
 
 function ReplaySelectScene:render()
-	love.graphics.draw(
+	drawBackground(0)
-		fetchBackgroundAndLoop(0),
-		0, 0, 0,
-		0.5, 0.5
-	)
 
 	-- Same graphic as mode select
 	--love.graphics.draw(misc_graphics["select_mode"], 20, 40)

scene/settings.lua

@@ -29,11 +29,7 @@ function SettingsScene:update() end
 
 function SettingsScene:render()
     love.graphics.setColor(1, 1, 1, 1)
-    love.graphics.draw(
+    drawBackground("options_game")
-		fetchBackgroundAndLoop("options_game"),
-		0, 0, 0,
-		0.5, 0.5
-    )
 
     love.graphics.setFont(font_3x5_4)
     love.graphics.print("SETTINGS", 80, 40)

scene/stick_config.lua

@@ -46,11 +46,7 @@ end
 
 function StickConfigScene:render()
 	love.graphics.setColor(1, 1, 1, 1)
-	love.graphics.draw(
+	drawBackground("options_input")
-		fetchBackgroundAndLoop("options_input"),
-		0, 0, 0,
-		0.5, 0.5
-	)
 
 	love.graphics.setFont(font_3x5_2)
 	for i, input in ipairs(configurable_inputs) do

scene/title.lua

@@ -73,11 +73,7 @@ local block_offsets = {
 function TitleScene:render()
 	love.graphics.setFont(font_3x5_4)
 	love.graphics.setColor(1, 1, 1, 1 - self.snow_bg_opacity)
-	love.graphics.draw(
+	drawBackground("title_no_icon") -- title, title_night
-		fetchBackgroundAndLoop("title_no_icon"), -- title, title_night
-		0, 0, 0,
-		0.5, 0.5
-	)
 
 	-- 490, 192
 	for _, b in ipairs(block_offsets) do
@@ -99,11 +95,7 @@ function TitleScene:render()
 
 	love.graphics.setFont(font_3x5_2)
 	love.graphics.setColor(1, 1, 1, self.snow_bg_opacity)
-	love.graphics.draw(
+	drawBackground("snow")
-		fetchBackgroundAndLoop("snow"),
-		0, 0, 0,
-		0.5, 0.5
-	)
 
 	love.graphics.draw(
 		misc_graphics["santa"],

scene/tuning.lua

@@ -34,11 +34,7 @@ end
 
 function TuningScene:render()
     love.graphics.setColor(1, 1, 1, 1)
-	love.graphics.draw(
+	drawBackground("options_game")
-		fetchBackgroundAndLoop("options_game"),
-		0, 0, 0,
-		0.5, 0.5
-    )
 
     love.graphics.setColor(1, 1, 1, 0.5)
     love.graphics.rectangle("fill", 75, 98 + self.highlight * 75, 400, 33)

tetris/modes/gamemode.lua

@@ -980,13 +980,9 @@ 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(
+	drawBackground(id)
-		fetchBackgroundAndLoop(id),
-		0, 0, 0,
-		0.5, 0.5
-	)
 end
 
 function GameMode:drawFrame()