Обновил Matrix.h и Transform.h в 6 задаче

1 files changed, 18 insertions, 0 deletions

diff --git a/task06/Guschin/Transform.h b/task06/Guschin/Transform.h
index d606647..d1b0af5 100644
--- a/task06/Guschin/Transform.h
+++ b/task06/Guschin/Transform.h
@@ -8,6 +8,15 @@ mat3 translate(float Tx, float Ty)
 	return *res;
 }
 
+mat4 translate(float Tx, float Ty, float Tz)
+{
+	mat4* res = new mat4(1.f);
+	(*res)[0][3] = Tx;
+	(*res)[1][3] = Ty;
+	(*res)[2][3] = Tz;
+	return *res;
+}
+
 mat3 scale(float Sx, float Sy)
 {
 	mat3* res = new mat3(1.f);
@@ -16,6 +25,15 @@ mat3 scale(float Sx, float Sy)
 	return *res;
 }
 
+mat4 scale(float Sx, float Sy, float Sz)
+{
+	mat4* res = new mat4(1.f);
+	(*res)[0][0] = Sx;
+	(*res)[1][1] = Sy;
+	(*res)[2][2] = Sz;
+	return *res;
+}
+
 mat3 scale(float S)
 {
 	return scale(S, S);