From d4caf79e435c42ba7d9d343c887262906568863d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Wed, 21 Nov 2018 19:47:10 +0100
Subject: [PATCH] Add scale

---
 s3l.h | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/s3l.h b/s3l.h
index f5ed602..d9fb6ce 100644
--- a/s3l.h
+++ b/s3l.h
@@ -253,7 +253,6 @@ static inline S3L_Unit S3L_nonZero(S3L_Unit value)
   Multiplies two matrices with normalization by S3L_FRACTIONS_PER_UNIT. Result
   is stored in the first matrix.
 */
-
 void S3L_mat4Xmat4(S3L_Mat4 *m1, S3L_Mat4 *m2)
 {
   S3L_Mat4 mat1;
@@ -316,6 +315,23 @@ void S3L_makeTranslationMat(
   #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)
   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)
 {
+  S3L_makeScaleMatrix(
+    worldTransform.scale.x,
+    worldTransform.scale.y,
+    worldTransform.scale.z,
+    m
+  );
+
+  S3L_Mat4 t;
+
   S3L_makeRotationMatrix(
     worldTransform.rotation.x,
     worldTransform.rotation.y,
     worldTransform.rotation.z,
-    m);
-
-S3L_Mat4 t;
+    &t);
 
+  S3L_mat4Xmat4(m,&t);
 
   S3L_makeTranslationMat(
     worldTransform.translation.x,
@@ -856,9 +880,7 @@ S3L_Mat4 t;
     worldTransform.translation.z,
     &t);
 
-S3L_mat4Xmat4(m,&t);
-
-  
+  S3L_mat4Xmat4(m,&t);
 }
 
 void S3L_makeCameraMatrix(S3L_Transform3D cameraTransform, S3L_Mat4 *m)