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

vk: don't apply studio model matrix to vertices

This commit is contained in:
Ivan Avdeev 2023-05-08 19:11:21 -07:00 committed by Ivan Avdeev
parent c91db96008
commit e49f517dc0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ref/vk/vk_studio.c
View File

@ -1,4 +1,5 @@
#include "vk_studio.h"
#include "com_model.h"
#include "vk_common.h"
#include "vk_textures.h"
#include "vk_render.h"
@ -873,7 +874,7 @@ void R_StudioMergeBones( cl_entity_t *e, model_t *m_pSubModel )
Matrix3x4_FromOriginQuat( bonematrix, q[i], pos[i] );
if( pbones[i].parent == -1 )
{
Matrix3x4_ConcatTransforms( g_studio.bonestransform[i], g_studio.rotationmatrix, bonematrix );
Matrix3x4_Copy( g_studio.bonestransform[i], bonematrix );
Matrix3x4_Copy( g_studio.lighttransform[i], g_studio.bonestransform[i] );
// apply client-side effects to the transformation matrix
@ -1031,7 +1032,7 @@ void R_StudioSetupBones( cl_entity_t *e )
if( pbones[i].parent == -1 )
{
Matrix3x4_ConcatTransforms( g_studio.bonestransform[i], g_studio.rotationmatrix, bonematrix );
Matrix3x4_Copy( g_studio.bonestransform[i], bonematrix );
Matrix3x4_Copy( g_studio.lighttransform[i], g_studio.bonestransform[i] );
// apply client-side effects to the transformation matrix
@ -2147,7 +2148,7 @@ static void R_StudioDrawPoints( void )
if (g_studio.rendermode2 == kRenderTransAdd) {
Vector4Set(color, g_studio.blend, g_studio.blend, g_studio.blend, 1.f);
}
VK_RenderModelDynamicBegin( studioRenderModeToRenderType(RI.currententity->curstate.rendermode), color, m_matrix4x4_identity, "%s", m_pSubModel->name );
VK_RenderModelDynamicBegin( studioRenderModeToRenderType(RI.currententity->curstate.rendermode), color, g_studio.rotationmatrix, "%s", m_pSubModel->name );
g_studio.numverts = g_studio.numelems = 0;
@ -3239,8 +3240,8 @@ void R_DrawViewModel( void )
switch( RI.currententity->model->type )
{
/* FIXME VK
case mod_alias:
/* FIXME VK
R_DrawAliasModel( RI.currententity );
break;
*/
@ -3248,6 +3249,11 @@ void R_DrawViewModel( void )
R_StudioSetupTimings();
R_StudioDrawModelInternal( RI.currententity, STUDIO_RENDER );
break;
case mod_sprite:
case mod_brush:
case mod_bad:
// Complain, impossible
break;
}
RI.currententity = NULL;