tech
/
worldspawn
2
0
Fork 0
Code Issues 16 Pull Requests Projects Releases Wiki Activity

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

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 */
if ( !strcmp( token, "patchDef2" ) || !strcmp( token, "patchDef2WS" ) ) {
if ( !strcmp( token, "patchDef2" ) ) {
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" ) ) {
numMapPatches++;
ParsePatch( onlyLights, qtrue );
ParsePatch( onlyLights, qtrue, qtrue );
// } else if ( !strcmp( token, "patchDefWS" ) ) {
// numMapPatches++;
// 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
*/
void ParsePatch( qboolean onlyLights, qboolean fixedtess ){
void ParsePatch( qboolean onlyLights, qboolean fixedtess, qboolean extended ){
vec_t info[ 5 ];
int i, j;
parseMesh_t *pm;
@ -272,7 +272,7 @@ void ParsePatch( qboolean onlyLights, qboolean fixedtess ){
GetToken( qtrue );
strcpy( texture, token );
if (fixedtess)
if (extended)
Parse1DMatrix( 7, info );
else
Parse1DMatrix( 5, info );

2
tools/vmap/vmap.h
View File

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