added giraffe.obj

src/gfx/src/obj_loader.cpp

@@ -3,13 +3,12 @@
 
 object_ptr load_object(std::string const& model_path)
 {
+    // TO DO: rework indices for normals from .obj
     tinyobj::attrib_t attrib;
     std::vector<tinyobj::shape_t> shapes;
     std::vector<tinyobj::material_t> objmaterials;
     std::string warn, err;
 
-    
-
     if (!tinyobj::LoadObj(&attrib, &shapes, &objmaterials, &warn, &err, model_path.c_str()))
         throw(std::runtime_error(warn + err));
 

src/studio/src/simulator.cpp

@@ -308,6 +308,11 @@ void Simulator::createScene()
     object_ptr vase = load_object("./data/models/smooth_vase.obj");
     scene.back()->addObject(std::move(vase));
 
+    // /* ADD .OBJ GIRAFFE */
+    // scene.emplace_back(std::make_shared<Node>(std::make_shared<Frame>(glm::vec3(-5, 1, 3))));
+    // object_ptr giraffe = load_object("./data/models/final_giraffe.obj");
+    // scene.back()->addObject(std::move(giraffe));
+
     /* ADD CAMERA */
     scene.emplace_back(std::make_shared<Node>(std::make_shared<Frame>(glm::vec3(0.0f, 1.0f, 6.0f))));
     scene.back()->addObject(std::make_shared<Camera>(60.0f, scene.back()->getFrame()));