Half-Life-RTX
/
xash3d-fwgs
mirror of https://github.com/w23/xash3d-fwgs
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vk: filter smoothing normals by texture 

thanks to G.I.F
This commit is contained in:
Ivan Avdeev 2023-09-05 12:06:59 -04:00
parent 0856e9e70d
commit d8d5019971
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ref/vk/vk_brush.c
View File

@ -799,18 +799,32 @@ static void getSurfaceNormal( const msurface_t *surf, vec3_t out_normal) {
//VectorScale(normal, surf->plane. //VectorScale(normal, surf->plane.
} }
static int getSurfaceTexture(const msurface_t *surf, int surface_index) {
const xvk_patch_surface_t *const psurf = R_VkPatchGetSurface(surface_index);
if (psurf && psurf->tex_id >= 0)
return psurf->tex_id;
return surf->texinfo->texture->gl_texturenum;
}
static qboolean shouldSmoothLinkSurfaces(const model_t* mod, int surf1, int surf2) { static qboolean shouldSmoothLinkSurfaces(const model_t* mod, int surf1, int surf2) {
//return Q_min(surf1, surf2) == 741 && Q_max(surf1, surf2) == 743; //return Q_min(surf1, surf2) == 741 && Q_max(surf1, surf2) == 743;
// TODO patch filtering
// Do not join surfaces with different textures. Assume they belong to different objects.
const int t1 = getSurfaceTexture(mod->surfaces + surf1, surf1);
const int t2 = getSurfaceTexture(mod->surfaces + surf2, surf2);
if (t1 != t2)
return false;
vec3_t n1, n2; vec3_t n1, n2;
getSurfaceNormal(mod->surfaces + surf1, n1); getSurfaceNormal(mod->surfaces + surf1, n1);
getSurfaceNormal(mod->surfaces + surf2, n2); getSurfaceNormal(mod->surfaces + surf2, n2);
// TODO patch filtering
const float dot = DotProduct(n1, n2); const float dot = DotProduct(n1, n2);
DEBUG("Smoothing: dot(%d, %d) = %f (t=%f)", surf1, surf2, dot, g_map_entities.smoothing_threshold); DEBUG("Smoothing: dot(%d, %d) = %f (t=%f)", surf1, surf2, dot, g_map_entities.smoothing.threshold);
return dot >= g_map_entities.smoothing_threshold; return dot >= g_map_entities.smoothing.threshold;
} }
static int lvFindValue(const linked_value_t *li, int count, int needle) { static int lvFindValue(const linked_value_t *li, int count, int needle) {

4
ref/vk/vk_mapents.c
View File

@ -571,7 +571,7 @@ static void parseEntities( char *string, qboolean is_patch ) {
} else if (have_fields & Field__xvk_ent_id) { } else if (have_fields & Field__xvk_ent_id) {
patchEntity( &values, have_fields ); patchEntity( &values, have_fields );
} else if (have_fields & Field__xvk_smoothing_threshold) { } else if (have_fields & Field__xvk_smoothing_threshold) {
g_map_entities.smoothing_threshold = cosf(DEG2RAD(values._xvk_smoothing_threshold)); g_map_entities.smoothing.threshold = cosf(DEG2RAD(values._xvk_smoothing_threshold));
} }
} }
break; break;
@ -678,7 +678,7 @@ void XVK_ParseMapEntities( void ) {
g_map_entities.single_environment_index = NoEnvironmentLights; g_map_entities.single_environment_index = NoEnvironmentLights;
g_map_entities.entity_count = 0; g_map_entities.entity_count = 0;
g_map_entities.func_walls_count = 0; g_map_entities.func_walls_count = 0;
g_map_entities.smoothing_threshold = cosf(DEG2RAD(45.f)); g_map_entities.smoothing.threshold = cosf(DEG2RAD(45.f));
parseEntities( map->entities, false ); parseEntities( map->entities, false );
orientSpotlights(); orientSpotlights();

4
ref/vk/vk_mapents.h
View File

@ -130,7 +130,9 @@ typedef struct {
//#define MAX_MAP_ENTITIES 2048 //#define MAX_MAP_ENTITIES 2048
xvk_mapent_ref_t refs[MAX_MAP_ENTITIES]; xvk_mapent_ref_t refs[MAX_MAP_ENTITIES];
float smoothing_threshold; struct {
float threshold;
} smoothing;
} xvk_map_entities_t; } xvk_map_entities_t;
extern xvk_map_entities_t g_map_entities; extern xvk_map_entities_t g_map_entities;