susanne demo

CMakeLists.txt

@@ -37,10 +37,6 @@ link_libraries(${GLFW_LIBRARY_DIRS})
 find_package(GLEW REQUIRED)
 include_directories(${GLEW_INCLUDE_DIRS})
 
-if (WIN32)
-    # nothing now
-endif (WIN32)
-
 target_link_libraries(
         ${PROJECT_NAME}
         glfw

src/main.cpp

@@ -16,7 +16,7 @@ GLFWwindow *window;
 bool dragging = false;
 int keyArr[350];
 
-InputHandler *InputHandler = InputHandler->GetInstance();
+InputHandler *InputHandler = InputHandler::GetInstance();
 
 vec3 forceGenerated(0.0f, 0.0f, 0.0f);
 bool resetExternalForces = false;

src/rendering/Scene.cpp

@@ -33,10 +33,10 @@ void Scene::Build() {
 //    Texture *headTexture = new CheckerBoardTexture(1, 0);
 
 //    auto headObject = new HeadObject(phongShader, sphere, headMaterial, headTexture);
-    auto headObject = new HeadObject(phongShader, new ObjGeometry("../data/sphere.obj"), headMaterial, headTexture);
+    auto headObject = new HeadObject(phongShader, new ObjGeometry("../data/susanne.obj"), headMaterial, headTexture);
 
     headObject->Scale(vec3(.35, .35, .35));
-    /* objects.push_back(headObject); */
+    objects.push_back(headObject);
 
     auto PBDSim = new PBDSimulation(headObject, nrSims, nrSegments, lSeg);
     auto simulationObject = new HairSimObject(headObject, basicShader, PBDSim);