From 2a02c803e885189a19c06008fa6fe226b0928318 Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <randomouscrap98@aol.com>
Date: Wed, 4 Sep 2024 17:14:08 -0400
Subject: [PATCH] Updated maze to work again

---
 maze.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/maze.c b/maze.c
index ef2bf9f..25000f7 100644
--- a/maze.c
+++ b/maze.c
@@ -31,6 +31,8 @@
 #define FARCLIP 100.0
 #define LIGHTANG -MPI / 4.0
 #define AVGWEIGHT 0.85
+#define DITHERSTART 10000
+#define DITHEREND 10000
 
 // Game options
 #define MAZESIZE 15
@@ -86,8 +88,6 @@
 const char POLYNAMES[NUMPOLYS][20] = {"tetrahedron"};
 
 // Store all the values users can change at the beginning
-float ditherstart = -1;
-float ditherend = 8;
 float fov = 90.0;
 float minlight = 0.15;
 float speed = 1.0;
@@ -963,8 +963,9 @@ int main() { // int argc, char **argv) {
   haloo3d_easyrender_init(&render, WIDTH, HEIGHT);
   render.camera.pos.y = 0.5;
   render.tprint.fb = &screen;
-  render.trifunc = 2; // 2 is just better overall for now
   render.autolightfix = 1;
+  render.rendersettings.ditherclose = DITHERSTART;
+  render.rendersettings.ditherfar = DITHEREND;
   eprintf("Initialized renderer\n");
 
   haloo3d_easyinstancer instancer = {.storage = &storage, .render = &render};
@@ -1073,9 +1074,10 @@ int main() { // int argc, char **argv) {
   haloo3d_debugconsole_set(&dc, "game/speed.f", &speed);
   haloo3d_debugconsole_set(&dc, "render/fps.i", &fps);
   haloo3d_debugconsole_set(&dc, "render/fov.f", &fov);
-  haloo3d_debugconsole_set(&dc, "render/trifunc.i", &render.trifunc);
-  haloo3d_debugconsole_set(&dc, "render/ditherstart.f", &ditherstart);
-  haloo3d_debugconsole_set(&dc, "render/ditherend.f", &ditherend);
+  haloo3d_debugconsole_set(&dc, "render/ditherstart.f",
+                           &render.rendersettings.ditherclose);
+  haloo3d_debugconsole_set(&dc, "render/ditherend.f",
+                           &render.rendersettings.ditherfar);
   haloo3d_debugconsole_set(&dc, "render/sky.u16x", &sky);
   haloo3d_debugconsole_set(&dc, "camera/pos_y.f", &render.camera.pos.y);
   haloo3d_debugconsole_set(&dc, "camera/pitch.f", &render.camera.pitch);
@@ -1227,8 +1229,8 @@ int main() { // int argc, char **argv) {
       haloo3d_easyrender_beginmodel(&render, object);
       //  Iterate over object faces
       for (int fi = 0; fi < object->model->numfaces; fi++) {
-        totaldrawn += haloo3d_easyrender_renderface(
-            &render, object, fi, ditherstart, ditherend, minlight);
+        totaldrawn +=
+            haloo3d_easyrender_renderface(&render, object, fi, minlight);
       }
     }