mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-04 18:06:22 +03:00
b7cd7c2b7c
1. Unify the faces classification procedure of the methods BOPAlgo_BuilderSolid::PerformInternalShapes() and BOPAlgo_Builder::FillIn3DParts() using the latter as a base. The new method BOPAlgo_Tools::ClassifyFaces() has been created for that. Both methods mentioned above have been updated to use the new one. 2. Forced intersection of the edges after enlarge of the tolerance values of their vertices during the operation has been added into BOP's intersection algorithm (BOPAlgo_PaveFiller). BOPAlgo_Tools::PerformCommonBlocks() method has been updated to avoid loosing faces of the already created Common blocks. As a result the case "boolean gdml_private ZF6" became more stable, because the intermediate result is no longer invalid. Additional test cases have been added to verify this improvement (bugs modalg_7 bug29322_*) 3. When building PCurves for edges on faces, check the existing PCurves on its validity for periodic surfaces and adjust PCurves if necessary. The improvement helps to produce the valid result in the test case "bugs moddata_1 bug152". 4. Avoid creation of empty Edge-Edge interference if the intersection point is lying close to a shared vertex. The improvement helps obtain the valid result of the "bopcheck" operation in the test case "bugs modalg_7 bug27683". Adjustment of the test case to current behavior: - Avoid usage of the self-intersecting torus in the test case "boolean gdml_public A9". - Fix the input shape in the test case "boolean bopfuse_complex H1" to provide valid result. - Test cases "bugs moddata_1 bug152_1 bug152_2" have been unified into single test case "bugs moddata_1 bug152". Now, the case rebuilds invalid input data and performs all types of Boolean operations. - Change the test case "bugs modalg_7 bug22750" to produce valid intermediate results used in subsequent operations as arguments. - The following test cases are improvements: - "boolean volumemaker D8" - "boolean volumemaker G1" - "bugs modalg_7 bug27683"
113 lines
2.6 KiB
Plaintext
113 lines
2.6 KiB
Plaintext
puts "========"
|
|
puts "OCC22750"
|
|
puts "========"
|
|
puts ""
|
|
#######################################################
|
|
# Boolean operation: Bug in Fuse
|
|
#######################################################
|
|
|
|
# Step 1: Create surface wing
|
|
|
|
# Create sections as ellipses 2D (possible to create directly in 3D)
|
|
ellipse e1 0 0 30 20
|
|
ellipse e2 0 0 20 10
|
|
ellipse e3 0 0 16 8
|
|
|
|
# Convert 2d Curves in 3d Curves, and place them along Z axis
|
|
to3d ee1 e1
|
|
to3d ee2 e2; translate ee2 0 0 100
|
|
to3d ee3 e3; translate ee3 0 0 200
|
|
|
|
rotate ee2 0 0 100 0 1 0 10
|
|
rotate ee3 0 0 200 0 1 0 20
|
|
|
|
#Approximate the ellipses by Bsplines
|
|
appro c1 16 ee1
|
|
appro c2 16 ee2
|
|
appro c3 16 ee3
|
|
|
|
#Make a surface by approximation passing throught a set of curves
|
|
# and create a face
|
|
appsurf s1 c1 c2 c3
|
|
mkface f1 s1
|
|
|
|
#Make a surface by approximation passing throught a set of ellipse
|
|
# and create a face
|
|
appsurf s2 ee1 ee2 ee3
|
|
mkface f2 s2
|
|
|
|
# Step 2: Create surface for fuselage
|
|
|
|
#Create circles in 3D along axe X
|
|
circle c1 -100 0 0 1 0 0 10
|
|
circle c2 -50 0 0 1 0 0 30
|
|
circle c3 50 0 0 1 0 0 29
|
|
circle c4 100 0 0 1 0 0 20
|
|
circle c5 150 0 0 1 0 0 10
|
|
|
|
#Make a surface by approximation passing throught a set of circles
|
|
# and create a face
|
|
appsurf s3 c1 c2 c3 c4 c5
|
|
mkface f3 s3
|
|
|
|
|
|
# Step 3: Create a Solid for the Wing
|
|
# Build edges from ellipse, wires with edges, faces on wires
|
|
# It's necessary to sew the faces to create the Shell, because the faces don't shared the same edge
|
|
#sewing will create a shell, it remains to create the solid from the shell
|
|
|
|
mkedge ed1 ee1
|
|
mkedge ed3 ee3
|
|
|
|
wire w1 ed1
|
|
wire w3 ed3
|
|
|
|
mkplane f5 w1
|
|
mkplane f6 w3
|
|
|
|
sewing r f2 f5 f6
|
|
###mksol so1 r
|
|
shape so1 So
|
|
add r so1
|
|
|
|
checkshape so1
|
|
# The shape so1 is valid
|
|
|
|
#Step 4: Create a Solid for fuselage
|
|
# We will extract the edge from the face f3, and use them to buid faces, the edge will be shared and we
|
|
# can rebuild a sh and a solid with the basic and fast method
|
|
|
|
nexplode f3 e
|
|
#nexplode give same order of exploration in different sessions
|
|
|
|
wire w1 f3_1
|
|
wire w3 f3_3
|
|
mkplane f7 w1 1
|
|
mkplane f8 w3 1
|
|
|
|
mkvolume so2 f3 f7 f8 -ni
|
|
checkshape so2
|
|
|
|
# Step 5: Fuse the Wing to the fuselage
|
|
ttranslate so1 0 0 10
|
|
bop so1 so2
|
|
bopfuse rrr
|
|
|
|
checkshape rrr
|
|
checknbshapes rrr -face 5 -wire 5 -shell 1 -solid 1
|
|
checkprops rrr -s 57448.9 -v 664969
|
|
|
|
# Step 6: Create the othe wing using copy and rotation
|
|
tcopy so1 so3
|
|
trotate so3 0 0 0 1 0 0 180
|
|
|
|
# Step 7: Fuse the Wing to the fuselage
|
|
bop rrr so3
|
|
bopfuse result
|
|
|
|
checkshape result
|
|
checknbshapes result -wire 8 -face 7 -shell 1 -solid 1
|
|
checkprops result -s 73752.9 -v 784375
|
|
|
|
checkview -display result -2d -path ${imagedir}/${test_image}-2d.png
|