| 1 |
francois |
285 |
//------------------------------------------------------------
|
| 2 |
|
|
//------------------------------------------------------------
|
| 3 |
|
|
// MAGiC
|
| 4 |
|
|
// Jean Christophe Cuilli�re et Vincent FRANCOIS
|
| 5 |
|
|
// D�partement de G�nie M�canique - UQTR
|
| 6 |
|
|
//------------------------------------------------------------
|
| 7 |
|
|
// Le projet MAGIC est un projet de recherche du d�partement
|
| 8 |
|
|
// de g�nie m�canique de l'Universit� du Qu�bec �
|
| 9 |
|
|
// Trois Rivi�res
|
| 10 |
|
|
// Les librairies ne peuvent �tre utilis�es sans l'accord
|
| 11 |
|
|
// des auteurs (contact : francois@uqtr.ca)
|
| 12 |
|
|
//------------------------------------------------------------
|
| 13 |
|
|
//------------------------------------------------------------
|
| 14 |
|
|
//
|
| 15 |
|
|
// mailleur.cpp
|
| 16 |
|
|
//
|
| 17 |
|
|
//------------------------------------------------------------
|
| 18 |
|
|
//------------------------------------------------------------
|
| 19 |
|
|
// COPYRIGHT 2000
|
| 20 |
|
|
// Version du 02/03/2006 � 11H23
|
| 21 |
|
|
//------------------------------------------------------------
|
| 22 |
|
|
//------------------------------------------------------------
|
| 23 |
|
|
|
| 24 |
|
|
|
| 25 |
|
|
#include "gestionversion.h"
|
| 26 |
|
|
#include "mailleur_delaunay.h"
|
| 27 |
|
|
#include "dly_noeud.h"
|
| 28 |
|
|
#include "dly_tetra.h"
|
| 29 |
|
|
#include "dly_triangle.h"
|
| 30 |
|
|
#include "dly_segment.h"
|
| 31 |
|
|
#include "mg_maillage.h"
|
| 32 |
|
|
#include "robustPredicates.h"
|
| 33 |
|
|
#include <algorithm>
|
| 34 |
|
|
#include <math.h>
|
| 35 |
|
|
#include "mg_gestionnaire.h"
|
| 36 |
|
|
#include "ot_cpu.h"
|
| 37 |
francois |
287 |
#include "m3d_noeud.h"
|
| 38 |
|
|
#include "m3d_tetra.h"
|
| 39 |
francois |
285 |
|
| 40 |
|
|
|
| 41 |
francois |
287 |
|
| 42 |
francois |
285 |
MAILLEUR_DELAUNAY::MAILLEUR_DELAUNAY(MG_MAILLAGE* m,FCT_GENERATEUR_3D<4> *cartetmp,double crit_arret,class OT_CPU* comp):MAILLEUR(comp),carte(cartetmp),mai(m),critere_arret(crit_arret)
|
| 43 |
|
|
{
|
| 44 |
|
|
robustPredicates::exactinit();
|
| 45 |
|
|
}
|
| 46 |
|
|
|
| 47 |
|
|
MAILLEUR_DELAUNAY::~MAILLEUR_DELAUNAY()
|
| 48 |
|
|
{
|
| 49 |
|
|
for (int i=0;i<tabnoeud.size();i++)
|
| 50 |
|
|
delete tabnoeud[i];
|
| 51 |
|
|
for (int i=0;i<tabtri.size();i++)
|
| 52 |
|
|
delete tabtri[i];
|
| 53 |
|
|
for (int i=0;i<tabtet.size();i++)
|
| 54 |
|
|
delete tabtet[i];
|
| 55 |
|
|
}
|
| 56 |
|
|
|
| 57 |
|
|
void MAILLEUR_DELAUNAY::maille(class MG_GROUPE_TOPOLOGIQUE* mggt)
|
| 58 |
|
|
{
|
| 59 |
|
|
if (affichageactif) affiche((char*)"Initialisation Delaunay");
|
| 60 |
|
|
initialise_maillage();
|
| 61 |
|
|
if (compteur!=NULL) compteur->ajouter_etape("Initialisation maillage");
|
| 62 |
francois |
287 |
|
| 63 |
francois |
285 |
if (affichageactif) affiche((char*)"Maillage");
|
| 64 |
|
|
raffine_maillage();
|
| 65 |
|
|
if (compteur!=NULL) compteur->ajouter_etape("Insertion de points");
|
| 66 |
francois |
287 |
|
| 67 |
|
|
if (affichageactif) affiche((char*)"Création du maillage final");
|
| 68 |
francois |
285 |
transfert_maillage(&tabnoeud,NULL,&tabtet);
|
| 69 |
|
|
if (compteur!=NULL) compteur->ajouter_etape("Création du maillage");
|
| 70 |
francois |
287 |
|
| 71 |
|
|
|
| 72 |
|
|
if (affichageactif) affiche((char*)"Optimisation de maillage");
|
| 73 |
|
|
|
| 74 |
|
|
if (compteur!=NULL) compteur->ajouter_etape("Création du maillage");
|
| 75 |
francois |
285 |
if (affichageactif) affiche((char*)"Fin Delaunay");
|
| 76 |
|
|
}
|
| 77 |
|
|
|
| 78 |
|
|
|
| 79 |
|
|
void MAILLEUR_DELAUNAY::raffine_maillage(void)
|
| 80 |
|
|
{
|
| 81 |
|
|
while ((*(front_trie.begin())).first>critere_arret)
|
| 82 |
|
|
//for (int jj=0;jj<10000;jj++)
|
| 83 |
|
|
{
|
| 84 |
|
|
// std::multimap<double, DLY_TETRA*, std::greater<double> >::iterator it=front.begin();
|
| 85 |
|
|
std::multimap<double, DLY_SEGMENT*, std::greater<double> >::iterator it=front_trie.begin();
|
| 86 |
|
|
//DLY_TETRA* tet=(*it).second;
|
| 87 |
|
|
DLY_SEGMENT* seg=(*it).second;
|
| 88 |
|
|
DLY_TETRA* tet=seg->get_tetra_feuille();
|
| 89 |
|
|
std::vector<double> lstptdecoup;
|
| 90 |
|
|
seg->decoupe_noeud(lstptdecoup);
|
| 91 |
|
|
int nbptdecoup=lstptdecoup.size()/3;
|
| 92 |
|
|
for (int j=0;j<nbptdecoup;j++)
|
| 93 |
|
|
{
|
| 94 |
|
|
double x=lstptdecoup[3*j];
|
| 95 |
|
|
double y=lstptdecoup[3*j+1];
|
| 96 |
|
|
double z=lstptdecoup[3*j+2];
|
| 97 |
|
|
DLY_TETRA* tetbase=get_tetra(tet,x,y,z);
|
| 98 |
|
|
std::vector<DLY_TETRA*> tetdetruit;
|
| 99 |
|
|
std::vector<DLY_TETRA*> tetcree;
|
| 100 |
|
|
std::vector<DLY_TRIANGLE*> basetri;
|
| 101 |
|
|
ajoute_tetra_cavite(tetbase,tetdetruit,basetri);
|
| 102 |
|
|
for (int i=0;i<tetdetruit.size();i++)
|
| 103 |
|
|
{
|
| 104 |
|
|
DLY_TETRA* tettmp=tetdetruit[i];
|
| 105 |
|
|
if (tettmp->get_voisin1()!=NULL)
|
| 106 |
|
|
{
|
| 107 |
|
|
std::vector<DLY_TETRA*>::iterator itv2=find(tetdetruit.begin(),tetdetruit.end(),tettmp->get_voisin1());
|
| 108 |
|
|
if (itv2==tetdetruit.end())
|
| 109 |
|
|
if (tettmp->get_voisin1()->point_dans_le_tetra(x,y,z)!=0)
|
| 110 |
|
|
ajoute_tetra_cavite(tettmp->get_voisin1(),tetdetruit,basetri);
|
| 111 |
|
|
}
|
| 112 |
|
|
if (tettmp->get_voisin2()!=NULL)
|
| 113 |
|
|
{
|
| 114 |
|
|
std::vector<DLY_TETRA*>::iterator itv2=find(tetdetruit.begin(),tetdetruit.end(),tettmp->get_voisin2());
|
| 115 |
|
|
if (itv2==tetdetruit.end())
|
| 116 |
|
|
if (tettmp->get_voisin2()->point_dans_le_tetra(x,y,z)!=0)
|
| 117 |
|
|
ajoute_tetra_cavite(tettmp->get_voisin2(),tetdetruit,basetri);
|
| 118 |
|
|
}
|
| 119 |
|
|
if (tettmp->get_voisin3()!=NULL)
|
| 120 |
|
|
{
|
| 121 |
|
|
std::vector<DLY_TETRA*>::iterator itv2=find(tetdetruit.begin(),tetdetruit.end(),tettmp->get_voisin3());
|
| 122 |
|
|
if (itv2==tetdetruit.end())
|
| 123 |
|
|
if (tettmp->get_voisin3()->point_dans_le_tetra(x,y,z)!=0)
|
| 124 |
|
|
ajoute_tetra_cavite(tettmp->get_voisin3(),tetdetruit,basetri);
|
| 125 |
|
|
}
|
| 126 |
|
|
if (tettmp->get_voisin4()!=NULL)
|
| 127 |
|
|
{
|
| 128 |
|
|
std::vector<DLY_TETRA*>::iterator itv2=find(tetdetruit.begin(),tetdetruit.end(),tettmp->get_voisin4());
|
| 129 |
|
|
if (itv2==tetdetruit.end())
|
| 130 |
|
|
if (tettmp->get_voisin4()->point_dans_le_tetra(x,y,z)!=0)
|
| 131 |
|
|
ajoute_tetra_cavite(tettmp->get_voisin4(),tetdetruit,basetri);
|
| 132 |
|
|
}
|
| 133 |
|
|
}
|
| 134 |
|
|
int nbtetrabase=tetdetruit.size();
|
| 135 |
|
|
for (int i=0;i<tetdetruit.size();i++)
|
| 136 |
|
|
{
|
| 137 |
|
|
DLY_TETRA* tettmp=tetdetruit[i];
|
| 138 |
|
|
if (tettmp->get_voisin1()!=NULL)
|
| 139 |
|
|
{
|
| 140 |
|
|
std::vector<DLY_TETRA*>::iterator itv2=find(tetdetruit.begin(),tetdetruit.end(),tettmp->get_voisin1());
|
| 141 |
|
|
if (itv2==tetdetruit.end())
|
| 142 |
|
|
if (tettmp->get_voisin1()->point_dans_la_sphere(x,y,z)!=0)
|
| 143 |
|
|
ajoute_tetra_cavite(tettmp->get_voisin1(),tetdetruit,basetri);
|
| 144 |
|
|
}
|
| 145 |
|
|
if (tettmp->get_voisin2()!=NULL)
|
| 146 |
|
|
{
|
| 147 |
|
|
std::vector<DLY_TETRA*>::iterator itv2=find(tetdetruit.begin(),tetdetruit.end(),tettmp->get_voisin2());
|
| 148 |
|
|
if (itv2==tetdetruit.end())
|
| 149 |
|
|
if (tettmp->get_voisin2()->point_dans_la_sphere(x,y,z)!=0)
|
| 150 |
|
|
ajoute_tetra_cavite(tettmp->get_voisin2(),tetdetruit,basetri);
|
| 151 |
|
|
}
|
| 152 |
|
|
if (tettmp->get_voisin3()!=NULL)
|
| 153 |
|
|
{
|
| 154 |
|
|
std::vector<DLY_TETRA*>::iterator itv2=find(tetdetruit.begin(),tetdetruit.end(),tettmp->get_voisin3());
|
| 155 |
|
|
if (itv2==tetdetruit.end())
|
| 156 |
|
|
if (tettmp->get_voisin3()->point_dans_la_sphere(x,y,z)!=0)
|
| 157 |
|
|
ajoute_tetra_cavite(tettmp->get_voisin3(),tetdetruit,basetri);
|
| 158 |
|
|
}
|
| 159 |
|
|
if (tettmp->get_voisin4()!=NULL)
|
| 160 |
|
|
{
|
| 161 |
|
|
std::vector<DLY_TETRA*>::iterator itv2=find(tetdetruit.begin(),tetdetruit.end(),tettmp->get_voisin4());
|
| 162 |
|
|
if (itv2==tetdetruit.end())
|
| 163 |
|
|
if (tettmp->get_voisin4()->point_dans_la_sphere(x,y,z)!=0)
|
| 164 |
|
|
ajoute_tetra_cavite(tettmp->get_voisin4(),tetdetruit,basetri);
|
| 165 |
|
|
}
|
| 166 |
|
|
}
|
| 167 |
|
|
|
| 168 |
|
|
|
| 169 |
|
|
|
| 170 |
|
|
|
| 171 |
|
|
int res=0;
|
| 172 |
|
|
do
|
| 173 |
|
|
{
|
| 174 |
|
|
res=modifie_cavite(tetdetruit,basetri,nbtetrabase,x,y,z);
|
| 175 |
|
|
}
|
| 176 |
|
|
while (res==0);
|
| 177 |
|
|
|
| 178 |
|
|
|
| 179 |
|
|
|
| 180 |
|
|
|
| 181 |
|
|
for (int i=0;i<tetdetruit.size();i++)
|
| 182 |
|
|
{
|
| 183 |
|
|
/*std::multimap<double, DLY_TETRA*, std::greater<double> >::iterator it2=front.find(tetdetruit[i]->get_critere_subdivision());
|
| 184 |
|
|
while ((*it2).second!=tetdetruit[i])
|
| 185 |
|
|
it2++;
|
| 186 |
|
|
front.erase(it2);*/
|
| 187 |
|
|
retirer_front(tetdetruit[i]->get_segment1());
|
| 188 |
|
|
retirer_front(tetdetruit[i]->get_segment2());
|
| 189 |
|
|
retirer_front(tetdetruit[i]->get_segment3());
|
| 190 |
|
|
retirer_front(tetdetruit[i]->get_segment4());
|
| 191 |
|
|
retirer_front(tetdetruit[i]->get_segment5());
|
| 192 |
|
|
retirer_front(tetdetruit[i]->get_segment6());
|
| 193 |
|
|
|
| 194 |
|
|
}
|
| 195 |
|
|
DLY_NOEUD* no=new DLY_NOEUD(tabnoeud.size(),x,y,z);
|
| 196 |
|
|
tabnoeud.push_back(no);
|
| 197 |
|
|
for (int i=0;i<basetri.size();i++)
|
| 198 |
|
|
{
|
| 199 |
|
|
int frontiere=basetri[i]->est_frontiere();
|
| 200 |
|
|
int coplanaire=basetri[i]->est_coplanaire(no->get_x(),no->get_y(),no->get_z());
|
| 201 |
|
|
if ((frontiere==0) || ((frontiere==1) && (coplanaire==0)))
|
| 202 |
|
|
{
|
| 203 |
|
|
DLY_TETRA* tetnv=cree_tetra(basetri[i]->get_noeud1(),basetri[i]->get_noeud2(),basetri[i]->get_noeud3(),no);
|
| 204 |
|
|
tetcree.push_back(tetnv);
|
| 205 |
|
|
}
|
| 206 |
|
|
}
|
| 207 |
|
|
double volold=0.;
|
| 208 |
|
|
double volnew=0.;
|
| 209 |
|
|
/*for (int i=0;i<tetdetruit.size();i++)
|
| 210 |
|
|
volold=volold+tetdetruit[i]->calcul_volume(NULL,0);
|
| 211 |
|
|
for (int i=0;i<tetcree.size();i++)
|
| 212 |
|
|
volnew=volnew+tetcree[i]->calcul_volume(NULL,0);
|
| 213 |
|
|
if (fabs(volold-volnew)>0.000000000001*volold)
|
| 214 |
|
|
//std::cout << volold << " remplacé par " << volnew << " Étape " << jj << " " << j << std::endl;
|
| 215 |
|
|
*/
|
| 216 |
|
|
for (int i=0;i<tetdetruit.size();i++)
|
| 217 |
|
|
tetdetruit[i]->ajoute_fils(tetcree);
|
| 218 |
|
|
for (int i=0;i<tetcree.size();i++)
|
| 219 |
|
|
{
|
| 220 |
|
|
mise_a_jour_voisin(tetcree[i]);
|
| 221 |
|
|
if (tetcree[i]->get_voisin1()!=NULL) mise_a_jour_voisin(tetcree[i]->get_voisin1());
|
| 222 |
|
|
if (tetcree[i]->get_voisin2()!=NULL) mise_a_jour_voisin(tetcree[i]->get_voisin2());
|
| 223 |
|
|
if (tetcree[i]->get_voisin3()!=NULL) mise_a_jour_voisin(tetcree[i]->get_voisin3());
|
| 224 |
|
|
if (tetcree[i]->get_voisin4()!=NULL) mise_a_jour_voisin(tetcree[i]->get_voisin4());
|
| 225 |
|
|
}
|
| 226 |
|
|
/* for (int i=0;i<tabtet.size();i++)
|
| 227 |
|
|
{
|
| 228 |
|
|
DLY_TETRA* tet=tabtet[i];
|
| 229 |
|
|
if (tet->get_feuille()==0) continue;
|
| 230 |
|
|
if (tet->get_voisin1()!=NULL)
|
| 231 |
|
|
if (tet->get_voisin1()->get_feuille()==0)
|
| 232 |
|
|
{
|
| 233 |
|
|
std::cout << "bug1 " << jj << " "<< j<< std::endl;
|
| 234 |
|
|
return;
|
| 235 |
|
|
}
|
| 236 |
|
|
if (tet->get_voisin2()!=NULL)
|
| 237 |
|
|
if (tet->get_voisin2()->get_feuille()==0)
|
| 238 |
|
|
{
|
| 239 |
|
|
std::cout << "bug2 " << jj << " "<< j<< std::endl;
|
| 240 |
|
|
return;
|
| 241 |
|
|
}
|
| 242 |
|
|
if (tet->get_voisin3()!=NULL)
|
| 243 |
|
|
if (tet->get_voisin3()->get_feuille()==0)
|
| 244 |
|
|
{
|
| 245 |
|
|
std::cout << "bug3 "<< jj << " "<< j << std::endl;
|
| 246 |
|
|
return;
|
| 247 |
|
|
}
|
| 248 |
|
|
if (tet->get_voisin4()!=NULL)
|
| 249 |
|
|
if (tet->get_voisin4()->get_feuille()==0)
|
| 250 |
|
|
{
|
| 251 |
|
|
std::cout << "bug4 "<< jj << " "<< j << std::endl;
|
| 252 |
|
|
return;
|
| 253 |
|
|
}
|
| 254 |
|
|
|
| 255 |
|
|
}*/
|
| 256 |
|
|
/* mai=new MG_MAILLAGE(NULL);
|
| 257 |
|
|
MG_GESTIONNAIRE g;
|
| 258 |
|
|
g.ajouter_mg_maillage(mai);
|
| 259 |
|
|
transfert_maillage(&tabnoeud,NULL,&tabtet);
|
| 260 |
|
|
g.enregistrer("test.magic");*/
|
| 261 |
|
|
|
| 262 |
|
|
}
|
| 263 |
|
|
}
|
| 264 |
|
|
}
|
| 265 |
|
|
|
| 266 |
|
|
void MAILLEUR_DELAUNAY::ajouter_front(double crit,DLY_SEGMENT* seg)
|
| 267 |
|
|
{
|
| 268 |
|
|
if (crit>critere_arret)
|
| 269 |
|
|
{
|
| 270 |
|
|
std::pair<const unsigned long long,DLY_SEGMENT*> tmp((const unsigned long long)seg,seg);
|
| 271 |
|
|
std::pair<std::map<const unsigned long long,DLY_SEGMENT*>::iterator,bool> res=front.insert(tmp);
|
| 272 |
|
|
if (res.second==true)
|
| 273 |
|
|
{
|
| 274 |
|
|
seg->change_critere(crit);
|
| 275 |
|
|
std::pair<double,DLY_SEGMENT*> tmp2(crit,seg);
|
| 276 |
|
|
front_trie.insert(tmp2);
|
| 277 |
|
|
}
|
| 278 |
|
|
}
|
| 279 |
|
|
}
|
| 280 |
|
|
void MAILLEUR_DELAUNAY::retirer_front(DLY_SEGMENT* seg)
|
| 281 |
|
|
{
|
| 282 |
|
|
std::map<const unsigned long long,DLY_SEGMENT*>::iterator it=front.find((const unsigned long long)seg);
|
| 283 |
|
|
if (it==front.end()) return;
|
| 284 |
|
|
front.erase(it);
|
| 285 |
|
|
std::multimap<double,DLY_SEGMENT*,std::greater<double> >::iterator it2=front_trie.find(seg->get_critere());
|
| 286 |
|
|
while ((*it2).second!=seg)
|
| 287 |
|
|
it2++;
|
| 288 |
|
|
front_trie.erase(it2);
|
| 289 |
|
|
}
|
| 290 |
|
|
int MAILLEUR_DELAUNAY::modifie_cavite(std::vector<DLY_TETRA*> &cavite,std::vector<DLY_TRIANGLE*> &basetri,int nbbase,double x, double y,double z)
|
| 291 |
|
|
{
|
| 292 |
|
|
std::map<unsigned long long,DLY_TETRA*> tetasupprimercavite;
|
| 293 |
|
|
for (int i=0;i<basetri.size();i++)
|
| 294 |
|
|
{
|
| 295 |
|
|
DLY_TRIANGLE* tri=basetri[i];
|
| 296 |
|
|
DLY_TETRA* inte=NULL;
|
| 297 |
|
|
DLY_TETRA* exte=NULL;
|
| 298 |
|
|
for (int j=0;j<tri->get_nb_tetra();j++)
|
| 299 |
|
|
{
|
| 300 |
|
|
DLY_TETRA* tet=tri->get_tetra(j);
|
| 301 |
|
|
if (tet->get_feuille()==1)
|
| 302 |
|
|
{
|
| 303 |
|
|
std::vector<DLY_TETRA*>::iterator it=find(cavite.begin(),cavite.end(),tet);
|
| 304 |
|
|
if (it==cavite.end()) exte=tet;
|
| 305 |
|
|
else inte=tet;
|
| 306 |
|
|
}
|
| 307 |
|
|
}
|
| 308 |
|
|
double nor[3];
|
| 309 |
|
|
int base=0;
|
| 310 |
|
|
for (int j=0;j<nbbase;j++)
|
| 311 |
|
|
if (inte==cavite[j]) base=1;
|
| 312 |
|
|
if (base==1) continue;
|
| 313 |
|
|
if (inte->get_triangle1()==tri) inte->get_normal1(nor);
|
| 314 |
|
|
if (inte->get_triangle2()==tri) inte->get_normal2(nor);
|
| 315 |
|
|
if (inte->get_triangle3()==tri) inte->get_normal3(nor);
|
| 316 |
|
|
if (inte->get_triangle4()==tri) inte->get_normal4(nor);
|
| 317 |
|
|
nor[0]=-nor[0];
|
| 318 |
|
|
nor[1]=-nor[1];
|
| 319 |
|
|
nor[2]=-nor[2];
|
| 320 |
|
|
double xyzo[3];
|
| 321 |
|
|
tri->get_noeud1()->get_coord(xyzo);
|
| 322 |
|
|
OT_VECTEUR_3D vecdir(x-xyzo[0],y-xyzo[1],z-xyzo[2]);
|
| 323 |
|
|
OT_VECTEUR_3D normal(nor);
|
| 324 |
|
|
vecdir.norme();
|
| 325 |
|
|
double ps=vecdir*normal;
|
| 326 |
|
|
if (ps<0.000000001)
|
| 327 |
|
|
{
|
| 328 |
|
|
tri->est_frontiere();
|
| 329 |
|
|
//retire_tetra_cavite(inte,cavite,basetri);
|
| 330 |
|
|
unsigned long long adresse=(unsigned long long)inte;
|
| 331 |
|
|
tetasupprimercavite.insert(std::pair<unsigned long long,DLY_TETRA*>(adresse,inte));
|
| 332 |
|
|
|
| 333 |
|
|
}
|
| 334 |
|
|
}
|
| 335 |
|
|
int nbtetasupprimer=tetasupprimercavite.size();
|
| 336 |
|
|
if (nbtetasupprimer==0) return 1;
|
| 337 |
|
|
for (std::map<unsigned long long,DLY_TETRA*>::iterator it=tetasupprimercavite.begin();it!=tetasupprimercavite.end();it++)
|
| 338 |
|
|
retire_tetra_cavite((*it).second,cavite,basetri);
|
| 339 |
|
|
|
| 340 |
|
|
return 0;
|
| 341 |
|
|
}
|
| 342 |
|
|
|
| 343 |
|
|
|
| 344 |
|
|
void MAILLEUR_DELAUNAY::retire_tetra_cavite(DLY_TETRA* tet,std::vector<DLY_TETRA*> &cavite,std::vector<DLY_TRIANGLE*> &basetri)
|
| 345 |
|
|
{
|
| 346 |
|
|
std::vector<DLY_TETRA*>::iterator it=find(cavite.begin(),cavite.end(),tet);
|
| 347 |
|
|
cavite.erase(it);
|
| 348 |
|
|
std::vector<DLY_TRIANGLE*>::iterator itv=find(basetri.begin(),basetri.end(),tet->get_triangle1());
|
| 349 |
|
|
if (itv==basetri.end()) basetri.push_back(tet->get_triangle1());
|
| 350 |
|
|
else basetri.erase(itv);
|
| 351 |
|
|
itv=find(basetri.begin(),basetri.end(),tet->get_triangle2());
|
| 352 |
|
|
if (itv==basetri.end()) basetri.push_back(tet->get_triangle2());
|
| 353 |
|
|
else basetri.erase(itv);
|
| 354 |
|
|
itv=find(basetri.begin(),basetri.end(),tet->get_triangle3());
|
| 355 |
|
|
if (itv==basetri.end()) basetri.push_back(tet->get_triangle3());
|
| 356 |
|
|
else basetri.erase(itv);
|
| 357 |
|
|
itv=find(basetri.begin(),basetri.end(),tet->get_triangle4());
|
| 358 |
|
|
if (itv==basetri.end()) basetri.push_back(tet->get_triangle4());
|
| 359 |
|
|
else basetri.erase(itv);
|
| 360 |
|
|
}
|
| 361 |
|
|
|
| 362 |
|
|
void MAILLEUR_DELAUNAY::ajoute_tetra_cavite(DLY_TETRA* tet,std::vector<DLY_TETRA*> &cavite,std::vector<DLY_TRIANGLE*> &basetri)
|
| 363 |
|
|
{
|
| 364 |
|
|
cavite.push_back(tet);
|
| 365 |
|
|
std::vector<DLY_TRIANGLE*>::iterator itv=find(basetri.begin(),basetri.end(),tet->get_triangle1());
|
| 366 |
|
|
if (itv==basetri.end()) basetri.push_back(tet->get_triangle1());
|
| 367 |
|
|
else basetri.erase(itv);
|
| 368 |
|
|
itv=find(basetri.begin(),basetri.end(),tet->get_triangle2());
|
| 369 |
|
|
if (itv==basetri.end()) basetri.push_back(tet->get_triangle2());
|
| 370 |
|
|
else basetri.erase(itv);
|
| 371 |
|
|
itv=find(basetri.begin(),basetri.end(),tet->get_triangle3());
|
| 372 |
|
|
if (itv==basetri.end()) basetri.push_back(tet->get_triangle3());
|
| 373 |
|
|
else basetri.erase(itv);
|
| 374 |
|
|
itv=find(basetri.begin(),basetri.end(),tet->get_triangle4());
|
| 375 |
|
|
if (itv==basetri.end()) basetri.push_back(tet->get_triangle4());
|
| 376 |
|
|
else basetri.erase(itv);
|
| 377 |
|
|
}
|
| 378 |
|
|
|
| 379 |
|
|
void MAILLEUR_DELAUNAY::initialise_maillage(void)
|
| 380 |
|
|
{
|
| 381 |
|
|
double param[32];
|
| 382 |
|
|
int nb_cellule=carte->get_nb_cellule();
|
| 383 |
|
|
carte->get_information(0,0,param);
|
| 384 |
|
|
double xmin=param[0]+0.005*(param[1]-param[0]);
|
| 385 |
|
|
double ymin=param[8]+0.005*(param[10]-param[8]);
|
| 386 |
|
|
double zmin=param[16]+0.005*(param[20]-param[16]);
|
| 387 |
|
|
carte->get_information(nb_cellule-1,0,param);
|
| 388 |
|
|
double xmax=param[1]-0.005*(param[1]-param[0]);
|
| 389 |
|
|
double ymax=param[10]-0.005*(param[10]-param[8]);
|
| 390 |
|
|
double zmax=param[20]-0.005*(param[20]-param[16]);
|
| 391 |
|
|
DLY_NOEUD* no1=new DLY_NOEUD(tabnoeud.size(),xmin,ymin,zmin);
|
| 392 |
|
|
tabnoeud.push_back(no1);
|
| 393 |
|
|
DLY_NOEUD* no2=new DLY_NOEUD(tabnoeud.size(),xmin,ymax,zmin);
|
| 394 |
|
|
tabnoeud.push_back(no2);
|
| 395 |
|
|
DLY_NOEUD* no3=new DLY_NOEUD(tabnoeud.size(),xmax,ymax,zmin);
|
| 396 |
|
|
tabnoeud.push_back(no3);
|
| 397 |
|
|
DLY_NOEUD* no4=new DLY_NOEUD(tabnoeud.size(),xmax,ymin,zmin);
|
| 398 |
|
|
tabnoeud.push_back(no4);
|
| 399 |
|
|
DLY_NOEUD* no5=new DLY_NOEUD(tabnoeud.size(),xmin,ymin,zmax);
|
| 400 |
|
|
tabnoeud.push_back(no5);
|
| 401 |
|
|
DLY_NOEUD* no6=new DLY_NOEUD(tabnoeud.size(),xmin,ymax,zmax);
|
| 402 |
|
|
tabnoeud.push_back(no6);
|
| 403 |
|
|
DLY_NOEUD* no7=new DLY_NOEUD(tabnoeud.size(),xmax,ymax,zmax);
|
| 404 |
|
|
tabnoeud.push_back(no7);
|
| 405 |
|
|
DLY_NOEUD* no8=new DLY_NOEUD(tabnoeud.size(),xmax,ymin,zmax);
|
| 406 |
|
|
tabnoeud.push_back(no8);
|
| 407 |
|
|
DLY_TETRA* tet1=cree_tetra(no2,no1,no3,no6);
|
| 408 |
|
|
DLY_TETRA* tet2=cree_tetra(no3,no1,no4,no5);
|
| 409 |
|
|
DLY_TETRA* tet3=cree_tetra(no3,no1,no5,no6);
|
| 410 |
|
|
DLY_TETRA* tet4=cree_tetra(no8,no5,no7,no4);
|
| 411 |
|
|
DLY_TETRA* tet5=cree_tetra(no7,no5,no6,no3);
|
| 412 |
|
|
DLY_TETRA* tet6=cree_tetra(no4,no3,no5,no7);
|
| 413 |
|
|
mise_a_jour_voisin(tet1);
|
| 414 |
|
|
mise_a_jour_voisin(tet2);
|
| 415 |
|
|
mise_a_jour_voisin(tet3);
|
| 416 |
|
|
mise_a_jour_voisin(tet4);
|
| 417 |
|
|
mise_a_jour_voisin(tet5);
|
| 418 |
|
|
mise_a_jour_voisin(tet6);
|
| 419 |
|
|
char message[255];
|
| 420 |
|
|
sprintf(message," Volume espace : %lf",(xmax-xmin)*(ymax-ymin)*(zmax-zmin));
|
| 421 |
|
|
if (affichageactif) affiche(message);
|
| 422 |
|
|
}
|
| 423 |
|
|
void MAILLEUR_DELAUNAY::mise_a_jour_voisin(DLY_TETRA* tet)
|
| 424 |
|
|
{
|
| 425 |
|
|
int nb=tet->get_triangle1()->get_nb_tetra();
|
| 426 |
|
|
for (int i=0;i<nb;i++)
|
| 427 |
|
|
{
|
| 428 |
|
|
DLY_TETRA* tetmp=tet->get_triangle1()->get_tetra(i);
|
| 429 |
|
|
if (tetmp->get_feuille()==1)
|
| 430 |
|
|
if (tetmp!=tet) tet->change_voisin1(tetmp);
|
| 431 |
|
|
}
|
| 432 |
|
|
nb=tet->get_triangle2()->get_nb_tetra();
|
| 433 |
|
|
for (int i=0;i<nb;i++)
|
| 434 |
|
|
{
|
| 435 |
|
|
DLY_TETRA* tetmp=tet->get_triangle2()->get_tetra(i);
|
| 436 |
|
|
if (tetmp->get_feuille()==1)
|
| 437 |
|
|
if (tetmp!=tet) tet->change_voisin2(tetmp);
|
| 438 |
|
|
}
|
| 439 |
|
|
nb=tet->get_triangle3()->get_nb_tetra();
|
| 440 |
|
|
for (int i=0;i<nb;i++)
|
| 441 |
|
|
{
|
| 442 |
|
|
DLY_TETRA* tetmp=tet->get_triangle3()->get_tetra(i);
|
| 443 |
|
|
if (tetmp->get_feuille()==1)
|
| 444 |
|
|
if (tetmp!=tet) tet->change_voisin3(tetmp);
|
| 445 |
|
|
}
|
| 446 |
|
|
nb=tet->get_triangle4()->get_nb_tetra();
|
| 447 |
|
|
for (int i=0;i<nb;i++)
|
| 448 |
|
|
{
|
| 449 |
|
|
DLY_TETRA* tetmp=tet->get_triangle4()->get_tetra(i);
|
| 450 |
|
|
if (tetmp->get_feuille()==1)
|
| 451 |
|
|
if (tetmp!=tet) tet->change_voisin4(tetmp);
|
| 452 |
|
|
}
|
| 453 |
|
|
}
|
| 454 |
|
|
|
| 455 |
|
|
|
| 456 |
|
|
DLY_TETRA* MAILLEUR_DELAUNAY::cree_tetra(DLY_NOEUD* n1,DLY_NOEUD* n2,DLY_NOEUD* n3,DLY_NOEUD* n4)
|
| 457 |
|
|
{
|
| 458 |
|
|
double xyz1[3],xyz2[3],xyz3[3],xyz4[3];
|
| 459 |
|
|
n1->get_coord(xyz1);
|
| 460 |
|
|
n2->get_coord(xyz2);
|
| 461 |
|
|
n3->get_coord(xyz3);
|
| 462 |
|
|
n4->get_coord(xyz4);
|
| 463 |
|
|
double qual=OPERATEUR::qualite_tetra(xyz1,xyz2,xyz3,xyz4);
|
| 464 |
|
|
DLY_TETRA* tet;
|
| 465 |
|
|
if (!(qual>0.))
|
| 466 |
|
|
{
|
| 467 |
|
|
DLY_NOEUD* ntmp=n1;
|
| 468 |
|
|
n1=n2;
|
| 469 |
|
|
n2=ntmp;
|
| 470 |
|
|
}
|
| 471 |
|
|
tet=new DLY_TETRA(n1,n2,n3,n4,fabs(qual));
|
| 472 |
|
|
tabtet.push_back(tet);
|
| 473 |
|
|
tet->change_triangle1(get_triangle(n1,n2,n3));
|
| 474 |
|
|
tet->change_triangle2(get_triangle(n1,n2,n4));
|
| 475 |
|
|
tet->change_triangle3(get_triangle(n1,n3,n4));
|
| 476 |
|
|
tet->change_triangle4(get_triangle(n2,n3,n4));
|
| 477 |
|
|
tet->change_segment1(get_segment(n1,n2));
|
| 478 |
|
|
tet->change_segment2(get_segment(n1,n3));
|
| 479 |
|
|
tet->change_segment3(get_segment(n1,n4));
|
| 480 |
|
|
tet->change_segment4(get_segment(n2,n3));
|
| 481 |
|
|
tet->change_segment5(get_segment(n2,n4));
|
| 482 |
|
|
tet->change_segment6(get_segment(n3,n4));
|
| 483 |
|
|
// std::pair<double,DLY_TETRA*> tmp(tet->get_critere_subdivision(),tet);
|
| 484 |
|
|
ajouter_front(tet->get_segment1()->calcul_longueur(carte,1),tet->get_segment1());
|
| 485 |
|
|
ajouter_front(tet->get_segment2()->calcul_longueur(carte,1),tet->get_segment2());
|
| 486 |
|
|
ajouter_front(tet->get_segment3()->calcul_longueur(carte,1),tet->get_segment3());
|
| 487 |
|
|
ajouter_front(tet->get_segment4()->calcul_longueur(carte,1),tet->get_segment4());
|
| 488 |
|
|
ajouter_front(tet->get_segment5()->calcul_longueur(carte,1),tet->get_segment5());
|
| 489 |
|
|
ajouter_front(tet->get_segment6()->calcul_longueur(carte,1),tet->get_segment6());
|
| 490 |
|
|
return tet;
|
| 491 |
|
|
}
|
| 492 |
|
|
DLY_SEGMENT* MAILLEUR_DELAUNAY::get_segment(DLY_NOEUD* n1,DLY_NOEUD* n2)
|
| 493 |
|
|
{
|
| 494 |
|
|
|
| 495 |
|
|
DLY_NOEUD* no;
|
| 496 |
|
|
if (n1->get_num()<n2->get_num()) no=n1;
|
| 497 |
|
|
else no=n2;
|
| 498 |
|
|
DLY_SEGMENT* seg=no->get_lien_segment(n1,n2);
|
| 499 |
|
|
if (seg==NULL)
|
| 500 |
|
|
{
|
| 501 |
|
|
seg=new DLY_SEGMENT(n1,n2);
|
| 502 |
|
|
tabseg.push_back(seg);
|
| 503 |
|
|
no->insere_lien_segment(seg);
|
| 504 |
|
|
}
|
| 505 |
|
|
return seg;
|
| 506 |
|
|
}
|
| 507 |
|
|
|
| 508 |
|
|
DLY_TRIANGLE* MAILLEUR_DELAUNAY::get_triangle(DLY_NOEUD* n1,DLY_NOEUD* n2,DLY_NOEUD* n3)
|
| 509 |
|
|
{
|
| 510 |
|
|
DLY_NOEUD* no;
|
| 511 |
|
|
if (n1->get_num()<n2->get_num()) no=n1;
|
| 512 |
|
|
else no=n2;
|
| 513 |
|
|
if (n3->get_num()<no->get_num()) no=n3;
|
| 514 |
|
|
DLY_TRIANGLE* tri=no->get_lien_triangle(n1,n2,n3);
|
| 515 |
|
|
if (tri==NULL)
|
| 516 |
|
|
{
|
| 517 |
|
|
tri=new DLY_TRIANGLE(n1,n2,n3);
|
| 518 |
|
|
tabtri.push_back(tri);
|
| 519 |
|
|
no->insere_lien_triangle(tri);
|
| 520 |
|
|
}
|
| 521 |
|
|
return tri;
|
| 522 |
|
|
}
|
| 523 |
|
|
|
| 524 |
|
|
|
| 525 |
|
|
DLY_TETRA* MAILLEUR_DELAUNAY::get_tetra(double x,double y,double z)
|
| 526 |
|
|
{
|
| 527 |
|
|
DLY_TETRA* tet;
|
| 528 |
|
|
tet=get_tetra(tabtet[0],x,y,z);
|
| 529 |
|
|
if (tet!=NULL) return tet;
|
| 530 |
|
|
tet=get_tetra(tabtet[1],x,y,z);
|
| 531 |
|
|
if (tet!=NULL) return tet;
|
| 532 |
|
|
tet=get_tetra(tabtet[2],x,y,z);
|
| 533 |
|
|
if (tet!=NULL) return tet;
|
| 534 |
|
|
tet=get_tetra(tabtet[3],x,y,z);
|
| 535 |
|
|
if (tet!=NULL) return tet;
|
| 536 |
|
|
tet=get_tetra(tabtet[4],x,y,z);
|
| 537 |
|
|
if (tet!=NULL) return tet;
|
| 538 |
|
|
tet=get_tetra(tabtet[5],x,y,z);
|
| 539 |
|
|
if (tet!=NULL) return tet;
|
| 540 |
|
|
return NULL;
|
| 541 |
|
|
}
|
| 542 |
|
|
|
| 543 |
|
|
DLY_TETRA* MAILLEUR_DELAUNAY::get_tetra(DLY_TETRA* tet,double x,double y,double z)
|
| 544 |
|
|
{
|
| 545 |
|
|
if (tet->point_dans_le_tetra(x,y,z))
|
| 546 |
|
|
{
|
| 547 |
|
|
if (tet->get_feuille()==1) return tet;
|
| 548 |
|
|
int nb=tet->get_nb_fils();
|
| 549 |
|
|
for (int i=0;i<nb;i++)
|
| 550 |
|
|
{
|
| 551 |
|
|
DLY_TETRA* tetrep=get_tetra(tet->get_fils(i),x,y,z);
|
| 552 |
|
|
if (tetrep!=NULL) return tetrep;
|
| 553 |
|
|
}
|
| 554 |
|
|
}
|
| 555 |
|
|
return NULL;
|
| 556 |
|
|
}
|
| 557 |
|
|
|
| 558 |
|
|
|
| 559 |
|
|
void MAILLEUR_DELAUNAY::transfert_maillage(std::vector<DLY_NOEUD*> *tabn,std::vector<DLY_TRIANGLE*> *tabe2d,std::vector<DLY_TETRA*> *tabe3d)
|
| 560 |
|
|
{
|
| 561 |
|
|
for (int i=0;i<tabn->size();i++)
|
| 562 |
|
|
{
|
| 563 |
|
|
DLY_NOEUD *no=(*tabn)[i];
|
| 564 |
francois |
287 |
M3D_NOEUD* noeud=new M3D_NOEUD(NULL,no->get_x(),no->get_y(),no->get_z(),TRIANGULATION);
|
| 565 |
francois |
285 |
mai->ajouter_mg_noeud(noeud);
|
| 566 |
|
|
no->change_noeud(noeud);
|
| 567 |
francois |
287 |
noeud->etat_actif();
|
| 568 |
francois |
285 |
}
|
| 569 |
|
|
if (tabe2d!=NULL)
|
| 570 |
|
|
{
|
| 571 |
|
|
for (int i=0;i<tabe2d->size();i++)
|
| 572 |
|
|
{
|
| 573 |
|
|
DLY_TRIANGLE* tri=(*tabe2d)[i];
|
| 574 |
|
|
if (tri->est_frontiere())
|
| 575 |
|
|
MG_TRIANGLE *mgtri=mai->ajouter_mg_triangle(NULL,tri->get_noeud1()->get_noeud(),tri->get_noeud2()->get_noeud(),tri->get_noeud3()->get_noeud(),TRIANGULATION);
|
| 576 |
|
|
}
|
| 577 |
|
|
}
|
| 578 |
|
|
else
|
| 579 |
|
|
{
|
| 580 |
|
|
double vol=0.;
|
| 581 |
|
|
double nbmaitheo=0;
|
| 582 |
|
|
for (int i=0;i<tabe3d->size();i++)
|
| 583 |
|
|
{
|
| 584 |
|
|
DLY_TETRA* tet=(*tabe3d)[i];
|
| 585 |
|
|
if (tet->get_feuille()==1)
|
| 586 |
|
|
{
|
| 587 |
francois |
287 |
MG_TRIANGLE* mgtriangle1=mai->get_mg_triangle(tet->get_noeud1()->get_noeud()->get_id(),tet->get_noeud3()->get_noeud()->get_id(),tet->get_noeud2()->get_noeud()->get_id());
|
| 588 |
|
|
MG_TRIANGLE* mgtriangle2=mai->get_mg_triangle(tet->get_noeud1()->get_noeud()->get_id(),tet->get_noeud2()->get_noeud()->get_id(),tet->get_noeud4()->get_noeud()->get_id());
|
| 589 |
|
|
MG_TRIANGLE* mgtriangle3=mai->get_mg_triangle(tet->get_noeud2()->get_noeud()->get_id(),tet->get_noeud3()->get_noeud()->get_id(),tet->get_noeud4()->get_noeud()->get_id());
|
| 590 |
|
|
MG_TRIANGLE* mgtriangle4=mai->get_mg_triangle(tet->get_noeud1()->get_noeud()->get_id(),tet->get_noeud4()->get_noeud()->get_id(),tet->get_noeud3()->get_noeud()->get_id());
|
| 591 |
|
|
if (mgtriangle1==NULL) mgtriangle1=mai->ajouter_mg_triangle(NULL,tet->get_noeud1()->get_noeud(),tet->get_noeud3()->get_noeud(),tet->get_noeud2()->get_noeud(),TRIANGULATION);
|
| 592 |
|
|
if (mgtriangle2==NULL) mgtriangle2=mai->ajouter_mg_triangle(NULL,tet->get_noeud1()->get_noeud(),tet->get_noeud2()->get_noeud(),tet->get_noeud4()->get_noeud(),TRIANGULATION);
|
| 593 |
|
|
if (mgtriangle3==NULL) mgtriangle3=mai->ajouter_mg_triangle(NULL,tet->get_noeud2()->get_noeud(),tet->get_noeud3()->get_noeud(),tet->get_noeud4()->get_noeud(),TRIANGULATION);
|
| 594 |
|
|
if (mgtriangle4==NULL) mgtriangle4=mai->ajouter_mg_triangle(NULL,tet->get_noeud1()->get_noeud(),tet->get_noeud4()->get_noeud(),tet->get_noeud3()->get_noeud(),TRIANGULATION);
|
| 595 |
|
|
M3D_TETRA* mgtet=mgtet=new M3D_TETRA(NULL,tet->get_noeud1()->get_noeud(),tet->get_noeud2()->get_noeud(),tet->get_noeud3()->get_noeud(),tet->get_noeud4()->get_noeud(),mgtriangle1,mgtriangle2,mgtriangle3,mgtriangle4,TRIANGULATION);
|
| 596 |
|
|
mai->ajouter_mg_tetra(mgtet);
|
| 597 |
|
|
int tabnoeud[4]={0,0,0,0};
|
| 598 |
|
|
if (tet->get_triangle1()->est_frontiere()) {tabnoeud[0]=1;tabnoeud[1]=1;tabnoeud[2]=1;}
|
| 599 |
|
|
if (tet->get_triangle2()->est_frontiere()) {tabnoeud[0]=1;tabnoeud[1]=1;tabnoeud[3]=1;}
|
| 600 |
|
|
if (tet->get_triangle3()->est_frontiere()) {tabnoeud[0]=1;tabnoeud[2]=1;tabnoeud[3]=1;}
|
| 601 |
|
|
if (tet->get_triangle4()->est_frontiere()) {tabnoeud[1]=1;tabnoeud[2]=1;tabnoeud[3]=1;}
|
| 602 |
|
|
if (tabnoeud[0]==1) ((M3D_NOEUD*)mgtet->get_noeud1())->etat_inactif();
|
| 603 |
|
|
if (tabnoeud[1]==1) ((M3D_NOEUD*)mgtet->get_noeud2())->etat_inactif();
|
| 604 |
|
|
if (tabnoeud[2]==1) ((M3D_NOEUD*)mgtet->get_noeud3())->etat_inactif();
|
| 605 |
|
|
if (tabnoeud[3]==1) ((M3D_NOEUD*)mgtet->get_noeud4())->etat_inactif();
|
| 606 |
|
|
|
| 607 |
|
|
vol=vol+tet->calcul_volume(NULL,0);
|
| 608 |
francois |
285 |
nbmaitheo=nbmaitheo+tet->calcul_volume(carte,0);
|
| 609 |
|
|
}
|
| 610 |
|
|
}
|
| 611 |
francois |
287 |
|
| 612 |
francois |
285 |
char message[255];
|
| 613 |
|
|
sprintf(message," Volume maille : %lf",vol);
|
| 614 |
|
|
if (affichageactif) affiche(message);
|
| 615 |
|
|
nbmaitheo=12.*nbmaitheo/sqrt(2);
|
| 616 |
|
|
double erreur=nbmaitheo-mai->get_nb_mg_tetra();
|
| 617 |
|
|
erreur=erreur/mai->get_nb_mg_tetra();
|
| 618 |
|
|
sprintf(message," Nombre de maille theorique : %d, Nombre de maille pratique %d, erreur %.2lf%%",(int)nbmaitheo,mai->get_nb_mg_tetra(),erreur);
|
| 619 |
|
|
if (affichageactif) affiche(message);
|
| 620 |
|
|
}
|
| 621 |
|
|
|
| 622 |
|
|
}
|
| 623 |
|
|
|
| 624 |
|
|
|
| 625 |
|
|
int MAILLEUR_DELAUNAY::est_de_delaunay(void)
|
| 626 |
|
|
{
|
| 627 |
|
|
for (int i=0;i<tabtet.size();i++)
|
| 628 |
|
|
{
|
| 629 |
|
|
DLY_TETRA* tet=tabtet[i];
|
| 630 |
|
|
for (int j=0;j<tabnoeud.size();j++)
|
| 631 |
|
|
{
|
| 632 |
|
|
DLY_NOEUD* no=tabnoeud[j];
|
| 633 |
|
|
if (no!=tet->get_noeud1())
|
| 634 |
|
|
if (no!=tet->get_noeud2())
|
| 635 |
|
|
if (no!=tet->get_noeud3())
|
| 636 |
|
|
if (no!=tet->get_noeud4())
|
| 637 |
|
|
{
|
| 638 |
|
|
int num=tet->point_dans_la_sphere(no->get_x(),no->get_y(),no->get_z()>1);
|
| 639 |
|
|
if (num>1)
|
| 640 |
|
|
return 0;
|
| 641 |
|
|
|
| 642 |
|
|
}
|
| 643 |
|
|
}
|
| 644 |
|
|
}
|
| 645 |
|
|
return 1;
|
| 646 |
|
|
}
|
