Commit 5c0c5c37 authored by Arash HABIBI's avatar Arash HABIBI

planB

parent de364d2c
......@@ -56,8 +56,8 @@ void MovingMesh::initGL()
m_texture = new Utils::Texture<2,Geom::Vec3uc>(GL_UNSIGNED_BYTE);
// if (m_texture->load("./meshRessources/limace.png"))
if (m_texture->load("./meshRessources/scenario3/limace_occ.png"))
if (m_texture->load("./meshRessources/limace.png"))
// if (m_texture->load("./meshRessources/scenario3/limace_occ.png"))
m_texture->update();
else
std::cout << "problem : loading texture" << std::endl;
......
......@@ -849,8 +849,8 @@ void Simulator::addMovingObstacle(Dart d, unsigned int obstType)
break;
case 1 :
{
mm = new MovingMesh(envMap_, d, "./meshRessources/scenario3/limace_occ.obj");
// mm = new MovingMesh(envMap_, d, "./meshRessources/LimaceLvl1.obj");
// mm = new MovingMesh(envMap_, d, "./meshRessources/scenario3/limace_occ.obj");
mm = new MovingMesh(envMap_, d, "./meshRessources/LimaceLvl1.obj");
// mm = new MovingMesh(envMap_, d, "./meshRessources/cylinder.obj");
// mm = new MovingMesh(envMap_, d, "./meshRessources/simpleCyl.obj");
movingMeshes_.push_back(mm);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment