qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Process each vertex texcoord only once.

Browse source 
Double converting texcoords results in 0,0 for all affected texcoords. Mr
Fixit was looking rather ill. Now he looks weird (something wrong in the
renderer?).
This commit is contained in:
Bill Currie 2012-05-19 09:15:26 +09:00
parent d41bf32d91
commit c1eb3e77c3
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libs/models/iqm/sw_model_iqm.c
View file

@ -139,7 +139,12 @@ sw_iqm_load_textures (iqm_t *iqm)
dstring_t *str = dstring_new (); dstring_t *str = dstring_new ();
swiqm_t *sw = (swiqm_t *) iqm->extra_data; swiqm_t *sw = (swiqm_t *) iqm->extra_data;
tex_t *tex; tex_t *tex;
byte *done_verts;
int bytes;
bytes = (iqm->num_verts + 7) / 8;
done_verts = alloca (bytes);
memset (done_verts, 0, bytes);
sw->skins = malloc (iqm->num_meshes * sizeof (tex_t)); sw->skins = malloc (iqm->num_meshes * sizeof (tex_t));
for (i = 0; i < iqm->num_meshes; i++) { for (i = 0; i < iqm->num_meshes; i++) {
for (j = 0; j < i; j++) { for (j = 0; j < i; j++) {
@ -153,14 +158,19 @@ sw_iqm_load_textures (iqm_t *iqm)
dstring_copystr (str, iqm->text + iqm->meshes[i].material); dstring_copystr (str, iqm->text + iqm->meshes[i].material);
QFS_StripExtension (str->str, str->str); QFS_StripExtension (str->str, str->str);
if ((tex = LoadImage (va ("textures/%s", str->str)))) if ((tex = LoadImage (va ("textures/%s", str->str))))
sw->skins[i] = convert_tex (tex); tex = sw->skins[i] = convert_tex (tex);
else else
sw->skins[i] = &null_texture; tex = sw->skins[i] = &null_texture;
for (j = 0; j < (int) iqm->meshes[i].num_triangles * 3; j++) { for (j = 0; j < (int) iqm->meshes[i].num_triangles * 3; j++) {
int ind = iqm->meshes[i].first_triangle * 3 + j; int ind = iqm->meshes[i].first_triangle * 3 + j;
int vind = iqm->elements[ind]; int vind = iqm->elements[ind];
byte *vert = iqm->vertices + iqm->stride * vind; byte *vert = iqm->vertices + iqm->stride * vind;
byte *tc = vert + sw->texcoord->offset; byte *tc = vert + sw->texcoord->offset;
if (done_verts[vind / 8] & (1 << (vind % 8)))
continue;
done_verts[vind / 8] |= (1 << (vind % 8));
*(int32_t *) (tc + 0) = *(float *) (tc + 0) * tex->width; *(int32_t *) (tc + 0) = *(float *) (tc + 0) * tex->width;
*(int32_t *) (tc + 4) = *(float *) (tc + 4) * tex->height; *(int32_t *) (tc + 4) = *(float *) (tc + 4) * tex->height;
} }