From 4fd8dfb9f17682eb0b969b9f6ab7ca98feb1ca74 Mon Sep 17 00:00:00 2001 From: Brian Date: Thu, 20 Feb 2014 20:19:49 -0700 Subject: [PATCH] Whoops, do need a default constructor since I provide another constructor. Also fixed Vec3 init, since I renamed the vars x,y,z to be lowercase. Don't want the user to have to use shift everytime they access a vec3, seems silly. --- include/math/Vector3.h | 16 +++++++++++----- tests/tests/TestsVector3.h | 24 ++++++++++++++++++++---- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/include/math/Vector3.h b/include/math/Vector3.h index 126b580..17a2410 100644 --- a/include/math/Vector3.h +++ b/include/math/Vector3.h @@ -20,7 +20,8 @@ BaseType x, y, z; - TVector3( BaseType x, BaseType y, BaseType z ); + TVector3( void ); + TVector3( BaseType X, BaseType Y, BaseType Z ); virtual ~TVector3( void ) { } @@ -54,10 +55,15 @@ template< typename BaseType > - inline TVector3< BaseType >::TVector3( BaseType x, BaseType y, BaseType z ) - : this->x( x ) - , this->y( y ) - , this->z( z ) + inline TVector3< BaseType >::TVector3( void ) + { + } + + template< typename BaseType > + inline TVector3< BaseType >::TVector3( BaseType X, BaseType Y, BaseType Z ) + : x( X ) + , y( Y ) + , z( Z ) { } diff --git a/tests/tests/TestsVector3.h b/tests/tests/TestsVector3.h index 858ab88..3a348c5 100644 --- a/tests/tests/TestsVector3.h +++ b/tests/tests/TestsVector3.h @@ -5,11 +5,11 @@ When( vector3_scalar_multiplied ) { - Then( it_should_multiply ) + Then( it_should_be_correct ) { - value1.X = 1.f; - value1.Y = 1.f; - value1.Z = 1.f; + value1.x = 1.f; + value1.y = 1.f; + value1.z = 1.f; value1 *= 2.f; @@ -19,4 +19,20 @@ Vec3f value1; }; + When( vector3_scalar_divided ) + { + Then( it_should_be_correct ) + { + value1.x = 2.f; + value1.y = 2.f; + value1.z = 2.f; + + value1 /= 2.f; + + Assert::That( value1, Equals( Vec3f( 1.f, 1.f, 1.f ) ) ); + } + + Vec3f value1; + }; + #endif //__TESTSVECTOR3_H__