nzp-team/quakespasm
0
0
Fork 0
mirror of https://github.com/nzp-team/quakespasm.git synced 2025-04-24 01:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fully fixed viewmodel FOV bug. (hopefully)

Browse source
This commit is contained in:
Tyler Young 2023-01-01 18:38:27 -05:00
parent b912fc17d6
commit a7b1595985
4 changed files with 183 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
assets/vita/eboot.bin
View file

Binary file not shown.

31
source/gl_rmain.c
View file

@ -622,17 +622,18 @@ void R_SetupView (void)
R_DrawEntitiesOnList
=============
*/
int doZHack;
//int doZHack;
void R_DrawEntitiesOnList (qboolean alphapass) //johnfitz -- added parameter
{
int i;
//char specChar; //nzp
if (!r_drawentities.value)
return;
int zHackCount = 0;
doZHack = 0;
//int zHackCount = 0;
//doZHack = 0;
char specChar;
//johnfitz -- sprites are not a special case
@ -668,7 +669,7 @@ void R_DrawEntitiesOnList (qboolean alphapass) //johnfitz -- added parameter
// continue;
//}
doZHack = 0;
/*doZHack = 0; sB needs to fix updateLimb in Quakespasm l8er
if(specChar == '#')
{
if(zHackCount > 5 || ((currententity->z_head != 0) && (currententity->z_larm != 0) && (currententity->z_rarm != 0)))
@ -680,7 +681,25 @@ void R_DrawEntitiesOnList (qboolean alphapass) //johnfitz -- added parameter
zHackCount ++;//drawing zombie piece by piece.
}
}
specChar = currententity->model->name[strlen(currententity->model->name)-5];
if(specChar == '(' || specChar == '^')//skip heads and arms: it's faster to do this than a strcmp...
{
continue;
}
doZHack = 0;
if(specChar == '#')
{
if(zHackCount > 5 || ((currententity->z_head != 0) && (currententity->z_larm != 0) && (currententity->z_rarm != 0)))
{
doZHack = 1;
}
else
{
zHackCount ++;//drawing zombie piece by piece.
}
}*/
switch (currententity->model->type)
{
@ -722,7 +741,7 @@ void R_DrawEntitiesOnList (qboolean alphapass) //johnfitz -- added parameter
default:
break;
}
doZHack = 0;
//doZHack = 0;
}
for (i=0 ; i<cl_numvisedicts ; i++)
@ -1155,7 +1174,7 @@ void R_RenderScene (void)
R_DrawWorld ();
S_ExtraUpdate (); // don't let sound get messed up if going slow
R_DrawShadows (); //johnfitz -- render entity shadows
R_DrawEntitiesOnList (false); //johnfitz -- false means this is the pass for nonalpha entities

11
source/gl_screen.c
View file

@ -1962,15 +1962,16 @@ void SCR_UpdateScreen (void)
if (cl.stats[STAT_ZOOM] == 1) //sB was here porting seperate viewmodel fov
{
if(!original_fov)
{
original_fov = scr_fov.value;
original_view_fov = scr_fov_viewmodel.value;
}
if(scr_fov.value > (GetWeaponZoomAmmount() + 1))//+1 for accounting for floating point inaccurraces
{
scr_fov.value += ((original_fov - GetWeaponZoomAmmount()) - scr_fov.value) * 0.25;
scr_fov_viewmodel.value += ((original_view_fov - GetWeaponZoomAmmount()) - scr_fov_viewmodel.value) * 0.25;
//scr_fov_viewmodel.value += ((original_view_fov - GetWeaponZoomAmmount()) - scr_fov_viewmodel.value) * 0.25;
Cvar_SetValue("fov",scr_fov.value);
Cvar_SetValue("r_viewmodel_fov", scr_fov_viewmodel.value);
//Cvar_SetValue("r_viewmodel_fov", scr_fov_viewmodel.value);
}
}
else if (cl.stats[STAT_ZOOM] == 2)
@ -1987,8 +1988,8 @@ void SCR_UpdateScreen (void)
}
if(scr_dynamic_fov.value == 0) //sB add dynamic FOV toggle
{
original_fov = scr_fov.value;
original_view_fov = scr_fov_viewmodel.value;
original_fov = 0;
original_view_fov = 0;
}
else if(scr_dynamic_fov.value == 1)
{

163
source/r_alias.c
View file

@ -54,6 +54,8 @@ extern vec3_t lightspot;
float *shadedots = r_avertexnormal_dots[0];
vec3_t shadevector;
extern int zombie_skins[2][2];
float entalpha; //johnfitz
qboolean overbright; //johnfitz
@ -935,24 +937,134 @@ cleanup:
glPopMatrix ();
}
/*
=====================
R_DrawZombieLimb
=====================
*/
//Blubs Z hacks: need this declaration.
qmodel_t *Mod_FindName (char *name);
void R_DrawZombieLimb (entity_t *e,int which)
{
//entity_t *e;
qmodel_t *clmodel;
aliashdr_t *paliashdr;
entity_t *limb_ent;
lerpdata_t lerpdata;
//e = &cl_entities[ent];
//clmodel = e->model;
if(which == 1)
limb_ent = &cl_entities[e->z_head];
else if(which == 2)
limb_ent = &cl_entities[e->z_larm];
else if(which == 3)
limb_ent = &cl_entities[e->z_rarm];
else
return;
clmodel = limb_ent->model;
if(clmodel == NULL)
return;
VectorCopy (e->origin, r_entorigin);
VectorSubtract (r_origin, r_entorigin, modelorg);
// locate the proper data
paliashdr = (aliashdr_t *)Mod_Extradata (clmodel);//e->model
rs_aliaspolys += paliashdr->numtris;
R_SetupAliasFrame (paliashdr, e->frame, &lerpdata);
R_SetupEntityTransform (e, &lerpdata);
glPushMatrix ();
R_RotateForEntity (lerpdata.origin, lerpdata.angles);
paliashdr = (aliashdr_t *)Mod_Extradata (e->model);
rs_aliaspolys += paliashdr->numtris;
if (gl_smoothmodels.value && !r_drawflat_cheatsafe)
glShadeModel (GL_SMOOTH);
if (gl_affinemodels.value)
glHint (GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
overbright = gl_overbright_models.value;
shading = true;
//blubs disabled
/*if (r_i_model_transform.value)
R_BlendedRotateForEntity (e, 0);
else
R_RotateForEntity (e, 0);*/
rs_aliaspolys += paliashdr->numtris;
R_SetupAliasLighting (e);
glTranslatef(paliashdr->scale_origin[0], paliashdr->scale_origin[1], paliashdr->scale_origin[2]);
GL_DisableMultitexture();
glScalef(paliashdr->scale[0], paliashdr->scale[1], paliashdr->scale[2]);
//R_SetupAliasFrame (paliashdr, e->frame, &lerpdata);
//R_SetupEntityTransform (e, &lerpdata);
GL_DrawAliasFrame(paliashdr, lerpdata);
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
#ifndef VITA
glHint (GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
glShadeModel (GL_FLAT);
#endif
glDepthMask(GL_TRUE);
glDisable(GL_BLEND);
//t3 += Sys_FloatTime();
glPopMatrix ();
}
/*
=================
R_DrawAliasModel -- johnfitz -- almost completely rewritten
=================
*/
//extern int doZHack;
void R_DrawAliasModel (entity_t *e)
{
aliashdr_t *paliashdr;
int i, anim, skinnum;
char specChar;
gltexture_t *tx, *fb;
lerpdata_t lerpdata;
qboolean alphatest = !!(e->model->flags & MF_HOLEY);
//qmodel_t *clmodel;
vec3_t mins, maxs;
//clmodel = e->model;
//
// setup pose/lerp data -- do it first so we don't miss updates due to culling
//
paliashdr = (aliashdr_t *)Mod_Extradata (e->model);
/*specChar = clmodel->name[strlen(clmodel->name) - 5];
if(doZHack && specChar == '#')
{
if(clmodel->name[strlen(clmodel->name) - 6] == 'c')
paliashdr = (aliashdr_t *) Mod_Extradata(Mod_FindName("models/ai/zcfull.mdl"));
else
paliashdr = (aliashdr_t *) Mod_Extradata(Mod_FindName("models/ai/zfull.mdl"));
}
else*/
paliashdr = (aliashdr_t *)Mod_Extradata (e->model);
R_SetupAliasFrame (paliashdr, e->frame, &lerpdata);
R_SetupEntityTransform (e, &lerpdata);
@ -967,17 +1079,21 @@ void R_DrawAliasModel (entity_t *e)
//
glPushMatrix ();
R_RotateForEntity (lerpdata.origin, lerpdata.angles);
//sB porting viewmodel FOV from 3ds build
// Special handling of view model to keep FOV from altering look. Pretty good. Not perfect but rather close.
if (e == &cl.viewent && scr_fov_viewmodel.value) {
float scale = 1.0f / tan (DEG2RAD (scr_fov.value / 2.0f)) * scr_fov_viewmodel.value / 90.0f;
glTranslatef (paliashdr->scale_origin[0] * scale, paliashdr->scale_origin[1], paliashdr->scale_origin[2]);
glScalef (paliashdr->scale[0] * scale, paliashdr->scale[1], paliashdr->scale[2]);
} else {
glTranslatef (paliashdr->scale_origin[0], paliashdr->scale_origin[1], paliashdr->scale_origin[2]);
glScalef (paliashdr->scale[0], paliashdr->scale[1], paliashdr->scale[2]);
/* //sB needs fixing in Quakespasm but fuck GL bro
//specChar = clmodel->name[strlen(clmodel->name) - 5];
if(doZHack && specChar == '#')
{
if(clmodel->name[strlen(clmodel->name) - 6] == 'c')
paliashdr = (aliashdr_t *) Mod_Extradata(Mod_FindName("models/ai/zcfull.mdl"));
else
paliashdr = (aliashdr_t *) Mod_Extradata(Mod_FindName("models/ai/zfull.mdl"));
}
else*/
paliashdr = (aliashdr_t *)Mod_Extradata (e->model);
rs_aliaspolys += paliashdr->numtris;
//glPushMatrix ();
//
// random stuff
@ -990,6 +1106,17 @@ void R_DrawAliasModel (entity_t *e)
#endif
overbright = gl_overbright_models.value;
shading = true;
//sB porting viewmodel FOV from 3ds build
// Special handling of view model to keep FOV from altering look. Pretty good. Not perfect but rather close.
if (e == &cl.viewent && scr_fov_viewmodel.value) {
float scale = 1.0f / tan (DEG2RAD (scr_fov.value / 2.0f)) * scr_fov_viewmodel.value / 90.0f;
glTranslatef (paliashdr->scale_origin[0] * scale, paliashdr->scale_origin[1], paliashdr->scale_origin[2]);
glScalef (paliashdr->scale[0] * scale, paliashdr->scale[1], paliashdr->scale[2]);
} else {
glTranslatef (paliashdr->scale_origin[0], paliashdr->scale_origin[1], paliashdr->scale_origin[2]);
glScalef (paliashdr->scale[0], paliashdr->scale[1], paliashdr->scale[2]);
}
//
// set up for alpha blending
@ -1019,6 +1146,7 @@ void R_DrawAliasModel (entity_t *e)
// set up textures
//
GL_DisableMultitexture();
anim = (int)(cl.time*10) & 3;
skinnum = e->skinnum;
if ((skinnum >= paliashdr->numskins) || (skinnum < 0))
@ -1029,6 +1157,7 @@ void R_DrawAliasModel (entity_t *e)
}
tx = paliashdr->gltextures[skinnum][anim];
fb = paliashdr->fbtextures[skinnum][anim];
if (e->colormap != vid.colormap && !gl_nocolors.value)
{
i = e - cl_entities;
@ -1211,6 +1340,18 @@ void R_DrawAliasModel (entity_t *e)
}
}
}
//glPopMatrix ();
/*
if (doZHack == 0 && specChar == '#')//if we're drawing zombie, also draw its limbs in one call
{
if(e->z_head)
R_DrawZombieLimb(e,1);
if(e->z_larm)
R_DrawZombieLimb(e,2);
if(e->z_rarm)
R_DrawZombieLimb(e,3);
}*/
cleanup:
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);