fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reduce console warning spam.

Browse source
This commit is contained in:
Shpoike 2021-09-08 01:48:18 +01:00
parent f2ad1f387c
commit 65aa0920fe
3 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Quake/common.c
View file

@ -2137,6 +2137,11 @@ static int COM_FindFile (const char *filename, int *handle, FILE **file,
&& strcmp(ext, "jpg") != 0
&& strcmp(ext, "jpeg") != 0
&& strcmp(ext, "dds") != 0
&& strcmp(ext, "lmp") != 0
&& strcmp(ext, "iqm") != 0
&& strcmp(ext, "md3") != 0
&& strcmp(ext, "md5mesh") != 0
&& strcmp(ext, "md5anim") != 0
&& strcmp(ext, "lit") != 0
&& strcmp(ext, "vis") != 0
&& strcmp(ext, "ent") != 0)

23
Quake/gl_mesh.c
View file

@ -1477,13 +1477,14 @@ static void Matrix3x4_RM_Transform4(const float *matrix, const float *vector, fl
product[1] = matrix[4]*vector[0] + matrix[5]*vector[1] + matrix[6]*vector[2] + matrix[7]*vector[3];
product[2] = matrix[8]*vector[0] + matrix[9]*vector[1] + matrix[10]*vector[2] + matrix[11]*vector[3];
}
static void MD5_BakeInfluences(bonepose_t *outposes, iqmvert_t *vert, struct md5vertinfo_s *vinfo, struct md5weightinfo_s *weight, size_t numverts, size_t numweights)
static void MD5_BakeInfluences(const char *fname, bonepose_t *outposes, iqmvert_t *vert, struct md5vertinfo_s *vinfo, struct md5weightinfo_s *weight, size_t numverts, size_t numweights)
{
size_t v, i, lowidx, k;
struct md5weightinfo_s *w;
vec3_t pos;
float lowval, scale;
unsigned int overinfluenced = 0;
unsigned int maxinfluences = 0;
float scaleimprecision = 1;
for (v = 0; v < numverts; v++, vert++, vinfo++)
{
//st were already loaded
@ -1494,7 +1495,9 @@ static void MD5_BakeInfluences(bonepose_t *outposes, iqmvert_t *vert, struct md5
vert->rgba[0] = vert->rgba[1] = vert->rgba[2] = vert->rgba[3] = 1; //for consistency with iqm, though irrelevant here
if (vinfo->firstweight + vinfo->count > numweights)
Sys_Error ("weight index out of bounds");
Sys_Error ("%s: weight index out of bounds", fname);
if (maxinfluences < vinfo->count)
maxinfluences = vinfo->count;
w = weight + vinfo->firstweight;
for (i = 0; i < vinfo->count; i++, w++)
{
@ -1522,8 +1525,6 @@ static void MD5_BakeInfluences(bonepose_t *outposes, iqmvert_t *vert, struct md5
vert->weight[lowidx] = w->pos[3];
vert->idx[lowidx] = w->bone;
}
else
overinfluenced++;
}
}
@ -1531,15 +1532,17 @@ static void MD5_BakeInfluences(bonepose_t *outposes, iqmvert_t *vert, struct md5
scale = vert->weight[0] + vert->weight[1] + vert->weight[2] + vert->weight[3];
if (scale>0)
{
if (scaleimprecision < scale)
scaleimprecision = scale;
scale = 1/scale;
for (k = 0; k < 4; k++)
for (k = 0; k < countof(vert->weight); k++)
vert->weight[k] *= scale;
}
else //something bad...
vert->weight[0] = 1, vert->weight[1] = vert->weight[2] = vert->weight[3] = 0;
}
if (overinfluenced)
Con_Warning("%u too many influences\n", overinfluenced);
if (maxinfluences > countof(vert->weight))
Con_DWarning("%s uses up to %u influences per vertex (weakest: %g)\n", fname, maxinfluences, scaleimprecision);
}
static void MD5_ComputeNormals(iqmvert_t *vert, size_t numverts, unsigned short *indexes, size_t numindexes)
{
@ -1862,7 +1865,7 @@ void Mod_LoadMD5MeshModel (qmodel_t *mod, const void *buffer)
q_snprintf(texname, sizeof(texname), "progs/%s_%02d_%02d", com_token, surf->numskins, 0);
surf->gltextures[surf->numskins][0] = TexMgr_LoadImage(mod, texname, surf->skinwidth, surf->skinheight, SRC_EXTERNAL, NULL, texname, 0, TEXPREF_ALLOWMISSING|TEXPREF_ALPHA|TEXPREF_NOBRIGHT|TEXPREF_MIPMAP);
if (!surf->gltextures[surf->numskins][0])
continue;
break;
surf->gltextures[surf->numskins][3] = surf->gltextures[surf->numskins][2] = surf->gltextures[surf->numskins][1] = surf->gltextures[surf->numskins][0];
surf->fbtextures[surf->numskins][0] = surf->fbtextures[surf->numskins][1] = surf->fbtextures[surf->numskins][2] = surf->fbtextures[surf->numskins][3] = NULL;
}
@ -1929,7 +1932,7 @@ void Mod_LoadMD5MeshModel (qmodel_t *mod, const void *buffer)
MD5EXPECT(")");
}
//so make it gpu-friendly.
MD5_BakeInfluences(outposes, poutvert, vinfo, weight, surf->numverts, numweights);
MD5_BakeInfluences(fname, outposes, poutvert, vinfo, weight, surf->numverts, numweights);
//and now make up the normals that the format lacks. we'll still probably have issues from seams, but then so did qme, so at least its faithful... :P
MD5_ComputeNormals(poutvert, surf->numverts, poutindexes, surf->numindexes);

14
Quake/host.c
View file

@ -754,15 +754,19 @@ static void CL_LoadCSProgs(void)
char versionedname[MAX_QPATH];
unsigned int csqchash;
size_t csqcsize;
const char *val;
PR_SwitchQCVM(&cl.qcvm);
csqchash = strtoul(Info_GetKey(cl.serverinfo, "*csprogs", versionedname, sizeof(versionedname)), NULL, 0);
val = Info_GetKey(cl.serverinfo, "*csprogs", versionedname, sizeof(versionedname));
csqchash = (unsigned int)strtoul(val, NULL, 0);
if (*val)
snprintf(versionedname, MAX_QPATH, "csprogsvers/%x.dat", csqchash);
else
*versionedname = 0;
csqcsize = strtoul(Info_GetKey(cl.serverinfo, "*csprogssize", versionedname, sizeof(versionedname)), NULL, 0);
snprintf(versionedname, MAX_QPATH, "csprogsvers/%x.dat", csqchash);
//try csprogs.dat first, then fall back on progs.dat in case someone tried merging the two.
//we only care about it if it actually contains a CSQC_DrawHud, otherwise its either just a (misnamed) ssqc progs or a full csqc progs that would just crash us on 3d stuff.
if ((PR_LoadProgs(versionedname, false, PROGHEADER_CRC, pr_csqcbuiltins, pr_csqcnumbuiltins) && (qcvm->extfuncs.CSQC_DrawHud||cl.qcvm.extfuncs.CSQC_UpdateView))||
if ((*versionedname && PR_LoadProgs(versionedname, false, PROGHEADER_CRC, pr_csqcbuiltins, pr_csqcnumbuiltins) && (qcvm->extfuncs.CSQC_DrawHud||cl.qcvm.extfuncs.CSQC_UpdateView))||
(PR_LoadProgs("csprogs.dat", false, PROGHEADER_CRC, pr_csqcbuiltins, pr_csqcnumbuiltins) && (qcvm->extfuncs.CSQC_DrawHud||qcvm->extfuncs.CSQC_DrawScores||cl.qcvm.extfuncs.CSQC_UpdateView))||
(PR_LoadProgs("progs.dat", false, PROGHEADER_CRC, pr_csqcbuiltins, pr_csqcnumbuiltins) && (qcvm->extfuncs.CSQC_DrawHud||cl.qcvm.extfuncs.CSQC_UpdateView)))
{
@ -772,7 +776,7 @@ static void CL_LoadCSProgs(void)
memset(qcvm->edicts, 0, qcvm->num_edicts*qcvm->edict_size);
//in terms of exploit protection this is kinda pointless as someone can just strip out this check and compile themselves. oh well.
if ((qcvm->progshash == csqchash && qcvm->progssize == csqcsize) || cls.demoplayback)
if ((*versionedname && qcvm->progshash == csqchash && qcvm->progssize == csqcsize) || cls.demoplayback)
fullcsqc = true;
else
{ //okay, it doesn't match. full csqc is disallowed to prevent cheats, but we still allow simplecsqc...