Make HWR_Draw2DModel not depend on resolution, make 3d skin select use skinselectspin cvar
This commit is contained in:
1 parent
b145d7fd0e
commit
ab654deba7
3 files changed
+7
-14
No files matched your search
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
+3
-10
@@ -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
|
||||
|
||||
Reference in new issue
Block a user