diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index 2579a3cdb..00d4b955f 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1559,7 +1559,7 @@ void HWR_Draw2DModel(md2_t *md2, INT32 x, INT32 y, INT32 skinnum, skincolors_t c memset(&p, 0x00, sizeof(FTransform)); - p.x = x; + p.x = x + (vid.width/vid.dup - BASEVIDWIDTH)/4; p.y = -400.0f; // idk man, but this makes the model not cull, kinda? p.z = y; // for whatever reason y and z are switched here @@ -1578,8 +1578,8 @@ void HWR_Draw2DModel(md2_t *md2, INT32 x, INT32 y, INT32 skinnum, skincolors_t c 0.0f, -1, &p, - FixedToFloat(scale), - FixedToFloat(scale), + FixedToFloat(scale) * (BASEVIDWIDTH / ((float)vid.width/vid.dup)), + FixedToFloat(scale) * (BASEVIDHEIGHT / ((float)vid.height/vid.dup)), true, false, &Surf diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index c4c3fc47e..773d19013 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -3123,7 +3123,7 @@ void GL_Draw2DModel(model_t *model, INT32 frameIndex, INT32 duration, INT32 tics //pglDepthRange(0.0f, 1.0f); pglClearDepth(1.0f); //Hurdler: all that are permanen states - pglDepthRange(ZCLIP_PLANE, FAR_ZCLIP_DEFAULT); // idk man im confused here tbh + pglDepthRange(0.f, FAR_ZCLIP_DEFAULT); // idk man im confused here tbh pglDepthFunc(GL_LEQUAL); pglClear(GL_DEPTH_BUFFER_BIT); //GL_ClearBuffer(false, true, false, NULL); diff --git a/src/m_menu.c b/src/m_menu.c index f94407284..ea2cdc9c6 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -8574,18 +8574,11 @@ static void M_DrawSetupMultiPlayerMenu(void) mx += 36; my += 131; - static angle_t angle = ANGLE_180; + const angle_t ROTATE_PER_TIC = (UINT64)ANGLE_45 * cv_skinselectspin.value / TICRATE; - // idk but those magic numbers work, gotta figure out smth proper - //x += vid.width/3; - //y += vid.height/2; - mx += BASEVIDWIDTH/8; - my -= BASEVIDHEIGHT/10; + angle_t angle = I_GetTime()*ROTATE_PER_TIC + FixedMul(cv_uncappedhud.value ? renderdeltatics : FRACUNIT, ROTATE_PER_TIC); - // just for testing - angle += FRACUNIT * 3; - - HWR_Draw2DModel(md2, mx, my, skinnum, (skincolors_t)setupm_fakecolor, colormap, 4*FRACUNIT/3, 0, angle); + HWR_Draw2DModel(md2, mx, my, skinnum, (skincolors_t)setupm_fakecolor, colormap, 8*FRACUNIT/3, frame, angle); } else #endif