From d75dcd358ef1297a99280a4a86ed1e20127554f5 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 28 Apr 2023 17:33:19 +0300 Subject: [PATCH] public: restore unused, removed in upstream Matrix4x4_SetOrigin. Actually used in Vulkan fork --- public/matrixlib.c | 7 +++++++ public/xash3d_mathlib.h | 1 + 2 files changed, 8 insertions(+) diff --git a/public/matrixlib.c b/public/matrixlib.c index a783c24b..b309ccf2 100644 --- a/public/matrixlib.c +++ b/public/matrixlib.c @@ -304,6 +304,13 @@ void Matrix4x4_ConcatTransforms( matrix4x4 out, const matrix4x4 in1, const matri out[2][3] = in1[2][0] * in2[0][3] + in1[2][1] * in2[1][3] + in1[2][2] * in2[2][3] + in1[2][3]; } +void Matrix4x4_SetOrigin( matrix4x4 out, float x, float y, float z ) +{ + out[0][3] = x; + out[1][3] = y; + out[2][3] = z; +} + void Matrix4x4_CreateFromEntity( matrix4x4 out, const vec3_t angles, const vec3_t origin, float scale ) { float angle, sr, sp, sy, cr, cp, cy; diff --git a/public/xash3d_mathlib.h b/public/xash3d_mathlib.h index fa7e354a..799f728f 100644 --- a/public/xash3d_mathlib.h +++ b/public/xash3d_mathlib.h @@ -233,6 +233,7 @@ void Matrix4x4_ConcatTransforms( matrix4x4 out, const matrix4x4 in1, const matri void Matrix4x4_CreateFromEntity( matrix4x4 out, const vec3_t angles, const vec3_t origin, float scale ); void Matrix4x4_TransformPositivePlane( const matrix4x4 in, const vec3_t normal, float d, vec3_t out, float *dist ); void Matrix4x4_ConvertToEntity( const matrix4x4 in, vec3_t angles, vec3_t origin ); +void Matrix4x4_SetOrigin( matrix4x4 out, float x, float y, float z ); void Matrix4x4_Invert_Simple( matrix4x4 out, const matrix4x4 in1 ); qboolean Matrix4x4_Invert_Full( matrix4x4 out, const matrix4x4 in1 );