Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-04-28 12:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

gfx: fix wireframe mode not working in tr2 title screen

Browse source
This commit is contained in:
Marcin Kurczewski 2024-12-11 17:16:57 +01:00
parent 83681dd4b4
commit f1b6a74f34
No known key found for this signature in database
GPG key ID: CC65E6FD28CAE42A
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/libtrx/gfx/3d/3d_renderer.c
View file

@ -35,6 +35,12 @@ static void M_RestoreTexture(GFX_3D_RENDERER *const renderer);
static void M_Flush(GFX_3D_RENDERER *const renderer)
{
glLineWidth(renderer->config->line_width);
glPolygonMode(
GL_FRONT_AND_BACK,
renderer->config->enable_wireframe ? GL_LINE : GL_FILL);
GFX_GL_CheckError();
GFX_3D_VertexStream_RenderPending(&renderer->vertex_stream);
}
@ -127,8 +133,6 @@ GFX_3D_RENDERER *GFX_3D_Renderer_Create(void)
&renderer->program, renderer->loc_alpha_threshold, -1.0);
GFX_3D_VertexStream_Init(&renderer->vertex_stream);
GFX_GL_CheckError();
return renderer;
}
@ -146,12 +150,6 @@ void GFX_3D_Renderer_Destroy(GFX_3D_RENDERER *const renderer)
void GFX_3D_Renderer_RenderBegin(GFX_3D_RENDERER *const renderer)
{
ASSERT(renderer != NULL);
glEnable(GL_BLEND);
glLineWidth(renderer->config->line_width);
glPolygonMode(
GL_FRONT_AND_BACK,
renderer->config->enable_wireframe ? GL_LINE : GL_FILL);
GFX_GL_CheckError();
renderer->vertex_stream.rendered_count = 0;
@ -180,6 +178,7 @@ void GFX_3D_Renderer_RenderBegin(GFX_3D_RENDERER *const renderer)
glDepthFunc(GL_LEQUAL);
glDepthMask(GL_TRUE);
glEnable(GL_DEPTH_TEST);
glEnable(GL_BLEND);
GFX_GL_CheckError();
}
@ -191,6 +190,7 @@ void GFX_3D_Renderer_RenderEnd(GFX_3D_RENDERER *const renderer)
void GFX_3D_Renderer_ClearDepth(GFX_3D_RENDERER *const renderer)
{
ASSERT(renderer != NULL);
M_Flush(renderer);
glClear(GL_DEPTH_BUFFER_BIT);
GFX_GL_CheckError();
@ -205,7 +205,6 @@ int GFX_3D_Renderer_RegisterEnvironmentMap(GFX_3D_RENDERER *const renderer)
renderer->env_map_texture = texture;
M_RestoreTexture(renderer);
GFX_GL_CheckError();
return GFX_ENV_MAP_TEXTURE;
}
@ -268,7 +267,6 @@ int GFX_3D_Renderer_RegisterTexturePage(
M_RestoreTexture(renderer);
GFX_GL_CheckError();
return texture_num;
}
@ -413,7 +411,6 @@ void GFX_3D_Renderer_SetBlendingMode(
GFX_GL_CheckError();
break;
}
GFX_GL_CheckError();
renderer->selected_blend_mode = blend_mode;
}