style

CMakeLists.txt

@@ -16,7 +16,7 @@ set(utils util.cpp)
 set(math quaternion.cpp vector.cpp matrix.cpp ray.cpp)
 set(render particleEmitter.cpp camera.cpp light.cpp material.cpp mesh.cpp model.cpp node.cpp quad.cpp box.cpp root.cpp shader.cpp texture.cpp)
 set(model modelReader.cpp assimpModelReader.cpp vbModelReader.cpp)
-set(anim animationController.cpp animationChannel.cpp animation.cpp keyframeChannel.cpp animatable.cpp driver.cpp)
+set(anim animationController.cpp animationChannel.cpp animation.cpp animatable.h keyframeChannel.cpp driver.cpp)
 set(armature skeleton.cpp bone.cpp ikSolver.cpp)
 set(library ${render} ${math} ${model} ${utils} ${gui} ${armature} ${assetManager} ${anim})
 

animatable.cpp

@@ -1,7 +0,0 @@
-#include "animatable.h"
-#include "animationController.h"
-
-namespace vb01{
-	Animatable::Animatable(){
-	}
-}

animatable.h

@@ -1,17 +1,13 @@
 #ifndef ANIMATABLE_H
 #define ANIMATABLE_H
 
-#include "animation.h"
+#include "keyframeChannel.h"
 
 namespace vb01{
-	class AnimationController;
-
 	class Animatable{
 		public:
-			Animatable();
+			Animatable(){}
 			virtual void animate(float, KeyframeChannel){}
-		private:
-		protected:
 	};
 }
 

animation.h

@@ -3,6 +3,7 @@
 
 #include <string>
 #include <vector>
+
 #include "keyframeChannel.h"
 
 namespace vb01{

animationController.h

@@ -3,6 +3,7 @@
 
 #include <string>
 #include <vector>
+
 #include "animation.h"
 
 namespace vb01{

assimpModelReader.cpp

@@ -1,5 +1,6 @@
 #include "assimpModelReader.h"
 #include "mesh.h"
+
 #include <Importer.hpp>
 #include <scene.h>
 #include <postprocess.h>

bone.h

@@ -2,6 +2,7 @@
 #define BONE_H
 
 #include "node.h"
+
 #include <string>
 
 namespace vb01{

camera.h

@@ -10,7 +10,7 @@ namespace vb01{
 			~Camera();
 			void update();
 			void setPosition(Vector3 position){this->position = position;}
-			void lookAt(Vector3, Vector3=Vector3(0,1,0));
+			void lookAt(Vector3, Vector3 = Vector3::VEC_J);
 			inline Vector3 getPosition(){return position;}
 			inline Vector3 getDirection(){return direction;}
 			inline Vector3 getLeft(){return left;}
@@ -21,7 +21,7 @@ namespace vb01{
 			inline float getNearPlane(){return nearPlane;}
 			inline float getFarPlane(){return farPlane;}
 		private:
-			Vector3 position=Vector3(0,0,0),direction=Vector3(0,0,-1),left=Vector3(1,0,0),up=Vector3(0,1,0);
+			Vector3 position = Vector3::VEC_ZERO, direction = Vector3(0,0,-1), left = Vector3::VEC_I, up = Vector3::VEC_J;
 			float fov = 45, nearPlane = .1, farPlane = 100;
 	};
 }

cameraTest.cpp

@@ -1,4 +1,5 @@
 #include "cameraTest.h"
+
 #include <cppunit/TestCase.h>
 #include <cppunit/TestSuite.h>
 #include <cppunit/TestResult.h>

driver.h

@@ -2,6 +2,7 @@
 #define DRIVER
 
 #include "keyframeChannel.h"
+
 #include <string>
 
 namespace vb01{

ikSolverTest.h

@@ -3,6 +3,7 @@
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
+
 #include "bone.h"
 
 namespace vb01{

light.h

@@ -13,7 +13,6 @@ namespace vb01{
 	class Shader;
 	class Material;
 
-
 	class Light : public Animatable{
 		public:
 			enum Type{POINT, DIRECTIONAL, SPOT, AMBIENT};

matrix.cpp

@@ -1,4 +1,5 @@
 #include "matrix.h"
+
 #include <iostream>
 
 using namespace std;
@@ -145,7 +146,7 @@ namespace vb01{
 
 			for(int j = 0; j < dim[1]; j++)
 				if(i != row && j != column){
-					int a=offsetRows&&i!=0?i-1:i,b=offsetColumns&&j!=0?j-1:j;
+					int a = (offsetRows && i != 0 ? i - 1 : i), b = (offsetColumns && j != 0 ? j - 1 : j);
 					matrix[a][b] = this->matrix[i][j];
 				}
 

mesh.cpp

@@ -4,6 +4,7 @@
 #include "texture.h"
 #include "skeleton.h"
 #include "animation.h"
+
 #include <glad.h>
 #include <glfw3.h>
 #include <glm.hpp>

modelReader.cpp

@@ -1,5 +1,6 @@
 #include "modelReader.h"
 #include "model.h"
+
 #include <vector>
 #include <fstream>
 

modelReader.h

@@ -2,6 +2,7 @@
 #define MODEL_READER
 
 #include <string>
+
 #include "model.h"
 
 namespace vb01{

quaternion.h

@@ -2,6 +2,7 @@
 #define QUATERNION_H
 
 #include <cmath>
+
 #include "vector.h"
 
 namespace vb01{

ray.cpp

@@ -1,4 +1,5 @@
 #include <algorithm>
+
 #include "ray.h"
 #include "mesh.h"
 #include "node.h"

ray.h

@@ -1,5 +1,6 @@
 #include "vector.h"
 #include "util.h"
+
 #include <vector>
 
 namespace vb01{

root.cpp

@@ -4,6 +4,7 @@
 #include "shader.h"
 #include "box.h"
 #include "quad.h"
+
 #include <glad.h>
 #include <glfw3.h>
 #include <cstdlib>

root.h

@@ -2,6 +2,7 @@
 #define ROOT_H
 
 #include "camera.h"
+
 #include <string>
 #include <vector>
 

shader.cpp

@@ -3,6 +3,7 @@
 #include <iostream>
 #include <sstream>
 #include <fstream>
+
 #include "shader.h"
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>

shader.h

@@ -3,6 +3,7 @@
 
 #include <string>
 #include <glm/mat4x4.hpp>
+
 #include "vector.h"
 #include "util.h"
 

skeleton.cpp

@@ -3,6 +3,7 @@
 #include "animationController.h"
 #include "box.h"
 #include "ikSolver.h"
+
 #include <glm.hpp>
 #include <glm/gtc/matrix_inverse.hpp>
 

skeleton.h

@@ -3,6 +3,7 @@
 
 #include <vector>
 #include <string>
+
 #include "bone.h"
 
 namespace vb01{

texture.cpp

@@ -1,8 +1,11 @@
 #define STB_IMAGE_IMPLEMENTATION
+
 #include "stb_image.h"
+
+#include "texture.h"
+
 #include <glad.h>
 #include <glfw3.h>
-#include"texture.h"
 #include <iostream>
 
 using namespace std;

texture.h

@@ -3,6 +3,7 @@
 
 #include <string>
 #include <ft2build.h>
+
 #include "util.h"
 #include "animatable.h"
 #include FT_FREETYPE_H

util.cpp

@@ -1,4 +1,5 @@
 #include "util.h"
+
 #include <fstream>
 
 using namespace std;