Add scene scaling

assetsraw/chunks/chunk_1_0_0.json

@@ -31,6 +31,14 @@
         10,
         0
       ]
+    },
+    {
+      "file": "house_5_2.dmf",
+      "pos": [
+        13,
+        6,
+        0
+      ]
     }
   ],
   "tiles": [
@@ -907,33 +915,6 @@
       "type": 1,
       "tile": 0
     },
-    {
-      "pos": [
-        13,
-        6,
-        0
-      ],
-      "type": 1,
-      "tile": 0
-    },
-    {
-      "pos": [
-        14,
-        6,
-        0
-      ],
-      "type": 1,
-      "tile": 0
-    },
-    {
-      "pos": [
-        15,
-        6,
-        0
-      ],
-      "type": 1,
-      "tile": 0
-    },
     {
       "pos": [
         0,
@@ -1051,33 +1032,6 @@
       "type": 1,
       "tile": 0
     },
-    {
-      "pos": [
-        13,
-        7,
-        0
-      ],
-      "type": 1,
-      "tile": 0
-    },
-    {
-      "pos": [
-        14,
-        7,
-        0
-      ],
-      "type": 1,
-      "tile": 0
-    },
-    {
-      "pos": [
-        15,
-        7,
-        0
-      ],
-      "type": 1,
-      "tile": 0
-    },
     {
       "pos": [
         0,

src/dusk/display/display.h

@@ -33,6 +33,10 @@
   #endif
 #endif
 
+#ifndef DUSK_DISPLAY_SCALE
+  #define DUSK_DISPLAY_SCALE 1
+#endif
+
 // Main Display Struct, platform-speicifc
 typedef displayplatform_t display_t;
 

src/dusk/display/screen/screen.c

@@ -23,6 +23,7 @@ const screencropaspectinfo_t SCREEN_CROP_ASPECTS[SCREEN_CROP_ASPECT_COUNT] = {
 errorret_t screenInit() {
   memoryZero(&SCREEN, sizeof(screen_t));
 
+  SCREEN.scale = DUSK_DISPLAY_SCALE;
   SCREEN.background = COLOR_CORNFLOWER_BLUE;
 
   #ifdef DUSK_DISPLAY_SIZE_DYNAMIC

src/dusk/display/screen/screen.h

@@ -7,6 +7,7 @@
 
 #pragma once
 #include "dusk.h"
+#include "display/display.h"
 #include "display/framebuffer/framebuffer.h"
 #include "display/mesh/quad.h"
 #include "display/color.h"
@@ -58,6 +59,7 @@ typedef enum {
 // } screenscalemode_t;
 
 typedef struct {
+  int32_t scale;
   screenmode_t mode;
   // screenscalemode_t scaleMode;
 

src/dusk/scene/overworld/sceneoverworld.c

@@ -85,7 +85,7 @@ errorret_t sceneOverworldRender(scenedata_t *sceneData) {
 
   // Camera Eye
   float_t pixelsPerUnit = TILE_SIZE_PIXELS;
-  float_t worldH = (float_t)SCREEN.height / pixelsPerUnit;
+  float_t worldH = (float_t)(SCREEN.height / SCREEN.scale) / pixelsPerUnit;
   float_t z = (worldH * 0.5f) / tanf(fov * 0.5f);
   vec3 worldPosVec;
   rpgCameraGetPosition(worldPosVec);

src/dusk/scene/scene.c

@@ -73,8 +73,8 @@ errorret_t sceneRender(void) {
   errorChain(shaderSetMatrix(&SHADER_UNLIT, SHADER_UNLIT_MODEL, ident));
 
   glm_ortho(
-    0.0f, SCREEN.width,
+    0.0f, (float_t)(SCREEN.width / SCREEN.scale),
-    SCREEN.height, 0.0f,
+    (float_t)(SCREEN.height / SCREEN.scale), 0.0f,
     0.1f, 100.0f,
     proj
   );

src/duskdolphin/display/displayplatform.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#define DUSK_DISPLAY_SCALE 2
 #include "displaydolphin.h"
 
 #define displayPlatformInit displayInitDolphin

src/duskpsp/display/displayplatform.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#define DUSK_DISPLAY_SCALE 2
 #include "display/displaysdl2.h"
 
 typedef displaysdl2_t displayplatform_t;