From 17c4a35df5de17edc316791ff8a036765a80f752 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 5 Jan 2024 00:21:51 +0100 Subject: [PATCH 1/5] change order of those --- src/hardware/hw_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index d4c00d879..119fb8350 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -1148,8 +1148,8 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, { if (HWR_ShouldUsePaletteRendering()) { - colormap = pfloor->master->frontsector->extra_colormap; lightnum = pfloor->master->frontsector->lightlevel; + colormap = pfloor->master->frontsector->extra_colormap; lightnum = colormap ? lightnum : HWR_CalcWallLight(lightnum, v1x, v1y, v2x, v2y); }else{ lightnum = HWR_CalcWallLight(pfloor->master->frontsector->lightlevel, v1x, v1y, v2x, v2y); @@ -1160,8 +1160,8 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, { if (HWR_ShouldUsePaletteRendering()) { - colormap = list[i].extra_colormap; lightnum = *list[i].lightlevel; + colormap = list[i].extra_colormap; lightnum = colormap ? lightnum : HWR_CalcWallLight(lightnum, v1x, v1y, v2x, v2y); }else{ lightnum = HWR_CalcWallLight(*list[i].lightlevel, v1x, v1y, v2x, v2y); @@ -1560,8 +1560,8 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom if (HWR_ShouldUsePaletteRendering()) { - colormap = gr_frontsector->extra_colormap; lightnum = gr_frontsector->lightlevel; + colormap = gr_frontsector->extra_colormap; lightnum = colormap ? lightnum : HWR_CalcWallLight(lightnum, vs.x, vs.y, ve.x, ve.y); }else{ lightnum = HWR_CalcWallLight(gr_frontsector->lightlevel, vs.x, vs.y, ve.x, ve.y); @@ -2508,8 +2508,8 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom if (HWR_ShouldUsePaletteRendering()) { - colormap = rover->master->frontsector->extra_colormap; lightnum = rover->master->frontsector->lightlevel; + colormap = rover->master->frontsector->extra_colormap; lightnum = colormap ? lightnum : HWR_CalcWallLight(lightnum, vs.x, vs.y, ve.x, ve.y); }else{ lightnum = HWR_CalcWallLight(rover->master->frontsector->lightlevel, vs.x, vs.y, ve.x, ve.y); @@ -2659,8 +2659,8 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom if (HWR_ShouldUsePaletteRendering()) { - colormap = rover->master->frontsector->extra_colormap; lightnum = rover->master->frontsector->lightlevel; + colormap = rover->master->frontsector->extra_colormap; lightnum = colormap ? lightnum : HWR_CalcWallLight(lightnum, vs.x, vs.y, ve.x, ve.y); }else{ lightnum = HWR_CalcWallLight(rover->master->frontsector->lightlevel, vs.x, vs.y, ve.x, ve.y); From 5d699d4cf36151189b25b193f16168f4e914e82c Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 5 Jan 2024 00:22:13 +0100 Subject: [PATCH 2/5] revert this --- src/hardware/r_opengl/r_opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 47e27a638..a5e05da75 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -910,7 +910,7 @@ static float shader_leveltime = 0; "uniform int palette[768];\n" \ "void main(void) {\n" \ "vec3 texel = vec3(texture2D(tex, gl_TexCoord[0].st));\n" \ - "int pal_idx = int(texture3D(lookup_tex, vec3((texel * 63.0 + 0.5) / 64.0))[0] * 255.0);\n" \ + "int pal_idx = int(texture3D(lookup_tex, vec3((63.0/64.0) * texel + 1.0 / 128.0))[0] * 255.0);\n" \ "gl_FragColor = vec4(float(palette[pal_idx*3])/255.0, float(palette[pal_idx*3+1])/255.0, float(palette[pal_idx*3+2])/255.0, 1.0);\n" \ "}\0" From 05b74102c082629899cbfdb13bae17a532837e1a Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 5 Jan 2024 00:53:19 +0100 Subject: [PATCH 3/5] little changes to palshader use gl_texture 2 in postprocess like srb2s palshader does it also disable depthtest for screentextures in palshader mode --- src/hardware/r_opengl/r_opengl.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index a5e05da75..f2510a389 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -495,6 +495,10 @@ static PFNglColorPointer pglColorPointer; #define GL_TEXTURE1 0x84C1 #endif +#ifndef GL_TEXTURE2 +#define GL_TEXTURE2 0x84C2 +#endif + boolean SetupGLfunc(void) { #ifndef STATIC_OPENGL @@ -4492,14 +4496,18 @@ EXPORT void HWRAPI(DrawScreenFinalTexture)(int width, int height) clearColour.red = clearColour.green = clearColour.blue = 0; clearColour.alpha = 1; ClearBuffer(true, false, false, &clearColour); - pglBindTexture(GL_TEXTURE_2D, finalScreenTexture); + if (gl_palshader) + { + SetBlend(PF_NoDepthTest); + pglBindTexture(GL_TEXTURE_2D, finalScreenTexture); + } + else + pglBindTexture(GL_TEXTURE_2D, finalScreenTexture); if (gl_palshader) { - Shader_SetUniforms(NULL, NULL, NULL, NULL); // prepare shader, if it is enabled - - pglUseProgram(gl_shaderprograms[8].program); // palette shader - pglActiveTexture(GL_TEXTURE1); + pglUseProgram(gl_shaderprograms[8].program); // palette postprocess shader + pglActiveTexture(GL_TEXTURE2); } pglColor4ubv(white); From 619fe7bdaf80e01f3261f28eae7a333366e8f2c0 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 5 Jan 2024 01:23:05 +0100 Subject: [PATCH 4/5] fix menu fade screen background using wrong things in palshader --- src/hardware/hw_draw.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c index 5aa2ae312..99c90243e 100644 --- a/src/hardware/hw_draw.c +++ b/src/hardware/hw_draw.c @@ -567,9 +567,14 @@ void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength) } else // Do TRANSMAP** fade. { - Surf.PolyColor.rgba = pLocalPalette[color].rgba; + if (HWR_ShouldUsePaletteRendering()) + Surf.PolyColor.rgba = pLocalPalette[color&0xFF].rgba; + else + Surf.PolyColor.rgba = pLocalPalette[color].rgba; + Surf.PolyColor.s.alpha = (UINT8)(strength*25.5f); } + HWD.pfnDrawPolygon(&Surf, v, 4, PF_NoTexture|PF_Modulated|PF_Translucent|PF_NoDepthTest, false); } From d81640c57e355b056076bf8eaa62ac3a53e7ce63 Mon Sep 17 00:00:00 2001 From: Indev Date: Fri, 5 Jan 2024 19:04:13 +0300 Subject: [PATCH 5/5] Fix hud offsets for position number, also refactor offsets definition a bit --- src/g_game.h | 46 ++++++++++++--------- src/k_kart.c | 114 ++++++++++++++++++++++++++------------------------- 2 files changed, 86 insertions(+), 74 deletions(-) diff --git a/src/g_game.h b/src/g_game.h index bc6d5f3b9..b6aab2b87 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -127,25 +127,33 @@ extern consvar_t cv_turnaxis4,cv_moveaxis4,cv_brakeaxis4,cv_aimaxis4,cv_lookaxis extern consvar_t cv_ghost_besttime, cv_ghost_bestlap, cv_ghost_last, cv_ghost_guest, cv_ghost_staff; // Hud offsets -extern consvar_t cv_item_xoffset; -extern consvar_t cv_item_yoffset; -extern consvar_t cv_time_xoffset; -extern consvar_t cv_time_yoffset; -extern consvar_t cv_laps_xoffset; -extern consvar_t cv_laps_yoffset; -extern consvar_t cv_spdm_xoffset; -extern consvar_t cv_spdm_yoffset; -extern consvar_t cv_posi_xoffset; -extern consvar_t cv_posi_yoffset; -extern consvar_t cv_face_xoffset; -extern consvar_t cv_face_yoffset; -extern consvar_t cv_stcd_xoffset; -extern consvar_t cv_stcd_yoffset; -extern consvar_t cv_chek_yoffset; -extern consvar_t cv_mini_xoffset; -extern consvar_t cv_mini_yoffset; -extern consvar_t cv_want_xoffset; -extern consvar_t cv_want_yoffset; +#define DECL_HUD_OFFSET_X(name)\ +extern consvar_t cv_##name##_xoffset; + +#define DECL_HUD_OFFSET_Y(name)\ +extern consvar_t cv_##name##_yoffset; + +#define DECL_HUD_OFFSET(name)\ +DECL_HUD_OFFSET_X(name)\ +DECL_HUD_OFFSET_Y(name) + +DECL_HUD_OFFSET(item); // Item box +DECL_HUD_OFFSET(time); // Time +DECL_HUD_OFFSET(laps); // Number of laps +DECL_HUD_OFFSET(dnft); // Countdown (did not finish timer) +DECL_HUD_OFFSET(spdm); // Speedometer +DECL_HUD_OFFSET(posi); // Position in race +DECL_HUD_OFFSET(face); // Mini rankings +DECL_HUD_OFFSET(stcd); // Starting countdown +DECL_HUD_OFFSET_Y(chek); // Check gfx +DECL_HUD_OFFSET(mini); // Minimap +DECL_HUD_OFFSET(want); // Wanted +DECL_HUD_OFFSET(stat); // Stats + +#undef DECL_HUD_OFFSET +#undef DECL_HUD_OFFSET_X +#undef DECL_HUD_OFFSET_Y + extern consvar_t cv_showinput; extern consvar_t cv_newspeedometer; diff --git a/src/k_kart.c b/src/k_kart.c index f5a97a95d..e567945ac 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -26,37 +26,32 @@ #include "d_main.h" // found_extra_kart // Hud offset cvars -consvar_t cv_item_xoffset = {"hud_item_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_item_yoffset = {"hud_item_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; +#define IMPL_HUD_OFFSET_X(name)\ +consvar_t cv_##name##_xoffset = {"hud_" #name "_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_time_xoffset = {"hud_time_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_time_yoffset = {"hud_time_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; +#define IMPL_HUD_OFFSET_Y(name)\ +consvar_t cv_##name##_yoffset = {"hud_" #name "_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_laps_xoffset = {"hud_laps_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_laps_yoffset = {"hud_laps_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; +#define IMPL_HUD_OFFSET(name)\ +IMPL_HUD_OFFSET_X(name)\ +IMPL_HUD_OFFSET_Y(name) -consvar_t cv_spdm_xoffset = {"hud_speed_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_spdm_yoffset = {"hud_speed_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; +IMPL_HUD_OFFSET(item); // Item box +IMPL_HUD_OFFSET(time); // Time +IMPL_HUD_OFFSET(laps); // Number of laps +IMPL_HUD_OFFSET(dnft); // Countdown (did not finish timer) +IMPL_HUD_OFFSET(spdm); // Speedometer +IMPL_HUD_OFFSET(posi); // Position in race +IMPL_HUD_OFFSET(face); // Mini rankings +IMPL_HUD_OFFSET(stcd); // Starting countdown +IMPL_HUD_OFFSET_Y(chek); // Check gfx +IMPL_HUD_OFFSET(mini); // Minimap +IMPL_HUD_OFFSET(want); // Wanted +IMPL_HUD_OFFSET(stat); // Stats -consvar_t cv_posi_xoffset = {"hud_position_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_posi_yoffset = {"hud_position_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; - -consvar_t cv_face_xoffset = {"hud_face_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_face_yoffset = {"hud_face_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; - -consvar_t cv_stcd_xoffset = {"hud_startcountdown_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_stcd_yoffset = {"hud_startcountdown_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; - -consvar_t cv_chek_yoffset = {"hud_check_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; - -consvar_t cv_mini_xoffset = {"hud_minimap_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_mini_yoffset = {"hud_minimap_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; - -consvar_t cv_want_xoffset = {"hud_wanted_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_want_yoffset = {"hud_wanted_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; - -consvar_t cv_stat_xoffset = {"hud_stat_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_stat_yoffset = {"hud_stat_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; +#undef IMPL_HUD_OFFSET +#undef IMPL_HUD_OFFSET_X +#undef IMPL_HUD_OFFSET_Y //extra hud things consvar_t cv_showstats = {"showstats", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -675,29 +670,34 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_kartdebugcheckpoint); CV_RegisterVar(&cv_kartdebugnodes); CV_RegisterVar(&cv_kartdebugcolorize); - - CV_RegisterVar(&cv_item_xoffset); - CV_RegisterVar(&cv_item_yoffset); - CV_RegisterVar(&cv_time_xoffset); - CV_RegisterVar(&cv_time_yoffset); - CV_RegisterVar(&cv_laps_xoffset); - CV_RegisterVar(&cv_laps_yoffset); - CV_RegisterVar(&cv_spdm_xoffset); - CV_RegisterVar(&cv_spdm_yoffset); - CV_RegisterVar(&cv_posi_xoffset); - CV_RegisterVar(&cv_posi_yoffset); - CV_RegisterVar(&cv_face_xoffset); - CV_RegisterVar(&cv_face_yoffset); - CV_RegisterVar(&cv_stcd_xoffset); - CV_RegisterVar(&cv_stcd_yoffset); - CV_RegisterVar(&cv_chek_yoffset); - CV_RegisterVar(&cv_mini_xoffset); - CV_RegisterVar(&cv_mini_yoffset); - CV_RegisterVar(&cv_want_xoffset); - CV_RegisterVar(&cv_want_yoffset); - CV_RegisterVar(&cv_stat_xoffset); - CV_RegisterVar(&cv_stat_yoffset); - + +#define REG_HUD_OFFSET_X(name)\ + CV_RegisterVar(&cv_##name##_xoffset); + +#define REG_HUD_OFFSET_Y(name)\ + CV_RegisterVar(&cv_##name##_yoffset); + +#define REG_HUD_OFFSET(name)\ + REG_HUD_OFFSET_X(name)\ + REG_HUD_OFFSET_Y(name) + + REG_HUD_OFFSET(item); // Item box + REG_HUD_OFFSET(time); // Time + REG_HUD_OFFSET(laps); // Number of laps + REG_HUD_OFFSET(dnft); // Countdown (did not finish timer) + REG_HUD_OFFSET(spdm); // Speedometer + REG_HUD_OFFSET(posi); // Position in race + REG_HUD_OFFSET(face); // Mini rankings + REG_HUD_OFFSET(stcd); // Starting countdown + REG_HUD_OFFSET_Y(chek); // Check gfx + REG_HUD_OFFSET(mini); // Minimap + REG_HUD_OFFSET(want); // Wanted + REG_HUD_OFFSET(stat); // Stats + +#undef REG_HUD_OFFSET +#undef REG_HUD_OFFSET_X +#undef REG_HUD_OFFSET_Y + CV_RegisterVar(&cv_showstats); CV_RegisterVar(&cv_showinput); CV_RegisterVar(&cv_newspeedometer); @@ -8210,7 +8210,7 @@ static void K_DrawKartPositionNum(INT32 num) if (!splitscreen) { fx = POSI_X + xoffs; - fy = BASEVIDHEIGHT - 8; + fy = BASEVIDHEIGHT - 8 + cv_posi_yoffset.value; fflags = V_SNAPTOBOTTOM|V_SNAPTORIGHT; } else if (splitscreen == 1) // for this splitscreen, we'll use case by case because it's a bit different. @@ -8218,14 +8218,14 @@ static void K_DrawKartPositionNum(INT32 num) fx = POSI_X; if (stplyr == &players[displayplayers[0]]) // for player 1: display this at the top right, above the minimap. { - fy = 30; + fy = 30 + cv_posi_yoffset.value; fflags = V_SNAPTOTOP|V_SNAPTORIGHT; if (overtake) flipvdraw = true; // make sure overtaking doesn't explode us } else // if we're not p1, that means we're p2. display this at the bottom right, below the minimap. { - fy = BASEVIDHEIGHT - 8; + fy = BASEVIDHEIGHT - 8 + cv_posi_yoffset.value; fflags = V_SNAPTOBOTTOM|V_SNAPTORIGHT; } } @@ -10056,12 +10056,16 @@ void K_drawKartHUD(void) { char *countstr = va("%d", racecountdown/TICRATE); + // Eeeh dunno if would be better to add another variable instead of LAPS_Y but this works too + int yoff = cv_dnft_yoffset.value - cv_laps_yoffset.value; + int xoff = cv_dnft_xoffset.value; + if (splitscreen > 1) - V_DrawCenteredString(BASEVIDWIDTH/4, LAPS_Y+1, K_calcSplitFlags(0), countstr); + V_DrawCenteredString(BASEVIDWIDTH/4+xoff, LAPS_Y+1+yoff, K_calcSplitFlags(0), countstr); else { INT32 karlen = strlen(countstr)*6; // half of 12 - V_DrawKartString((BASEVIDWIDTH/2)-karlen, LAPS_Y+3, K_calcSplitFlags(0), countstr); + V_DrawKartString((BASEVIDWIDTH/2)-karlen+xoff, LAPS_Y+3+yoff, K_calcSplitFlags(0), countstr); } }