Updated maze to work again

This commit is contained in:
Carlos Sanchez 2024-09-04 17:14:08 -04:00
parent b899de7c14
commit 2a02c803e8

18
maze.c
View File

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