X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=main.cpp;h=0b7cb229dd745e09d405234bfe89b5f107eab389;hp=635e182dedd1ab047252afc38640c91dfb30b522;hb=d0c631f46c6db417e013b1bc0edec24cb9c2824a;hpb=be8759aec179d6d7bed58732134673870c596b4f

diff --git a/main.cpp b/main.cpp
index 635e182..0b7cb22 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,7 +5,6 @@
 #include <vector>
 #ifdef __APPLE__
 #include <GL/glew.h>
-#include "cocoa.h"
 #else
 #include <OpenGL/glew.h>
 #endif
@@ -43,14 +42,15 @@ struct Light {
 };
 
 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) }
+	{ glm::vec3(5, 2, -5), glm::vec3(1) },
+	{ glm::vec3(0, 2, -5), glm::vec3(1) },
+	{ glm::vec3(-5, 2, -5), glm::vec3(1) },
 };
 
 int activeLight = 0;
 
+bool discoLights = false;
+
 int windowWidth = 800, windowHeight = 600;
 
 float aspect() {
@@ -115,19 +115,44 @@ void display() {
 	glUseProgram(pbrProg->progId);
 	setProjectionAndViewUniforms(pbrProg->progId);
 
-	glm::vec3 lightPositions[4], lightColors[4];
-   	for (int i = 0; i < 4; i++) {
+	glm::vec3 lightPositions[6], lightColors[6];
+   	for (int i = 0; i < 3; i++) {
 		lightPositions[i] = lights[i].pos;
 		lightColors[i] = lights[i].color;
 	}
 
-	glUniform3fv(glGetUniformLocation(pbrProg->progId, "lightPositions"), 4, glm::value_ptr(lightPositions[0]));
-	glUniform3fv(glGetUniformLocation(pbrProg->progId, "lightColors"), 4, glm::value_ptr(lightColors[0]));
+	for (int i = 3; i < 6; i++) {
+		if (discoLights) {
+			auto m = glm::translate(glm::mat4(1.f), glm::vec3(-2.5, 0, 0));
+			m = glm::rotate(m, glm::radians(d * 100 + i * 30), glm::vec3(1, 0, 0));
+			m = glm::rotate(m, glm::radians(d * 100 + i * 30), glm::vec3(0, 1, 0));
+			m = glm::rotate(m, glm::radians(d * 100 + i * 30), glm::vec3(0, 0, 1));
+			lightPositions[i] = glm::vec3(m * glm::vec4(5, 0, 0, 1));
+			lightColors[i] = glm::vec3(0.2);
+			if (i == 3) lightColors[i].x = sin(d);
+			if (i == 4) lightColors[i].y = cos(d * 3);
+			if (i == 5) lightColors[i].z = cos(d);
+		} else {
+			lightPositions[i] = glm::vec3(0);
+			lightColors[i] = glm::vec3(0);
+		}
+	}
+	
+	glUniform3fv(glGetUniformLocation(pbrProg->progId, "lightPositions"), 6, glm::value_ptr(lightPositions[0]));
+	glUniform3fv(glGetUniformLocation(pbrProg->progId, "lightColors"), 6, glm::value_ptr(lightColors[0]));
 
+	/* pbr->getRoot()->model = glm::rotate(glm::mat4(1.f), glm::radians(d * 10), glm::vec3(0, 1, 0)); */
 	pbr->draw(skyboxes[activeSkybox], d * 1000);
 
 	for (Light &light: lights) drawLight(light);
 
+	if (discoLights) {
+		for (int i = 3; i < 6; i++) {
+			Light l { lightPositions[i], lightColors[i] };
+			drawLight(l);
+		}
+	}
+
 	skyboxes[activeSkybox].draw(projMat(), viewMat());
 
 	glutSwapBuffers();
@@ -161,7 +186,7 @@ void init() {
 
 	pbrProg = new Program("pbrvert.glsl", "pbrfrag.glsl");
 	glUseProgram(pbrProg->progId);
-	pbr = new Model("models/newtonsCradle.gltf", *pbrProg);
+	pbr = new Model("models/newtonsCradle.glb", *pbrProg);
 
 	glEnable(GL_DEPTH_TEST); 
 	glEnable(GL_CULL_FACE); 
@@ -179,6 +204,8 @@ void keyboard(unsigned char key, int x, int y) {
 		activeSkybox = (activeSkybox + 1) % skyboxes.size();
 	if (key == 'x')
 		activeLight = (activeLight + 1) % lights.size();
+	if (key == 'c')
+		discoLights = !discoLights;
 }
 
 void keyboardUp(unsigned char key, int x, int y) {
@@ -259,7 +286,6 @@ int main(int argc, char** argv) {
 	glutInitDisplayMode(GLUT_DEPTH|GLUT_DOUBLE|GLUT_RGB|GLUT_3_2_CORE_PROFILE);
 	glutInitWindowSize(windowWidth, windowHeight);
 	int win = glutCreateWindow("Physically Based Rendering");
-	makeRetina();
 	glutDisplayFunc(display);
 	glutReshapeFunc(reshape);