Commit 95a00669 authored by pitiot's avatar pitiot

up

parent db284716
Determining if the Q_WS_WIN exist failed with the following output:
Change Dir: /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp
Run Build Command:/usr/bin/make "cmTryCompileExec2095757032/fast"
/usr/bin/make -f CMakeFiles/cmTryCompileExec2095757032.dir/build.make CMakeFiles/cmTryCompileExec2095757032.dir/build
Run Build Command:/usr/bin/make "cmTryCompileExec2303089626/fast"
/usr/bin/make -f CMakeFiles/cmTryCompileExec2303089626.dir/build.make CMakeFiles/cmTryCompileExec2303089626.dir/build
make[1]: entrant dans le répertoire « /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp »
/usr/bin/cmake -E cmake_progress_report /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CMakeFiles 1
Building CXX object CMakeFiles/cmTryCompileExec2095757032.dir/CheckSymbolExists.cxx.o
/usr/bin/c++ -g -I/usr/include/qt4 -o CMakeFiles/cmTryCompileExec2095757032.dir/CheckSymbolExists.cxx.o -c /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx
Building CXX object CMakeFiles/cmTryCompileExec2303089626.dir/CheckSymbolExists.cxx.o
/usr/bin/c++ -g -I/usr/include/qt4 -o CMakeFiles/cmTryCompileExec2303089626.dir/CheckSymbolExists.cxx.o -c /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx
/home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx: In function ‘int main(int, char**)’:
/home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx:8:19: error: ‘Q_WS_WIN’ was not declared in this scope
return ((int*)(&Q_WS_WIN))[argc];
^
make[1]: *** [CMakeFiles/cmTryCompileExec2095757032.dir/CheckSymbolExists.cxx.o] Erreur 1
make[1]: *** [CMakeFiles/cmTryCompileExec2303089626.dir/CheckSymbolExists.cxx.o] Erreur 1
make[1]: quittant le répertoire « /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp »
make: *** [cmTryCompileExec2095757032/fast] Erreur 2
make: *** [cmTryCompileExec2303089626/fast] Erreur 2
File /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx:
/* */
......@@ -33,19 +33,19 @@ int main(int argc, char** argv)
Determining if the Q_WS_QWS exist failed with the following output:
Change Dir: /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp
Run Build Command:/usr/bin/make "cmTryCompileExec2773758678/fast"
/usr/bin/make -f CMakeFiles/cmTryCompileExec2773758678.dir/build.make CMakeFiles/cmTryCompileExec2773758678.dir/build
Run Build Command:/usr/bin/make "cmTryCompileExec4173002346/fast"
/usr/bin/make -f CMakeFiles/cmTryCompileExec4173002346.dir/build.make CMakeFiles/cmTryCompileExec4173002346.dir/build
make[1]: entrant dans le répertoire « /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp »
/usr/bin/cmake -E cmake_progress_report /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CMakeFiles 1
Building CXX object CMakeFiles/cmTryCompileExec2773758678.dir/CheckSymbolExists.cxx.o
/usr/bin/c++ -g -I/usr/include/qt4 -o CMakeFiles/cmTryCompileExec2773758678.dir/CheckSymbolExists.cxx.o -c /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx
Building CXX object CMakeFiles/cmTryCompileExec4173002346.dir/CheckSymbolExists.cxx.o
/usr/bin/c++ -g -I/usr/include/qt4 -o CMakeFiles/cmTryCompileExec4173002346.dir/CheckSymbolExists.cxx.o -c /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx
/home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx: In function ‘int main(int, char**)’:
/home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx:8:19: error: ‘Q_WS_QWS’ was not declared in this scope
return ((int*)(&Q_WS_QWS))[argc];
^
make[1]: *** [CMakeFiles/cmTryCompileExec2773758678.dir/CheckSymbolExists.cxx.o] Erreur 1
make[1]: *** [CMakeFiles/cmTryCompileExec4173002346.dir/CheckSymbolExists.cxx.o] Erreur 1
make[1]: quittant le répertoire « /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp »
make: *** [cmTryCompileExec2773758678/fast] Erreur 2
make: *** [cmTryCompileExec4173002346/fast] Erreur 2
File /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx:
/* */
......@@ -65,19 +65,19 @@ int main(int argc, char** argv)
Determining if the Q_WS_MAC exist failed with the following output:
Change Dir: /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp
Run Build Command:/usr/bin/make "cmTryCompileExec2857516199/fast"
/usr/bin/make -f CMakeFiles/cmTryCompileExec2857516199.dir/build.make CMakeFiles/cmTryCompileExec2857516199.dir/build
Run Build Command:/usr/bin/make "cmTryCompileExec735597770/fast"
/usr/bin/make -f CMakeFiles/cmTryCompileExec735597770.dir/build.make CMakeFiles/cmTryCompileExec735597770.dir/build
make[1]: entrant dans le répertoire « /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp »
/usr/bin/cmake -E cmake_progress_report /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CMakeFiles 1
Building CXX object CMakeFiles/cmTryCompileExec2857516199.dir/CheckSymbolExists.cxx.o
/usr/bin/c++ -g -I/usr/include/qt4 -o CMakeFiles/cmTryCompileExec2857516199.dir/CheckSymbolExists.cxx.o -c /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx
Building CXX object CMakeFiles/cmTryCompileExec735597770.dir/CheckSymbolExists.cxx.o
/usr/bin/c++ -g -I/usr/include/qt4 -o CMakeFiles/cmTryCompileExec735597770.dir/CheckSymbolExists.cxx.o -c /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx
/home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx: In function ‘int main(int, char**)’:
/home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx:8:19: error: ‘Q_WS_MAC’ was not declared in this scope
return ((int*)(&Q_WS_MAC))[argc];
^
make[1]: *** [CMakeFiles/cmTryCompileExec2857516199.dir/CheckSymbolExists.cxx.o] Erreur 1
make[1]: *** [CMakeFiles/cmTryCompileExec735597770.dir/CheckSymbolExists.cxx.o] Erreur 1
make[1]: quittant le répertoire « /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp »
make: *** [cmTryCompileExec2857516199/fast] Erreur 2
make: *** [cmTryCompileExec735597770/fast] Erreur 2
File /home/pitiot/CGoGN_Apps/VolusionQt/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx:
/* */
......
This diff is collapsed.
No preview for this file type
......@@ -55,7 +55,7 @@ public:
VEC3 mapMaxY;
VEC3 mapMinZ;
VEC3 mapMaxZ;
void subdivideVolume(Dart d);
bool subdivideVolume(Dart d);
Dart getBelongingCell(const PFP::VEC3& pos);
......
......@@ -524,9 +524,11 @@ void EnvMap::popSegment(Segment* o)
}
void EnvMap::subdivideVolume(Dart dglobal)
bool EnvMap::subdivideVolume(Dart dglobal)
{
bool res =false;
#ifdef IHMap
CGoGNout<<"debut refine"<<CGoGNendl;
unsigned int max = map.getMaxLevel() ;
map.setCurrentLevel(max) ;
......@@ -542,14 +544,16 @@ void EnvMap::subdivideVolume(Dart dglobal)
this->popSegment(s) ;
for (Segment * s : oldNeighborObst)
this->popSegment(s) ;
#ifdef DEBUG_affichage
CGoGNout<<"tests pour subdivision"<< CGoGNendl;
#endif
if(!map.isBoundaryMarked(3,dglobal) && map.getDartLevel(dglobal) <= max && !map.volumeIsSubdivided(dglobal) )
{
#ifdef DEBUG_affichage
CGoGNout<<"debut subdivision"<< CGoGNendl;
#endif
Algo::Volume::IHM::subdivideVolumeClassic<PFP>(map, dglobal, position);
res=true;
}
map.setCurrentLevel(map.getMaxLevel()) ;
......@@ -573,7 +577,9 @@ void EnvMap::subdivideVolume(Dart dglobal)
CGoGNout<<"fin refine"<<CGoGNendl;
CGoGNout<<"fin refine"<<CGoGNendl;
#endif
return res;
}
......@@ -620,6 +626,7 @@ void EnvMap::resetPartSubdiv(Segment* o)
#endif
}
}
//void EnvMap::coarse()
......
......@@ -40,9 +40,9 @@ Needle::Needle(Simulator* sim,std::pair<VEC3, Dart> startingPoint)
// }
createEdge(0);
#ifdef IHMap
// refine();
#endif
}
void Needle::color_close()
......@@ -261,8 +261,8 @@ void Needle::refine()
PFP::VEC3 edge = Algo::Surface::Geometry::vectorOutOfDart<PFP>(sim_->envMap_.map, volume, sim_->envMap_.position) ;
if( edge.norm2() > 1.0f )
{
sim_->envMap_.subdivideVolume(volume);
refine();
if(sim_->envMap_.subdivideVolume(volume))
refine();
}
......
......@@ -25,7 +25,7 @@ void Simulator::init(int argc, char **argv)
Needle_or_knife = atoi(argv[1]) ;
// Needle_or_knife=false;
initFixedObjects();
// initFixedObjects();
initMovingObject();
// initEmptyMovingObject();
......@@ -107,7 +107,7 @@ void Simulator::initMovingObject()
if(Needle_or_knife) // Needle
{
std::pair<VEC3, Dart> startingPoint ;
Dart d=envMap_.map.indexDart(40);
Dart d=envMap_.map.indexDart(0);
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.second=d;
......
......@@ -282,6 +282,7 @@ void Volusion::cb_redraw()
if(render_MovingObject)
{
m_ds->newList(GL_COMPILE_AND_EXECUTE);
m_ds->begin(GL_LINE_STRIP);
......@@ -299,7 +300,6 @@ void Volusion::cb_redraw()
}
m_ds->color3f(0,0.5f,1.0f);
m_ds->end();
m_ds->endList();
// VEC3 pos1 = simul.aiguille->parts_[0]->getPosition();
......@@ -311,7 +311,7 @@ void Volusion::cb_redraw()
for(auto particule : simul.aiguille->parts_)
{
VEC3 p = particule->getPosition();
if(i==0) m_topo_render->overdrawDart(particule->d,15.0f,1.0f,0.5f,1.0f);
data[i] = p;
i++;
}
......
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