From 2fb7c4252d70e71ae93b30630b06edd1405daed6 Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Sun, 27 Jan 2019 21:45:57 +0100 Subject: [PATCH] src/core: add screen system as a cscreen wrapper --- sonic-radiance.love/core/init.lua | 2 + sonic-radiance.love/core/screen.lua | 64 ++++++++++++++++++ sonic-radiance.love/libs/cscreen.lua | 99 ++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+) create mode 100644 sonic-radiance.love/core/screen.lua create mode 100644 sonic-radiance.love/libs/cscreen.lua diff --git a/sonic-radiance.love/core/init.lua b/sonic-radiance.love/core/init.lua index 620c68c..15d1396 100644 --- a/sonic-radiance.love/core/init.lua +++ b/sonic-radiance.love/core/init.lua @@ -29,11 +29,13 @@ local DebugSystem = require "core.debug" local Options = require "core.options" local Input = require "core.input" +local Screen = require "core.screen" function CoreSystem:new() self.debug = DebugSystem(self) self.options = Options(self) self.input = Input(self) + self.screen = Screen(self) end function CoreSystem:update(dt) diff --git a/sonic-radiance.love/core/screen.lua b/sonic-radiance.love/core/screen.lua new file mode 100644 index 0000000..1a1cf37 --- /dev/null +++ b/sonic-radiance.love/core/screen.lua @@ -0,0 +1,64 @@ +-- core/screen.lua :: Basic screen manager. Use CScreen as a backend, and works +-- as an abstraction layer around CScreen. + +--[[ + Copyright © 2019 Kazhnuz + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + the Software, and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +]] + +local ScreenManager = Object:extend() + +local CScreen = require "libs.cscreen" + +local SCREEN_HEIGHT = 240 +local SCREEN_WIDTH = 424 + +function ScreenManager:new(controller) + self.controller = controller + self.data = self.controller.options.data.video + self:applySettings() + CScreen.init(SCREEN_WIDTH, SCREEN_HEIGHT, true) + CScreen.setColor(0, 0, 0, 1) + + love.graphics.setDefaultFilter( "nearest", "nearest", 1 ) +end + +function ScreenManager:applySettings() + self.data = self.controller.options.data.video + + local flags = {} + flags.vsync = self.data.vsync + flags.borderless = (self.data.border == false) + + love.window.setMode(SCREEN_WIDTH * self.data.resolution, SCREEN_WIDTH * self.data.resolution, flags) + love.window.setFullscreen( self.data.fullscreen ) + + local width, height = love.window.getMode() + CScreen.update(width, height) +end + +function ScreenManager:apply() + CScreen.apply() +end + +function ScreenManager:cease() + CScreen.cease() +end + +return ScreenManager diff --git a/sonic-radiance.love/libs/cscreen.lua b/sonic-radiance.love/libs/cscreen.lua new file mode 100644 index 0000000..579ea0d --- /dev/null +++ b/sonic-radiance.love/libs/cscreen.lua @@ -0,0 +1,99 @@ +--[[ +CScreen v1.3 by CodeNMore +A simple way to make resolution-independent Love2D games +Tested for LOVE 0.10.1 +See: https://github.com/CodeNMore/CScreen +Zlib License: +Copyright (c) 2016 CodeNMore +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from +the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: +1. The origin of this software must not be misrepresented; you must not +claim that you wrote the original software. If you use this software in +a product, an acknowledgment in the product documentation would be appreciated +but is not required. +2. Altered source versions must be plainly marked as such, and must not be +misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +--]] + +local CScreen = {} +local rx, ry, ctr = 800, 600, true +local rxv, ryv, fsv, fsvr = 800, 600, 1.0, 1.0 +local tx, ty, rwf, rhf = 0, 0, 800, 600 +local cr, cg, cb, ca = 0, 0, 0, 255 + +-- Initializes CScreen with the initial size values +function CScreen.init(tw, th, cntr) + rx = tw or 800 + ry = th or 600 + ctr = cntr or false + CScreen.update(love.graphics.getWidth(), love.graphics.getHeight()) +end + +-- Draws letterbox borders +function CScreen.cease() + if ctr then + local pr, pg, pb, pa = love.graphics.getColor() + love.graphics.setColor(cr, cg, cb, ca) + love.graphics.scale(fsvr, fsvr) + + if tx ~= 0 then + love.graphics.rectangle("fill", -tx, 0, tx, rhf) + love.graphics.rectangle("fill", rxv, 0, tx, rhf) + elseif ty ~= 0 then + love.graphics.rectangle("fill", 0, -ty, rwf, ty) + love.graphics.rectangle("fill", 0, ryv, rwf, ty) + end + + love.graphics.setColor(pr, pg, pb, pa) + end +end + +-- Scales and centers all graphics properly +function CScreen.apply() + if ctr then + love.graphics.translate(tx, ty) + end + love.graphics.scale(fsv, fsv) +end + +-- Updates CScreen when the window size changes +function CScreen.update(w, h) + local sx = w / rx + local sy = h / ry + fsv = math.min(sx, sy) + fsvr = 1 / fsv + -- Centering + if ctr and fsv == sx then -- Vertically + tx = 0 + ty = (h / 2) - (ry * fsv / 2) + elseif ctr and fsv == sy then -- Horizontally + ty = 0 + tx = (w / 2) - (rx * fsv / 2) + end + -- Variable sets + rwf = w + rhf = h + rxv = rx * fsv + ryv = ry * fsv +end + +-- Convert from window coordinates to target coordinates +function CScreen.project(x, y) + return math.floor((x - tx) / fsv), math.floor((y - ty) / fsv) +end + +-- Change letterbox color +function CScreen.setColor(r, g, b, a) + cr = r + cg = g + cb = b + ca = a +end + +-- Return the table for use +return CScreen