From 248f58048e8adfb5393362a8703ac4542b15f0a2 Mon Sep 17 00:00:00 2001 From: Redacted Date: Sun, 7 Apr 2024 12:39:46 -0400 Subject: [PATCH] Fix debug collision renders --- cfg/engine.cfg | 2 +- src/engine/engine.cpp | 4 ++-- src/types/entity/entity.cpp | 9 +++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cfg/engine.cfg b/cfg/engine.cfg index 10c27ad..74e84ca 100644 --- a/cfg/engine.cfg +++ b/cfg/engine.cfg @@ -1,4 +1,4 @@ Fullscreen: 0 Resolution: 1152 864 -Debug: 0 +Debug: 1 CameraFOV: 72.5 diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index f386999..1c77ff8 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp @@ -55,10 +55,10 @@ void Engine::initGL() glEnable(GL_CULL_FACE); glEnable(GL_VERTEX_ARRAY); glEnable(GL_LIGHTING); + glEnable(GL_LIGHT0); + glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); //glEnable(GL_ALPHA_TEST); //glAlphaFunc(GL_GREATER, 0.05f); //Anything with an opacity of less than 5% gets thrown out - //glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); - //glEnable(GL_LIGHT0); //glEnable(GL_COLOR_MATERIAL); //glDepthRange(-0.5f,0.5f); } diff --git a/src/types/entity/entity.cpp b/src/types/entity/entity.cpp index 801302c..9954fda 100644 --- a/src/types/entity/entity.cpp +++ b/src/types/entity/entity.cpp @@ -208,6 +208,7 @@ void Entity::render() { for (int j = 0; j <= i; j++) { glActiveTexture(GL_TEXTURE1 + j); glClientActiveTexture(GL_TEXTURE1 + j); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); glDisable(GL_TEXTURE_2D); glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_TEXTURE_COORD_ARRAY); @@ -220,14 +221,18 @@ void Entity::render() { glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_TEXTURE_COORD_ARRAY); } + glPopMatrix(); if (engine->debug) { + glDisable(GL_LIGHTING); + glPushMatrix(); glColor4f(1, 0, 0, 1); glTranslatef(0, 0, 0); getCollider().draw(); - glColor4f(1, 1, 1,1); + glColor4f(1, 1, 1, 1); + glPopMatrix(); + glEnable(GL_LIGHTING); } - glPopMatrix(); } bool Entity::isCollidingWith(Entity *entity) {