RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

utils: mdldec: fix UV coords shifting yet again.

Browse Source
This commit is contained in:
Andrey Akhmichin
2025-03-30 21:04:32 +05:00
committed by Alibek Omarov
parent a85bd0c864
commit 92e976952e
3 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
utils/mdldec/mdldec.c
View File

@@ -78,7 +78,8 @@ static void TextureNameFix( void )
{
ExtractFileName( texture->name, sizeof( texture->name ));
if( !IsValidName( texture->name ))
if( !( ( ( texture->width == 1 || texture->height == 1 )
&& texture->name[0] == '#' ) || IsValidName( texture->name )))
Q_snprintf( texture->name, sizeof( texture->name ), "MDLDEC_Texture%i.bmp", ++protected );
}

35
utils/mdldec/smd.c
View File

@@ -227,7 +227,8 @@ static void WriteTriangleInfo( FILE *fp, mstudiomodel_t *model, mstudiotexture_t
int norm_index;
int bone_index;
int valid_bones;
float s, t, u, v;
int width, height;
float u, v;
byte *vertbone;
vec3_t *studioverts;
vec3_t *studionorms;
@@ -235,16 +236,19 @@ static void WriteTriangleInfo( FILE *fp, mstudiomodel_t *model, mstudiotexture_t
float weights[MAXSTUDIOBONEWEIGHTS], oldweight, totalweight;
matrix3x4 bonematrix[MAXSTUDIOBONEWEIGHTS], skinmatrix, *pskinmatrix;
mstudioboneweight_t *studioboneweights;
char buffer[64];
vertbone = ( (byte *)model_hdr + model->vertinfoindex );
studioverts = (vec3_t *)( (byte *)model_hdr + model->vertindex );
studionorms = (vec3_t *)( (byte *)model_hdr + model->normindex );
studioboneweights = (mstudioboneweight_t *)( (byte *)model_hdr + model->blendvertinfoindex );
s = 1.0f / texture->width;
t = 1.0f / texture->height;
Q_strncpy( buffer, texture->name, sizeof( buffer ));
fprintf( fp, "%s\n", texture->name );
// Many filesystems couldn't write files if "#" is first character in the name.
if( buffer[0] == '#' ) buffer[0] = 's';
fprintf( fp, "%s\n", buffer );
for( i = 0; i < 3; i++ )
{
@@ -293,10 +297,29 @@ static void WriteTriangleInfo( FILE *fp, mstudiomodel_t *model, mstudiotexture_t
u = HalfToFloat( triverts[index]->s );
v = -HalfToFloat( triverts[index]->t );
}
else if( texture->width == 1 || texture->height == 1 )
{
if( texture->name[0] == '#' )
{
Q_strncpy( buffer, &texture->name[1], 4 );
width = Q_atoi( buffer );
Q_strncpy( buffer, &texture->name[4], 4 );
height = Q_atoi( buffer );
u = (float)triverts[index]->s / width;
v = 1.0f - (float)triverts[index]->t / height;
}
else
{
u = (float)triverts[index]->s;
v = 1.0f - (float)triverts[index]->t;
}
}
else
{
u = ( triverts[index]->s + 1.0f ) * s;
v = 1.0f - triverts[index]->t * t;
u = (float)triverts[index]->s / ( texture->width - 1 );
v = 1.0f - (float)triverts[index]->t / ( texture->height - 1 );
}
fprintf( fp, "%3i %f %f %f %f %f %f %f %f",

3
utils/mdldec/texture.c
View File

@@ -164,6 +164,9 @@ void WriteTextures( void )
return;
}
// Many filesystems couldn't write files if "#" is first character in the name.
if( texture->name[0] == '#' ) texture->name[0] = 's';
if( !Q_stricmp( COM_FileExtension( texture->name ), "tga" ))
WriteTGA( fp, texture );
else