Commit 76f1ee4a authored by Thomas Jund's avatar Thomas Jund
Browse files

var name

parent c5ea16b4
...@@ -34,7 +34,7 @@ class ArticulatedObstacle; ...@@ -34,7 +34,7 @@ class ArticulatedObstacle;
//#define EXPORTING3 //#define EXPORTING3
//#define TWO_AND_HALF_DIM #define TWO_AND_HALF_DIM
#ifdef EXPORTING3 #ifdef EXPORTING3
......
...@@ -1178,7 +1178,7 @@ void MovingObstacle::updateRegistration() ...@@ -1178,7 +1178,7 @@ void MovingObstacle::updateRegistration()
position[d] = parts_[i]->getPosition(); //recalage de l'obstacle sur ses particules (qui elles ont bien suivi la carte au sol) position[d] = parts_[i]->getPosition(); //recalage de l'obstacle sur ses particules (qui elles ont bien suivi la carte au sol)
PFP::VEC3 normal = CGoGN::Algo::Surface::Geometry::faceNormal<PFP>(sim_->envMap_.map, parts_[i]->d, sim_->envMap_.position); PFP::VEC3 normal = CGoGN::Algo::Surface::Geometry::faceNormal<PFP>(sim_->envMap_.map, parts_[i]->d, sim_->envMap_.position);
normal *= hight; normal *= height;
// std::cout << " phi11 d : " << map.phi<112>(d) <<" || d : "<<d<< std::endl; // std::cout << " phi11 d : " << map.phi<112>(d) <<" || d : "<<d<< std::endl;
position[map.phi_1(d)] = position[d]+normal; position[map.phi_1(d)] = position[d]+normal;
......
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