From ced6e8869ab453727d372018e5a2bb014cbdd46e Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 1 Feb 2023 04:55:21 +0300 Subject: [PATCH] ref: fix chrome texture being misaligned --- ref/gl/gl_studio.c | 12 ++++++------ ref/soft/r_studio.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ref/gl/gl_studio.c b/ref/gl/gl_studio.c index 0f32b8d7..af117914 100644 --- a/ref/gl/gl_studio.c +++ b/ref/gl/gl_studio.c @@ -1260,18 +1260,18 @@ void R_StudioSetupChrome( float *pchrome, int bone, vec3_t normal ) vec3_t tmp; // vector pointing at bone in world reference frame VectorNegate( g_studio.chrome_origin, tmp ); - tmp[0] += g_studio.bonestransform[bone][0][3]; - tmp[1] += g_studio.bonestransform[bone][1][3]; - tmp[2] += g_studio.bonestransform[bone][2][3]; + tmp[0] += g_studio.lighttransform[bone][0][3]; + tmp[1] += g_studio.lighttransform[bone][1][3]; + tmp[2] += g_studio.lighttransform[bone][2][3]; VectorNormalize( tmp ); CrossProduct( tmp, RI.vright, chromeupvec ); VectorNormalize( chromeupvec ); - CrossProduct( tmp, chromeupvec, chromerightvec ); + CrossProduct( chromeupvec, tmp, chromerightvec ); VectorNormalize( chromerightvec ); - Matrix3x4_VectorIRotate( g_studio.bonestransform[bone], chromeupvec, g_studio.chromeup[bone] ); - Matrix3x4_VectorIRotate( g_studio.bonestransform[bone], chromerightvec, g_studio.chromeright[bone] ); + Matrix3x4_VectorIRotate( g_studio.lighttransform[bone], chromeupvec, g_studio.chromeup[bone] ); + Matrix3x4_VectorIRotate( g_studio.lighttransform[bone], chromerightvec, g_studio.chromeright[bone] ); g_studio.chromeage[bone] = g_studio.framecount; } diff --git a/ref/soft/r_studio.c b/ref/soft/r_studio.c index 3aed2ce6..a678715b 100644 --- a/ref/soft/r_studio.c +++ b/ref/soft/r_studio.c @@ -1256,18 +1256,18 @@ void R_StudioSetupChrome( float *pchrome, int bone, vec3_t normal ) vec3_t tmp; // vector pointing at bone in world reference frame VectorNegate( g_studio.chrome_origin, tmp ); - tmp[0] += g_studio.bonestransform[bone][0][3]; - tmp[1] += g_studio.bonestransform[bone][1][3]; - tmp[2] += g_studio.bonestransform[bone][2][3]; + tmp[0] += g_studio.lighttransform[bone][0][3]; + tmp[1] += g_studio.lighttransform[bone][1][3]; + tmp[2] += g_studio.lighttransform[bone][2][3]; VectorNormalize( tmp ); CrossProduct( tmp, RI.vright, chromeupvec ); VectorNormalize( chromeupvec ); - CrossProduct( tmp, chromeupvec, chromerightvec ); + CrossProduct( chromeupvec, tmp, chromerightvec ); VectorNormalize( chromerightvec ); - Matrix3x4_VectorIRotate( g_studio.bonestransform[bone], chromeupvec, g_studio.chromeup[bone] ); - Matrix3x4_VectorIRotate( g_studio.bonestransform[bone], chromerightvec, g_studio.chromeright[bone] ); + Matrix3x4_VectorIRotate( g_studio.lighttransform[bone], chromeupvec, g_studio.chromeup[bone] ); + Matrix3x4_VectorIRotate( g_studio.lighttransform[bone], chromerightvec, g_studio.chromeright[bone] ); g_studio.chromeage[bone] = g_studio.framecount; }