yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-13 00:24:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

renders: additional validation cleanups for SiN

Browse source
This commit is contained in:
Denis Pauk 2024-05-07 00:22:54 +03:00
parent 13e1df2bda
commit 9145c0a923
1 changed files with 41 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/client/refresh/files/models.c
View file

@ -2,6 +2,7 @@
* Copyright (C) 1997-2001 Id Software, Inc. * Copyright (C) 1997-2001 Id Software, Inc.
* Copyright (c) 2005-2015 David HENRY * Copyright (c) 2005-2015 David HENRY
* Copyright (c) 2011 Sajt (https://icculus.org/qshed/qwalk/) * Copyright (c) 2011 Sajt (https://icculus.org/qshed/qwalk/)
* Copyright (c) 1998 Trey Harrison (SiN View)
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -2536,10 +2537,9 @@ Mod_LoadModel_SDEF_Text(const char *mod_name, char *curr_buff, readfile_t read_f
struct image_s ***skins, int *numskins) struct image_s ***skins, int *numskins)
{ {
char models_path[MAX_QPATH]; char models_path[MAX_QPATH];
char base_model[MAX_QPATH]; char base_model[MAX_QPATH * 2];
char skinnames[255][MAX_SKINNAME]; char skinnames[255][MAX_SKINNAME];
char animations[255][MAX_QPATH]; char animations[255][MAX_QPATH * 2];
char fullbasename[MAX_QPATH * 2];
int actions_num, skinnames_num, i, base_size; int actions_num, skinnames_num, i, base_size;
sin_sbm_header_t *base; sin_sbm_header_t *base;
sin_sam_header_t *anim[255]; sin_sam_header_t *anim[255];
@ -2637,13 +2637,27 @@ Mod_LoadModel_SDEF_Text(const char *mod_name, char *curr_buff, readfile_t read_f
return NULL; return NULL;
} }
/* Convert from LittleLong */
for (i = 0; i < sizeof(sin_sbm_header_t) / 4; i ++)
{
((int *)base)[i] = LittleLong(((int *)base)[i]);
}
if ((base->ident != SBMHEADER) || (base->version != MDSINVERSION))
{
free(base);
R_Printf(PRINT_DEVELOPER, "%s: %s, Incorrect ident or version for %s\n",
__func__, mod_name, base_model);
return NULL;
}
int num_tris = 0; int num_tris = 0;
{ {
sin_trigroup_t *trigroup = (sin_trigroup_t *)((char*)base + sizeof(sin_sbm_header_t)); sin_trigroup_t *trigroup = (sin_trigroup_t *)((char*)base + sizeof(sin_sbm_header_t));
for(i = 0; i < base->num_groups; i ++) for(i = 0; i < base->num_groups; i ++)
{ {
num_tris += trigroup[i].num_tris; num_tris += LittleLong(trigroup[i].num_tris);
} }
} }
@ -2652,7 +2666,7 @@ Mod_LoadModel_SDEF_Text(const char *mod_name, char *curr_buff, readfile_t read_f
for (i = 0; i < actions_num; i++) for (i = 0; i < actions_num; i++)
{ {
int anim_size; int anim_size, j;
anim[animation_num] = (sin_sam_header_t*)read_file(animations[i], &anim_size); anim[animation_num] = (sin_sam_header_t*)read_file(animations[i], &anim_size);
if (anim_size <= 0) if (anim_size <= 0)
@ -2661,6 +2675,7 @@ Mod_LoadModel_SDEF_Text(const char *mod_name, char *curr_buff, readfile_t read_f
__func__, mod_name, animations[i]); __func__, mod_name, animations[i]);
continue; continue;
} }
if (anim[animation_num]->num_xyz != base->num_xyz) if (anim[animation_num]->num_xyz != base->num_xyz)
{ {
R_Printf(PRINT_DEVELOPER, "%s: %s, incorrect count tris in animation in %s\n", R_Printf(PRINT_DEVELOPER, "%s: %s, incorrect count tris in animation in %s\n",
@ -2668,6 +2683,22 @@ Mod_LoadModel_SDEF_Text(const char *mod_name, char *curr_buff, readfile_t read_f
continue; continue;
} }
/* Convert from LittleLong */
for (j = 0; j < sizeof(sin_sam_header_t) / 4; j ++)
{
((int *)anim[animation_num])[j] = LittleLong(
((int *)anim[animation_num])[j]);
}
if ((anim[animation_num]->ident != SAMHEADER) ||
(anim[animation_num]->version != MDSINVERSION))
{
free(base);
R_Printf(PRINT_DEVELOPER, "%s: %s, Incorrect ident or version for %s\n",
__func__, mod_name, base_model);
return NULL;
}
animation_num ++; animation_num ++;
framescount += anim[i]->num_frames; framescount += anim[i]->num_frames;
} }
@ -2720,8 +2751,8 @@ Mod_LoadModel_SDEF_Text(const char *mod_name, char *curr_buff, readfile_t read_f
dstvert_t *st_out = (dstvert_t *)((char *)pheader + pheader->ofs_st); dstvert_t *st_out = (dstvert_t *)((char *)pheader + pheader->ofs_st);
for (i = 0; i < pheader->num_st; i ++) for (i = 0; i < pheader->num_st; i ++)
{ {
st_out[i].s = (int)(st_in[i].s * pheader->skinwidth + 256) % 256; st_out[i].s = (int)(LittleFloat(st_in[i].s) * pheader->skinwidth + 256) % 256;
st_out[i].t = (int)(st_in[i].t * pheader->skinheight + 256) % 256; st_out[i].t = (int)(LittleFloat(st_in[i].t) * pheader->skinheight + 256) % 256;
} }
/* tris and mesh */ /* tris and mesh */
@ -2736,11 +2767,11 @@ Mod_LoadModel_SDEF_Text(const char *mod_name, char *curr_buff, readfile_t read_f
int j; int j;
mesh_nodes[i].ofs_tris = tris_ofs; mesh_nodes[i].ofs_tris = tris_ofs;
mesh_nodes[i].num_tris = trigroup_in[i].num_tris; mesh_nodes[i].num_tris = LittleLong(trigroup_in[i].num_tris);
/* offset from current group */ /* offset from current group */
tri_in = (sin_triangle_t *)((char*)(trigroup_in + i) + trigroup_in[i].ofs_tris); tri_in = (sin_triangle_t *)((char*)(trigroup_in + i) + LittleLong(trigroup_in[i].ofs_tris));
for (j = 0; j < trigroup_in[i].num_tris; j++) for (j = 0; j < mesh_nodes[i].num_tris; j++)
{ {
int k; int k;