Added support for backgrounds that are not 1280x960

pull/75/head
Ishaan Bhardwaj 2023-07-16 01:49:26 -04:00
parent 1556b247fe
commit 2166a3c6d8
12 changed files with 26 additions and 61 deletions

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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(
fetchBackgroundAndLoop("title_no_icon"), -- title, title_night
0, 0, 0,
0.5, 0.5
)
drawBackground("title_no_icon"), -- title, title_night
-- 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(
fetchBackgroundAndLoop("snow"),
0, 0, 0,
0.5, 0.5
)
drawBackground("snow")
love.graphics.draw(
misc_graphics["santa"],

View File

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

View File

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