diff --git a/game/graphics/opengl_renderer/OpenGLRenderer.cpp b/game/graphics/opengl_renderer/OpenGLRenderer.cpp index 756e62275bf..37ec2bf88a1 100644 --- a/game/graphics/opengl_renderer/OpenGLRenderer.cpp +++ b/game/graphics/opengl_renderer/OpenGLRenderer.cpp @@ -1304,7 +1304,8 @@ void OpenGLRenderer::dispatch_buckets_jak1(DmaFollower dma, m_category_times[(int)m_bucket_categories[bucket_id]] += bucket_prof.get_elapsed_time(); // hack to draw the collision mesh in the middle the drawing - if (bucket_id == 31 - 1 && Gfx::g_global_settings.collision_enable) { + if (bucket_id == (int)jak1::BucketId::MERC_PRIS_LEVEL0 && + Gfx::g_global_settings.collision_enable) { auto p = prof.make_scoped_child("collision-draw"); m_collide_renderer.render(&m_render_state, p); } diff --git a/goal_src/jak1/pc/debug/default-menu-pc.gc b/goal_src/jak1/pc/debug/default-menu-pc.gc index 95d467e1f12..18066877e6b 100644 --- a/goal_src/jak1/pc/debug/default-menu-pc.gc +++ b/goal_src/jak1/pc/debug/default-menu-pc.gc @@ -227,11 +227,11 @@ (cond ((-> arg value) (false! (-> arg value)) - (logior! *vu1-enable-user-menu* (vu1-renderer-mask tfrag trans-tfrag tie tie-near)) + (logior! *vu1-enable-user-menu* (vu1-renderer-mask tfrag tie tie-near)) (true! *generic-tie*)) (else (true! (-> arg value)) - (logclear! *vu1-enable-user-menu* (vu1-renderer-mask tfrag trans-tfrag tie tie-near)) + (logclear! *vu1-enable-user-menu* (vu1-renderer-mask tfrag tie tie-near)) (false! *generic-tie*)))) (-> arg value)) diff --git a/goalc/build_level/common/gltf_mesh_extract.cpp b/goalc/build_level/common/gltf_mesh_extract.cpp index 69124f1ec87..0223980232f 100644 --- a/goalc/build_level/common/gltf_mesh_extract.cpp +++ b/goalc/build_level/common/gltf_mesh_extract.cpp @@ -12,7 +12,7 @@ #include "common/math/geometry.h" #include "common/util/Timer.h" #include "common/util/gltf_util.h" -#include +#include "common/util/image_resize.h" using namespace gltf_util; constexpr int kColorTreeDepth = 13;