Skip to content

Commit 4a15aa0

Browse files
lelandaisblelandaisb
committed
Mix of 2.6.0 and 2.5.0 for splitFaces
1 parent a61b088 commit 4a15aa0

File tree

7 files changed

+962
-92
lines changed

7 files changed

+962
-92
lines changed

‎src/Core/Topo/Block.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2146,7 +2146,7 @@ split(CoEdge* arete, double ratio,
21462146
timer.start();
21472147
#endif
21482148
// le découpage des faces communes (qui doivent former une boucle)
2149-
TopoHelper::splitFaces(blk_cofaces, arete, ratio, 0, true, false, splitingEdges, icmd);
2149+
TopoHelper::splitFaces2D(blk_cofaces, arete, ratio, 0, true, false, splitingEdges, icmd);
21502150
#ifdef _DEBUG_TIMER
21512151
timer.stop();
21522152
std::cout<<" TopoHelper::splitFaces en "<<timer.strDuration()<<std::endl;

‎src/Core/Topo/CommandExtendSplitFace.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ internalExecute()
6363
cofaces.push_back(m_coface);
6464

6565
if (coedge->getVertex(0) == m_sommet)
66-
TopoHelper::splitFaces(cofaces, coedge, 0, 0, false, false, splitingEdges, &getInfoCommand());
66+
TopoHelper::splitFaces2D(cofaces, coedge, 0, 0, false, false, splitingEdges, &getInfoCommand());
6767
else if (coedge->getVertex(1) == m_sommet)
68-
TopoHelper::splitFaces(cofaces, coedge, 1, 0, false, false, splitingEdges, &getInfoCommand());
68+
TopoHelper::splitFaces2D(cofaces, coedge, 1, 0, false, false, splitingEdges, &getInfoCommand());
6969
else
7070
throw TkUtil::Exception (TkUtil::UTF8String ("La face ne peut être découpée avec ce sommet, on ne trouve retrouve pas ce sommet dans l'arête", TkUtil::Charset::UTF_8));
7171

‎src/Core/Topo/CommandNewTopoOGridOnGeometry.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ createCylinderTopo1BlockDemi(Geom::PropertyCylinder* propertyCyl)
363363
std::vector<Edge* > splitingEdges;
364364
std::vector<CoFace* > cofaces;
365365
cofaces.push_back(b1->getFace(Block::j_min)->getCoFace(0));
366-
TopoHelper::splitFaces(cofaces,
366+
TopoHelper::splitFaces2D(cofaces,
367367
b1->getFace(Block::k_min)->getEdge(b1->getVertex(0), b1->getVertex(1))->getCoEdge(0),
368368
0.5, 0.0, false, false,
369369
splitingEdges,
@@ -1411,7 +1411,7 @@ void CommandNewTopoOGridOnGeometry::createCylinderTopoOGridDemiNonDeg(Geom::Prop
14111411
std::vector<Edge* > splitingEdges;
14121412
std::vector<CoFace* > cofaces;
14131413
cofaces.push_back(b1->getFace(Block::j_min)->getCoFace(0));
1414-
TopoHelper::splitFaces(cofaces,
1414+
TopoHelper::splitFaces2D(cofaces,
14151415
b1->getFace(Block::k_min)->getEdge(b1->getVertex(0), b1->getVertex(1))->getCoEdge(0),
14161416
0.5, 0.0, false, false,
14171417
splitingEdges,
@@ -1662,7 +1662,7 @@ createSphereTopo1BlockDemi(Geom::PropertySphere* propertySph)
16621662
std::vector<Edge* > splitingEdges;
16631663
std::vector<CoFace* > cofaces;
16641664
cofaces.push_back(b1->getFace(Block::j_min)->getCoFace(0));
1665-
TopoHelper::splitFaces(cofaces,
1665+
TopoHelper::splitFaces2D(cofaces,
16661666
b1->getFace(Block::j_min)->getEdge(b1->getVertex(0), b1->getVertex(1))->getCoEdge(0),
16671667
0.5, 0.0, false, false,
16681668
splitingEdges,
@@ -2237,7 +2237,7 @@ createSphereTopoOGridDemiDeg(Geom::PropertySphere* propertySph)
22372237
std::vector<CoEdge* > coedges;
22382238
std::vector<CoFace* > cofaces;
22392239
cofaces.push_back(b4->getFace(Block::i_min)->getCoFace(0));
2240-
TopoHelper::splitFaces(cofaces,
2240+
TopoHelper::splitFaces2D(cofaces,
22412241
b4->getFace(Block::i_min)->getEdge(b4->getVertex(0), b4->getVertex(2))->getCoEdge(0),
22422242
0.5, 0.0, false, false,
22432243
splitingEdges,
@@ -2246,7 +2246,7 @@ createSphereTopoOGridDemiDeg(Geom::PropertySphere* propertySph)
22462246
coedges.push_back(splitingEdges[0]->getCoEdge(0));
22472247
cofaces.clear();
22482248
cofaces.push_back(b5->getFace(Block::i_min)->getCoFace(0));
2249-
TopoHelper::splitFaces(cofaces,
2249+
TopoHelper::splitFaces2D(cofaces,
22502250
b5->getFace(Block::i_min)->getEdge(b5->getVertex(0), b5->getVertex(2))->getCoEdge(0),
22512251
0.5, 0.0, false, false,
22522252
splitingEdges,
@@ -2464,7 +2464,7 @@ createSphereTopoOGridDemiNonDeg(Geom::PropertySphere* propertySph)
24642464
cofaces.push_back(b1->getFace(Block::k_max)->getCoFace(0));
24652465
cofaces.push_back(b4->getFace(Block::i_min)->getCoFace(0));
24662466
cofaces.push_back(b5->getFace(Block::i_min)->getCoFace(0));
2467-
TopoHelper::splitFaces(cofaces,
2467+
TopoHelper::splitFaces2D(cofaces,
24682468
b4->getFace(Block::i_min)->getEdge(b4->getVertex(0), b4->getVertex(2))->getCoEdge(0),
24692469
0.5, 0.0, false, false,
24702470
splitingEdges,
@@ -3966,7 +3966,7 @@ createHollowSphereTopoDemi(Geom::PropertyHollowSphere* propertySph)
39663966
std::vector<CoEdge* > coedges;
39673967
std::vector<CoFace* > cofaces;
39683968
cofaces.push_back(b4->getFace(Block::i_min)->getCoFace(0));
3969-
TopoHelper::splitFaces(cofaces,
3969+
TopoHelper::splitFaces2D(cofaces,
39703970
b4->getFace(Block::i_min)->getEdge(b4->getVertex(0), b4->getVertex(2))->getCoEdge(0),
39713971
0.5, 0.0, false, false,
39723972
splitingEdges,
@@ -3975,7 +3975,7 @@ createHollowSphereTopoDemi(Geom::PropertyHollowSphere* propertySph)
39753975
coedges.push_back(splitingEdges[0]->getCoEdge(0));
39763976
cofaces.clear();
39773977
cofaces.push_back(b5->getFace(Block::i_min)->getCoFace(0));
3978-
TopoHelper::splitFaces(cofaces,
3978+
TopoHelper::splitFaces2D(cofaces,
39793979
b5->getFace(Block::i_min)->getEdge(b5->getVertex(0), b5->getVertex(2))->getCoEdge(0),
39803980
0.5, 0.0, false, false,
39813981
splitingEdges,
@@ -4574,7 +4574,7 @@ void CommandNewTopoOGridOnGeometry::createConeTopo1BlockDemiR0()
45744574
std::vector<Edge* > splitingEdges;
45754575
std::vector<CoFace* > cofaces;
45764576
cofaces.push_back(b1->getFace(Block::j_max)->getCoFace(0));
4577-
TopoHelper::splitFaces(cofaces,
4577+
TopoHelper::splitFaces2D(cofaces,
45784578
cofaces[0]->getEdge(b1->getVertex(2), b1->getVertex(3))->getCoEdge(0),
45794579
0.5, 0.0, false, false,
45804580
splitingEdges,
@@ -4661,7 +4661,7 @@ void CommandNewTopoOGridOnGeometry::createConeTopo1BlockDemi()
46614661
std::vector<Edge* > splitingEdges;
46624662
std::vector<CoFace* > cofaces;
46634663
cofaces.push_back(b1->getFace(Block::j_max)->getCoFace(0));
4664-
TopoHelper::splitFaces(cofaces,
4664+
TopoHelper::splitFaces2D(cofaces,
46654665
cofaces[0]->getEdge(b1->getVertex(2), b1->getVertex(3))->getCoEdge(0),
46664666
0.5, 0.0, false, false,
46674667
splitingEdges,
@@ -5284,7 +5284,7 @@ void CommandNewTopoOGridOnGeometry::createConeTopoOGridDemiNonDegR0()
52845284
std::vector<Edge* > splitingEdges;
52855285
std::vector<CoFace* > cofaces;
52865286
cofaces.push_back(b5->getFace(Block::i_max)->getCoFace(0));
5287-
TopoHelper::splitFaces(cofaces,
5287+
TopoHelper::splitFaces2D(cofaces,
52885288
cofaces[0]->getEdge(b5->getVertex(1), b5->getVertex(3))->getCoEdge(0),
52895289
0.5, 0.0, false, false,
52905290
splitingEdges,
@@ -5567,7 +5567,7 @@ void CommandNewTopoOGridOnGeometry::createConeTopoOGridDemiNonDeg()
55675567
std::vector<Edge* > splitingEdges;
55685568
std::vector<CoFace* > cofaces;
55695569
cofaces.push_back(b5->getFace(Block::i_max)->getCoFace(0));
5570-
TopoHelper::splitFaces(cofaces,
5570+
TopoHelper::splitFaces2D(cofaces,
55715571
cofaces[0]->getEdge(b5->getVertex(1), b5->getVertex(3))->getCoEdge(0),
55725572
0.5, 0.0, false, false,
55735573
splitingEdges,

‎src/Core/Topo/CommandSplitFaces.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,9 @@ internalExecute()
299299

300300
std::vector<Edge*> splitingEdges;
301301

302-
// if (m_cas_2D) {
303-
// TopoHelper::splitFaces(m_cofaces, m_arete, m_ratio_dec, m_ratio_ogrid, false, true, splitingEdges, &getInfoCommand());
304-
// } else {
302+
if (m_cas_2D) {
303+
TopoHelper::splitFaces2D(m_cofaces, m_arete, m_ratio_dec, m_ratio_ogrid, false, true, splitingEdges, &getInfoCommand());
304+
} else {
305305
do {
306306
Vertex* sommet = 0;
307307
CoFace* coface = 0;
@@ -325,10 +325,10 @@ internalExecute()
325325
coedge = *iter;
326326

327327
if (coedge->getVertex(0) == sommet)
328-
TopoHelper::splitFaces(coface_vec, coedge, 0, m_ratio_ogrid, false, false, current_splitingEdge,
328+
TopoHelper::splitFaces3D(coface_vec, coedge, 0, m_ratio_ogrid, false, false, current_splitingEdge,
329329
&getInfoCommand());
330330
else if (coedge->getVertex(1) == sommet)
331-
TopoHelper::splitFaces(coface_vec, coedge, 1, m_ratio_ogrid, false, false, current_splitingEdge,
331+
TopoHelper::splitFaces3D(coface_vec, coedge, 1, m_ratio_ogrid, false, false, current_splitingEdge,
332332
&getInfoCommand());
333333

334334
filtre_faces.insert(coface);
@@ -345,7 +345,7 @@ internalExecute()
345345

346346
coface_vec = {coface};
347347

348-
TopoHelper::splitFaces(coface_vec, m_arete, m_ratio_dec, m_ratio_ogrid, false, true, current_splitingEdge, &getInfoCommand());
348+
TopoHelper::splitFaces3D(coface_vec, m_arete, m_ratio_dec, m_ratio_ogrid, false, true, current_splitingEdge, &getInfoCommand());
349349

350350
filtre_faces.insert(coface);
351351
}
@@ -359,7 +359,7 @@ internalExecute()
359359
}
360360

361361
} while (nb_faces_dep != nb_faces_split);
362-
//}
362+
}
363363

364364
// on replace les sommets en fonction de m_ratio_dec
365365
if (!m_project_on_meshing_edges)

0 commit comments

Comments
 (0)