Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

Commit 4c7379a9 authored by Arash HABIBI's avatar Arash HABIBI
Browse files

Merge branch 'master' of cgogn:~jund/CGoGN_Apps/SA2

parents a738b569 5d17a127
...@@ -853,8 +853,15 @@ void Simulator::addPathsToAgents() ...@@ -853,8 +853,15 @@ void Simulator::addPathsToAgents()
for (std::vector<Dart>::iterator it = path.begin() ; it != path.end() ; ++it) for (std::vector<Dart>::iterator it = path.begin() ; it != path.end() ; ++it)
{ {
Dart d = *it;
while(envMap_.map.isBoundaryEdge(d))
{
d = envMap_.map.phi1(d);
}
// VEC3 dest = Algo::Geometry::faceCentroid<PFP>(envMap_.map, *it, envMap_.position); // VEC3 dest = Algo::Geometry::faceCentroid<PFP>(envMap_.map, *it, envMap_.position);
VEC3 dest = envMap_.position[*it] + envMap_.position[envMap_.map.phi1(*it)] ;
VEC3 dest = envMap_.position[d] + envMap_.position[envMap_.map.phi1(d)] ;
dest /= 2.0f ; dest /= 2.0f ;
dest[2] = 0 ; dest[2] = 0 ;
...@@ -882,8 +889,14 @@ void Simulator::addPathsToAgents() ...@@ -882,8 +889,14 @@ void Simulator::addPathsToAgents()
for (std::vector<Dart>::iterator it = path.begin() ; it != path.end() ; ++it) for (std::vector<Dart>::iterator it = path.begin() ; it != path.end() ; ++it)
{ {
Dart d = *it;
while(envMap_.map.isBoundaryEdge(d))
{
d = envMap_.map.phi1(d);
}
// VEC3 dest = Algo::Geometry::faceCentroid<PFP>(envMap_.map, *it, envMap_.position); // VEC3 dest = Algo::Geometry::faceCentroid<PFP>(envMap_.map, *it, envMap_.position);
VEC3 dest = envMap_.position[*it] + envMap_.position[envMap_.map.phi1(*it)] ; VEC3 dest = envMap_.position[d] + envMap_.position[envMap_.map.phi1(d)] ;
dest /= 2.0f ; dest /= 2.0f ;
dest[2] = 0 ; dest[2] = 0 ;
......
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