From e39eb39d2c0456130e6c8d432ab4f614e9834552 Mon Sep 17 00:00:00 2001 From: Garritt McCune Date: Tue, 21 Jul 2020 15:02:31 -0500 Subject: [PATCH] Forgot to add __str__ overrides to the matrix and vector objects. --- matrix.py | 7 +++++++ vectors.py | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/matrix.py b/matrix.py index cac15dd..42be9ac 100644 --- a/matrix.py +++ b/matrix.py @@ -36,6 +36,13 @@ class Matrix3x3: def __setitem__(self, key, value): self.rows[key] = value + def __str__(self): + tmp = "" + for row in self.rows: + tmp += str(row) + tmp += "\n" + return tmp + class Matrix4x4(Matrix3x3): def __init__(self, row1, row2, row3, row4): diff --git a/vectors.py b/vectors.py index 5b34fbc..be9e2a6 100644 --- a/vectors.py +++ b/vectors.py @@ -26,6 +26,9 @@ class Vector2d: def __setitem__(self, key, value): self.points[key] = value + def __str__(self): + return "%d %d" %(self.x, self.y) + #def get_normalized_form(self): # return Vector3d(self.x / 2, self.y / 2, self.z / 2) @@ -71,6 +74,9 @@ class Vector3d(Vector2d): @z.setter def z(self, value): self.points[2] = value + + def __str__(self): + return "%d %d %d" %(self.x, self.y, self.z) class Vector4d(Vector3d): def __init__(self, x, y, z, w): @@ -84,5 +90,8 @@ class Vector4d(Vector3d): def w(self, value): self.points[3] = value + def __str__(self): + return "%d %d %d %d" %(self.x, self.y, self.z, self.w) + #def get_normalized_form(self): # return Vector3d(self.x / 4, self.y / 4, self.z / 4)