williamjcm/small3dlib
1
0
Fork 0
mirror of https://git.coom.tech/drummyfish/small3dlib.git synced 2024-11-21 20:39:57 +01:00
Code Activity

Add scale

Browse source
This commit is contained in:
Miloslav Číž 2018-11-21 19:47:10 +01:00
parent f542d31937
commit d4caf79e43
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
s3l.h
View file

@ -253,7 +253,6 @@ static inline S3L_Unit S3L_nonZero(S3L_Unit value)
Multiplies two matrices with normalization by S3L_FRACTIONS_PER_UNIT. Result Multiplies two matrices with normalization by S3L_FRACTIONS_PER_UNIT. Result
is stored in the first matrix. is stored in the first matrix.
*/ */
void S3L_mat4Xmat4(S3L_Mat4 *m1, S3L_Mat4 *m2) void S3L_mat4Xmat4(S3L_Mat4 *m1, S3L_Mat4 *m2)
{ {
S3L_Mat4 mat1; S3L_Mat4 mat1;
@ -316,6 +315,23 @@ void S3L_makeTranslationMat(
#undef S #undef S
} }
/**
Makes a scaling matrix. DON'T FORGET: scale of 1.0 is set with
S3L_FRACTIONS_PER_UNIT!
*/
void S3L_makeScaleMatrix(
S3L_Unit scaleX, S3L_Unit scaleY, S3L_Unit scaleZ, S3L_Mat4 *m)
{
#define M(x,y) (*m)[x][y]
M(0,0) = scaleX; M(2,0) = 0; M(3,0) = 0;
M(0,1) = 0; M(1,1) = scaleY; M(2,1) = 0; M(3,1) = 0;
M(0,2) = 0; M(1,2) = 0; M(2,2) = scaleZ; M(3,2) = 0;
M(0,3) = 0; M(1,3) = 0; M(2,3) = 0; M(3,3) = S3L_FRACTIONS_PER_UNIT;
#undef M
}
/** /**
Makes a rotation matrix. For the rotation conventions (meaning, order, units) Makes a rotation matrix. For the rotation conventions (meaning, order, units)
see the appropriate structure comments. see the appropriate structure comments.
@ -841,14 +857,22 @@ static inline void S3L_rotate2DPoint(S3L_Unit *x, S3L_Unit *y, S3L_Unit angle)
void S3L_makeWorldMatrix(S3L_Transform3D worldTransform, S3L_Mat4 *m) void S3L_makeWorldMatrix(S3L_Transform3D worldTransform, S3L_Mat4 *m)
{ {
S3L_makeScaleMatrix(
worldTransform.scale.x,
worldTransform.scale.y,
worldTransform.scale.z,
m
);
S3L_Mat4 t;
S3L_makeRotationMatrix( S3L_makeRotationMatrix(
worldTransform.rotation.x, worldTransform.rotation.x,
worldTransform.rotation.y, worldTransform.rotation.y,
worldTransform.rotation.z, worldTransform.rotation.z,
m); &t);
S3L_Mat4 t;
S3L_mat4Xmat4(m,&t);
S3L_makeTranslationMat( S3L_makeTranslationMat(
worldTransform.translation.x, worldTransform.translation.x,
@ -856,9 +880,7 @@ S3L_Mat4 t;
worldTransform.translation.z, worldTransform.translation.z,
&t); &t);
S3L_mat4Xmat4(m,&t); S3L_mat4Xmat4(m,&t);
} }
void S3L_makeCameraMatrix(S3L_Transform3D cameraTransform, S3L_Mat4 *m) void S3L_makeCameraMatrix(S3L_Transform3D cameraTransform, S3L_Mat4 *m)