#include "program.hpp"
#include "skybox.hpp"
#include "image.hpp"
+#include "util.hpp"
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
float d = (float)glutGet(GLUT_ELAPSED_TIME) * 0.001f;
+ glUseProgram(getUtilProg()->progId);
+ setProjectionAndViewUniforms(getUtilProg()->progId);
+
glUseProgram(pbrProg->progId);
setProjectionAndViewUniforms(pbrProg->progId);
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)); */
+ /* sceneModel->find("Top Bone")->transform = glm::rotate(glm::mat4(1), d / 5.f, { 1, 0, 0}); */
+ /* sceneModel->find("Bottom Bone")->transform = glm::rotate(glm::mat4(1), d / 3.f, { 1, 0, 0}); */
sceneModel->draw(skyboxes[activeSkybox], d * 1000);
for (Light &light: lights) drawLight(light);
}
void init() {
+ initUtilProg();
+
plainProg = new Program("plainvertex.glsl", "plainfrag.glsl");
glUseProgram(plainProg->progId);
setupLightBuffers(plainProg->progId);
plainProg->validate();
- 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")));
+ skyboxes.push_back(Skybox(Image("skyboxes/wooden_lounge_8k.hdr")));
+ skyboxes.push_back(Skybox(Image("skyboxes/machine_shop_02_8k.hdr")));
+ skyboxes.push_back(Skybox(Image("skyboxes/pink_sunrise_8k.hdr")));
pbrProg = new Program("pbrvert.glsl", "pbrfrag.glsl");
glUseProgram(pbrProg->progId);
- const aiScene *scene = importer.ReadFile("models/newtonsCradle.glb", aiProcess_Triangulate | aiProcess_CalcTangentSpace | aiProcess_GenNormals | aiProcess_FlipUVs);
+ const std::string scenePath = "models/ik.glb";
+ const aiScene *scene = importer.ReadFile(scenePath, aiProcess_Triangulate | aiProcess_CalcTangentSpace | aiProcess_GenNormals | aiProcess_FlipUVs);
if (!scene) {
std::cerr << importer.GetErrorString() << std::endl;
exit(1);
keyStates[key] = false;
}
+#define ENABLE_MOVEMENT
+
void timer(int _) {
+#ifdef ENABLE_MOVEMENT
float xSpeed = 0.f, ySpeed = 0.f, zSpeed = 0.f;
if (keyStates['w'])
zSpeed = 0.1f;
camPos.x += xSpeed * sin(yaw) + zSpeed * cos(yaw);
camPos.y += ySpeed;
camPos.z += zSpeed * sin(yaw) - xSpeed * cos(yaw);
+#endif
glutPostRedisplay();
glutTimerFunc(16, timer, 0);
}
bool firstMouse = true;
void motion(int x, int y) {
+#ifdef ENABLE_MOVEMENT
if (firstMouse) {
prevMouseX = x;
prevMouseY = y;
} else {
camUp = glm::vec3(0, 1, 0);
}
+#endif
}
void mouse(int button, int state, int x, int y) {