Scaling

4 files changed, 19 insertions, 9 deletions

diff --git a/camera.lua b/camera.lua
index 535e0ac..0245218 100644
--- a/camera.lua
+++ b/camera.lua
@@ -7,7 +7,7 @@ Camera = {
 	y = 0,
 	dest_x = 0,
 	dest_y = 0,
-	scale = 4,
+	scale = getScale(),
 	shake = 0,
 	timer = 0,
 	delay = 0,
diff --git a/conf.lua b/conf.lua
index c5d97e3..e34d170 100644
--- a/conf.lua
+++ b/conf.lua
@@ -2,6 +2,11 @@
 function love.conf(t)
 	t.title = "Roflnauts 2"
 	t.version = "0.10.1"
+	--[[
+	t.window.width = 320*3
+	t.window.height = 180*3
+	t.window.borderless = true
+	--]]
 	t.window.fullscreentype = "desktop"
 	t.window.fullscreen = true
 	t.console = false
diff --git a/main.lua b/main.lua
index 92d53b8..d5552d0 100644
--- a/main.lua
+++ b/main.lua
@@ -1,6 +1,17 @@
 -- "NOTNAUTS"
 -- WHOLE CODE HAS FLAG OF "need a cleanup"
 
+-- Pretend you didn't see this
+Scene = nil
+function changeScene(scene)
+	Scene = scene
+end
+
+function getScale()
+	return math.max(1, math.floor(love.graphics.getWidth() / 320)-1, math.floor(love.graphics.getHeight() / 180)-1)
+end
+
+-- Require
 require "world"
 require "camera"
 require "menu"
@@ -9,12 +20,6 @@ require "controller"
 -- Temporary debug
 debug = false
 
--- Pretend you didn't see this
-Scene = nil
-function changeScene(scene)
-	Scene = scene
-end
-
 -- Load
 function love.load ()
 	-- Graphics
@@ -99,6 +104,6 @@ end
 function love.draw ()
 	Scene:draw()
 	if debug then
-		love.graphics.print("Current FPS: "..tostring(love.timer.getFPS( )), 10, 10)
+		love.graphics.print("Current FPS: "..tostring(love.timer.getFPS()), 10, 10)
 	end
 end
\ No newline at end of file
diff --git a/menu.lua b/menu.lua
index 5b0ade1..e7841a2 100644
--- a/menu.lua
+++ b/menu.lua
@@ -15,7 +15,7 @@ Menu = {
 	nauts = require "nautslist",
 	portrait_sprite = nil,
 	portrait_sheet  = require "portraits",
-	scale = 4,
+	scale = getScale(),
 	countdown = 6
 }