diff --git a/Makefile b/Makefile index b4323695f60..eb8308387d2 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,8 @@ LIBS = -lSDL -lGL -lGLU -Llua/lib -llua -llualib `sdl-config --libs` OBJS = main.o lab.o bitmap.o model.o resource.o material.o debug.o \ textsplit.o lua.o registry.o localize.o scene.o engine.o actor.o \ - sound.o mixer.o keyframe.o costume.o walkplane.o textobject.o + sound.o mixer.o keyframe.o costume.o walkplane.o textobject.o \ + matrix3.o matrix4.o DEPS = $(OBJS:.o=.d) diff --git a/matrix3.cpp b/matrix3.cpp index 1c750926b81..594b663b4a5 100644 --- a/matrix3.cpp +++ b/matrix3.cpp @@ -1,14 +1,14 @@ #include #include "matrix3.h" -Matrix3::setAsIdentity( void ) +void Matrix3::setAsIdentity( void ) { right_.set(1.f, 0.f, 0.f); up_.set(0.f, 1.f, 0.f); at_.set(0.f, 0.f, 0.f); } -Matrix3::buildFromPitchYawRoll( float pitch, float yaw, float roll ) +void Matrix3::buildFromPitchYawRoll( float pitch, float yaw, float roll ) { Matrix3 temp1, temp2; @@ -37,7 +37,7 @@ float DegreeToRadian( float degrees ) } // right -Matrix3::constructAroundPitch( float pitch ) +void Matrix3::constructAroundPitch( float pitch ) { float cosa; float sina; @@ -51,7 +51,7 @@ Matrix3::constructAroundPitch( float pitch ) } // up -Matrix3::constructAroundYaw( float yaw ) +void Matrix3::constructAroundYaw( float yaw ) { float cosa; float sina; @@ -65,7 +65,7 @@ Matrix3::constructAroundYaw( float yaw ) } // at -Matrix3::constructAroundRoll( float roll ) +void Matrix3::constructAroundRoll( float roll ) { float cosa; float sina; @@ -175,3 +175,4 @@ void Matrix3::transform( Vector3d v ) v.set( x, y, z ); } + diff --git a/matrix3.h b/matrix3.h index 98a29ac10a2..64222420ef8 100644 --- a/matrix3.h +++ b/matrix3.h @@ -27,12 +27,12 @@ public: Vector3d up_; Vector3d at_; - buildFromPitchYawRoll( float pitch, float yaw, float roll ); - setAsIdentity(void); + void buildFromPitchYawRoll( float pitch, float yaw, float roll ); + void setAsIdentity(void); - constructAroundPitch( float pitch ); - constructAroundYaw( float pitch ); - constructAroundRoll( float pitch ); + void constructAroundPitch( float pitch ); + void constructAroundYaw( float pitch ); + void constructAroundRoll( float pitch ); void getPitchYawRoll( float* pPitch, float* pYaw, float* pRoll ); @@ -79,4 +79,5 @@ public: private: }; -#endif // MATRIX_HH \ No newline at end of file +#endif // MATRIX_HH + diff --git a/matrix4.cpp b/matrix4.cpp index 941f79e69bf..a4c7ffbbac3 100644 --- a/matrix4.cpp +++ b/matrix4.cpp @@ -15,4 +15,5 @@ void Matrix4::translate( float x, float y, float z ) rot_.transform( v ); pos_ += v; -} \ No newline at end of file +} + diff --git a/matrix4.h b/matrix4.h index 9d45868f554..68dd05b87cc 100644 --- a/matrix4.h +++ b/matrix4.h @@ -56,4 +56,5 @@ public: private: }; -#endif // MATRIX_HH \ No newline at end of file +#endif // MATRIX_HH +