diff --git a/src/needle.cpp b/src/needle.cpp index 31c0819561bb2849aefd2890fbf6854d40cb987d..c9c3eb877f88ec2746cc129b8e2a50b30a29f761 100644 --- a/src/needle.cpp +++ b/src/needle.cpp @@ -240,10 +240,10 @@ void Needle::refine() REAL rayon = sim_->envMap_.volumeMaxdistance(volume) ; if(rayon > sim_->envMap_.maxCellRay ) { -// if(sim_->envMap_.subdivideVolume(volume)) -// { + if(sim_->envMap_.subdivideVolume(volume)) + { // refine(); -// } + } } #endif diff --git a/src/simulator.cpp b/src/simulator.cpp index 1957af9cc144abe667d8a90e5cfa850bb304179c..89b47b3683872b0f247bf33a845b393026a89e56 100644 --- a/src/simulator.cpp +++ b/src/simulator.cpp @@ -26,7 +26,7 @@ void Simulator::init(int argc, char **argv) else Needle_or_knife=true; - initFixedObjects(); +// initFixedObjects(); initSurfaces(); initMovingObject(); @@ -42,7 +42,7 @@ void Simulator::doStep() 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 : "<index_surface< startingPoint ; Dart d=envMap_.map.indexDart(0); - startingPoint.first=Algo::Surface::Geometry::volumeCentroid>(envMap_.map,d,envMap_.position); -// startingPoint.first=VEC3(-2.5f,-2.5f,2.5f); +// startingPoint.first=Algo::Surface::Geometry::volumeCentroid>(envMap_.map,d,envMap_.position); + startingPoint.first=VEC3(-5,0,0); startingPoint.second=d; aiguille=new Needle(this,startingPoint); }