new file mode 100644

@@ -0,0 +1 @@

+/tsbk07

similarity index 52%

rename from lab4/lab4-1.cpp

rename to generate_terrain.cpp

@@ -1,19 +1,9 @@

 /// Inlcudes

-#define MAIN

-#include "MicroGlut.h"

-#include "GL_utilities.h"

 #include "VectorUtils4.h"

 #include "LittleOBJLoader.h"

 #include "LoadTGA.h"

-/// Globals

-GLuint   program;

-mat4     projection;

-Model  * terrain;

-GLuint   tex;

-

-

 /// Generate terrain

 Model * GenerateTerrain(const char * filename)

 {

@@ -75,88 +65,3 @@ Model * GenerateTerrain(const char * filename)

 	free(textureData.imageData);

 	return model;

 }

-

-

-/// Init

-void init(void)

-{

-	// GL inits.

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

-	glEnable(GL_DEPTH_TEST);

-	glDisable(GL_CULL_FACE);

-	printError("init GL");

-

-	// Load and compile shader.

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

-	glUseProgram(program);

-	printError("init shader");

-

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

-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

-

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

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

-}

-

-

-/// Main

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

-{

-	glutInit(&argc, argv);

-	glutInitDisplayMode(GLUT_DOUBLE | GLUT_DEPTH);

-	glutInitContextVersion(3, 2);

-	glutInitWindowSize(600, 600);

-	glutCreateWindow("TSBK07");

-

-	glutRepeatingTimer(20);

-	glutDisplayFunc(display);

-	glutPassiveMotionFunc(mouse);

-

-	dumpInfo();

-	init();

-	glutMainLoop();

-}

deleted file mode 100644

@@ -1,11 +0,0 @@

-# set this variable to the director in which you saved the common files

-commondir = ../common/

-

-all : lab1-1

-

-lab1-1 : lab1-1.cpp $(commondir)GL_utilities.c $(commondir)LoadTGA.c $(commondir)Linux/MicroGlut.c

-	gcc -Wall -o lab1-1 -I$(commondir) -I../common/Linux -DGL_GLEXT_PROTOTYPES lab1-1.cpp $(commondir)GL_utilities.c $(commondir)LoadTGA.c $(commondir)Linux/MicroGlut.c -lXt -lX11 -lGL -lm -lstdc++

-

-clean :

-	rm lab1-1

-

deleted file mode 100644

@@ -1,10 +0,0 @@

-# set this variable to the director in which you saved the common files

-commondir = ../common/

-

-all : lab4-1

-

-lab4-1 : lab4-1.cpp $(commondir)GL_utilities.c $(commondir)LoadTGA.c $(commondir)Linux/MicroGlut.c

-	gcc -Wall -o lab4-1 -I$(commondir) -I../common/Linux -DGL_GLEXT_PROTOTYPES lab4-1.cpp $(commondir)GL_utilities.c $(commondir)LoadTGA.c $(commondir)Linux/MicroGlut.c -lXt -lX11 -lGL -lm

-

-clean :

-	rm lab4-1

deleted file mode 100644

@@ -1,13 +0,0 @@

-#version 150

-

-in vec2 texCoord;

-

-out vec4 outColor;

-

-uniform sampler2D tex;

-

-

-void main(void)

-{

-	outColor = texture(tex, texCoord);

-}

deleted file mode 100644

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

-#version 150

-

-in vec3 inPosition;

-in vec3 inNormal;

-in vec2 inTexCoord;

-

-out vec2 texCoord;

-

-uniform mat4 projection;

-uniform mat4 modelView;

-

-

-void main(void)

-{

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

-	texCoord    = inTexCoord;

-}

new file mode 100644

@@ -0,0 +1,11 @@

+# set this variable to the director in which you saved the common files

+commondir = common/

+

+all : tsbk07

+

+tsbk07 : tsbk07.cpp $(commondir)GL_utilities.c $(commondir)LoadTGA.c $(commondir)Linux/MicroGlut.c

+	gcc -Wall -o tsbk07 -I$(commondir) -Icommon/Linux -DGL_GLEXT_PROTOTYPES tsbk07.cpp $(commondir)GL_utilities.c $(commondir)LoadTGA.c $(commondir)Linux/MicroGlut.c -lXt -lX11 -lGL -lm -lstdc++

+

+clean :

+	rm tsbk07

+

similarity index 96%

rename from lab1/lab1-1.cpp

rename to tsbk07.cpp

@@ -26,7 +26,7 @@ void init(void)

 	printError("init GL");

 	// Load and compile shader.

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

+	GLuint program = loadShaders("tsbk07.vert", "tsbk07.frag");

 	printError("init shader");

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

similarity index 100%

rename from lab1/lab1-1.frag

rename to tsbk07.frag

similarity index 100%

rename from lab1/lab1-1.vert

rename to tsbk07.vert