Clang Reformat + Math Modules for Physics

Author: willnode

.vscode/settings.json

@@ -4,10 +4,6 @@
 		"vector": "cpp",
 		"iostream": "cpp"
 	},
-	"cmake.configureArgs": [
-        "-DCMAKE_CXX_COMPILER:STRING=C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x64/cl.exe",
-        "-DCMAKE_C_COMPILER:STRING=C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.16.27023/bin/Hostx86/x64/cl.exe",
-    ],
 	"cmake.generator": "Visual Studio 15 2017",
 	"C_Cpp.clang_format_style": "{ BasedOnStyle: LLVM, UseTab: Always, IndentWidth: 4, BreakBeforeBraces: Allman, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 0, TabWidth: 4, NamespaceIndentation: All, AllowAllParametersOfDeclarationOnNextLine: true }"
 }

CMakeLists.txt

@@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 2.8)
 
 project("forth")
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+endif()
 
 set(forth_version 0.1)
 

source/CMakeLists.txt

@@ -22,9 +22,13 @@ set(forth_math_srcs
     math/Matrix4.cpp
     math/Matrix4.h
     math/Plane4.h
+    math/Ray4.h
     math/SphereBounds4.h
+    math/Tensor4.cpp
+    math/Tensor4.h
     math/Transform4.h
     math/Vector3.h
+    math/Vector4.cpp
     math/Vector4.h
     )
 

source/common/Buffer3.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../math/Vector3.h"
 #include "../common/Color.h"
 #include "../extras/Utils.h"
-#include "VertexProfile.h"
+#include "../math/Vector3.h"
 #include "Enums.h"
+#include "VertexProfile.h"
 #include <vector>
 
 namespace Forth
@@ -55,6 +55,5 @@ namespace Forth
 			indices[indices_count++] = b;
 			indices[indices_count++] = c;
 		}
-
 	};
-}
+} // namespace Forth

source/common/Buffer4.cpp

@@ -499,7 +499,7 @@ namespace Forth
 	void Buffer4::AddBySequence(SequenceMode mode, const std::vector<int> &v)
 	{
 		// Copy of the original sequence
-		int va = v.size();
+		int va = (int)v.size();
 		switch (mode)
 		{
 		case SQM_Points:

source/common/Buffer4.h

@@ -158,39 +158,38 @@ namespace Forth
 		void SequenceGrid(int x, int y = 1, int z = 1, int w = 1);
 
 		/// <summary>
-        /// Add by given sequence
-        /// </summary>
-        void AddBySequence(SequenceMode mode, const std::vector<int> &v);
-
-        /// <summary>
-        /// Add points.
-        /// </summary>
-        void AddPoint(const std::vector<int> &v);
-
-        /// <summary>
-        /// Add segments.
-        /// </summary>
-        void AddSegment(const std::vector<int> &v);
-
-        /// <summary>
-        /// Add triangles.
-        /// </summary>
-        void AddTriangle(const std::vector<int> &v);
-
-        /// <summary>
-        /// Add quads.
-        /// </summary>
-        void AddQuad(const std::vector<int> &v);
-
-        /// <summary>
-        /// Add trimids.
-        /// </summary>
-        void AddTrimid(const std::vector<int> &v);
-
-        /// <summary>
-        /// Add polygon points/wires/surfaces.
-        /// </summary>
-        void AddPolygon(const std::vector<int> &v);
+		/// Add by given sequence
+		/// </summary>
+		void AddBySequence(SequenceMode mode, const std::vector<int> &v);
+
+		/// <summary>
+		/// Add points.
+		/// </summary>
+		void AddPoint(const std::vector<int> &v);
+
+		/// <summary>
+		/// Add segments.
+		/// </summary>
+		void AddSegment(const std::vector<int> &v);
+
+		/// <summary>
+		/// Add triangles.
+		/// </summary>
+		void AddTriangle(const std::vector<int> &v);
 
+		/// <summary>
+		/// Add quads.
+		/// </summary>
+		void AddQuad(const std::vector<int> &v);
+
+		/// <summary>
+		/// Add trimids.
+		/// </summary>
+		void AddTrimid(const std::vector<int> &v);
+
+		/// <summary>
+		/// Add polygon points/wires/surfaces.
+		/// </summary>
+		void AddPolygon(const std::vector<int> &v);
 	};
 } // namespace Forth

source/common/BufferGL.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "../common/Color.h"
-#include "../math/Vector3.h"
 #include "../extras/Utils.h"
+#include "../math/Vector3.h"
 #include "Buffer3.h"
 #include "Enums.h"
 #include <vector>
@@ -56,11 +56,10 @@ namespace Forth
 				};
 				// clang-format on
 
-				for(int j = 0; j < BUFFER_PER_TRIS;)
+				for (int j = 0; j < BUFFER_PER_TRIS;)
 				{
 					vb[vb_count++] = arr[j++];
 				}
-
 			}
 		}
 	};

source/common/Color.h

@@ -6,21 +6,20 @@ namespace Forth
 	{
 		float r, g, b, a;
 
-		Color(void) { }
+		Color(void) {}
 
-		Color(float r, float g, float b, float a) : r(r), g(g), b(b), a(a) { }
+		Color(float r, float g, float b, float a) : r(r), g(g), b(b), a(a) {}
 	};
 
 	/// <summary>
 	/// Interpolate between two colors (without clamping)
 	/// </summary>
-	inline Color LerpUnclamped(const Color& a, const Color& b, float t)
+	inline Color LerpUnclamped(const Color &a, const Color &b, float t)
 	{
 		return Color(
 			a.r + (b.r - a.r) * t,
 			a.g + (b.g - a.g) * t,
 			a.b + (b.b - a.b) * t,
-			a.a + (b.a - a.a) * t
-		);
+			a.a + (b.a - a.a) * t);
 	}
-}
+} // namespace Forth