Stuff

[opengl.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 003723704f39485a8f84184292a45634ffba1aad..742c8983840eff62fbb68652ba0365fe2da0c72b 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -22,13 +22,14 @@
 using namespace std;
 
 GLuint pyramidVao, lightVao, teapotVao;
 using namespace std;
 
 GLuint pyramidVao, lightVao, teapotVao;

-GLuint gradientProgId, plainProgId, normalProgId, solidProgId;
-glm::vec3 camPos   = glm::vec3(0.0f, 0.0f,  -10.0f);
+GLuint gradientProgId, plainProgId, normalProgId, solidProgId, textureProgId;
+glm::vec3 camPos   = glm::vec3(0.0f, 0.0f,  0.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;
 Model *monkeyHead, *chest;
 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;
 Model *monkeyHead, *chest;

+glm::vec3 lightPos(0);

 
 const int WIDTH = 800, HEIGHT = 600;
 const float ASPECT = (float)WIDTH / (float)HEIGHT;
 
 const int WIDTH = 800, HEIGHT = 600;
 const float ASPECT = (float)WIDTH / (float)HEIGHT;


@@ -47,8 +48,11 @@ void setLightColorAndPos(GLuint progId, glm::vec3 lightPos, glm::vec4 lightColor
        GLuint lightColorLoc = glGetUniformLocation(progId, "lightColor");
        glUniform4fv(lightColorLoc, 1, glm::value_ptr(lightColor));
 
        GLuint lightColorLoc = glGetUniformLocation(progId, "lightColor");
        glUniform4fv(lightColorLoc, 1, glm::value_ptr(lightColor));
 

-       GLuint lightPosLoc = glGetUniformLocation(progId, "lightPos");
+       GLuint lightPosLoc = glGetUniformLocation(progId, "vLightPos");

        glUniform3fv(lightPosLoc, 1, glm::value_ptr(lightPos));
        glUniform3fv(lightPosLoc, 1, glm::value_ptr(lightPos));

+
+       GLuint viewPosLoc = glGetUniformLocation(progId, "vViewPos");
+       glUniform3fv(viewPosLoc, 1, glm::value_ptr(camPos));

 }
 
 void drawLight(float d, glm::vec3 lightPos, glm::vec4 lightColor) {
 }
 
 void drawLight(float d, glm::vec3 lightPos, glm::vec4 lightColor) {


@@ -74,9 +78,6 @@ void drawPyramids(float d, glm::vec3 lightPos, glm::vec4 lightColor) {
 
        setLightColorAndPos(gradientProgId, lightPos, lightColor);
 
 
        setLightColorAndPos(gradientProgId, lightPos, lightColor);
 

-       GLuint viewPosLoc = glGetUniformLocation(gradientProgId, "viewPos");
-       glUniform3fv(viewPosLoc, 1, glm::value_ptr(camPos));
-

        GLuint modelId = glGetUniformLocation(gradientProgId, "model");
 
        for (int i = 0; i < 10; i++) {
        GLuint modelId = glGetUniformLocation(gradientProgId, "model");
 
        for (int i = 0; i < 10; i++) {


@@ -155,44 +156,33 @@ void display() {
        glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
        float d = (float)glutGet(GLUT_ELAPSED_TIME) * 0.001f;
 
        glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
        float d = (float)glutGet(GLUT_ELAPSED_TIME) * 0.001f;
 

-       glm::vec3 lightPos = glm::vec3(sin(d) * 10, 0, cos(d) * 10);
+       /* glm::vec3 lightPos = glm::vec3(sin(d / 10.f) * 10, 0, cos(d / 10.f) * 10); */

        glm::vec4 lightColor(1, 1, 1, 1);
 
        glm::vec4 lightColor(1, 1, 1, 1);
 

-       glViewport(0, 0, WIDTH, HEIGHT);
-       /* drawPyramids(d, lightPos, lightColor); */

        drawLight(d, lightPos, lightColor);
 
        drawLight(d, lightPos, lightColor);
 

-       glUseProgram(solidProgId);
-       setProjectionAndViewUniforms(solidProgId);
-       setLightColorAndPos(solidProgId, lightPos, lightColor);
-       GLuint colorLoc = glGetUniformLocation(solidProgId, "color");
-       glm::vec4 c(1.f, 0, 1.f, 1.f);
-       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->draw();
-       model = glm::translate(model, glm::vec3(3, 0, 0));
-       glUniformMatrix4fv(modelLoc, 1, GL_FALSE, glm::value_ptr(model));
-       chest->draw();
-       
-       /* drawTeapot(teapotCamera, false, d, lightPos, lightColor); */
-
-       /* glClear(GL_DEPTH_BUFFER_BIT); */
+       glUseProgram(textureProgId);
+       setProjectionAndViewUniforms(textureProgId);
+       setLightColorAndPos(textureProgId, lightPos, lightColor);

 
 

-       /* glViewport(0, 0, WIDTH / 4, HEIGHT / 4); */
-       /* drawTeapot(teapotOrtho, false, d, lightPos, lightColor); */
+       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));

        
        

-       /* glViewport(WIDTH / 4, 0, WIDTH / 4, HEIGHT / 4); */
-       /* drawTeapot(teapotOrtho, true, d, lightPos, lightColor); */
+       /* Model::Node *jewels = chest->find("jewels"); */
+       /* jewels->model = glm::scale(glm::mat4(1), glm::vec3((sin(d) + 1.2f) / 2.f)); */

 
 

-       /* glViewport(WIDTH / 4 * 2, 0, WIDTH / 4, HEIGHT / 4); */
-       /* drawTeapot(teapotPerspStatic, false, d, lightPos, lightColor); */
+       /* 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)); */

 
 

-       /* glViewport(WIDTH / 4 * 3, 0, WIDTH / 4, HEIGHT / 4); */
-       /* drawTeapot(teapotPerspAnimated, false, d, lightPos, lightColor); */
+       /* 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), lightPos); */
+       chest->draw();

 
        glutSwapBuffers();
 }
 
        glutSwapBuffers();
 }


@@ -490,11 +480,15 @@ void init() {
        glUseProgram(solidProgId);
        validateProgram(solidProgId);
 
        glUseProgram(solidProgId);
        validateProgram(solidProgId);
 

+       textureProgId = compileShaders((char*)"texturevertex.glsl", (char*)"texturefrag.glsl");
+       glUseProgram(textureProgId);
+       validateProgram(textureProgId);
+

        monkeyHead = new Model("monkeyhead_smooth.dae", solidProgId);
        monkeyHead = new Model("monkeyhead_smooth.dae", solidProgId);

-       chest = new Model("chest.obj", solidProgId);
+       chest = new Model("models/chest.dae", textureProgId);

 
        glEnable(GL_DEPTH_TEST); 
 
        glEnable(GL_DEPTH_TEST); 

-       /* glEnable(GL_CULL_FACE); */ 
+       glEnable(GL_CULL_FACE); 

 }
 
 bool* keyStates = new bool[256];
 }
 
 bool* keyStates = new bool[256];


@@ -528,6 +522,13 @@ void timer(int _) {
        if (keyStates['e'])
                ySpeed = -0.1f;
 
        if (keyStates['e'])
                ySpeed = -0.1f;
 

+       if (keyStates['j']) lightPos.z += 0.1f;
+       if (keyStates['k']) lightPos.z -= 0.1f;
+       if (keyStates['h']) lightPos.x -= 0.1f;
+       if (keyStates['l']) lightPos.x += 0.1f;
+       if (keyStates['m']) lightPos.y -= 0.1f;
+       if (keyStates['n']) lightPos.y += 0.1f;
+

        camPos.x += xSpeed * sin(yaw) + zSpeed * cos(yaw);
        camPos.y += ySpeed;
        camPos.z += zSpeed * sin(yaw) - xSpeed * cos(yaw);
        camPos.x += xSpeed * sin(yaw) + zSpeed * cos(yaw);
        camPos.y += ySpeed;
        camPos.z += zSpeed * sin(yaw) - xSpeed * cos(yaw);