deleted file mode 100644

@@ -1,80 +0,0 @@

-/// Inlcudes

-#include "MicroGlut.h"

-#include "GL_utilities.h"

-

-

-/// Defines

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

-

-

-/// Globals

-GLuint  vertexArray;

-GLfloat positions[] =

-{

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

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

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

-};

-

-

-/// Init

-void init(void)

-{

-	// GL inits.

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

-	glDisable(GL_DEPTH_TEST);

-	printError("init GL");

-

-	// Load and compile shader.

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

-	printError("init shader");

-

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

-{

-	// Clear the screen.

-	glClear(GL_COLOR_BUFFER_BIT);

-

-	// Select VAO.

-	glBindVertexArray(vertexArray);

-

-	// Draw.

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

-	printError("display draw");

-

-	// Show on the screen.

-	glutSwapBuffers();

-}

-

-

-/// Main

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

-{

-	glutInit(&argc, argv);

-	glutInitContextVersion(3, 2);

-	glutInitWindowSize(600, 600);

-	glutCreateWindow("TSBK07");

-

-	glutDisplayFunc(display);

-

-	dumpInfo();

-	init();

-	glutMainLoop();

-}

@@ -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;

 }

old mode 100755

new mode 100644

new file mode 100755

@@ -0,0 +1,87 @@

+// 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"

+#include "MicroGlut.h"

+// uses framework OpenGL

+// uses framework Cocoa

+

+// Globals

+// Data would normally be read from files

+GLfloat vertices[] =

+{

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

+	-0.5f,0.5f,0.0f,

+	0.5f,-0.5f,0.0f

+};

+

+// vertex array object

+unsigned int vertexArrayObjID;

+

+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);

+	glDisable(GL_DEPTH_TEST);

+	printError("GL inits");

+

+	// Load and compile shader

+	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");

+}

+

+

+void display(void)

+{

+	printError("pre display");

+

+	// clear the screen

+	glClear(GL_COLOR_BUFFER_BIT);

+

+	glBindVertexArray(vertexArrayObjID);	// Select VAO

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

+	

+	printError("display");

+	

+	glutSwapBuffers();

+}

+

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

+{

+	glutInit(&argc, argv);

+	glutInitContextVersion(3, 2);

+	glutInitWindowSize(600, 600);

+	glutCreateWindow ("GL3 white triangle example");

+	glutDisplayFunc(display); 

+	init ();

+	glutMainLoop();

+	return 0;

+}