vera/vmap
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

patchDef2WS now is always treated as fixed, as it should be

Browse source
This commit is contained in:
Marco Cawthorne 2022-03-26 21:49:31 -07:00
parent c353639515
commit 028f1ae2a0
Signed by: eukara
GPG key ID: C196CD8BA993248A
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/vmap/map.c
View file

@ -1716,12 +1716,15 @@ static qboolean ParseMapEntity( qboolean onlyLights, qboolean noCollapseGroups )
} }
/* check */ /* check */
if ( !strcmp( token, "patchDef2" ) || !strcmp( token, "patchDef2WS" ) ) { if ( !strcmp( token, "patchDef2" ) ) {
numMapPatches++; numMapPatches++;
ParsePatch( onlyLights, qfalse ); ParsePatch( onlyLights, qfalse, qfalse );
} else if ( !strcmp( token, "patchDef2WS" ) ) {
numMapPatches++;
ParsePatch( onlyLights, qtrue, qfalse );
} else if ( !strcmp( token, "patchDef3" ) || !strcmp( token, "patchDef3WS" ) ) { } else if ( !strcmp( token, "patchDef3" ) || !strcmp( token, "patchDef3WS" ) ) {
numMapPatches++; numMapPatches++;
ParsePatch( onlyLights, qtrue ); ParsePatch( onlyLights, qtrue, qtrue );
// } else if ( !strcmp( token, "patchDefWS" ) ) { // } else if ( !strcmp( token, "patchDefWS" ) ) {
// numMapPatches++; // numMapPatches++;
// ParsePatch( onlyLights, qfalse ); // ParsePatch( onlyLights, qfalse );

4
tools/vmap/patch.c
View file

@ -252,7 +252,7 @@ void ParseVertMatrix(bspDrawVert_t *v)
creates a mapDrawSurface_t from the patch text creates a mapDrawSurface_t from the patch text
*/ */
void ParsePatch( qboolean onlyLights, qboolean fixedtess ){ void ParsePatch( qboolean onlyLights, qboolean fixedtess, qboolean extended ){
vec_t info[ 5 ]; vec_t info[ 5 ];
int i, j; int i, j;
parseMesh_t *pm; parseMesh_t *pm;
@ -272,7 +272,7 @@ void ParsePatch( qboolean onlyLights, qboolean fixedtess ){
GetToken( qtrue ); GetToken( qtrue );
strcpy( texture, token ); strcpy( texture, token );
if (fixedtess) if (extended)
Parse1DMatrix( 7, info ); Parse1DMatrix( 7, info );
else else
Parse1DMatrix( 5, info ); Parse1DMatrix( 5, info );

2
tools/vmap/vmap.h
View file

@ -1655,7 +1655,7 @@ void FreeTreePortals_r( node_t *node );
/* patch.c */ /* patch.c */
void ParsePatch( qboolean onlyLights, qboolean fixedsubdivs ); void ParsePatch( qboolean onlyLights, qboolean fixedsubdivs, qboolean extended );
void ParsePatchWS( qboolean onlyLights ); void ParsePatchWS( qboolean onlyLights );
mesh_t *SubdivideMesh( mesh_t in, float maxError, float minLength ); mesh_t *SubdivideMesh( mesh_t in, float maxError, float minLength );
void PatchMapDrawSurfs( entity_t *e ); void PatchMapDrawSurfs( entity_t *e );