tech
/
engine
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix up d3d renderers. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6231 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2022-04-17 19:46:46 +00:00
parent 27c32fc1a0
commit 7f649df33e
4 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
engine/d3d/d3d11_backend.c
View File

@ -2912,46 +2912,46 @@ static void BE_RotateForEntity (const entity_t *e, const model_t *mod)
if (e->flags & RF_WEAPONMODELNOBOB) if (e->flags & RF_WEAPONMODELNOBOB)
{ {
vm[0] = vpn[0]; vm[0] = r_refdef.weaponmatrix[0][0];
vm[1] = vpn[1]; vm[1] = r_refdef.weaponmatrix[0][1];
vm[2] = vpn[2]; vm[2] = r_refdef.weaponmatrix[0][2];
vm[3] = 0; vm[3] = 0;
vm[4] = -vright[0]; vm[4] = r_refdef.weaponmatrix[1][0];
vm[5] = -vright[1]; vm[5] = r_refdef.weaponmatrix[1][1];
vm[6] = -vright[2]; vm[6] = r_refdef.weaponmatrix[1][2];
vm[7] = 0; vm[7] = 0;
vm[8] = vup[0]; vm[8] = r_refdef.weaponmatrix[2][0];
vm[9] = vup[1]; vm[9] = r_refdef.weaponmatrix[2][1];
vm[10] = vup[2]; vm[10] = r_refdef.weaponmatrix[2][2];
vm[11] = 0; vm[11] = 0;
vm[12] = r_refdef.vieworg[0]; vm[12] = r_refdef.weaponmatrix[3][0];
vm[13] = r_refdef.vieworg[1]; vm[13] = r_refdef.weaponmatrix[3][1];
vm[14] = r_refdef.vieworg[2]; vm[14] = r_refdef.weaponmatrix[3][2];
vm[15] = 1; vm[15] = 1;
} }
else else
{ {
vm[0] = r_refdef.playerview->vw_axis[0][0]; vm[0] = r_refdef.weaponmatrix_bob[0][0];
vm[1] = r_refdef.playerview->vw_axis[0][1]; vm[1] = r_refdef.weaponmatrix_bob[0][1];
vm[2] = r_refdef.playerview->vw_axis[0][2]; vm[2] = r_refdef.weaponmatrix_bob[0][2];
vm[3] = 0; vm[3] = 0;
vm[4] = r_refdef.playerview->vw_axis[1][0]; vm[4] = r_refdef.weaponmatrix_bob[1][0];
vm[5] = r_refdef.playerview->vw_axis[1][1]; vm[5] = r_refdef.weaponmatrix_bob[1][1];
vm[6] = r_refdef.playerview->vw_axis[1][2]; vm[6] = r_refdef.weaponmatrix_bob[1][2];
vm[7] = 0; vm[7] = 0;
vm[8] = r_refdef.playerview->vw_axis[2][0]; vm[8] = r_refdef.weaponmatrix_bob[2][0];
vm[9] = r_refdef.playerview->vw_axis[2][1]; vm[9] = r_refdef.weaponmatrix_bob[2][1];
vm[10] = r_refdef.playerview->vw_axis[2][2]; vm[10] = r_refdef.weaponmatrix_bob[2][2];
vm[11] = 0; vm[11] = 0;
vm[12] = r_refdef.playerview->vw_origin[0]; vm[12] = r_refdef.weaponmatrix_bob[3][0];
vm[13] = r_refdef.playerview->vw_origin[1]; vm[13] = r_refdef.weaponmatrix_bob[3][1];
vm[14] = r_refdef.playerview->vw_origin[2]; vm[14] = r_refdef.weaponmatrix_bob[3][2];
vm[15] = 1; vm[15] = 1;
} }

48
engine/d3d/d3d_backend.c
View File

@ -3455,46 +3455,46 @@ static void D3D9BE_RotateForEntity (const entity_t *e, const model_t *mod)
if (e->flags & RF_WEAPONMODELNOBOB) if (e->flags & RF_WEAPONMODELNOBOB)
{ {
vm[0] = vpn[0]; vm[0] = r_refdef.weaponmatrix[0][0];
vm[1] = vpn[1]; vm[1] = r_refdef.weaponmatrix[0][1];
vm[2] = vpn[2]; vm[2] = r_refdef.weaponmatrix[0][2];
vm[3] = 0; vm[3] = 0;
vm[4] = -vright[0]; vm[4] = r_refdef.weaponmatrix[1][0];
vm[5] = -vright[1]; vm[5] = r_refdef.weaponmatrix[1][1];
vm[6] = -vright[2]; vm[6] = r_refdef.weaponmatrix[1][2];
vm[7] = 0; vm[7] = 0;
vm[8] = vup[0]; vm[8] = r_refdef.weaponmatrix[2][0];
vm[9] = vup[1]; vm[9] = r_refdef.weaponmatrix[2][1];
vm[10] = vup[2]; vm[10] = r_refdef.weaponmatrix[2][2];
vm[11] = 0; vm[11] = 0;
vm[12] = r_refdef.vieworg[0]; vm[12] = r_refdef.weaponmatrix[3][0];
vm[13] = r_refdef.vieworg[1]; vm[13] = r_refdef.weaponmatrix[3][1];
vm[14] = r_refdef.vieworg[2]; vm[14] = r_refdef.weaponmatrix[3][2];
vm[15] = 1; vm[15] = 1;
} }
else else
{ {
vm[0] = r_refdef.playerview->vw_axis[0][0]; vm[0] = r_refdef.weaponmatrix_bob[0][0];
vm[1] = r_refdef.playerview->vw_axis[0][1]; vm[1] = r_refdef.weaponmatrix_bob[0][1];
vm[2] = r_refdef.playerview->vw_axis[0][2]; vm[2] = r_refdef.weaponmatrix_bob[0][2];
vm[3] = 0; vm[3] = 0;
vm[4] = r_refdef.playerview->vw_axis[1][0]; vm[4] = r_refdef.weaponmatrix_bob[1][0];
vm[5] = r_refdef.playerview->vw_axis[1][1]; vm[5] = r_refdef.weaponmatrix_bob[1][1];
vm[6] = r_refdef.playerview->vw_axis[1][2]; vm[6] = r_refdef.weaponmatrix_bob[1][2];
vm[7] = 0; vm[7] = 0;
vm[8] = r_refdef.playerview->vw_axis[2][0]; vm[8] = r_refdef.weaponmatrix_bob[2][0];
vm[9] = r_refdef.playerview->vw_axis[2][1]; vm[9] = r_refdef.weaponmatrix_bob[2][1];
vm[10] = r_refdef.playerview->vw_axis[2][2]; vm[10] = r_refdef.weaponmatrix_bob[2][2];
vm[11] = 0; vm[11] = 0;
vm[12] = r_refdef.playerview->vw_origin[0]; vm[12] = r_refdef.weaponmatrix_bob[3][0];
vm[13] = r_refdef.playerview->vw_origin[1]; vm[13] = r_refdef.weaponmatrix_bob[3][1];
vm[14] = r_refdef.playerview->vw_origin[2]; vm[14] = r_refdef.weaponmatrix_bob[3][2];
vm[15] = 1; vm[15] = 1;
} }

2
engine/d3d/vid_d3d.c
View File

@ -1094,7 +1094,7 @@ static qboolean (D3D9_SCR_UpdateScreen) (void)
if (topmenu && topmenu->isopaque) if (topmenu && topmenu->isopaque)
nohud = true; nohud = true;
#ifdef VM_CG #ifdef VM_CG
else if (CG_Refresh()) else if (q3 && q3->cg.Redraw(cl.time))
nohud = true; nohud = true;
#endif #endif
#ifdef CSQC_DAT #ifdef CSQC_DAT

2
engine/d3d/vid_d3d11.c
View File

@ -1436,7 +1436,7 @@ static qboolean (D3D11_SCR_UpdateScreen) (void)
if (topmenu && topmenu->isopaque) if (topmenu && topmenu->isopaque)
nohud = true; nohud = true;
#ifdef VM_CG #ifdef VM_CG
else if (CG_Refresh()) else if (q3 && q3->cg.Redraw(cl.time))
nohud = true; nohud = true;
#endif #endif
#ifdef CSQC_DAT #ifdef CSQC_DAT