@@ -240,6 +240,7 @@ void printError(const char *functionName)

    }

 }

+

 // FBO

 //----------------------------------FBO functions-----------------------------------

@@ -12,6 +12,8 @@

 // 180216: calloc is better than malloc when you may have undefined data in parts of the texture!

 // 190416: Skipped testing the last four bytes of the 12-byte heading. That is the origin of the

 // image which is usually 0. It is now ignored.

+// 220218: Big change: Removed the power of 2. GPUs with that limitation are gone now.

+// This simplifies both the code and the interface.

 // NOTE: LoadTGA does NOT support all TGA variants! You may need to re-save your TGA

 // with different settings to find a suitable format.

@@ -29,7 +31,7 @@ void LoadTGASetMipmapping(bool active)

 	gMipmap = active;

 }

-bool LoadTGATextureData(char *filename, TextureData *texture)	// Loads A TGA File Into Memory

+bool LoadTGATextureData(const char *filename, TextureData *texture)	// Loads A TGA File Into Memory

 {

 	GLuint i;

 	GLubyte

@@ -43,7 +45,7 @@ bool LoadTGATextureData(char *filename, TextureData *texture)	// Loads A TGA Fil

 		imageSize,		// Used To Store The Image Size When Setting Aside Ram

 		temp;			// Temporary Variable

 	long rowSize, stepSize, bytesRead;

-	long w, h;

+//	long w, h;

 	GLubyte *rowP;

 	int err;

 	GLubyte rle;

@@ -109,20 +111,21 @@ bool LoadTGATextureData(char *filename, TextureData *texture)	// Loads A TGA Fil

 		return false;

 	}

 	flipped = (header[5] & 32) != 0; // Testa om flipped

-	

-	w = 1;

-	while (w < texture->width) w = w << 1;

-	h = 1;

-	while (h < texture->height) h = h << 1;

-	texture->texWidth = (GLfloat)texture->width / w;

-	texture->texHeight = (GLfloat)texture->height / h;

+

+// That old power of 2 is no longer needed!

+//	w = 1;

+//	while (w < texture->width) w = w << 1;

+//	h = 1;

+//	while (h < texture->height) h = h << 1;

+//	texture->texWidth = (GLfloat)texture->width / w;

+//	texture->texHeight = (GLfloat)texture->height / h;

 	texture->bpp = header[4];		// Grab The TGA's Bits Per Pixel (24 or 32)

 	bytesPerPixel = texture->bpp/8;		// Divide By 8 To Get The Bytes Per Pixel

-	imageSize = w * h * bytesPerPixel;	// Calculate The Memory Required For The TGA Data

+	imageSize = texture->width * texture->height * bytesPerPixel;	// Calculate The Memory Required For The TGA Data

 	rowSize	= texture->width * bytesPerPixel;	// Image memory per row

-	stepSize = w * bytesPerPixel;		// Memory per row

+	stepSize = texture->width * bytesPerPixel;		// Memory per row

 	texture->imageData = (GLubyte *)calloc(1, imageSize);	// Reserve Memory To Hold The TGA Data

 	if (texture->imageData == NULL)				// Does The Storage Memory Exist?

 	{

@@ -133,7 +136,7 @@ bool LoadTGATextureData(char *filename, TextureData *texture)	// Loads A TGA Fil

 	// Set rowP and step depending on direction

 	// Inverted this 120131, since a texture came out wrong.

 	// I am still not sure this is OK.

-	if (!flipped)

+	if (flipped)

 	{

 		step = -stepSize;

 		rowP = &texture->imageData[imageSize - stepSize];

@@ -204,13 +207,13 @@ bool LoadTGATextureData(char *filename, TextureData *texture)	// Loads A TGA Fil

 	}

 	fclose (file);

-texture->w = w;

-texture->h = h;

+//texture->w = w;

+//texture->h = h;

 	return true;				// Texture loading Went Ok, Return True

 }

-bool LoadTGATexture(char *filename, TextureData *texture)	// Loads A TGA File Into Memory and creates texture object

+bool LoadTGATexture(const char *filename, TextureData *texture)	// Loads A TGA File Into Memory and creates texture object

 {

 	char ok;

 	GLuint type = GL_RGBA;		// Set The Default GL Mode To RBGA (32 BPP)

@@ -232,7 +235,7 @@ bool LoadTGATexture(char *filename, TextureData *texture)	// Loads A TGA File In

 	{

 		type=GL_RGB;			// If So Set The 'type' To GL_RGB

 	}

-	glTexImage2D(GL_TEXTURE_2D, 0, type, texture->w, texture->h, 0, type, GL_UNSIGNED_BYTE, texture[0].imageData);

+	glTexImage2D(GL_TEXTURE_2D, 0, type, texture->width, texture->height, 0, type, GL_UNSIGNED_BYTE, texture[0].imageData);

 	if (gMipmap)

 	{

@@ -243,7 +246,7 @@ bool LoadTGATexture(char *filename, TextureData *texture)	// Loads A TGA File In

 	return true;				// Texture Building Went Ok, Return True

 }

-void LoadTGATextureSimple(char *filename, GLuint *tex) // If you really only need the texture object.

+void LoadTGATextureSimple(const char *filename, GLuint *tex) // If you really only need the texture object.

 {

 	TextureData texture;

 	memset(&texture, 0, sizeof(texture)); // Bug fix 130905.

@@ -324,7 +327,8 @@ int SaveDataToTGA(char			*filename,

 	fclose(file);

 // release the memory

-	free(imageData);

+// No, this is the responsability of the host!

+//	free(imageData);

 	return(TGA_OK);

 }

@@ -44,10 +44,10 @@ typedef struct TextureData		// Create A Structure for .tga loading.

 	GLfloat	texWidth, texHeight;

 } TextureData, *TextureDataPtr;					// Structure Name

-bool LoadTGATexture(char *filename, TextureData *texture);

-void LoadTGATextureSimple(char *filename, GLuint *tex);

+bool LoadTGATexture(const char *filename, TextureData *texture);

+void LoadTGATextureSimple(const char *filename, GLuint *tex);

 void LoadTGASetMipmapping(bool active);

-bool LoadTGATextureData(char *filename, TextureData *texture);

+bool LoadTGATextureData(const char *filename, TextureData *texture);

 // Constants for SaveTGA

 #define	TGA_ERROR_FILE_OPEN				-5

@@ -62,12 +62,14 @@

 // 131014: Added TransposeMat3 (although I doubt its importance)

 // 140213: Corrected mat3tomat4. (Were did the correction in 130924 go?)

 // 151210: Added printMat4 and printVec3.

-// 160302: Added empty constuctors for vec3 and vec4.

+// 160302: Added empty constructors for vec3 and vec4.

 // 170221: Uses _WIN32 instead of WIN32

 // 170331: Added stdio.h for printMat4 and printVec3

 // 180314: Added some #defines for moving closer to GLSL (dot, cross...).

 // 2021-05-15: Constructiors for vec3 etc replaced in order to avoid

 // problems with some C++ compilers.

+// 2022-05-14: Corrected transposed version of lookAtv.

+// 2023-01-31: Added shader upload utility functions.

 // 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.

@@ -559,7 +561,7 @@ char transposed = 0;

 //	}

 	// Complete transpose!

-	mat4 Transpose(mat4 m)

+	mat4 transpose(mat4 m)

 	{

 		mat4 a;

@@ -629,7 +631,7 @@ mat4 ArbRotate(vec3 axis, GLfloat fi)

 		R.m[12] = 0.0; R.m[13] = 0.0; R.m[14] = 0.0;  R.m[15] = 1.0;

 	}

-	Rt = Transpose(R); // Transpose = Invert -> felet ej i Transpose, och det �r en ortonormal matris

+	Rt = transpose(R); // Transpose = Invert -> felet ej i Transpose, och det �r en ortonormal matris

 	Raxel = Rx(fi); // Rotate around x axis

@@ -701,10 +703,16 @@ mat4 lookAtv(vec3 p, vec3 l, vec3 v)

 //                      n.x, n.y, n.z, 0,

 //                      0,   0,   0,   1 }};

 // VS friendly version:

+	if (transposed)

+	rot = SetMat4(u.x, v.x, n.x, 0,

+                  u.y, v.y, n.y, 0,

+                  u.z, v.z, n.z, 0,

+                  0,   0,   0,   1);

+	else

 	rot = SetMat4(u.x, u.y, u.z, 0,

-                      v.x, v.y, v.z, 0,

-                      n.x, n.y, n.z, 0,

-                      0,   0,   0,   1);

+                  v.x, v.y, v.z, 0,

+                  n.x, n.y, n.z, 0,

+                  0,   0,   0,   1);

 	trans = T(-p.x, -p.y, -p.z);

 	return Mult(rot, trans);

 }

@@ -728,23 +736,18 @@ mat4 lookAt(GLfloat px, GLfloat py, GLfloat pz,

 // Creates a projection matrix like gluPerspective or glFrustum.

 // Upload to your shader as usual.

+// 2022: Yet another fix. Was it correct this time?

 mat4 perspective(float fovyInDegrees, float aspectRatio,

                       float znear, float zfar)

 {

-    float ymax, xmax;

-    ymax = znear * tanf(fovyInDegrees * M_PI / 360.0);

-    if (aspectRatio < 1.0)

-    {

-	    ymax = znear * tanf(fovyInDegrees * M_PI / 360.0);

-       xmax = ymax * aspectRatio;

-    }

-    else

-    {

-	    xmax = znear * tanf(fovyInDegrees * M_PI / 360.0);

-       ymax = xmax / aspectRatio;

-    }

-    

-    return frustum(-xmax, xmax, -ymax, ymax, znear, zfar);

+	float f = 1.0/tan(fovyInDegrees * M_PI / 360.0);

+	mat4 m = SetMat4(f/aspectRatio, 0, 0, 0,

+					0, f, 0, 0,

+					0, 0, (zfar+znear)/(znear-zfar), 2*zfar*znear/(znear-zfar),

+					0, 0, -1, 0);

+	if (transposed)

+		m = transpose(m);

+	return m;

 }

 mat4 frustum(float left, float right, float bottom, float top,

@@ -775,7 +778,7 @@ mat4 frustum(float left, float right, float bottom, float top,

     matrix.m[15] = 0.0;

     if (!transposed)

-    	matrix = Transpose(matrix);

+    	matrix = transpose(matrix);

     return matrix;

 }

@@ -1026,3 +1029,97 @@ void printVec3(vec3 in)

 {

 	printf("(%f, %f, %f)\n", in.x, in.y, in.z);

 }

+

+

+

+/* Utility functions for easier uploads to shaders with error messages. */

+// NEW as prototype 2022, added to VU 2023

+

+#define NUM_ERRORS 8

+

+static void ReportError(const char *caller, const char *name)

+{

+	static unsigned int draw_error_counter = 0; 

+	if(draw_error_counter < NUM_ERRORS)

+	{

+		fprintf(stderr, "%s warning: '%s' not found in shader!\n", caller, name);

+		draw_error_counter++;

+	}

+	else if(draw_error_counter == NUM_ERRORS)

+	{

+		fprintf(stderr, "%s: Number of errors bigger than %i. No more vill be printed.\n", caller, NUM_ERRORS);

+		draw_error_counter++;

+	}

+}

+

+void uploadMat4ToShader(GLuint shader, char *nameInShader, mat4 m)

+{

+	if (nameInShader == NULL) return;

+	glUseProgram(shader);

+	GLint loc = glGetUniformLocation(shader, nameInShader);

+	if (loc >= 0)

+		glUniformMatrix4fv(loc, 1, GL_TRUE, m.m);

+	else

+		ReportError("uploadMat4ToShader", nameInShader);

+}

+

+void uploadUniformIntToShader(GLuint shader, char *nameInShader, GLint i)

+{

+	if (nameInShader == NULL) return;

+	glUseProgram(shader);

+	GLint loc = glGetUniformLocation(shader, nameInShader);

+	if (loc >= 0)

+		glUniform1i(loc, i);

+	else

+		ReportError("uploadUniformIntToShader", nameInShader);

+}

+

+void uploadUniformFloatToShader(GLuint shader, char *nameInShader, GLfloat f)

+{

+	if (nameInShader == NULL) return;

+	glUseProgram(shader);

+	GLint loc = glGetUniformLocation(shader, nameInShader);

+	if (loc >= 0)

+		glUniform1f(loc, f);

+	else

+		ReportError("uploadUniformFloatToShader", nameInShader);

+}

+

+void uploadUniformFloatArrayToShader(GLuint shader, char *nameInShader, GLfloat *f, int arrayLength)

+{

+	if (nameInShader == NULL) return;

+	glUseProgram(shader);

+	GLint loc = glGetUniformLocation(shader, nameInShader);

+	if (loc >= 0)

+		glUniform1fv(loc, arrayLength, f);

+	else

+		ReportError("uploadUniformFloatToShader", nameInShader);

+}

+

+void uploadUniformVec3ToShader(GLuint shader, char *nameInShader, vec3 v)

+{

+	if (nameInShader == NULL) return;

+	glUseProgram(shader);

+	GLint loc = glGetUniformLocation(shader, nameInShader);

+	if (loc >= 0)

+		glUniform3f(loc, v.x, v.y, v.z);

+	else

+		ReportError("uploadUniformVec3ToShader", nameInShader);

+}

+

+void uploadUniformVec3ArrayToShader(GLuint shader, char *nameInShader, vec3 *a, int arrayLength)

+{

+	if (nameInShader == NULL) return;

+	glUseProgram(shader);

+	GLint loc = glGetUniformLocation(shader, nameInShader);

+	if (loc >= 0)

+		glUniform3fv(loc, arrayLength, (GLfloat *)a);

+	else

+		ReportError("uploadUniformVec3ArrayToShader", nameInShader);

+}

+

+void bindTextureToTextureUnit(GLuint tex, int unit)

+{

+	glActiveTexture(GL_TEXTURE0 + unit);

+	glBindTexture(GL_TEXTURE_2D, tex);

+}

@@ -142,7 +142,7 @@ extern "C" {

 	vec3 MultMat3Vec3(mat3 a, vec3 b); // result = a * b

 	void OrthoNormalizeMatrix(mat4 *R);

-	mat4 Transpose(mat4 m);

+	mat4 transpose(mat4 m);

 //	mat4 TransposeRotation(mat4 m); // Will probably be removed

 	mat3 TransposeMat3(mat3 m);

 	mat4 ArbRotate(vec3 axis, GLfloat fi);

@@ -179,6 +179,15 @@ extern "C" {

 	void printMat4(mat4 m);

 	void printVec3(vec3 in);

+/* Utility functions for easier uploads to shaders with error messages. */

+// NEW as prototype 2022, added to VU 2023

+	void uploadMat4ToShader(GLuint shader, char *nameInShader, mat4 m);

+	void uploadUniformIntToShader(GLuint shader, char *nameInShader, GLint i);

+	void uploadUniformFloatToShader(GLuint shader, char *nameInShader, GLfloat f);

+	void uploadUniformFloatArrayToShader(GLuint shader, char *nameInShader, GLfloat *f, int arrayLength);

+	void uploadUniformVec3ToShader(GLuint shader, char *nameInShader, vec3 v);

+	void uploadUniformVec3ArrayToShader(GLuint shader, char *nameInShader, vec3 *a, int arrayLength);

+	void bindTextureToTextureUnit(GLuint tex, int unit);

new file mode 100755

Binary files /dev/null and b/lab1/lab1-1 differ

new file mode 100644

Binary files /dev/null and b/lab3/skybox-alt/._Daylight Box UV.tga differ

new file mode 100644

Binary files /dev/null and b/lab3/skybox-alt/._atmosphere-cloud.tga differ

new file mode 100644

Binary files /dev/null and b/lab3/skybox-alt/._attributions.txt differ

new file mode 100644

Binary files /dev/null and b/lab3/skybox-alt/._cloud-landscape.tga differ

new file mode 100644

Binary files /dev/null and b/lab3/skybox-alt/._desert-skybox-texture.tga differ

new file mode 100644

Binary files /dev/null and b/lab3/skybox-alt/._http-skybox-texture.tga differ

new file mode 100755

Binary files /dev/null and b/lab3/skybox-alt/._skybox-full-tweaked.obj differ

new file mode 100755

Binary files /dev/null and b/lab3/skybox-alt/._skybox-full.obj differ

new file mode 100644

Binary files /dev/null and b/lab3/skybox-alt/Daylight Box UV.tga differ

new file mode 100644

Binary files /dev/null and b/lab3/skybox-alt/atmosphere-cloud.tga differ

new file mode 100644

@@ -0,0 +1,26 @@

+Daylight box fetched from https://opengameart.org/content/sky-box-sunny-day

+Copyright/Attribution Notice: 

+KIIRA

+

+cloud-landscape.tga was originally called

+"png-transparent-skybox-cube-mapping-texture-mapping-terragen-textured-box-photography-cloud-landscape.png"

+and was fetched from https://www.pngwing.com/en/free-png-ysvvj#google_vignette

+No source/copyright documented on page.

+

+https://www.pngwing.com/en/free-png-kyycs

+png-transparent-skybox-texture-mapping-panorama-others-texture-atmosphere-cloud.png

+Free for non-commercial use.

+

+Desert skybox texture

+<a href="https://www.nicepng.com/ourpic/u2q8o0t4i1w7q8y3_desert-skybox-texture-png/" target="_blank">Desert - Skybox Texture Png @nicepng.com</a>

+Original name: 153-1530454_desert-skybox-texture-png.png

+No source/copyright documented on page.

+

+

+Http-skybox texture

+https://www.nicepng.com/maxp/u2q8y3a9t4r5i1q8/

+<a href="https://www.nicepng.com/ourpic/u2q8y3a9t4r5i1q8_http-skybox-texture/" target="_blank">Http - Skybox Texture @nicepng.com</a>

+"A high-quality creative community needs everyone's contribution. The shared material of Http - Skybox Texture is a free 3611x2693 PNG picture with no background, This PNG image is high resolution and very popular on the public internet. You can download it for free and use it for personal non-commercial use. Http - Skybox Texture belongs to the category watercolor texture png,texture png,grunge texture png. "

+-> personal non-commercial use

+Original name "96-961924_http-skybox-texture.png"

+

new file mode 100644

Binary files /dev/null and b/lab3/skybox-alt/cloud-landscape.tga differ

new file mode 100644

Binary files /dev/null and b/lab3/skybox-alt/desert-skybox-texture.tga differ

new file mode 100644

Binary files /dev/null and b/lab3/skybox-alt/http-skybox-texture.tga differ

new file mode 100755

@@ -0,0 +1,51 @@

+# Full skybox

+

+# Built manually by Ingemar

+# This version has tweaked number to get inside the borders

+# and avoid interpolation with the empty areas

+

+mtllib cube.mtl

+o cube1

+#8 vertices, 5 faces

+v -2.0 -2.0 2.0

+v -2.0 2.0 2.0

+v 2.0 2.0 2.0

+v 2.0 -2.0 2.0

+v -2.0 -2.0 -2.0

+v -2.0 2.0 -2.0

+v 2.0 2.0 -2.0

+v 2.0 -2.0 -2.0

+

+vt 0.252 1.0

+vt 0.498 1.0

+

+vt 0.0 0.665

+vt 0.252 0.665

+vt 0.498 0.665

+vt 0.75 0.665

+vt 1.0 0.665

+

+vt 0.0 0.34

+vt 0.252 0.34

+vt 0.498 0.34

+vt 0.75 0.34

+vt 1.0 0.34

+

+vt 0.252 0.0

+vt 0.498 0.0

+

+g cube1_default

+usemtl default

+# top

+f 2/4 6/1 7/2 3/5

+# front

+f 1/9 2/4 3/5 4/10

+# right

+f 3/5 7/6 8/11 4/10

+# back

+f 8/11 7/6 6/7 5/12

+# left

+f 5/8 6/3 2/4 1/9

+# bottom

+f 1/9 4/10 8/14 5/13

+

new file mode 100755

@@ -0,0 +1,49 @@

+# Full skybox

+

+# Built manually by Ingemar

+

+mtllib cube.mtl

+o cube1

+#8 vertices, 5 faces

+v -2.0 -2.0 2.0

+v -2.0 2.0 2.0

+v 2.0 2.0 2.0

+v 2.0 -2.0 2.0

+v -2.0 -2.0 -2.0

+v -2.0 2.0 -2.0

+v 2.0 2.0 -2.0

+v 2.0 -2.0 -2.0

+

+vt 0.25 1.0

+vt 0.5 1.0

+

+vt 0.0 0.67

+vt 0.25 0.67

+vt 0.5 0.67

+vt 0.75 0.67

+vt 1.0 0.67

+

+vt 0.0 0.33

+vt 0.25 0.33

+vt 0.5 0.33

+vt 0.75 0.33

+vt 1.0 0.33

+

+vt 0.25 0.0

+vt 0.5 0.0

+

+g cube1_default

+usemtl default

+# top

+f 2/4 6/1 7/2 3/5

+# front

+f 1/9 2/4 3/5 4/10

+# right

+f 3/5 7/6 8/11 4/10

+# back

+f 8/11 7/6 6/7 5/12

+# left

+f 5/8 6/3 2/4 1/9

+# bottom

+f 1/9 4/10 8/14 5/13

+

new file mode 100644

Binary files /dev/null and b/lab3/skybox/._SkyBoxFull.tga differ

new file mode 100755

Binary files /dev/null and b/lab3/skybox/._skyboxfull.obj differ

new file mode 100644

Binary files /dev/null and b/lab3/skybox/SkyBoxFull.tga differ

new file mode 100755

@@ -0,0 +1,39 @@

+# Exported from Wings 3D 0.98.26b

+# Edited by Ingemar, extended to full height

+# No normal vector - this is a skybox!

+

+mtllib cube.mtl

+o cube1

+#8 vertices, 5 faces

+v -2.0 -2.0 2.0

+v -2.0 2.0 2.0

+v 2.0 2.0 2.0

+v 2.0 -2.0 2.0

+v -2.0 -2.0 -2.0

+v -2.0 2.0 -2.0

+v 2.0 2.0 -2.0

+v 2.0 -2.0 -2.0

+

+vt 0.33 0.0

+vt 0.67 0.0

+

+vt 0.0 0.33

+vt 0.33 0.33

+vt 0.67 0.33

+vt 1.0 0.33

+

+vt 0.0 0.67

+vt 0.33 0.67

+vt 0.67 0.67

+vt 1.0 0.67

+

+vt 0.33 1.0

+vt 0.67 1.0

+

+g cube1_default

+usemtl default

+f 3/9 2/8 1/11/1 4/12

+f 5/3 1/7 2/8/2 6/4

+f 6/4 2/8 3/9/3 7/5

+f 7/5 3/9 4/10/4 8/6

+f 8/2 5/1 6/4/6 7/5