fixcmakepath

Author: archibate

CMakeLists.txt

@@ -44,3 +44,5 @@ add_subdirectory(glfw)
 target_link_libraries(${PROJECT_NAME} PUBLIC glfw)
 add_subdirectory(glad)
 target_link_libraries(${PROJECT_NAME} PUBLIC glad)
+
+target_compile_definitions(${PROJECT_NAME} PUBLIC -DOPENGLTUTOR_HOME=\"${CMAKE_CURRENT_SOURCE_DIR}/\")

src/Game.cpp

@@ -26,10 +26,14 @@ void Game::set_window(GLFWwindow *window) {
     m_inputCtl.register_callbacks(window);
 }
 
+#ifndef OPENGLTUTOR_HOME // this should be defined by CMakeLists.txt, your project root directory
+#define OPENGLTUTOR_HOME
+#endif
+
 void Game::initialize() {
-    m_private->monkey.load_obj("/home/bate/Codes/opengltutor/assets/opencvpart.obj");
-    /* m_private->monkey.load_obj("/home/bate/Codes/opengltutor/assets/monkey.obj"); */
-    /* m_private->monkey.load_obj("/home/bate/Codes/opengltutor/assets/cube.obj"); */
+    /* m_private->monkey.load_obj(OPENGLTUTOR_HOME "assets/opencvpart.obj"); */
+    m_private->monkey.load_obj(OPENGLTUTOR_HOME "assets/monkey.obj");
+    /* m_private->monkey.load_obj(OPENGLTUTOR_HOME "assets/cube.obj"); */
     CHECK_GL(glEnable(GL_DEPTH_TEST));
     CHECK_GL(glDisable(GL_MULTISAMPLE));
     CHECK_GL(glEnable(GL_BLEND));
@@ -66,5 +70,6 @@ void Game::render() {
     CHECK_GL(glMatrixMode(GL_MODELVIEW));
     CHECK_GL(glLoadMatrixf(glm::value_ptr(view * model)));
 
+    glColor3f(0.9f, 0.6f, 0.1f);
     m_private->monkey.draw_obj();
 }

src/OBJ.cpp

@@ -54,7 +54,6 @@ static glm::vec3 compute_normal(glm::vec3 a, glm::vec3 b, glm::vec3 c) {
 
 void OBJ::draw_obj() {
     glBegin(GL_TRIANGLES);
-    glColor3f(0.9f, 0.6f, 0.1f);
 
     for (auto face : faces) {
         auto const &a = vertices.at(face[0]);