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

add support for studio chrome meshes, fix #149 

no support for glow chrome yet.
This commit is contained in:
Ivan Avdeev 2021-10-31 13:46:02 -07:00 committed by Ivan Avdeev
parent ef15ba5e08
commit eceb52cee0
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ref_vk/vk_ray_model.c
View File

@ -366,10 +366,13 @@ void VK_RayFrameAddModel( vk_ray_model_t *model, const vk_render_model_t *render
// HACK until there is proper specular
// FIXME also this erases previour roughness unconditionally
if (HACK_reflective)
if (HACK_reflective) {
kusok->roughness = 0.f;
else
} else if (geom->material == kXVkMaterialChrome) {
kusok->roughness = .1f;
} else {
kusok->roughness = 1.f;
}
Vector4Copy(color, kusok->color);

1
ref_vk/vk_render.h
View File

@ -74,6 +74,7 @@ typedef enum {
kXVkMaterialSky,
kXVkMaterialEmissive,
kXVkMaterialConveyor,
kXVkMaterialChrome,
} XVkMaterialType;
typedef struct vk_render_geometry_s {

16
ref_vk/vk_studio.c
View File

@ -1950,8 +1950,17 @@ static void R_StudioDrawNormalMesh( short *ptricmds, vec3_t *pstudionorms, float
VectorCopy(g_studio.verts[ptricmds[0]], dst_vtx->pos);
VectorCopy(g_studio.norms[ptricmds[0]], dst_vtx->normal);
dst_vtx->lm_tc[0] = dst_vtx->lm_tc[1] = 0.f;
dst_vtx->gl_tc[0] = ptricmds[2] * s;
dst_vtx->gl_tc[1] = ptricmds[3] * t;
if (FBitSet( g_nFaceFlags, STUDIO_NF_CHROME ))
{
// FIXME also support glow mode
const int idx = ptricmds[1];
dst_vtx->gl_tc[0] = g_studio.chrome[idx][0] * s;
dst_vtx->gl_tc[1] = g_studio.chrome[idx][1] * t;
} else {
dst_vtx->gl_tc[0] = ptricmds[2] * s;
dst_vtx->gl_tc[1] = ptricmds[3] * t;
}
dst_vtx->flags = 1; // vertex lighting instead of lightmap lighting
R_StudioSetColorBegin( ptricmds, pstudionorms, dst_vtx->color );
@ -1997,12 +2006,13 @@ static void R_StudioDrawNormalMesh( short *ptricmds, vec3_t *pstudionorms, float
XVK_RenderBufferUnlock( index_buffer.buffer );
XVK_RenderBufferUnlock( vertex_buffer.buffer );
// Render
{
const vk_render_geometry_t geometry = {
//.lightmap = tglob.whiteTexture,
.texture = texture,
.material = kXVkMaterialRegular,
.material = FBitSet( g_nFaceFlags, STUDIO_NF_CHROME ) ? kXVkMaterialChrome : kXVkMaterialRegular,
.vertex_offset = vertex_buffer.buffer.unit.offset,
.max_vertex = num_vertices,