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

Fix vmap_remapMaterial/q3map_remapShader to carry over surfaceflag info

Browse source
This commit is contained in:
Marco Cawthorne 2021-10-31 18:48:24 +01:00
parent 08238a4e4b
commit 921c07a3f8
Signed by: eukara
GPG key ID: C196CD8BA993248A
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tools/vmap/shaders.c
View file

@ -1254,8 +1254,8 @@ shaderInfo_t *ShaderInfoForShader( const char *shaderName ){
#endif #endif
/* match q3map_ */ /* match q3map_ */
else if ( !Q_strncasecmp( mattoken, "q3map_", 6 ) || !Q_strncasecmp( mattoken, "vmap_", 5 ) ) { else if ( !Q_strncasecmp( mattoken, "q3map_", 6 ) || !Q_strncasecmp( mattoken, "vmap_", 5 ) ) {
/* ydnar: q3map_baseShader <shader> (inherit this shader's parameters) */ /* ydnar: vmap_baseMaterial <shader> (inherit this shader's parameters) */
if ( !Q_stricmp( mattoken, "q3map_baseShader" ) || !Q_stricmp( mattoken, "vmap_baseShader" ) ) { if ( !Q_stricmp( mattoken, "vmap_baseMaterial" ) ) {
shaderInfo_t *si2; shaderInfo_t *si2;
qboolean oldWarnImage; qboolean oldWarnImage;
@ -1419,7 +1419,7 @@ shaderInfo_t *ShaderInfoForShader( const char *shaderName ){
GetMatTokenAppend( shaderText, qfalse ); GetMatTokenAppend( shaderText, qfalse );
si->backsplashDistance = atof( mattoken ); si->backsplashDistance = atof( mattoken );
} }
#if 0 #if 1
/* q3map_floodLight <r> <g> <b> <diste> <intensity> <light_direction_power> */ /* q3map_floodLight <r> <g> <b> <diste> <intensity> <light_direction_power> */
else if ( !Q_stricmp( mattoken, "q3map_floodLight" ) || !Q_stricmp( mattoken, "vmap_floodLight" ) ) { else if ( !Q_stricmp( mattoken, "q3map_floodLight" ) || !Q_stricmp( mattoken, "vmap_floodLight" ) ) {
/* get color */ /* get color */
@ -1525,7 +1525,7 @@ shaderInfo_t *ShaderInfoForShader( const char *shaderName ){
} }
/* q3map_backShader <shader> */ /* q3map_backShader <shader> */
else if ( !Q_stricmp( mattoken, "q3map_backShader" ) || !Q_stricmp( mattoken, "vmap_backShader" ) ) { else if ( !Q_stricmp( mattoken, "q3map_backMaterial" ) || !Q_stricmp( mattoken, "vmap_backMaterial" ) ) {
GetMatTokenAppend( shaderText, qfalse ); GetMatTokenAppend( shaderText, qfalse );
if ( mattoken[ 0 ] != '\0' ) { if ( mattoken[ 0 ] != '\0' ) {
si->backShader = safe_malloc( strlen( mattoken ) + 1 ); si->backShader = safe_malloc( strlen( mattoken ) + 1 );
@ -1534,7 +1534,7 @@ shaderInfo_t *ShaderInfoForShader( const char *shaderName ){
} }
/* ydnar: q3map_cloneShader <shader> */ /* ydnar: q3map_cloneShader <shader> */
else if ( !Q_stricmp( mattoken, "q3map_cloneShader" ) || !Q_stricmp( mattoken, "vmap_cloneShader" ) ) { else if ( !Q_stricmp( mattoken, "q3map_cloneShader" ) || !Q_stricmp( mattoken, "vmap_cloneMaterial" ) ) {
GetMatTokenAppend( shaderText, qfalse ); GetMatTokenAppend( shaderText, qfalse );
if ( mattoken[ 0 ] != '\0' ) { if ( mattoken[ 0 ] != '\0' ) {
si->cloneShader = safe_malloc( strlen( mattoken ) + 1 ); si->cloneShader = safe_malloc( strlen( mattoken ) + 1 );
@ -1543,7 +1543,7 @@ shaderInfo_t *ShaderInfoForShader( const char *shaderName ){
} }
/* q3map_remapShader <shader> */ /* q3map_remapShader <shader> */
else if ( !Q_stricmp( mattoken, "q3map_remapShader" ) || !Q_stricmp( mattoken, "vmap_remapShader" ) ) { else if ( !Q_stricmp( mattoken, "q3map_remapShader" ) || !Q_stricmp( mattoken, "vmap_remapMaterial" ) ) {
GetMatTokenAppend( shaderText, qfalse ); GetMatTokenAppend( shaderText, qfalse );
if ( mattoken[ 0 ] != '\0' ) { if ( mattoken[ 0 ] != '\0' ) {
si->remapShader = safe_malloc( strlen( mattoken ) + 1 ); si->remapShader = safe_malloc( strlen( mattoken ) + 1 );
@ -1552,7 +1552,7 @@ shaderInfo_t *ShaderInfoForShader( const char *shaderName ){
} }
/* q3map_deprecateShader <shader> */ /* q3map_deprecateShader <shader> */
else if ( !Q_stricmp( mattoken, "q3map_deprecateShader" ) || !Q_stricmp( mattoken, "vmap_deprecateShader" ) ) { else if ( !Q_stricmp( mattoken, "q3map_deprecateShader" ) || !Q_stricmp( mattoken, "vmap_deprecateMaterial" ) ) {
GetMatTokenAppend( shaderText, qfalse ); GetMatTokenAppend( shaderText, qfalse );
if ( mattoken[ 0 ] != '\0' ) { if ( mattoken[ 0 ] != '\0' ) {
@ -2345,7 +2345,7 @@ static void ParseShaderFile( const char *filename ){
/* match q3map_ */ /* match q3map_ */
else if ( !Q_strncasecmp( token, "q3map_", 6 ) || !Q_strncasecmp( token, "vmap_", 5 ) ) { else if ( !Q_strncasecmp( token, "q3map_", 6 ) || !Q_strncasecmp( token, "vmap_", 5 ) ) {
/* ydnar: q3map_baseShader <shader> (inherit this shader's parameters) */ /* ydnar: q3map_baseShader <shader> (inherit this shader's parameters) */
if ( !Q_stricmp( token, "q3map_baseShader" ) || !Q_stricmp( token, "vmap_baseShader" ) ) { if ( !Q_stricmp( token, "q3map_baseShader" ) || !Q_stricmp( token, "vmap_baseMaterial" ) ) {
shaderInfo_t *si2; shaderInfo_t *si2;
qboolean oldWarnImage; qboolean oldWarnImage;
@ -2609,7 +2609,7 @@ static void ParseShaderFile( const char *filename ){
} }
/* q3map_backShader <shader> */ /* q3map_backShader <shader> */
else if ( !Q_stricmp( token, "q3map_backShader" ) || !Q_stricmp( token, "vmap_backShader" ) ) { else if ( !Q_stricmp( token, "q3map_backShader" ) || !Q_stricmp( token, "vmap_backMaterial" ) ) {
GetTokenAppend( shaderText, qfalse ); GetTokenAppend( shaderText, qfalse );
if ( token[ 0 ] != '\0' ) { if ( token[ 0 ] != '\0' ) {
si->backShader = safe_malloc( strlen( token ) + 1 ); si->backShader = safe_malloc( strlen( token ) + 1 );
@ -2618,7 +2618,7 @@ static void ParseShaderFile( const char *filename ){
} }
/* ydnar: q3map_cloneShader <shader> */ /* ydnar: q3map_cloneShader <shader> */
else if ( !Q_stricmp( token, "q3map_cloneShader" ) || !Q_stricmp( token, "vmap_cloneShader" ) ) { else if ( !Q_stricmp( token, "q3map_cloneShader" ) || !Q_stricmp( token, "vmap_cloneMaterial" ) ) {
GetTokenAppend( shaderText, qfalse ); GetTokenAppend( shaderText, qfalse );
if ( token[ 0 ] != '\0' ) { if ( token[ 0 ] != '\0' ) {
si->cloneShader = safe_malloc( strlen( token ) + 1 ); si->cloneShader = safe_malloc( strlen( token ) + 1 );
@ -2627,7 +2627,7 @@ static void ParseShaderFile( const char *filename ){
} }
/* q3map_remapShader <shader> */ /* q3map_remapShader <shader> */
else if ( !Q_stricmp( token, "q3map_remapShader" ) || !Q_stricmp( token, "vmap_remapShader" ) ) { else if ( !Q_stricmp( token, "q3map_remapShader" ) || !Q_stricmp( token, "vmap_remapMaterial" ) ) {
GetTokenAppend( shaderText, qfalse ); GetTokenAppend( shaderText, qfalse );
if ( token[ 0 ] != '\0' ) { if ( token[ 0 ] != '\0' ) {
si->remapShader = safe_malloc( strlen( token ) + 1 ); si->remapShader = safe_malloc( strlen( token ) + 1 );
@ -2636,7 +2636,7 @@ static void ParseShaderFile( const char *filename ){
} }
/* q3map_deprecateShader <shader> */ /* q3map_deprecateShader <shader> */
else if ( !Q_stricmp( token, "q3map_deprecateShader" ) || !Q_stricmp( token, "vmap_deprecateShader" ) ) { else if ( !Q_stricmp( token, "q3map_deprecateShader" ) || !Q_stricmp( token, "vmap_deprecateMaterial" ) ) {
GetTokenAppend( shaderText, qfalse ); GetTokenAppend( shaderText, qfalse );
if ( token[ 0 ] != '\0' ) { if ( token[ 0 ] != '\0' ) {

2
tools/vmap/surface.c
View file

@ -3601,7 +3601,9 @@ void FilterDrawsurfsIntoTree( entity_t *e, tree_t *tree ){
/* ydnar: remap shader */ /* ydnar: remap shader */
if ( ds->shaderInfo->remapShader && ds->shaderInfo->remapShader[ 0 ] ) { if ( ds->shaderInfo->remapShader && ds->shaderInfo->remapShader[ 0 ] ) {
int surfaceflags = ds->shaderInfo->surfaceFlags;
ds->shaderInfo = ShaderInfoForShader( ds->shaderInfo->remapShader ); ds->shaderInfo = ShaderInfoForShader( ds->shaderInfo->remapShader );
ds->shaderInfo->surfaceFlags = surfaceflags;
} }
/* ydnar: gs mods: handle the various types of surfaces */ /* ydnar: gs mods: handle the various types of surfaces */