Commit 9c17bb11 authored by Thomas Pitiot 's avatar Thomas Pitiot

merged

parents 0266b219 ca5b2abe
......@@ -386,7 +386,7 @@ void Volusion::displayMO()
if(val_comboEdge==0)
{
for(auto vect : simul.aiguille->belonging_cells)
for(const auto& vect : simul.aiguille->belonging_cells)
{
// m_topo_render->overdrawDart(simul.aiguille->parts_[i]->d,10.0f,1.0f,0,0);
for(Dart it : vect)
......@@ -428,7 +428,7 @@ void Volusion::displayMO()
m_topo_render->updateData(simul.envMap_.map, simul.envMap_.position, 0.8f, 0.8f, 0.8f);
if(val_comboEdge==0)
{
for(auto vect : simul.aiguille->neighbor_cells)
for(const auto& vect : simul.aiguille->neighbor_cells)
{
// m_topo_render->overdrawDart(simul.aiguille->parts_[i]->d,10.0f,1.0f,0,0);
for(Dart it : vect)
......@@ -551,8 +551,8 @@ void Volusion::displayObj()
m_topo_render->updateData(simul.envMap_.map, simul.envMap_.position, 0.8f, 0.8f, 0.8f);
for (ArticulatedObject * o : simul.objects)
{
// CGoGNout<<" size belong :"<< o->belonging_cells.size()<< " || nbseg :"<<o->nbEdges << CGoGNendl;
for(auto vect : o->belonging_cells)
CGoGNout<<" size belong :"<< o->belonging_cells.size()<< " || nbseg :"<<o->nbEdges << CGoGNendl;
for(const auto& vect : o->belonging_cells)
{
// CGoGNout<<" size vector :"<< vect.size() << CGoGNendl;
// m_topo_render->overdrawDart(simul.aiguille->parts_[i]->d,10.0f,1.0f,0,0);
......@@ -592,7 +592,7 @@ void Volusion::displayObj()
m_topo_render->updateData(simul.envMap_.map, simul.envMap_.position, 0.8f, 0.8f, 0.8f);
for (ArticulatedObject * o : simul.objects)
{
for(auto vect : o->neighbor_cells)
for(const auto& vect : o->neighbor_cells)
{
// m_topo_render->overdrawDart(simul.aiguille->parts_[i]->d,10.0f,1.0f,0,0);
for(Dart it : vect)
......
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