Commit 289da2a2 authored by Thomas Pitiot 's avatar Thomas Pitiot

working

parent f961ea6e
...@@ -240,10 +240,10 @@ void Needle::refine() ...@@ -240,10 +240,10 @@ void Needle::refine()
REAL rayon = sim_->envMap_.volumeMaxdistance(volume) ; REAL rayon = sim_->envMap_.volumeMaxdistance(volume) ;
if(rayon > sim_->envMap_.maxCellRay ) if(rayon > sim_->envMap_.maxCellRay )
{ {
// if(sim_->envMap_.subdivideVolume(volume)) if(sim_->envMap_.subdivideVolume(volume))
// { {
// refine(); // refine();
// } }
} }
#endif #endif
......
...@@ -26,7 +26,7 @@ void Simulator::init(int argc, char **argv) ...@@ -26,7 +26,7 @@ void Simulator::init(int argc, char **argv)
else else
Needle_or_knife=true; Needle_or_knife=true;
initFixedObjects(); // initFixedObjects();
initSurfaces(); initSurfaces();
initMovingObject(); initMovingObject();
...@@ -42,7 +42,7 @@ void Simulator::doStep() ...@@ -42,7 +42,7 @@ void Simulator::doStep()
void Simulator::initSurfaces() void Simulator::initSurfaces()
{ {
Surface * obj = new Surface(this,VEC3(-1.0f,-1.5f,0.0f)); Surface * obj = new Surface(this,VEC3(-1.0f,-1.5f,0.69f));
CGoGNout<<"surface initialisée : "<<obj->index_surface<<CGoGNendl; CGoGNout<<"surface initialisée : "<<obj->index_surface<<CGoGNendl;
} }
...@@ -121,8 +121,8 @@ void Simulator::initMovingObject() ...@@ -121,8 +121,8 @@ void Simulator::initMovingObject()
{ {
std::pair<VEC3, Dart> startingPoint ; std::pair<VEC3, Dart> startingPoint ;
Dart d=envMap_.map.indexDart(0); Dart d=envMap_.map.indexDart(0);
startingPoint.first=Algo::Surface::Geometry::volumeCentroid<PFP,VertexAttribute<VEC3,MAP>>(envMap_.map,d,envMap_.position); // startingPoint.first=Algo::Surface::Geometry::volumeCentroid<PFP,VertexAttribute<VEC3,MAP>>(envMap_.map,d,envMap_.position);
// startingPoint.first=VEC3(-2.5f,-2.5f,2.5f); startingPoint.first=VEC3(-5,0,0);
startingPoint.second=d; startingPoint.second=d;
aiguille=new Needle(this,startingPoint); aiguille=new Needle(this,startingPoint);
} }
......
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