Commit 08ab54eb authored by Thomas Pitiot 's avatar Thomas Pitiot

merge failed

parent 3e3734b2
...@@ -590,12 +590,12 @@ void Volusion::displayObj() ...@@ -590,12 +590,12 @@ void Volusion::displayObj()
m_topo_render->updateData(simul.envMap_.map, simul.envMap_.position, 0.8f, 0.8f, 0.8f); m_topo_render->updateData(simul.envMap_.map, simul.envMap_.position, 0.8f, 0.8f, 0.8f);
for (ArticulatedObject * o : simul.objects) for (ArticulatedObject * o : simul.objects)
{ {
for(unsigned int i =0;i<o->nbEdges;i++) for(auto vect : o->neighbor_cells)
{ {
// m_topo_render->overdrawDart(simul.aiguille->parts_[i]->d,10.0f,1.0f,0,0); // m_topo_render->overdrawDart(simul.aiguille->parts_[i]->d,10.0f,1.0f,0,0);
for(auto it = o->neighbor_cells[i].begin(); it !=o->neighbor_cells[i].end();++it) for(Dart it : vect)
{ {
for (Edge d : edgesIncidentToVolume3(simul.envMap_.map,(*it))) for (Edge d : edgesIncidentToVolume3(simul.envMap_.map,(it)))
{ {
m_topo_render->overdrawDart(d,5.0f,1.0f,0.0f,0.8f); m_topo_render->overdrawDart(d,5.0f,1.0f,0.0f,0.8f);
} }
...@@ -613,9 +613,9 @@ void Volusion::displayObj() ...@@ -613,9 +613,9 @@ void Volusion::displayObj()
{ {
// m_topo_render->overdrawDart(simul.aiguille->parts_[i]->d,10.0f,1.0f,0,0); // m_topo_render->overdrawDart(simul.aiguille->parts_[i]->d,10.0f,1.0f,0,0);
for(auto it = o->neighbor_cells[i].begin(); it !=o->neighbor_cells[i].end();++it) for(Dart it : o->neighbor_cells[i])
{ {
for (Edge d : edgesIncidentToVolume3(simul.envMap_.map,(*it))) for (Edge d : edgesIncidentToVolume3(simul.envMap_.map,(it)))
{ {
m_topo_render->overdrawDart(d,5.0f,1.0f,0.0f,0.8f); m_topo_render->overdrawDart(d,5.0f,1.0f,0.0f,0.8f);
} }
......
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