X-Git-Url: http://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=main.cpp;h=fcc7a1eb90c033f6c1b3a5edec943ff759e16ac8;hp=ef18bf2f72de2475d2f8fda9270445bc1f146524;hb=511a2c92fcb9dda82dd5d38b91ea03790d0cb7b2;hpb=526f5c3dc0302e541c95ed2198ce8fdb5cdd0b99

diff --git a/main.cpp b/main.cpp
index ef18bf2..fcc7a1e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,241 +1,171 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <iostream>
-#include <fstream>
-#include <sstream>
 #include <array>
 #include <vector>
 #ifdef __APPLE__
 #include <GL/glew.h>
+#include "cocoa.h"
 #else
 #include <OpenGL/glew.h>
 #endif
 #include <GLUT/glut.h>
+#include "shapes.hpp"
 #include <glm/glm.hpp>
 #include <glm/ext.hpp>
 #include <glm/gtc/type_ptr.hpp>
+#include "model.hpp"
+#include "program.hpp"
+#include "skybox.hpp"
+#include "image.hpp"
 
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 
 using namespace std;
 
-GLuint* vaos;
-GLuint progId;
-glm::vec3 camPos   = glm::vec3(0.0f, 0.0f,  -5.0f);
-glm::vec3 camFront = glm::vec3(0.0f, 0.0f, 1.0f);
-glm::vec3 camUp    = glm::vec3(0.0f, 1.0f,  0.0f);
-float yaw = 1.57, pitch = 0;
-bool doScale, doRotate, doTranslate;
-
-void display() {
-	glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-	glUseProgram(progId);
-	glBindVertexArray(vaos[0]);
-
-	float d = (float)glutGet(GLUT_ELAPSED_TIME) * 0.001f;
-
-	GLuint projId = glGetUniformLocation(progId, "projection");
-	glm::mat4 proj = glm::perspective(glm::radians(45.f), 1.33f, 0.01f, 10000.f);
-	glUniformMatrix4fv(projId, 1, GL_FALSE, glm::value_ptr(proj));
-
-	GLuint viewId = glGetUniformLocation(progId, "view");
-	glm::mat4 view = glm::lookAt(camPos, camPos + camFront, camUp);
-	glUniformMatrix4fv(viewId, 1, GL_FALSE, glm::value_ptr(view));
-
-	GLuint lightPosLoc = glGetUniformLocation(progId, "lightPos");
-	glm::vec3 lightPos = glm::vec3(sin(d) * 10, 0, 0);//10 * cos(d));
-	glUniform3fv(lightPosLoc, 1, glm::value_ptr(lightPos));
-	
-	GLuint viewPosLoc = glGetUniformLocation(progId, "viewPos");
-	glUniform3fv(viewPosLoc, 1, glm::value_ptr(camPos));
-
-	GLuint modelId = glGetUniformLocation(progId, "model");
+GLuint lightVao;
 
-	for (int i = 0; i < 10; i++) {
+Program *textureProg, *plainProg, *reflectProg, *pbrProg;
 
-		glm::mat4 model = glm::mat4(1.f);
+std::vector<Skybox> skyboxes;
+int activeSkybox = 0;
 
-		model = glm::translate(model, glm::vec3(sin(i * 30) * 10, 0, i * 2 - 10));
+Model *chest, *mirrorCube, *pbr;
 	  		  
-		if (doRotate) {
-			model = glm::rotate(model, d * glm::radians(30.f), glm::vec3(0.f, 1.f, 0.f));
-			model = glm::rotate(model, d * glm::radians(20.f), glm::vec3(1.f, 0.f, 0.f));
-		}
+glm::vec3 camPos   = glm::vec3(0.0f, 0.0f,  -5.f);
+glm::vec3 camFront = glm::vec3(0.0f, 0.0f, 1.0f);
+glm::vec3 camUp    = glm::vec3(0.0f, 1.0f,  0.0f);
+float yaw = 1.57, pitch = 0;
 
-		if (doScale)
-			model = glm::scale(model, glm::vec3(1.f, 0.7f + 0.7f * (1 + sin(d + (i + 3))), 1.f));
+struct Light {
+	glm::vec3 pos;
+	glm::vec3 color;
+};
 
-		if (doTranslate)
-			model = glm::translate(model, glm::vec3(sin(d + (i + 1)), cos(d + (i + -3)), sin(d + (i + 4))));
+std::vector<Light> lights = {
+	{ glm::vec3(0, 0, 3), glm::vec3(1) },
+	{ glm::vec3(0, 3, 0), glm::vec3(1) },
+	{ glm::vec3(3, 0, 0), glm::vec3(1) },
+	{ glm::vec3(3, 0, 0), glm::vec3(1) }
+};
 
+int activeLight = 0;
 
-		glUniformMatrix4fv(modelId, 1, GL_FALSE, glm::value_ptr(model));
+int windowWidth = 800, windowHeight = 600;
 
-		glDrawArrays(GL_TRIANGLES, 0, 12);
-	}
-	glutSwapBuffers();
+float aspect() {
+	return (float)windowWidth / (float)windowHeight;
 }	
 
-void attachShader(GLuint progId, const char* filePath, GLenum type) {
-	GLuint shader = glCreateShader(type);
-
-	if (!shader) {
-		fprintf(stderr, "error creating shader\n");
-		exit(1);
+glm::mat4 projMat() {
+	return glm::perspective(glm::radians(45.f), aspect(), 0.01f, 10000.f);
 }
 
-	ifstream file(filePath);
-	stringstream buffer;
-	buffer << file.rdbuf();
-	string str = buffer.str();
-	const char* contents = str.c_str();
-
-	glShaderSource(shader, 1, (const GLchar**)&contents, NULL);
-	glCompileShader(shader);
-	GLint success;
-	glGetShaderiv(shader, GL_COMPILE_STATUS, &success);
-	if (!success) {
-		GLchar log[1024];
-		glGetShaderInfoLog(shader, 1024, NULL, log);
-		fprintf(stderr, "error: %s\n", log);
-		exit(1);
-	}
-	glAttachShader(progId, shader);
+glm::mat4 viewMat() {
+	return glm::lookAt(camPos, camPos + camFront, camUp);
 }
 
-GLuint compileShaders(char* vertexShader, char* fragmentShader) {
-	GLuint progId = glCreateProgram();
+void setProjectionAndViewUniforms(GLuint progId) {
+	GLuint projLoc = glGetUniformLocation(progId, "projection");
+	glm::mat4 proj = projMat();
+	glUniformMatrix4fv(projLoc, 1, GL_FALSE, glm::value_ptr(proj));
 
-	attachShader(progId, vertexShader, GL_VERTEX_SHADER);
-	attachShader(progId, fragmentShader, GL_FRAGMENT_SHADER);
+	GLuint viewLoc = glGetUniformLocation(progId, "view");
+	glm::mat4 view = viewMat();
+	glUniformMatrix4fv(viewLoc, 1, GL_FALSE, glm::value_ptr(view));
 
-	glLinkProgram(progId);
-	GLint success = 0;
-	glGetProgramiv(progId, GL_LINK_STATUS, &success);
-	if (!success) {
-		GLchar log[1024];
-		glGetProgramInfoLog(progId, sizeof(log), NULL, log);
-		fprintf(stderr, "error linking: %s\n", log);
-		exit(1);
+	GLuint camPosLoc = glGetUniformLocation(progId, "camPos");
+	glUniform3fv(camPosLoc, 1, glm::value_ptr(camPos));
 }
 
-	return progId;
-}
-
-#define BUFFER_OFFSET(i) ((char *)NULL + (i))
-
-GLuint setupBuffers(glm::vec3* vertices, glm::vec3* normals, GLuint progId) {
-
-	GLfloat colors[] = {
-		0, 1, 0, 1,
-		1, 0, 0, 1,
-		0, 0, 1, 1,
+void setLightColorAndPos(GLuint progId, glm::vec3 lightPos, glm::vec4 lightColor) {
+	GLuint lightColorLoc = glGetUniformLocation(progId, "lightColor");
+	glUniform4fv(lightColorLoc, 1, glm::value_ptr(lightColor));
 
-		0, 1, 0, 1,
-		1, 0, 0, 1,
-		0, 0, 1, 1,
+	GLuint lightPosLoc = glGetUniformLocation(progId, "vLightPos");
+	glUniform3fv(lightPosLoc, 1, glm::value_ptr(lightPos));
 
-		0, 1, 0, 1,
-		1, 0, 0, 1,
-		0, 0, 1, 1,
+	GLuint viewPosLoc = glGetUniformLocation(progId, "vViewPos");
+	glUniform3fv(viewPosLoc, 1, glm::value_ptr(camPos));
+}
 
-		0, 1, 0, 1,
-		1, 0, 0, 1,
-		0, 0, 1, 1
-	};
+void drawLight(Light &light) {
+  	glUseProgram(plainProg->progId);
+	glBindVertexArray(lightVao);
+	setProjectionAndViewUniforms(plainProg->progId);
+	glm::mat4 model = glm::translate(glm::mat4(1.f), light.pos);
+	model = glm::scale(model, glm::vec3(0.2));
+	GLuint modelLoc = glGetUniformLocation(plainProg->progId, "model");
+	glUniformMatrix4fv(modelLoc, 1, GL_FALSE, glm::value_ptr(model));
 
-	GLuint numVerts = 12;
+	GLuint colorLoc = glGetUniformLocation(plainProg->progId, "color");
+	glUniform4fv(colorLoc, 1, glm::value_ptr(light.color));
 		
-	GLuint vbo;
-	glGenBuffers(1, &vbo);
+	glDrawArrays(GL_TRIANGLES, 0, 36);
+}
 
-	GLuint vao;
-	glGenVertexArrays(1, &vao);
 
-	GLuint posId = glGetAttribLocation(progId, "vPosition");
-	GLuint colorId = glGetAttribLocation(progId, "vColor");
-	GLuint normalLoc = glGetAttribLocation(progId, "vNormal");
+void display() {
+	glClearColor(0.5, 0.5, 0.5, 1);
+	glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
 
-	GLuint vertsLen = numVerts * 3 * sizeof(GLfloat);
-	GLuint colorsLen = numVerts * 4 * sizeof(GLfloat);
-	GLuint normalLen = numVerts * 3 * sizeof(GLfloat);
+	float d = (float)glutGet(GLUT_ELAPSED_TIME) * 0.001f;
 
-	glBindBuffer(GL_ARRAY_BUFFER, vbo);
-	glBufferData(GL_ARRAY_BUFFER, vertsLen + colorsLen + normalLen, NULL, GL_STATIC_DRAW);
+	glUseProgram(pbrProg->progId);
+	setProjectionAndViewUniforms(pbrProg->progId);
 
-	glBufferSubData(GL_ARRAY_BUFFER, 0, vertsLen, glm::value_ptr(vertices[0]));
-	glBufferSubData(GL_ARRAY_BUFFER, vertsLen, colorsLen, colors);
-	glBufferSubData(GL_ARRAY_BUFFER, vertsLen + colorsLen, normalLen, glm::value_ptr(normals[0]));
+	glm::vec3 lightPositions[4], lightColors[4];
+   	for (int i = 0; i < 4; i++) {
+		lightPositions[i] = lights[i].pos;
+		lightColors[i] = lights[i].color;
+	}
 	
-	glBindVertexArray(vao);
+	glUniform3fv(glGetUniformLocation(pbrProg->progId, "lightPositions"), 4, glm::value_ptr(lightPositions[0]));
+	glUniform3fv(glGetUniformLocation(pbrProg->progId, "lightColors"), 4, glm::value_ptr(lightColors[0]));
 
-	glEnableVertexAttribArray(posId);
-	glVertexAttribPointer(posId, 3, GL_FLOAT, GL_FALSE, 0, 0);
+	pbr->draw(skyboxes[activeSkybox]);
 
-	glEnableVertexAttribArray(colorId);
-	glVertexAttribPointer(colorId, 4, GL_FLOAT, GL_FALSE, 0, BUFFER_OFFSET(vertsLen));
+	for (Light &light: lights) drawLight(light);
 
-	glEnableVertexAttribArray(normalLoc);
-	glVertexAttribPointer(normalLoc, 3, GL_FLOAT, GL_FALSE, 0, BUFFER_OFFSET(vertsLen + colorsLen));
+	skyboxes[activeSkybox].draw(projMat(), viewMat());
 
-	return vao;
+	glutSwapBuffers();
 }
 
-void validateProgram(GLuint progId) {
-	glValidateProgram(progId);
+void setupLightBuffers(GLuint progId) {
+  	auto vertices = cube();
+	GLuint verticesSize = 36 * 3 * sizeof(GLfloat);
 
-	GLint success;
-	glGetProgramiv(progId, GL_VALIDATE_STATUS, &success);
-	if (!success) {
-		GLchar log[1024];
-		glGetProgramInfoLog(progId, sizeof(log), NULL, log);
-		fprintf(stderr, "error: %s\n", log);
-		exit(1);
-	}
+	glGenVertexArrays(1, &lightVao);
+	GLuint vbo;
+	glBindVertexArray(lightVao);
+	glGenBuffers(1, &vbo);
+	glBindBuffer(GL_ARRAY_BUFFER, vbo);
+	glBufferData(GL_ARRAY_BUFFER, verticesSize, NULL, GL_STATIC_DRAW);
+	glBufferSubData(GL_ARRAY_BUFFER, 0, verticesSize, glm::value_ptr(vertices[0]));
+	GLuint posLoc = glGetAttribLocation(progId, "vPosition");
+	glEnableVertexAttribArray(posLoc);
+	glVertexAttribPointer(posLoc, 3, GL_FLOAT, GL_FALSE, 0, 0);
 }
 
 void init() {
-	glm::vec3 vertices[12] = {
-		glm::vec3(0.0f, 1.0f, 0.0f),
-		glm::vec3(1.0f, -1.0f, -1.0f),
-		glm::vec3(-1.0f, -1.0f, -1.0f),
-
-		glm::vec3(0.0f, 1.0f, 0.0f),
-		glm::vec3(-1.0f, -1.0f, 1.0f),
-		glm::vec3(1.0f, -1.0f, 1.0f),
-
-		glm::vec3(0.0f, 1.0f, 0.0f),
-		glm::vec3(-1.0f, -1.0f, -1.0f),
-		glm::vec3(-1.0f, -1.0f, 1.0f),
-
-		glm::vec3(0.0f, 1.0f, 0.0f),
-		glm::vec3(1.0f, -1.0f, 1.0f),
-		glm::vec3(1.0f, -1.0f, -1.0f)
-	};
-
-	// work out the normals
-	glm::vec3 normals[12];
-	for (int i = 0; i < 4; i++) {
-		glm::vec3 a = vertices[i * 3];
-		glm::vec3 b = vertices[i * 3 + 1];
-		glm::vec3 c = vertices[i * 3 + 2];
-		glm::vec3 u = glm::normalize(a - c);
-	  	glm::vec3 v = glm::normalize(b - c);
-		glm::vec3 norm = glm::normalize(glm::cross(v, u));
-		for(int j = 0; j < 3; j++) {
-			normals[i * 3 + j] = glm::vec3(norm);
-		}
-	}
+	plainProg = new Program("plainvertex.glsl", "plainfrag.glsl");
+	glUseProgram(plainProg->progId);
+	setupLightBuffers(plainProg->progId);
+	plainProg->validate();
 
-	vaos = new GLuint[2];
+	skyboxes.push_back(Skybox(Image("skyboxes/loft/Newport_Loft_Ref.hdr")));
+	skyboxes.push_back(Skybox(Image("skyboxes/monumentValley/Road_to_MonumentValley_Ref.hdr")));
+	skyboxes.push_back(Skybox(Image("skyboxes/factory/Factory_Catwalk_2k.hdr")));
 
-	progId = compileShaders((char*)"vertex.glsl", (char*)"fragment.glsl");
-	glUseProgram(progId);
-	vaos[0] = setupBuffers(vertices, normals, progId);
-	validateProgram(progId);
+	pbrProg = new Program("pbrvert.glsl", "pbrfrag.glsl");
+	glUseProgram(pbrProg->progId);
+	pbr = new Model("models/sphereMetal.gltf", *pbrProg);
 
 	glEnable(GL_DEPTH_TEST); 
 	glEnable(GL_CULL_FACE); 
+	// prevent edge artifacts in specular cubemaps
+	glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
 }
 
 bool* keyStates = new bool[256];
@@ -243,11 +173,9 @@ bool* keyStates = new bool[256];
 void keyboard(unsigned char key, int x, int y) {
 	keyStates[key] = true;
 	if (key == 'z')
-		doScale = !doScale;
+		activeSkybox = (activeSkybox + 1) % skyboxes.size();
 	if (key == 'x')
-		doRotate = !doRotate;
-	if (key == 'c')
-		doTranslate = !doTranslate;
+		activeLight = (activeLight + 1) % lights.size();
 }
 
 void keyboardUp(unsigned char key, int x, int y) {
@@ -269,6 +197,13 @@ void timer(int _) {
 	if (keyStates['e'])
 		ySpeed = -0.1f;
 
+	if (keyStates['j']) lights[activeLight].pos.z += 0.1f;
+	if (keyStates['k']) lights[activeLight].pos.z -= 0.1f;
+	if (keyStates['h']) lights[activeLight].pos.x -= 0.1f;
+	if (keyStates['l']) lights[activeLight].pos.x += 0.1f;
+	if (keyStates['m']) lights[activeLight].pos.y -= 0.1f;
+	if (keyStates['n']) lights[activeLight].pos.y += 0.1f;
+
 	camPos.x += xSpeed * sin(yaw) + zSpeed * cos(yaw);
 	camPos.y += ySpeed;
 	camPos.z += zSpeed * sin(yaw) - xSpeed * cos(yaw);
@@ -299,6 +234,12 @@ void motion(int x, int y) {
 	front.y = sin(pitch);
 	front.z = cos(pitch) * sin(yaw);
 	camFront = glm::normalize(front);
+
+	if (pitch < -1.57079632679 || pitch >= 1.57079632679) {
+		camUp = glm::vec3(0, -1, 0);
+	} else {
+		camUp = glm::vec3(0, 1, 0);
+	}
 }
 
 void mouse(int button, int state, int x, int y) {
@@ -306,17 +247,25 @@ void mouse(int button, int state, int x, int y) {
 		firstMouse = true;
 }
 
+void reshape(int newWidth, int newHeight) {
+	glViewport(0, 0, newWidth * 2, newHeight * 2);
+	windowWidth = newWidth, windowHeight = newHeight;
+}
+
 int main(int argc, char** argv) {
 	glutInit(&argc, argv);
 	glutInitDisplayMode(GLUT_DEPTH|GLUT_DOUBLE|GLUT_RGB|GLUT_3_2_CORE_PROFILE);
-	glutInitWindowSize(800, 600);
-	int win = glutCreateWindow("Hello Triangle");
+	glutInitWindowSize(windowWidth, windowHeight);
+	int win = glutCreateWindow("Physically Based Rendering");
 	glutDisplayFunc(display);
+	glutReshapeFunc(reshape);
 
 	glewInit();
 	
 	init();
 	
+	makeRetina();
+
 	glutKeyboardFunc(keyboard);
 	glutKeyboardUpFunc(keyboardUp);
 	glutTimerFunc(16, timer, 0);