From 57bf396ed52510fee5a34e479ca1f671faba2773 Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Sun, 23 May 2010 18:28:50 +0200 Subject: Added Vector2. --- engine/vector.cpp | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) (limited to 'engine/vector.cpp') diff --git a/engine/vector.cpp b/engine/vector.cpp index f2ce8d7..1d243dd 100644 --- a/engine/vector.cpp +++ b/engine/vector.cpp @@ -1,7 +1,27 @@ #include "vector.h" -Vector3::Vector3() { - x = y = z = 0; +Vector2::Vector2() { + x = y = 0; +} + +Vector2::Vector2(float p1, float p2) { + x = p1; + y = p2; +} + +Vector2::Vector2(const Vector2& v) { + x = v.x; + y = v.y; +} + +Vector2& Vector2::operator=(const Vector2& v) { + x = v.x; + y = v.y; + return *this; +} + +Vector3::Vector3() : Vector2() { + z = 0; } Vector3::Vector3(float p1, float p2, float p3) { @@ -11,13 +31,13 @@ Vector3::Vector3(float p1, float p2, float p3) { } Vector3::Vector3(const Vector3& v) { - x = v.r; + x = v.x; y = v.y; z = v.z; } Vector3& Vector3::operator=(const Vector3& v) { - x = v.r; + x = v.x; y = v.y; z = v.z; return *this; @@ -32,14 +52,14 @@ Vector4::Vector4(float p1, float p2, float p3, float p4) : Vector3(p1, p2, p3) { } Vector4::Vector4(const Vector4& v) { - x = v.r; + x = v.x; y = v.y; z = v.z; w = v.w; } Vector4& Vector4::operator=(const Vector4& v) { - x = v.r; + x = v.x; y = v.y; z = v.z; w = v.w; -- cgit v1.2.3