From 5bd32cf7692fc6f6b2f91ed02f563191ca5fe9cf Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 25 Dec 2019 00:30:13 +0100 Subject: [PATCH] - fixed: Voxel setup code wasn't called anymore. --- source/build/include/build.h | 1 + source/build/src/polymost.cpp | 3 +-- source/common/rendering/v_video.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/build/include/build.h b/source/build/include/build.h index 4af8fc8cb..de62a32a6 100644 --- a/source/build/include/build.h +++ b/source/build/include/build.h @@ -1057,6 +1057,7 @@ void polymostSet2dView(void); // sets up GL for 2D drawing void polymost_glreset(void); void polymost_precache(int32_t dapicnum, int32_t dapalnum, int32_t datype); void PrecacheHardwareTextures(int nTile); +void Polymost_Startup(); typedef uint16_t polytintflags_t; diff --git a/source/build/src/polymost.cpp b/source/build/src/polymost.cpp index bdc5cf495..5b41010b4 100644 --- a/source/build/src/polymost.cpp +++ b/source/build/src/polymost.cpp @@ -5242,7 +5242,7 @@ static void PolymostProcessVoxels(void) g_haveVoxels = 2; OSD_Printf("Generating voxel models for Polymost. This may take a while...\n"); - videoNextPage(); + //videoNextPage(); for (bssize_t i = 0; i < MAXVOXELS; i++) { @@ -5257,7 +5257,6 @@ static void PolymostProcessVoxels(void) void Polymost_Startup() { - polymost_glreset(); polymost_glinit(); PolymostProcessVoxels(); } diff --git a/source/common/rendering/v_video.cpp b/source/common/rendering/v_video.cpp index 2c8df26e9..8cc554bbf 100644 --- a/source/common/rendering/v_video.cpp +++ b/source/common/rendering/v_video.cpp @@ -617,7 +617,7 @@ void V_Init2() C_NewModeAdjust(); videoSetGameMode(vid_fullscreen, SCREENWIDTH, SCREENHEIGHT, 32, 1); - polymost_glinit(); + Polymost_Startup(); GLInterface.Init(SCREENHEIGHT); GLInterface.InitGLState(4, 4/*glmultisample*/); GLInterface.mSamplers->SetTextureFilterMode(hw_texfilter, hw_anisotropy);