X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=main.cpp;h=37033957472fe847bab02902e565abc713283af0;hp=003723704f39485a8f84184292a45634ffba1aad;hb=ba5e08bf25de722d907748ce55b27a45b2b270bf;hpb=b64cd5a5ec09e6f051583371045ef7080c69b776

diff --git a/main.cpp b/main.cpp
index 0037237..3703395 100644
--- a/main.cpp
+++ b/main.cpp
@@ -29,6 +29,7 @@ glm::vec3 camUp    = glm::vec3(0.0f, 1.0f,  0.0f);
 float yaw = 1.57, pitch = 0;
 bool doScale, doRotate, doTranslate;
 Model *monkeyHead, *chest;
+glm::vec3 chestPos(0);
 
 const int WIDTH = 800, HEIGHT = 600;
 const float ASPECT = (float)WIDTH / (float)HEIGHT;
@@ -165,16 +166,31 @@ void display() {
 	glUseProgram(solidProgId);
 	setProjectionAndViewUniforms(solidProgId);
 	setLightColorAndPos(solidProgId, lightPos, lightColor);
+	
 	GLuint colorLoc = glGetUniformLocation(solidProgId, "color");
-	glm::vec4 c(1.f, 0, 1.f, 1.f);
+	glm::vec4 c(1);
 	glUniform4fv(colorLoc, 1, glm::value_ptr(c));
-	GLuint modelLoc = glGetUniformLocation(solidProgId, "model");
-	glm::mat4 model(1);
-	model = glm::scale(model, glm::vec3(2.0));
-	glUniformMatrix4fv(modelLoc, 1, GL_FALSE, glm::value_ptr(model));
+
+	monkeyHead->getRoot()->model = glm::translate(glm::mat4(1), glm::vec3(2, 0, 0));
 	monkeyHead->draw();
-	model = glm::translate(model, glm::vec3(3, 0, 0));
-	glUniformMatrix4fv(modelLoc, 1, GL_FALSE, glm::value_ptr(model));
+
+	Model::Node *top = chest->find("top");
+	top->model = glm::translate(glm::mat4(1), glm::vec3(0, 1, -1));
+	top->model = glm::rotate(top->model, sin(d / 2.5f) * 0.5f, glm::vec3(1, 0, 0));
+	top->model = glm::translate(top->model, glm::vec3(0, -1, 1));
+	
+	Model::Node *jewels = chest->find("jewels");
+	jewels->model = glm::scale(glm::mat4(1), glm::vec3((sin(d) + 1.2f) / 2.f));
+
+	Model::Node *lock = chest->find("lock");
+	lock->model = glm::translate(glm::mat4(1), glm::vec3(0.22610, 3.36478, -0.75649));
+	lock->model = glm::rotate(lock->model, (d / 2.5f), glm::vec3(0, 1, 0.4));
+	lock->model = glm::translate(lock->model, -glm::vec3(0.22610, 3.36478, -0.75649));
+
+	Model::Node *key = chest->find("key");
+	key->model = glm::translate(glm::mat4(1), glm::vec3(0, 0, sin(d)));
+	
+	chest->getRoot()->model = glm::translate(glm::mat4(1), chestPos);
 	chest->draw();
 	
 	/* drawTeapot(teapotCamera, false, d, lightPos, lightColor); */
@@ -491,10 +507,10 @@ void init() {
 	validateProgram(solidProgId);
 
 	monkeyHead = new Model("monkeyhead_smooth.dae", solidProgId);
-	chest = new Model("chest.obj", solidProgId);
+	chest = new Model("chest.dae", solidProgId);
 
 	glEnable(GL_DEPTH_TEST); 
-	/* glEnable(GL_CULL_FACE); */ 
+	glEnable(GL_CULL_FACE); 
 }
 
 bool* keyStates = new bool[256];
@@ -528,6 +544,11 @@ void timer(int _) {
 	if (keyStates['e'])
 		ySpeed = -0.1f;
 
+	if (keyStates['j']) chestPos.z += 0.1f;
+	if (keyStates['k']) chestPos.z -= 0.1f;
+	if (keyStates['h']) chestPos.x -= 0.1f;
+	if (keyStates['l']) chestPos.x += 0.1f;
+
 	camPos.x += xSpeed * sin(yaw) + zSpeed * cos(yaw);
 	camPos.y += ySpeed;
 	camPos.z += zSpeed * sin(yaw) - xSpeed * cos(yaw);