OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-16 10:08:36 +03:00
Code

Testing - Update tests with direct VIS loading

Browse Source 
XShow and XDisplay XDE require VISUALIZATION for correct work.
In some scenario DRAWEXE can generate a duplicates of the internal static singletons.
This means each dynamic library will have their own instance of the static singleton.
Update all direct library loading to use the XDE plugin mechanism.
This will ensure that the XDE plugin is loaded only once and that the correct instance is used.
Originally issue is reproduced only Linux with dlopen with "RTLD_LAZY".
Can be resolved additionally adding "RTLD_LAZY | RTLD_GLOBAL" for dlopen
This commit is contained in:
dpasukhi 2024-11-05 19:45:59 +00:00
parent ea86bfe2fa
commit 05ec4972c3
16 changed files with 16 additions and 15 deletions
tests
de_mesh
gltf_lateload
begin
gltf_read
begin
gltf_write
begin
obj_read
begin
obj_write
as1balllanternmustangship_boat
step_read
begin
step_write
begin
vrml_read
begin
v3d
bugs
bug23123bug23407_1
materials
bug27818_2materials

2
tests/de_mesh/gltf_lateload/begin

@ -1,2 +1,2 @@
pload XDE OCAF MODELING VISUALIZATION pload VISUALIZATION XDE OCAF MODELING
catch { Close D } catch { Close D }

2
tests/de_mesh/gltf_read/begin

@ -1,4 +1,4 @@
pload XDE OCAF MODELING VISUALIZATION pload VISUALIZATION XDE OCAF MODELING
Close D -silent Close D -silent
# PBR requires OpenGL 3.0+ on macOS # PBR requires OpenGL 3.0+ on macOS
if { $::tcl_platform(os) == "Darwin" } { vcaps -core } if { $::tcl_platform(os) == "Darwin" } { vcaps -core }

2
tests/de_mesh/gltf_write/begin

@ -1,4 +1,4 @@
pload XDE OCAF MODELING VISUALIZATION pload VISUALIZATION XDE OCAF MODELING
Close D -silent Close D -silent
# PBR requires OpenGL 3.0+ on macOS # PBR requires OpenGL 3.0+ on macOS
if { $::tcl_platform(os) == "Darwin" } { vcaps -core } if { $::tcl_platform(os) == "Darwin" } { vcaps -core }

2
tests/de_mesh/obj_read/begin

@ -1,4 +1,4 @@
pload XDE OCAF MODELING VISUALIZATION pload VISUALIZATION XDE OCAF MODELING
Close D -silent Close D -silent
# PBR requires OpenGL 3.0+ on macOS # PBR requires OpenGL 3.0+ on macOS
if { $::tcl_platform(os) == "Darwin" } { vcaps -core } if { $::tcl_platform(os) == "Darwin" } { vcaps -core }

2
tests/de_mesh/obj_write/as1

@ -3,7 +3,7 @@ puts "0029303: Data Exchange - add RWObj_CafWriter tool for wavefront OBJ file"
puts "Write as1 STEP model into OBJ file" puts "Write as1 STEP model into OBJ file"
puts "========" puts "========"
pload XDE OCAF MODELING VISUALIZATION pload VISUALIZATION XDE OCAF MODELING
Close D -silent Close D -silent
Close D1 -silent Close D1 -silent
ReadStep D1 [locate_data_file as1-oc-214-mat.stp] ReadStep D1 [locate_data_file as1-oc-214-mat.stp]

2
tests/de_mesh/obj_write/ball

@ -3,7 +3,7 @@ puts "0029303: Data Exchange - add RWObj_CafWriter tool for wavefront OBJ file"
puts "Write B-Rep model into OBJ file" puts "Write B-Rep model into OBJ file"
puts "========" puts "========"
pload XDE OCAF MODELING VISUALIZATION pload VISUALIZATION XDE OCAF MODELING
Close D -silent Close D -silent
restore [locate_data_file Ball.brep] b restore [locate_data_file Ball.brep] b

2
tests/de_mesh/obj_write/lantern

@ -3,7 +3,7 @@ puts "0029303: Data Exchange - add RWObj_CafWriter tool for wavefront OBJ file"
puts "Write textured lantern glTF model into OBJ file" puts "Write textured lantern glTF model into OBJ file"
puts "========" puts "========"
pload XDE OCAF MODELING VISUALIZATION pload VISUALIZATION XDE OCAF MODELING
Close D -silent Close D -silent
Close D1 -silent Close D1 -silent
ReadGltf D1 [locate_data_file bug30691_Lantern.glb] ReadGltf D1 [locate_data_file bug30691_Lantern.glb]

2
tests/de_mesh/obj_write/mustang

@ -3,7 +3,7 @@ puts "0029303: Data Exchange - add RWObj_CafWriter tool for wavefront OBJ file"
puts "Write textured plane OBJ model into OBJ file" puts "Write textured plane OBJ model into OBJ file"
puts "========" puts "========"
pload XDE OCAF MODELING VISUALIZATION pload VISUALIZATION XDE OCAF MODELING
Close D -silent Close D -silent
Close D1 -silent Close D1 -silent

2
tests/de_mesh/obj_write/ship_boat

@ -3,7 +3,7 @@ puts "0029303: Data Exchange - add RWObj_CafWriter tool for wavefront OBJ file"
puts "Write textured boat OBJ model into OBJ file" puts "Write textured boat OBJ model into OBJ file"
puts "========" puts "========"
pload XDE OCAF MODELING VISUALIZATION pload VISUALIZATION XDE OCAF MODELING
Close D -silent Close D -silent
Close D1 -silent Close D1 -silent
ReadObj D1 [locate_data_file ship_boat.obj] ReadObj D1 [locate_data_file ship_boat.obj]

2
tests/de_mesh/step_read/begin

@ -1,4 +1,4 @@
pload XDE OCAF MODELING pload VISUALIZATION XDE OCAF MODELING
# enable reading/writing tessellated STEP geometry # enable reading/writing tessellated STEP geometry
param write.step.schema AP242DIS param write.step.schema AP242DIS

2
tests/de_mesh/step_write/begin

@ -1,4 +1,4 @@
pload XDE OCAF MODELING pload VISUALIZATION XDE OCAF MODELING
# enable reading/writing tessellated STEP geometry # enable reading/writing tessellated STEP geometry
param write.step.schema AP242DIS param write.step.schema AP242DIS

1
tests/de_mesh/vrml_read/begin

@ -1,5 +1,6 @@
# File: begin # File: begin
pload VISUALIZATION
pload XDE pload XDE
pload OCAF pload OCAF
pload TOPTEST pload TOPTEST

2
tests/v3d/bugs/bug23123

@ -3,7 +3,7 @@ puts "OCC23123: Bug/Regression in visualization of XDE documents in shaded mode"
puts "============" puts "============"
puts "" puts ""
pload XDE VISUALIZATION pload VISUALIZATION XDE
ReadStep D [locate_data_file OCC23123-test.step] ReadStep D [locate_data_file OCC23123-test.step]
XShow D XShow D

2
tests/v3d/bugs/bug23407_1

@ -3,7 +3,7 @@ puts "CR23407: Draw face outlines for XDE objects"
puts "============" puts "============"
puts "" puts ""
pload XDEDRAW VISUALIZATION STEP pload VISUALIZATION XDEDRAW STEP
XNewDoc Doc1 XNewDoc Doc1
ReadStep Doc1 [locate_data_file screw.step] ReadStep Doc1 [locate_data_file screw.step]

2
tests/v3d/materials/bug27818_2

@ -7,7 +7,7 @@ puts ""
# test change of highlight and selection properties for particular objects # test change of highlight and selection properties for particular objects
#################################################################################### ####################################################################################
pload QAcommands VISUALIZATION pload VISUALIZATION QAcommands
vinit View1 vinit View1
OCC27818 OCC27818

2
tests/v3d/materials/materials

@ -3,7 +3,7 @@ puts "0030930: Draw Harness, ViewerTest - add commands vlistcolors and vlistmate
puts "Generate a table of predefined Materials (Graphic3d_NameOfMaterial enumeration)" puts "Generate a table of predefined Materials (Graphic3d_NameOfMaterial enumeration)"
puts "========" puts "========"
pload XDE OCAF MODELING VISUALIZATION pload VISUALIZATION XDE OCAF MODELING
Close D -silent Close D -silent
vclear vclear