new file mode 100755

Binary files /dev/null and b/._TSBK07-labs-cpp differ

Binary files a/common/._LittleOBJLoader.h and b/common/._LittleOBJLoader.h differ

Binary files a/common/._VectorUtils4.h and b/common/._VectorUtils4.h differ

@@ -84,8 +84,12 @@ void DisposeModel(Model *m);

 //}

 ///#endif

+#endif

+

 // --------------- Implementation part ----------------

+#ifdef MAIN

+

 #ifndef LOL_IMPLEMENTATION

 #define LOL_IMPLEMENTATION

@@ -88,6 +88,7 @@

 // 20220525: Revised perpective() to conform with the reference manual as well as GLM.

 // 20230205: Added new helper functions, uploadMat4ToShader etc.

 // Made a better #ifdef for handling multiple inclusions.

+// 20230227: Fixed the mat4(mat3) constructor.

 // You may use VectorUtils as you please. A reference to the origin is appreciated

 // but if you grab some snippets from it without reference... no problem.

@@ -253,14 +254,16 @@

 	} mat3;

 #ifdef __cplusplus

-	vec3::vec3(vec4 v) : x(v.x), y(v.y), z(v.z) {}

-	mat4::mat4(mat3 x)

-	{

-		m[0] = x.m[0]; m[1] = x.m[1]; m[2] = x.m[2]; m[3] = 0;

-		m[4] = x.m[3]; m[5] = x.m[4]; m[6] = x.m[5]; m[7] = 0;

-		m[8] = x.m[6]; m[9] = x.m[7]; m[10] = x.m[8]; m[11] = 0;

-		m[12] = x.m[0]; m[13] = x.m[0]; m[14] = x.m[0]; m[15] = 1;

-	}

+// This needed to be compiled only once - moved to implementation.

+// This most likely must be done with several more!

+//	vec3::vec3(vec4 v) : x(v.x), y(v.y), z(v.z) {}

+//	mat4::mat4(mat3 x)

+//	{

+//		m[0] = x.m[0]; m[1] = x.m[1]; m[2] = x.m[2]; m[3] = 0;

+//		m[4] = x.m[3]; m[5] = x.m[4]; m[6] = x.m[5]; m[7] = 0;

+//		m[8] = x.m[6]; m[9] = x.m[7]; m[10] = x.m[8]; m[11] = 0;

+//		m[12] = x.m[0]; m[13] = x.m[0]; m[14] = x.m[0]; m[15] = 1;

+//	}

 #endif

 //#ifdef __cplusplus

@@ -375,7 +378,7 @@

 #ifdef __cplusplus

 // Some C++ operator overloads

 // Non-member C++ operators!

-// New version 2021-05-2x: Constructiors for vec3 etc replaced in order to avoid

+// New version 2021-05-2x: Constructors for vec3 etc replaced in order to avoid

 // problems with some C++ compilers.

 // --- vec3 operations ---

@@ -1656,6 +1659,20 @@ mat4 lookAt(vec3 p, vec3 l, vec3 u)

 	return lookAtv(p, l, u);

 }

+

+#ifdef __cplusplus

+	vec3::vec3(vec4 v) : x(v.x), y(v.y), z(v.z) {}

+	// Was wrong, fixed 2023-02-27

+	mat4::mat4(mat3 x)

+	{

+		m[0]  = x.m[0]; m[1]  = x.m[1]; m[2] =  x.m[2]; m[3]  = 0;

+		m[4]  = x.m[3]; m[5]  = x.m[4]; m[6] =  x.m[5]; m[7]  = 0;

+		m[8]  = x.m[6]; m[9]  = x.m[7]; m[10] = x.m[8]; m[11] = 0;

+		m[12] = 0;      m[13] = 0;      m[14] = 0;      m[15] = 1;

+	}

+#endif

+

+

 #endif

 #endif

 #endif