mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-03 17:56:21 +03:00
0d0481c787
When fuzzy option is in force prevent increasing tolerance of input shapes. Instead pass increased by fuzzy value the tolerances of sub-shapes everywhere where it is needed by intersection algorithms. The following changes in API have been made: - The methods SetFuzzyValue and FuzzyValue have been moved from the classes BOPAlgo_ArgumentAnalyzer, BOPAlgo_Builder, and BOPAlgo_PaveFiller to the base class BOPAlgo_Algo. - The public method BOPDS_DS::VerticesOnIn has been renamed to SubShapesOnIn, and the new output parameter theCommonPB has been added. - In BOPTools_AlgoTools, a new argument "theFuzzyValue" has been added in the methods ComputeVV and AreFacesSameDomain. - In IntTools_Context, a new argument "theFuzzyValue" has been added in the methods ComputeVE and ComputeVF. - The methods SetFuzzyValue and FuzzyValue have been added in the classes IntTools_EdgeEdge, IntTools_FaceFace. - In the class IntTools_EdgeFace, the methods SetTolE, SetTolF, TolE, TolF have been removed, and the methods SetFuzzyValue, FuzzyValue have been added. - The new argument "theTol" has been added in the method IntTools_WLineTool::DecompositionOfWLine. Some improvements in algorithms have been made during fighting with regressions: - Correct initialization of pave blocks for degenerated edges. - In BOPAlgo_PaveFiller::MakeBlocks(), filter out paves on intersection curve that were put on the curve accidentally due to wide range of E-F intersection vertex. - In the method IntTools_Tools::ComputeTolerance the margin added to the computed tolerance has been increased up to 0.001%. - The method BOPAlgo_PaveFiller::PutPaveOnCurve has been corrected in order to use the original vertex tolerance instead of the value increased during putting it on other curves. - The new method BOPDS_PaveBlock::RemoveExtPave has been added. - The vertex tolerance computation in BOPTools_AlgoTools::CorrectCurveOnSurface has been improved, taking into account intersection segments between p-curves (to avoid regression on "bugs modalg_6 bug22794"). - Improve IsExistingPaveBlock to make more stable catching of coincidence of common block with section curve (against regression "bugs modalg_4 bug697_2" on Linux). Test case for the bug has been added. The following test cases have been updated as improvements: boolean gdml_private ZH2 ZI7 ZJ7 boolean volumemaker C4 The test case bugs/modalg_4/pro19653 has been corrected to make it stable. See comment inside the script for details. The test case bugs/modalg_6/bug25880 has been corrected to suppress wrong bfuse commands. The test bugs/modalg_6/bug26954_3 has been corrected to compare the result with more precise reference value. The "faulty" TODO in boolean/volumemaker/A8 has been made actual for Linux as well. //Eliminate compilation error on Linux.
66 lines
1.7 KiB
Plaintext
Executable File
66 lines
1.7 KiB
Plaintext
Executable File
puts "============"
|
|
puts "OCC25880"
|
|
puts "============"
|
|
puts ""
|
|
###############################
|
|
## fuzzy booleans with multiple tools
|
|
###############################
|
|
|
|
bfuzzyvalue 0.00001
|
|
box Box018 13.550000190735 50.200000762939 3.299999952316
|
|
ttranslate Box018 -19.1 -0.1 2.35
|
|
#Object Label: Box
|
|
|
|
psphere Sphere002 1.600000023842 0 90 180
|
|
ttranslate Sphere002 -15 50.1 5.5
|
|
#Object Label: LeftSph
|
|
|
|
#bfuse to-Fusion-001-t Box018 Sphere002
|
|
pcylinder Cylinder006 1.600000023842 3.200000047684 180
|
|
ttranslate Cylinder006 -15 50.1 2.35
|
|
|
|
#Object Label: LeftHalfCyl
|
|
#bfuse to-Fusion-002-t to-Fusion-001-t Cylinder006
|
|
psphere Sphere001 1.600000023842 0 90 180
|
|
trotate Sphere001 0 0 0 1 0 0 90
|
|
ttranslate Sphere001 -15 -0.1 5.5
|
|
|
|
#Object Label: RightSph
|
|
#bfuse to-Fusion-003-t to-Fusion-002-t Sphere001
|
|
pcylinder Cylinder005 1.600000023842 3.200000047684 180
|
|
trotate Cylinder005 0 0 0 0 0 1 180
|
|
ttranslate Cylinder005 -15 -0.1 2.35
|
|
|
|
#Object Label: RightHalfCyl
|
|
#bfuse to-Fusion-004-t to-Fusion-003-t Cylinder005
|
|
pcylinder Cylinder004 1.600000023842 50.200000762939 180
|
|
trotate Cylinder004 0 0 0 0 0.7071067811865475 0.7071067811865475 180
|
|
ttranslate Cylinder004 -15.000003814697 -0.100001335144 5.500000953674
|
|
|
|
#Object Label: TopHalfCyl
|
|
#bfuse Fusion to-Fusion-004-t Cylinder004
|
|
bclearobjects
|
|
bcleartools
|
|
baddobjects Box018
|
|
baddtools Sphere002 Cylinder006 Sphere001 Cylinder005 Cylinder004
|
|
bfillds
|
|
bbop result 1
|
|
|
|
checkprops result -s 1893.17
|
|
checkshape result
|
|
|
|
set nbshapes_expected "
|
|
Number of shapes in shape
|
|
VERTEX : 32
|
|
EDGE : 51
|
|
WIRE : 20
|
|
FACE : 20
|
|
SHELL : 1
|
|
SOLID : 1
|
|
COMPSOLID : 0
|
|
COMPOUND : 1
|
|
SHAPE : 126
|
|
"
|
|
checknbshapes result -ref ${nbshapes_expected} -t -m "fuzzy booleans with multiple tools"
|
|
checkview -display result -3d -path ${imagedir}/${test_image}.png
|