Cleanup

src/core/math/vector3.h

@@ -7,7 +7,6 @@
 
 #include "math_types.h"
 #include "math_utils.h"
-#include "vector2.h"
 #include "error.h"
 
 namespace crown
@@ -179,7 +178,10 @@ inline const float* to_float_ptr(const Vector3& a)
 /// Returns the Vector2 portion of @a a. (i.e. truncates z)
 inline Vector2 to_vector2(const Vector3& a)
 {
-	return vector2(a.x, a.y);
+	Vector2 v;
+	v.x = a.x;
+	v.y = a.y;
+	return v;
 }
 
 /// @}

src/core/math/vector4.h

@@ -7,7 +7,6 @@
 
 #include "math_types.h"
 #include "math_utils.h"
-#include "vector3.h"
 #include "error.h"
 
 namespace crown
@@ -196,7 +195,11 @@ inline const float* to_float_ptr(const Vector4& a)
 
 inline Vector3 to_vector3(const Vector4& a)
 {
-	return vector3(a.x, a.y, a.z);
+	Vector3 v;
+	v.x = a.x;
+	v.y = a.y;
+	v.z = a.z;
+	return v;
 }
 
 /// @}

src/resource/mesh_resource.cpp

@@ -12,6 +12,7 @@
 #include "vector3.h"
 #include "resource_manager.h"
 #include "compile_options.h"
+#include "vector2.h"
 
 namespace crown
 {
@@ -25,9 +26,9 @@ namespace mesh_resource
 
 		bool operator==(const MeshVertex& other)
 		{
-			return position == other.position &&
-					normal == other.normal &&
-					texcoord == other.texcoord;
+			return position == other.position
+				&& normal == other.normal
+				&& texcoord == other.texcoord;
 		}
 	};