quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* brushexport plugin: write Kd (diffuse color) and map_Kd (diffuse map) data to .mtl

Browse Source 
* brushexport plugin fix: invert Y during YZ swap; invert V of UV coords (correct texturing)
	* brushexport plugin: default to 'Don't collapse' option
q3map2:	* obj export: save in popular 'Y = Up, -Z = Forward' format
	* picomodel::obj: load as popular 'Y = Up, -Z = Forward' format
	* picomodel::obj: fix support of back references in faces
This commit is contained in:
Garux
2019-01-10 00:44:27 +03:00
parent e7fbe45319
commit 034f06f18d
4 changed files with 56 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libs/picomodel/pm_obj.c
View File

@@ -779,17 +779,15 @@ static picoModel_t *_obj_load( PM_PARAMS_LOAD ){
}
}
/* fix useless back references */
/* todo: check if this works as it is supposed to */
/* assign new indices */
if ( iv [ i ] < 0 ) {
iv [ i ] = ( numVerts - iv [ i ] );
iv [ i ] = ( numVerts + iv [ i ] + 1 );
}
if ( ivt[ i ] < 0 ) {
ivt[ i ] = ( numUVs - ivt[ i ] );
ivt[ i ] = ( numUVs + ivt[ i ] + 1 );
}
if ( ivn[ i ] < 0 ) {
ivn[ i ] = ( numNormals - ivn[ i ] );
ivn[ i ] = ( numNormals + ivn[ i ] + 1 );
}
/* validate indices */
@@ -806,9 +804,9 @@ static picoModel_t *_obj_load( PM_PARAMS_LOAD ){
}
/* get vertex data */
verts[ i ][ 0 ] = vertexData[ iv[ i ] - 1 ].v[ 0 ];
verts[ i ][ 1 ] = vertexData[ iv[ i ] - 1 ].v[ 1 ];
verts[ i ][ 2 ] = vertexData[ iv[ i ] - 1 ].v[ 2 ];
verts[ i ][ 0 ] = vertexData[ iv[ i ] - 1 ].v[ 0 ];
verts[ i ][ 1 ] = -vertexData[ iv[ i ] - 1 ].v[ 2 ];
verts[ i ][ 2 ] = vertexData[ iv[ i ] - 1 ].v[ 1 ];
}
/* set vertex normal */
if ( has_vn ) {
@@ -818,9 +816,9 @@ static picoModel_t *_obj_load( PM_PARAMS_LOAD ){
}
/* get normal data */
normals[ i ][ 0 ] = vertexData[ ivn[ i ] - 1 ].vn[ 0 ];
normals[ i ][ 1 ] = vertexData[ ivn[ i ] - 1 ].vn[ 1 ];
normals[ i ][ 2 ] = vertexData[ ivn[ i ] - 1 ].vn[ 2 ];
normals[ i ][ 0 ] = vertexData[ ivn[ i ] - 1 ].vn[ 0 ];
normals[ i ][ 1 ] = -vertexData[ ivn[ i ] - 1 ].vn[ 2 ];
normals[ i ][ 2 ] = vertexData[ ivn[ i ] - 1 ].vn[ 1 ];
}
/* set texture coordinate */
if ( has_vt ) {
@@ -830,9 +828,8 @@ static picoModel_t *_obj_load( PM_PARAMS_LOAD ){
}
/* get uv coord data */
coords[ i ][ 0 ] = vertexData[ ivt[ i ] - 1 ].vt[ 0 ];
coords[ i ][ 1 ] = vertexData[ ivt[ i ] - 1 ].vt[ 1 ];
coords[ i ][ 1 ] = -coords[ i ][ 1 ];
coords[ i ][ 0 ] = vertexData[ ivt[ i ] - 1 ].vt[ 0 ];
coords[ i ][ 1 ] = -vertexData[ ivt[ i ] - 1 ].vt[ 1 ];
}
#ifdef DEBUG_PM_OBJ_EX
printf( "(%4d",iv[ i ] );
@@ -852,10 +849,7 @@ static picoModel_t *_obj_load( PM_PARAMS_LOAD ){
/* read the actual data we need to assign all the crap */
/* to our current pico surface */
if ( has_v ) {
int max = 3;
if ( have_quad ) {
max = 4;
}
const int max = have_quad? 4 : 3;
/* assign all surface information */
for ( i = 0; i < max; i++ )