@@ -1,87 +1,80 @@

-// Lab 1-1.

-// This is the same as the first simple example in the course book,

-// but with a few error checks.

-// Remember to copy your file to a new on appropriate places during the lab so you keep old results.

-// Note that the files "lab1-1.frag", "lab1-1.vert" are required.

-

-#include "GL_utilities.h"

+/// Inlcudes

 #include "MicroGlut.h"

-// uses framework OpenGL

-// uses framework Cocoa

+#include "GL_utilities.h"

+

+

+/// Defines

+#define ARRAY_COUNT(ARRAY) (sizeof(ARRAY)/sizeof(*(ARRAY)))

-// Globals

-// Data would normally be read from files

-GLfloat vertices[] =

+

+/// Globals

+GLuint  vertexArray;

+GLfloat positions[] =

 {

-	-0.5f,-0.5f,0.0f,

-	-0.5f,0.5f,0.0f,

-	0.5f,-0.5f,0.0f

+	-0.5f, -0.5f, 0.0f,

+	-0.5f, +0.5f, 0.0f,

+	+0.5f, -0.5f, 0.0f,

 };

-// vertex array object

-unsigned int vertexArrayObjID;

+/// Init

 void init(void)

 {

-	// vertex buffer object, used for uploading the geometry

-	unsigned int vertexBufferObjID;

-	// Reference to shader program

-	GLuint program;

-

-	dumpInfo();

-

-	// GL inits

-	glClearColor(0.2,0.2,0.5,0);

+	// GL inits.

+	glClearColor(0.2, 0.2, 0.5, 0.0);

 	glDisable(GL_DEPTH_TEST);

-	printError("GL inits");

+	printError("init GL");

-	// Load and compile shader

-	program = loadShaders("lab1-1.vert", "lab1-1.frag");

+	// Load and compile shader.

+	GLuint program = loadShaders("lab1-1.vert", "lab1-1.frag");

 	printError("init shader");

-	

-	// Upload geometry to the GPU:

-	

-	// Allocate and activate Vertex Array Object

-	glGenVertexArrays(1, &vertexArrayObjID);

-	glBindVertexArray(vertexArrayObjID);

-	// Allocate Vertex Buffer Objects

-	glGenBuffers(1, &vertexBufferObjID);

-	

-	// VBO for vertex data

-	glBindBuffer(GL_ARRAY_BUFFER, vertexBufferObjID);

-	glBufferData(GL_ARRAY_BUFFER, 9*sizeof(GLfloat), vertices, GL_STATIC_DRAW);

-	glVertexAttribPointer(glGetAttribLocation(program, "in_Position"), 3, GL_FLOAT, GL_FALSE, 0, 0); 

-	glEnableVertexAttribArray(glGetAttribLocation(program, "in_Position"));

-	

-	// End of upload of geometry

-	

-	printError("init arrays");

+

+	// Allocate and activate Vertex Array Object (VAO), used for uploading

+	// the geometry.

+	glGenVertexArrays(1, &vertexArray);

+	glBindVertexArray(vertexArray);

+

+	// Allocate and activate Vertex Buffer Objects (VBO), for vertex data.

+	GLint  positionLocation = glGetAttribLocation(program, "inPosition");

+	GLuint positionBuffer;

+	glGenBuffers(1, &positionBuffer);

+	glBindBuffer(GL_ARRAY_BUFFER, positionBuffer);

+	glBufferData(GL_ARRAY_BUFFER, sizeof(positions), positions, GL_STATIC_DRAW);

+	glVertexAttribPointer(positionLocation, 3, GL_FLOAT, GL_FALSE, 0, 0);

+	glEnableVertexAttribArray(positionLocation);

+	printError("init VBOs");

 }

+/// Display

 void display(void)

 {

-	printError("pre display");

-

-	// clear the screen

+	// Clear the screen.

 	glClear(GL_COLOR_BUFFER_BIT);

-	glBindVertexArray(vertexArrayObjID);	// Select VAO

-	glDrawArrays(GL_TRIANGLES, 0, 3);	// draw object

-	

-	printError("display");

-	

+	// Select VAO.

+	glBindVertexArray(vertexArray);

+

+	// Draw.

+	glDrawArrays(GL_TRIANGLES, 0, ARRAY_COUNT(positions)/3);

+	printError("display draw");

+

+	// Show on the screen.

 	glutSwapBuffers();

 }

-int main(int argc, char *argv[])

+

+/// Main

+int main(int argc, char * argv[])

 {

 	glutInit(&argc, argv);

 	glutInitContextVersion(3, 2);

 	glutInitWindowSize(600, 600);

-	glutCreateWindow ("GL3 white triangle example");

-	glutDisplayFunc(display); 

-	init ();

+	glutCreateWindow("TSBK07");

+

+	glutDisplayFunc(display);

+

+	dumpInfo();

+	init();

 	glutMainLoop();

-	return 0;

 }

@@ -1,8 +1,8 @@

 #version 150

-in  vec3 in_Position;

+in  vec3 inPosition;

 void main(void)

 {

-	gl_Position = vec4(in_Position, 1.0);

+	gl_Position = vec4(inPosition, 1.0);

 }

@@ -1,7 +1,4 @@

-// Lab 4, terrain generation

-

-// uses framework Cocoa

-// uses framework OpenGL

+/// Inlcudes

 #define MAIN

 #include "MicroGlut.h"

 #include "GL_utilities.h"

@@ -9,149 +6,157 @@

 #include "LittleOBJLoader.h"

 #include "LoadTGA.h"

-mat4 projectionMatrix;

-Model* GenerateTerrain(TextureData *tex)

+/// Globals

+GLuint   program;

+mat4     projection;

+Model  * terrain;

+GLuint   tex;

+

+

+/// Generate terrain

+Model * GenerateTerrain(const char * filename)

 {

-	int vertexCount = tex->width * tex->height;

-	int triangleCount = (tex->width-1) * (tex->height-1) * 2;

-	unsigned int x, z;

-	

-	vec3 *vertexArray = (vec3 *)malloc(sizeof(GLfloat) * 3 * vertexCount);

-	vec3 *normalArray = (vec3 *)malloc(sizeof(GLfloat) * 3 * vertexCount);

-	vec2 *texCoordArray = (vec2 *)malloc(sizeof(GLfloat) * 2 * vertexCount);

-	GLuint *indexArray = (GLuint *) malloc(sizeof(GLuint) * triangleCount*3);

-	

-	printf("bpp %d\n", tex->bpp);

-	for (x = 0; x < tex->width; x++)

-		for (z = 0; z < tex->height; z++)

-		{

-// Vertex array. You need to scale this properly

-			vertexArray[(x + z * tex->width)].x = x / 1.0;

-			vertexArray[(x + z * tex->width)].y = tex->imageData[(x + z * tex->width) * (tex->bpp/8)] / 100.0;

-			vertexArray[(x + z * tex->width)].z = z / 1.0;

-// Normal vectors. You need to calculate these.

-			normalArray[(x + z * tex->width)].x = 0.0;

-			normalArray[(x + z * tex->width)].y = 1.0;

-			normalArray[(x + z * tex->width)].z = 0.0;

-// Texture coordinates. You may want to scale them.

-			texCoordArray[(x + z * tex->width)].x = x; // (float)x / tex->width;

-			texCoordArray[(x + z * tex->width)].y = z; // (float)z / tex->height;

-		}

-	for (x = 0; x < tex->width-1; x++)

-		for (z = 0; z < tex->height-1; z++)

-		{

+	TextureData textureData;

+	if (!LoadTGATextureData(filename, &textureData))

+		return nullptr;

+

+	int vertexCount   =  textureData.width    *  textureData.height;

+	int triangleCount = (textureData.width-1) * (textureData.height-1) * 2;

+

+	vec3   * position = (vec3 *)  malloc(sizeof(GLfloat) * 3 * vertexCount);

+	vec3   * normal   = (vec3 *)  malloc(sizeof(GLfloat) * 3 * vertexCount);

+	vec2   * texCoord = (vec2 *)  malloc(sizeof(GLfloat) * 2 * vertexCount);

+	GLuint * indices  = (GLuint *)malloc(sizeof(GLuint)  * 3 * triangleCount);

+

+	int bytesPerPixel = textureData.bpp / 8;

+	for (unsigned int x = 0; x < textureData.width;  ++x)

+	for (unsigned int z = 0; z < textureData.height; ++z)

+	{

+		int indexBase = (x + z * textureData.width);

+		// Vertex array. You need to scale this properly.

+		GLubyte data = textureData.imageData[indexBase * bytesPerPixel];

+		position[indexBase].x = x    / 1.0;

+		position[indexBase].y = data / 100.0;

+		position[indexBase].z = z    / 1.0;

+		// Normal vectors. You need to calculate these.

+		normal[indexBase].x = 0.0;

+		normal[indexBase].y = 1.0;

+		normal[indexBase].z = 0.0;

+		// Texture coordinates. You may want to scale them.

+		texCoord[indexBase].x = x; // (float)x / textureData.width;

+		texCoord[indexBase].y = z; // (float)z / textureData.height;

+	}

+	for (unsigned int x = 0; x < textureData.width-1;  ++x)

+	for (unsigned int z = 0; z < textureData.height-1; ++z)

+	{

+		int indexBase = (x + z * (textureData.width-1))*6;

 		// Triangle 1

-			indexArray[(x + z * (tex->width-1))*6 + 0] = x + z * tex->width;

-			indexArray[(x + z * (tex->width-1))*6 + 1] = x + (z+1) * tex->width;

-			indexArray[(x + z * (tex->width-1))*6 + 2] = x+1 + z * tex->width;

+		indices[indexBase + 0] = (x+0) + (z+0) * textureData.width;

+		indices[indexBase + 1] = (x+0) + (z+1) * textureData.width;

+		indices[indexBase + 2] = (x+1) + (z+0) * textureData.width;

 		// Triangle 2

-			indexArray[(x + z * (tex->width-1))*6 + 3] = x+1 + z * tex->width;

-			indexArray[(x + z * (tex->width-1))*6 + 4] = x + (z+1) * tex->width;

-			indexArray[(x + z * (tex->width-1))*6 + 5] = x+1 + (z+1) * tex->width;

-		}

-	

-	// End of terrain generation

-	

-	// Create Model and upload to GPU:

-

-	Model* model = LoadDataToModel(

-			vertexArray,

-			normalArray,

-			texCoordArray,

-			NULL,

-			indexArray,

-			vertexCount,

-			triangleCount*3);

+		indices[indexBase + 3] = (x+1) + (z+0) * textureData.width;

+		indices[indexBase + 4] = (x+0) + (z+1) * textureData.width;

+		indices[indexBase + 5] = (x+1) + (z+1) * textureData.width;

+	}

+	// Create Model and upload to GPU:

+	Model * model = LoadDataToModel(

+		position,

+		normal,

+		texCoord,

+		nullptr,

+		indices,

+		vertexCount,

+		triangleCount * 3

+	);

+

+	free(textureData.imageData);

 	return model;

 }

-// vertex array object

-Model *m, *m2, *tm;

-// Reference to shader program

-GLuint program;

-GLuint tex1, tex2;

-TextureData ttex; // terrain

-

+/// Init

 void init(void)

 {

-	// GL inits

-	glClearColor(0.2,0.2,0.5,0);

+	// GL inits.

+	glClearColor(0.2, 0.2, 0.5, 0.0);

 	glEnable(GL_DEPTH_TEST);

 	glDisable(GL_CULL_FACE);

-	printError("GL inits");

-

-	projectionMatrix = frustum(-0.1, 0.1, -0.1, 0.1, 0.2, 50.0);

+	printError("init GL");

-	// Load and compile shader

+	// Load and compile shader.

 	program = loadShaders("terrain.vert", "terrain.frag");

 	glUseProgram(program);

 	printError("init shader");

-	

-	glUniformMatrix4fv(glGetUniformLocation(program, "projMatrix"), 1, GL_TRUE, projectionMatrix.m);

-	glUniform1i(glGetUniformLocation(program, "tex"), 0); // Texture unit 0

-	LoadTGATextureSimple("maskros512.tga", &tex1);

-	

-// Load terrain data

-	

-	LoadTGATextureData("44-terrain.tga", &ttex);

-	tm = GenerateTerrain(&ttex);

-	printError("init terrain");

-	printf("Note: The call to DrawModel will report warnings about inNormal not existing. This is because inNormal is not used in the shader yet so it is optimized away.\n");

+	// Matrices.

+	projection = frustum(-0.1, 0.1, -0.1, 0.1, 0.2, 50.0);

+	glUniformMatrix4fv(glGetUniformLocation(program, "projection"), 1, GL_TRUE, projection.m);

+	printError("init matrices");

+

+	// Textures.

+	LoadTGATextureSimple("../assets/terrain/dandelion.tga", &tex);

+	glBindTexture(GL_TEXTURE_2D, tex);

+	glUniform1i(glGetUniformLocation(program, "tex"), 0);

+	printError("init textures");

+

+	// Generate terrain.

+	terrain = GenerateTerrain("../assets/terrain/simple-4.tga");

+	printError("init terrain");

 }

+

+/// Display

 void display(void)

 {

-	// clear the screen

+	// Clear the screen.

 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

-	

-	mat4 total, modelView, camMatrix;

-	

-	printError("pre display");

-	

-	glUseProgram(program);

-	// Build matrix

-	

-	vec3 cam = vec3(0, 5, 8);

-	vec3 lookAtPoint = vec3(2, 0, 2);

-	camMatrix = lookAt(cam.x, cam.y, cam.z,

-				lookAtPoint.x, lookAtPoint.y, lookAtPoint.z,

-				0.0, 1.0, 0.0);

-	modelView = IdentityMatrix();

-	total = camMatrix * modelView;

-	glUniformMatrix4fv(glGetUniformLocation(program, "mdlMatrix"), 1, GL_TRUE, total.m);

-	

-	glBindTexture(GL_TEXTURE_2D, tex1);		// Bind Our Texture tex1

-	DrawModel(tm, program, "inPosition", "inNormal", "inTexCoord");

-

-	printError("display 2");

-	

+	// Uniforms.

+	mat4 view = lookAt(

+		vec3(0, 5, 8), // Position.

+		vec3(2, 0, 2), // Target.

+		vec3(0, 1, 0)  // Up.

+	);

+	mat4 model = IdentityMatrix();

+	mat4 modelView = view * model;

+	glUniformMatrix4fv(glGetUniformLocation(program, "modelView"), 1, GL_TRUE, modelView.m);

+	printError("display uniforms");

+

+	// Draw.

+	DrawModel(terrain, program, "inPosition", nullptr, "inTexCoord");

+	printError("display draw");

+

+	// Show on the screen.

 	glutSwapBuffers();

 }

+

+/// Mouse

 void mouse(int x, int y)

 {

-	// This function is included in case you want some hints about using passive mouse movement.

-	// Uncomment to see mouse coordinates:

+	// This function is included in case you want some hints about using

+	// passive mouse movement. Uncomment to see mouse coordinates:

 	// printf("%d %d\n", x, y);

 }

-int main(int argc, char **argv)

+

+

+/// Main

+int main(int argc, char * argv[])

 {

 	glutInit(&argc, argv);

 	glutInitDisplayMode(GLUT_DOUBLE | GLUT_DEPTH);

 	glutInitContextVersion(3, 2);

-	glutInitWindowSize (600, 600);

-	glutCreateWindow ("TSBK07 Lab 4");

-	glutDisplayFunc(display);

-	init ();

+	glutInitWindowSize(600, 600);

+	glutCreateWindow("TSBK07");

+

 	glutRepeatingTimer(20);

-	

+	glutDisplayFunc(display);

 	glutPassiveMotionFunc(mouse);

+	dumpInfo();

+	init();

 	glutMainLoop();

-	exit(0);

 }

@@ -1,9 +1,12 @@

 #version 150

-out vec4 outColor;

 in vec2 texCoord;

+

+out vec4 outColor;

+

 uniform sampler2D tex;

+

 void main(void)

 {

 	outColor = texture(tex, texCoord);

@@ -1,17 +1,17 @@

 #version 150

-in  vec3 inPosition;

-in  vec3 inNormal;

+in vec3 inPosition;

+in vec3 inNormal;

 in vec2 inTexCoord;

+

 out vec2 texCoord;

-// NY

-uniform mat4 projMatrix;

-uniform mat4 mdlMatrix;

+uniform mat4 projection;

+uniform mat4 modelView;

+

 void main(void)

 {

-	mat3 normalMatrix1 = mat3(mdlMatrix);

-	texCoord = inTexCoord;

-	gl_Position = projMatrix * mdlMatrix * vec4(inPosition, 1.0);

+	gl_Position = projection * modelView * vec4(inPosition, 1.0);

+	texCoord    = inTexCoord;

 }