diff --git a/tests/3rdparty/begin b/tests/3rdparty/begin deleted file mode 100755 index fd1ba96434..0000000000 --- a/tests/3rdparty/begin +++ /dev/null @@ -1,12 +0,0 @@ -cpulimit 1000 - -pload TOPTEST VISUALIZATION - -if { [info exists imagedir] == 0 } { - set imagedir . -} -if { [info exists test_image] == 0 } { - set test_image photo -} - -vinit View1 diff --git a/tests/3rdparty/end b/tests/3rdparty/end deleted file mode 100755 index 8525cdc153..0000000000 --- a/tests/3rdparty/end +++ /dev/null @@ -1,3 +0,0 @@ -puts "" -puts "TEST COMPLETED" -puts "" diff --git a/tests/3rdparty/grids.list b/tests/3rdparty/grids.list deleted file mode 100644 index 958c6c3e68..0000000000 --- a/tests/3rdparty/grids.list +++ /dev/null @@ -1,2 +0,0 @@ -001 fonts -002 text3d diff --git a/tests/bugs/grids.list b/tests/bugs/grids.list index 98f0679746..beba144d4a 100755 --- a/tests/bugs/grids.list +++ b/tests/bugs/grids.list @@ -1,23 +1,22 @@ 001 demo 002 fclasses 003 iges -004 vis -005 xde -006 modalg_1 -007 modalg_2 -008 modalg_3 -009 modalg_4 -010 modalg_5 -011 modalg_6 -012 modalg_7 -013 moddata_1 -014 moddata_2 -015 moddata_3 -016 step -017 caf -018 mesh -019 heal -020 stlvrml -021 splitshape -022 splitshape_1 -023 filling \ No newline at end of file +004 xde +005 modalg_1 +006 modalg_2 +007 modalg_3 +008 modalg_4 +009 modalg_5 +010 modalg_6 +011 modalg_7 +012 moddata_1 +013 moddata_2 +014 moddata_3 +015 step +016 caf +017 mesh +018 heal +019 stlvrml +020 splitshape +021 splitshape_1 +022 filling diff --git a/tests/bugs/vis/buc60830_1 b/tests/bugs/modalg_1/buc60830_1 old mode 100755 new mode 100644 similarity index 99% rename from tests/bugs/vis/buc60830_1 rename to tests/bugs/modalg_1/buc60830_1 index 1ae875ad8a..ae231f3b15 --- a/tests/bugs/vis/buc60830_1 +++ b/tests/bugs/modalg_1/buc60830_1 @@ -14,4 +14,3 @@ result side right mat result - diff --git a/tests/bugs/vis/buc60830_2 b/tests/bugs/modalg_1/buc60830_2 old mode 100755 new mode 100644 similarity index 76% rename from tests/bugs/vis/buc60830_2 rename to tests/bugs/modalg_1/buc60830_2 index b135dcbcae..eb7c393f30 --- a/tests/bugs/vis/buc60830_2 +++ b/tests/bugs/modalg_1/buc60830_2 @@ -2,6 +2,8 @@ puts "=============" puts "BUC60830" puts "BUC60829" puts "=============" + +pload QAcommands coordload res [locate_data_file cont1.dat] topoload res drawcont @@ -11,5 +13,6 @@ result side right mat result - - +axo +fit +xwd ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/buc60830_3 b/tests/bugs/modalg_1/buc60830_3 old mode 100755 new mode 100644 similarity index 76% rename from tests/bugs/vis/buc60830_3 rename to tests/bugs/modalg_1/buc60830_3 index 5fa3bf53b9..2c3016ad19 --- a/tests/bugs/vis/buc60830_3 +++ b/tests/bugs/modalg_1/buc60830_3 @@ -3,6 +3,7 @@ puts "BUC60830" puts "BUC60829" puts "=============" +pload QAcommands coordload res [locate_data_file cont2.dat] topoload res drawcont @@ -12,5 +13,6 @@ result side right mat result - - +axo +fit +xwd ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/begin b/tests/bugs/vis/begin deleted file mode 100755 index 18fe572f9e..0000000000 --- a/tests/bugs/vis/begin +++ /dev/null @@ -1,7 +0,0 @@ -pload QAcommands - -set subgroup vis - - - - diff --git a/tests/bugs/vis/buc60632_1 b/tests/bugs/vis/buc60632_1 deleted file mode 100755 index 1846077ff2..0000000000 --- a/tests/bugs/vis/buc60632_1 +++ /dev/null @@ -1,21 +0,0 @@ -puts "================" -puts "BUC60632" -puts "================" - -vinit -BUC60632 0 100 -vfit -vmoveto 126 143 -puts "Highlighting by 'Move To' command in wireframe mode" - -set x_coord 129 -set y_coord 143 - -checkcolor $x_coord $y_coord 0 1 1 - -if { $stat != 1 } { - puts "Error : Highlighting by Move To command in wireframe mode is WRONG." -} -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - diff --git a/tests/bugs/vis/buc60632_2 b/tests/bugs/vis/buc60632_2 deleted file mode 100755 index 80615e6d66..0000000000 --- a/tests/bugs/vis/buc60632_2 +++ /dev/null @@ -1,22 +0,0 @@ -puts "================" -puts "BUC60632" -puts "================" - -vinit -BUC60632 1 100 -vfit -vmoveto 126 143 -puts "Highlighting by 'Move To' command in shading mode" - -set x_coord 128 -set y_coord 143 - -checkcolor $x_coord $y_coord 0 1 1 - -if { $stat != 1 } { - puts "Error : Highlighting by Move To command in shading mode is WRONG." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - diff --git a/tests/bugs/vis/buc60659 b/tests/bugs/vis/buc60659 deleted file mode 100755 index 9463b29b90..0000000000 --- a/tests/bugs/vis/buc60659 +++ /dev/null @@ -1,16 +0,0 @@ - -puts "==========================" -puts "BUC60659" -puts "==========================" -puts "" -########################################## -## puts "There was Exception after vsetshading command" -########################################## - -box a 10 30 50 -vinit -vdisplay a -vfit -vsetshading a - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/buc60740 b/tests/bugs/vis/buc60740 deleted file mode 100755 index 05eb1650c0..0000000000 --- a/tests/bugs/vis/buc60740 +++ /dev/null @@ -1,28 +0,0 @@ -puts "===========" -puts "BUC60740" -puts "===========" -puts "==================================" -puts "It takes visual check for this BUG" -puts "==================================" - -vinit -box b 0 0 0 10 10 10 -pcylinder c 10 10 -vdisplay b -vsetdispmode b 1 -vdisplay c -vsetdispmode c 1 -vfit -vsettransparency c 0.5 - -set x_coord 154 -set y_coord 257 - - -checkcolor $x_coord $y_coord 0.6 0.4 0.07 - -if {$stat != 1} { - puts "Error :function vsettransparency works WRONGLY" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/buc60774 b/tests/bugs/vis/buc60774 deleted file mode 100755 index 1a719fe6a9..0000000000 --- a/tests/bugs/vis/buc60774 +++ /dev/null @@ -1,14 +0,0 @@ -puts "========" -puts "BUC60774" -puts "========" -puts "" - -vinit -catch {BUC60774} -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - - - diff --git a/tests/bugs/vis/buc60832 b/tests/bugs/vis/buc60832 deleted file mode 100755 index df0c644e79..0000000000 --- a/tests/bugs/vis/buc60832 +++ /dev/null @@ -1,21 +0,0 @@ -puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_" - -puts "============" -puts "BUC60832" -puts "============" -puts "" -################################################################################ -## Try to display this shape in the viewer 3D by means of the method AIS_InteractiveContext::Display(). -## This method calls StdSelect_BRepSelectionTool::ComputeSelection() a recursive method which hangs up an application. -################################################################################ - -restore [locate_data_file BUC60832.brep] result -checkshape result - -tclean result -vinit -vdisplay result -vsetdispmode result 1 -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/buc60887 b/tests/bugs/vis/buc60887 deleted file mode 100755 index 6d053b6b61..0000000000 --- a/tests/bugs/vis/buc60887 +++ /dev/null @@ -1,20 +0,0 @@ -puts "============" -puts "BUC60887" -puts "============" -puts "" -############################################ -## Shape hangs after command " vdisplay " in the Viewer3d. -############################################ - -restore [locate_data_file BUC60887.brep] result - -set nb_info [nbshapes result] -regexp {VERTEX +: +([-0-9.+eE]+)} $nb_info full nb_v - -puts [format "Shape res contains %s vertexes" $nb_v] -if { $nb_v == 0} { - puts "Error : Result shape is NULL shape" -} else { - checkview -display result -3d -path ${imagedir}/${test_image}.png -} - diff --git a/tests/bugs/vis/buc60915 b/tests/bugs/vis/buc60915 deleted file mode 100755 index cf3d1a92f9..0000000000 --- a/tests/bugs/vis/buc60915 +++ /dev/null @@ -1,22 +0,0 @@ -puts "===========" -puts "BUC60915" -puts "===========" -puts "==================================" -puts "It takes visual check for this BUG" -puts "==================================" - -vinit -BUC60915 - -set x_coord 300 -set y_coord 164 - -checkcolor $x_coord $y_coord 0.51 0.98 0 - -if {$stat != 1} { - puts "Error : Cannot set the arrow size when using AIS_LengthDimension or AIS_RadiusDimensin." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - diff --git a/tests/bugs/vis/buc60920 b/tests/bugs/vis/buc60920 deleted file mode 100755 index 4c9d53bfea..0000000000 --- a/tests/bugs/vis/buc60920 +++ /dev/null @@ -1,21 +0,0 @@ -puts "===========" -puts "BUC60920" -puts "===========" -puts "==================================" -puts "It takes visual check for this BUG" -puts "==================================" -######################################################################### -## Bug in Viewer3d: curves and points are not highlighted when mouse pointer is moved over in shading mode. -######################################################################### - -vinit -BUC60920 -vfit - - -set x_coord 315 -set y_coord 210 - -checkcolor $x_coord $y_coord 0 1 1 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug10781 b/tests/bugs/vis/bug10781 deleted file mode 100755 index 1786e4b5f4..0000000000 --- a/tests/bugs/vis/bug10781 +++ /dev/null @@ -1,33 +0,0 @@ -puts "============" -puts "OCC10781" -puts "MeshVS is not sensitive to width of edges" -puts "============" -puts "" - -set BugNumber OCC10781 - -pload XDE - -vinit View1 -vclear -vaxo - -meshfromstl m [locate_data_file OMF6391_box.stl] - -set aCoordX 206 -set aCoordY 280 - -vmoveto $aCoordX $aCoordY - -set aColor1px [vreadpixel $aCoordX $aCoordY rgb name] -if { "$aColor1px" != "BLACK" } { - puts "Error: BLACK color is expected at pixel ${aCoordX}x${aCoordY}" -} - -mesh_edge_width m 6 -set aColor5px [vreadpixel $aCoordX $aCoordY rgb name] -if { "$aColor5px" == "BLACK" } { - puts "Error: YELLOW color is expected at pixel ${aCoordX}x${aCoordY}" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug11095 b/tests/bugs/vis/bug11095 deleted file mode 100755 index c551ff04ab..0000000000 --- a/tests/bugs/vis/bug11095 +++ /dev/null @@ -1,38 +0,0 @@ -puts "============" -puts "OCC11095" -puts "============" -puts "" -####################################################################### -# MeshVS: Borders of faces are not visible in shrink mode -####################################################################### - -set BugNumber OCC11095 - -pload XDE - -vinit - -meshfromstl m [locate_data_file OMF6391_box.stl] - -set x_coord 157 -set y_coord 280 - -set RED_R1 0 -set GREEN_R1 0 -set BLUE_R1 0 - -vmoveto $x_coord $y_coord - -vsetdispmode m 3 -puts "\nSet shrinked display mode\n" - -set x_coord 137 -set y_coord 277 - -checkcolor $x_coord $y_coord 0 0 0 - -if { ${stat} != 1 } { - puts "Error : Borders of faces are not visible in shrink mode" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug112 b/tests/bugs/vis/bug112 deleted file mode 100755 index 48d694d762..0000000000 --- a/tests/bugs/vis/bug112 +++ /dev/null @@ -1,26 +0,0 @@ -puts "========" -puts "BUC60956" -puts "OCC112" -puts "========" -puts "" -############################################################### -## When restoring a TopoDS_Shape containing a valid Meshing (computed for display) the -## meshing is computed again when displaying it. -############################################################### - -set x_coord 140 -set y_coord 115 - -restore [locate_data_file OCC20.brep] result -tclean result -vinit -vdisplay result -vfit -vsetdispmode result 1 - -checkcolor $x_coord $y_coord 0.77 0.54 0.9 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - - diff --git a/tests/bugs/vis/bug11615 b/tests/bugs/vis/bug11615 deleted file mode 100755 index 664ea638b3..0000000000 --- a/tests/bugs/vis/bug11615 +++ /dev/null @@ -1,44 +0,0 @@ -puts "============" -puts "OCC11615" -puts "============" -puts "" -###################################################### -# Anisotropic scaling in 3D view -###################################################### - -set BugNumber OCC11615 - -box b 10 10 10 -vinit -vdisplay b -vfit -vscale 1 1 1 - -set x1 [list 165 340 70] -set y1 [list 384 283 79] -vaspects -setwidth 5 -puts "" -for {set i 0} {$i < 3} {incr i} { - set x_coord [lindex ${x1} $i] - set y_coord [lindex ${y1} $i] - if { "[vreadpixel $x_coord $y_coord rgb name]" != "YELLOW" } { - puts "Error : color is not yellow" - } -} - -vscale 0.5 1.5 0.7 -vfit - -set x2 [list 80 390 25] -set y2 [list 390 218 167] - -puts "" -for {set i 0} {$i < 3} {incr i} { - set x_coord [lindex ${x2} $i] - set y_coord [lindex ${y2} $i] - if { "[vreadpixel $x_coord $y_coord rgb name]" != "YELLOW" } { - puts "Error : color is not yellow" - } -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug12584 b/tests/bugs/vis/bug12584 deleted file mode 100755 index 18b44b79d2..0000000000 --- a/tests/bugs/vis/bug12584 +++ /dev/null @@ -1,10 +0,0 @@ -set BugNumber OCC12584 - -puts "============" -puts "OCC12584" -puts "============" -puts "" -vinit -OCC12584 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug128 b/tests/bugs/vis/bug128 deleted file mode 100755 index 94e93c1e0e..0000000000 --- a/tests/bugs/vis/bug128 +++ /dev/null @@ -1,17 +0,0 @@ -puts "================" -puts "OCC128" -puts "================" -############################################################### -## The shading is false: objects seem to be situated in front of the others while they are behind. -############################################################### - -set x_coord 171 -set y_coord 171 - -vinit -OCC128 -vviewparams -scale 4.9487928 -proj 0.7329295 0.59461397 0.33052679 -up -0.536849 0.2071041 0.81786 -at 32.4556665273951 52.9347942181675 -5.1270029887922 - -checkcolor $x_coord $y_coord 0.43 0.48 0.54 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug16950_1 b/tests/bugs/vis/bug16950_1 deleted file mode 100755 index 5ac326852a..0000000000 --- a/tests/bugs/vis/bug16950_1 +++ /dev/null @@ -1,25 +0,0 @@ -puts "===========" -puts "OCC16950" -puts "===========" -###################################################### -# OCC Visualization fails to display empty nested compounds -###################################################### - -set BugNumber OCC16950 - -puts "Make compound containing another (empty) one" -compound c -compound c result - -puts "And display it" -vinit -vdisplay result - -# Resume -if [catch { vsetdispmode 1 } res] { - puts "Faulty ${BugNumber}" -} else { - puts "OK ${BugNumber}" -} - - diff --git a/tests/bugs/vis/bug16950_2 b/tests/bugs/vis/bug16950_2 deleted file mode 100755 index 12cfde7553..0000000000 --- a/tests/bugs/vis/bug16950_2 +++ /dev/null @@ -1,24 +0,0 @@ -puts "===========" -puts "OCC16950" -puts "===========" -###################################################### -# OCC Visualization fails to display empty nested compounds -###################################################### - -set BugNumber OCC16950 - -puts "Make compound containing another (empty) one" -compound c -compound c result - -puts "And display it" -vinit -vdisplay result - -# Resume -if [catch { vsetdispmode 2 } res] { - puts "Faulty ${BugNumber}" -} else { - puts "OK ${BugNumber}" -} - diff --git a/tests/bugs/vis/bug17126 b/tests/bugs/vis/bug17126 deleted file mode 100644 index b0cf9c834e..0000000000 --- a/tests/bugs/vis/bug17126 +++ /dev/null @@ -1,15 +0,0 @@ -puts "================" -puts "OCC17126" -puts "================" -puts "" -####################################################################################### -# Visualisation in 3d viewer in Draw hangs up -####################################################################################### - -restore [locate_data_file bug17126_ff_1285_viz.brep] a - -vinit -vdisplay a -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug173_1 b/tests/bugs/vis/bug173_1 deleted file mode 100755 index 82866ef436..0000000000 --- a/tests/bugs/vis/bug173_1 +++ /dev/null @@ -1,38 +0,0 @@ -puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_" -puts "========" -puts "OCC173" -puts "(case 1)" -puts "========" -puts "" -########################################################### -## Impossible to change the material or the transparency of the attached BREP shape. -########################################################### - -restore [locate_data_file OCC173.brep] result -checkshape result - -vinit -tclean result -vdisplay result -vfit -vsetdispmode result 1 - -set x_coord 175 -set y_coord 195 - -checkcolor $x_coord $y_coord 1 0.75 0.15 - -if { $stat != 1 } { - puts "Error : Shading is missing in 3D Viewer" -} - -######################################################## -vsetmaterial result COPPER - -checkcolor $x_coord $y_coord 0.77 0.32 0.23 - -if { $stat != 1 } { - puts "Error : material of shape is not COPPER" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug185 b/tests/bugs/vis/bug185 deleted file mode 100755 index a7504935cc..0000000000 --- a/tests/bugs/vis/bug185 +++ /dev/null @@ -1,36 +0,0 @@ -puts "========" -puts "OCC185" -puts "========" - -pload XDE - -igesbrep [locate_data_file OCC185.igs] a * - -tpcompound result -tclean result - -vinit -vdisplay result -vfit - -set x_coord 235 -set y_coord 214 - -vsetdispmode result 1 - -checkcolor $x_coord $y_coord 0.78 0.55 0.9 - -if { $stat != 1 } { - puts "Error : Shading is OFF, but should be ON" -} - -vsetdispmode result 0 - -checkcolor $x_coord $y_coord 0 1 0 - -if { $stat != 1 } { - puts "Error : Shading is ON, but should be OFF" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - diff --git a/tests/bugs/vis/bug19_1 b/tests/bugs/vis/bug19_1 deleted file mode 100755 index 30a9bdf41e..0000000000 --- a/tests/bugs/vis/bug19_1 +++ /dev/null @@ -1,14 +0,0 @@ -puts "================" -puts "OCC19" -puts "================" -puts "" - -restore [locate_data_file OCC19.brep] result -checkshape result - -tclean result -incmesh result .9 -triangles result - -checktrinfo result -tri 82 -nod 84 -checkview -display result -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug20373 b/tests/bugs/vis/bug20373 deleted file mode 100755 index 58b11908f1..0000000000 --- a/tests/bugs/vis/bug20373 +++ /dev/null @@ -1,21 +0,0 @@ -puts "============" -puts "OCC20373" -puts "============" -puts "" -####################################################################### -# Shading doesn't work on b-spline sphere -####################################################################### - -set BugNumber OCC20373 - -restore [locate_data_file OCC20373.brep] result - -vinit -vdisplay result -vsetdispmode 1 -vfit - -checktrinfo result -tri -checkprops result -s 9.92128e+06 -checkshape result -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug204_2 b/tests/bugs/vis/bug204_2 deleted file mode 100755 index 24b86a72d6..0000000000 --- a/tests/bugs/vis/bug204_2 +++ /dev/null @@ -1,19 +0,0 @@ -puts "========" -puts "OCC204" -puts "========" - -vinit -OCC204 1 -vfit - -set x_coord 150 -set y_coord 200 - -checkcolor $x_coord $y_coord 0 0 0 - -if { ${stat} != 1 } { - puts "Error : There are 3 boxes in the viewer! (should be nothing)" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - diff --git a/tests/bugs/vis/bug20802 b/tests/bugs/vis/bug20802 deleted file mode 100755 index b032a696ee..0000000000 --- a/tests/bugs/vis/bug20802 +++ /dev/null @@ -1,18 +0,0 @@ -puts "========================" -puts "OCC20802" -puts "========================" -puts "" -####################################################################### -# V3d_View: Text size used by V3d_ZBUFFER'ed trihedron is too large -####################################################################### - -set BugNumber OCC20802 - -vinit -vzbufftrihedron - -puts "V3d_View: Text size used by V3d_ZBUFFER'ed trihedron is too large" - -puts "OK ${BugNumber}" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21171_1 b/tests/bugs/vis/bug21171_1 deleted file mode 100755 index ddd46fe93e..0000000000 --- a/tests/bugs/vis/bug21171_1 +++ /dev/null @@ -1,22 +0,0 @@ -puts "============" -puts "OCC21171" -puts "============" -puts "" -####################################################################### -# Problem with vfit of vertex and edge -####################################################################### - -set BugNumber OCC21171 - -box result 100 100 100 -explode result e - -vinit -vdisplay result_1 -vfit - -# Resume -puts "" -puts "1 edge is not fit" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21171_2 b/tests/bugs/vis/bug21171_2 deleted file mode 100755 index 9a37ddbccd..0000000000 --- a/tests/bugs/vis/bug21171_2 +++ /dev/null @@ -1,23 +0,0 @@ -puts "============" -puts "OCC21171" -puts "============" -puts "" -####################################################################### -# Problem with vfit of vertex and edge -####################################################################### - -set BugNumber OCC21171 - -box result 100 100 100 -explode result e - -vinit -vdisplay result_1 -vdisplay result_2 -vfit - -# Resume -puts "" -puts "2 edges are fit" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21171_3 b/tests/bugs/vis/bug21171_3 deleted file mode 100755 index 2585703503..0000000000 --- a/tests/bugs/vis/bug21171_3 +++ /dev/null @@ -1,22 +0,0 @@ -puts "============" -puts "OCC21171" -puts "============" -puts "" -####################################################################### -# Problem with vfit of vertex and edge -####################################################################### - -set BugNumber OCC21171 - -box result 100 100 100 -explode result v - -vinit -vdisplay result_8 -vfit - -# Resume -puts "" -puts "1 vertex is not fit" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21171_4 b/tests/bugs/vis/bug21171_4 deleted file mode 100755 index 3b9406b682..0000000000 --- a/tests/bugs/vis/bug21171_4 +++ /dev/null @@ -1,23 +0,0 @@ -puts "============" -puts "OCC21171" -puts "============" -puts "" -####################################################################### -# Problem with vfit of vertex and edge -####################################################################### - -set BugNumber OCC21171 - -box result 100 100 100 -explode result v - -vinit -vdisplay result_8 -vdisplay result_1 -vfit - -# Resume -puts "" -puts "2 vertexes are fit" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_1 b/tests/bugs/vis/bug21747_1 deleted file mode 100755 index fe72437b5a..0000000000 --- a/tests/bugs/vis/bug21747_1 +++ /dev/null @@ -1,16 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - - -puts "${BugNumber}" -puts "Type=NONE, Color from RED to BLUE" - -vbackground -gradient RED BLUE -gradientMode NONE - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_10 b/tests/bugs/vis/bug21747_10 deleted file mode 100755 index 2e0bee91cd..0000000000 --- a/tests/bugs/vis/bug21747_10 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - -puts "${BugNumber}" -puts "Type=CORNER1, Color from RED to BLUE, Direction from LEFT TOP CORNER" - -vbackground -gradient RED BLUE -gradientMode CORNER1 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_11 b/tests/bugs/vis/bug21747_11 deleted file mode 100755 index b14c52efa5..0000000000 --- a/tests/bugs/vis/bug21747_11 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - -puts "${BugNumber}" -puts "Type=CORNER2, Color from RED to BLUE, Direction from RIGHT TOP CORNER" - -vbackground -gradient RED BLUE -gradientMode CORNER2 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_12 b/tests/bugs/vis/bug21747_12 deleted file mode 100755 index e62d341888..0000000000 --- a/tests/bugs/vis/bug21747_12 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - -puts "${BugNumber}" -puts "Type=CORNER3, Color from RED to BLUE, Direction from RIGHT BOTTOM CORNER" - -vbackground -gradient RED BLUE -gradientMode CORNER3 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_13 b/tests/bugs/vis/bug21747_13 deleted file mode 100755 index 6bacaa0c81..0000000000 --- a/tests/bugs/vis/bug21747_13 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - -puts "${BugNumber}" -puts "Type=CORNER4, Color from RED to BLUE, Direction from LEFT BOTTOM CORNER" - -vbackground -gradient RED BLUE -gradientMode CORNER4 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_14 b/tests/bugs/vis/bug21747_14 deleted file mode 100755 index 6607312ef8..0000000000 --- a/tests/bugs/vis/bug21747_14 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - -puts "${BugNumber}" -puts "Type=CORNER1, Color from BLUE to RED, Direction from LEFT TOP CORNER" - -vbackground -gradient BLUE RED -gradientMode CORNER1 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_15 b/tests/bugs/vis/bug21747_15 deleted file mode 100755 index 14ffe0e2e8..0000000000 --- a/tests/bugs/vis/bug21747_15 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - -puts "${BugNumber}" -puts "Type=CORNER2, Color from BLUE to RED, Direction from RIGHT TOP CORNER" - -vbackground -gradient BLUE RED -gradientMode CORNER2 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_16 b/tests/bugs/vis/bug21747_16 deleted file mode 100755 index 8764931054..0000000000 --- a/tests/bugs/vis/bug21747_16 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - -puts "${BugNumber}" -puts "Type=CORNER3, Color from BLUE to RED, Direction from RIGHT BOTTOM CORNER" - -vbackground -gradient BLUE RED -gradientMode CORNER3 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_17 b/tests/bugs/vis/bug21747_17 deleted file mode 100755 index a77d18570f..0000000000 --- a/tests/bugs/vis/bug21747_17 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - -puts "${BugNumber}" -puts "Type=CORNER4, Color from BLUE to RED, Direction from LEFT BOTTOM CORNER" - -vbackground -gradient BLUE RED -gradientMode CORNER4 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_2 b/tests/bugs/vis/bug21747_2 deleted file mode 100755 index 95155b5f89..0000000000 --- a/tests/bugs/vis/bug21747_2 +++ /dev/null @@ -1,16 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - - -puts "${BugNumber}" -puts "Type=HORIZONTAL, Color from RED to BLUE, Direction from LEFT to RIGHT" - -vbackground -gradient RED BLUE -gradientMode HORIZONTAL - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_3 b/tests/bugs/vis/bug21747_3 deleted file mode 100755 index 18dcff0094..0000000000 --- a/tests/bugs/vis/bug21747_3 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - -puts "${BugNumber}" -puts "Type=HORIZONTAL, Color from BLUE to RED, Direction from LEFT to RIGHT" - -vbackground -gradient BLUE RED -gradientMode HORIZONTAL - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_4 b/tests/bugs/vis/bug21747_4 deleted file mode 100755 index d9294324c3..0000000000 --- a/tests/bugs/vis/bug21747_4 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - -puts "${BugNumber}" -puts "Type=VERTICAL, Color from RED to BLUE, Direction from TOP to BOTTOM" - -vbackground -gradient RED BLUE -gradientMode VERTICAL - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_5 b/tests/bugs/vis/bug21747_5 deleted file mode 100755 index 36cbc1d482..0000000000 --- a/tests/bugs/vis/bug21747_5 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - -puts "${BugNumber}" -puts "Type=VERTICAL, Color from BLUE to RED, Direction from TOP to BOTTOM" - -vbackground -gradient BLUE RED -gradientMode VERTICAL - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_6 b/tests/bugs/vis/bug21747_6 deleted file mode 100755 index 30cf46eede..0000000000 --- a/tests/bugs/vis/bug21747_6 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - -puts "${BugNumber}" -puts "Type=DIAGONAL1, Color from RED to BLUE, Direction from LEFT TOP CORNER to RIGHT BOTTOM CORNER" - -vbackground -gradient RED BLUE -gradientMode DIAGONAL1 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_7 b/tests/bugs/vis/bug21747_7 deleted file mode 100755 index 8a20196170..0000000000 --- a/tests/bugs/vis/bug21747_7 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - -puts "${BugNumber}" -puts "Type=DIAGONAL1, Color from BLUE to RED, Direction from LEFT TOP CORNER to RIGHT BOTTOM CORNER" - -vbackground -gradient BLUE RED -gradientMode DIAGONAL1 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_8 b/tests/bugs/vis/bug21747_8 deleted file mode 100755 index 36924ddbb8..0000000000 --- a/tests/bugs/vis/bug21747_8 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - -puts "${BugNumber}" -puts "Type=DIAGONAL2, Color from RED to BLUE, Direction from RIGHT TOP CORNER to LEFT BOTTOM CORNER" - -vbackground -gradient RED BLUE -gradientMode DIAGONAL2 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_9 b/tests/bugs/vis/bug21747_9 deleted file mode 100755 index 7259bffbc0..0000000000 --- a/tests/bugs/vis/bug21747_9 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "OCC21747" -puts "============" -puts "" - -set BugNumber OCC21747 - -vinit - -puts "${BugNumber}" -puts "Type=DIAGONAL2, Color from BLUE to RED, Direction from RIGHT TOP CORNER to LEFT BOTTOM CORNER" - -vbackground -gradient BLUE RED -gradientMode DIAGONAL2 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21757 b/tests/bugs/vis/bug21757 deleted file mode 100755 index 85a0a36ae4..0000000000 --- a/tests/bugs/vis/bug21757 +++ /dev/null @@ -1,24 +0,0 @@ -puts "===========" -puts "OCC21757" -puts "===========" -puts "" -################################################################################ -# Funny (giraffe-like) shading of torus meshed with specific parameters (WNT) -################################################################################ - -set BugNumber OCC21757 - -vinit -vsetdispmode 1 -vclear - -ptorus result 200 50 45 -incmesh result 0.4 -vdisplay result -vfit - -checkprops result -s 65069.2 -checkshape result -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - diff --git a/tests/bugs/vis/bug21757_1 b/tests/bugs/vis/bug21757_1 deleted file mode 100644 index 5ace1f2dbe..0000000000 --- a/tests/bugs/vis/bug21757_1 +++ /dev/null @@ -1,23 +0,0 @@ -puts "============" -puts "OCC21757" -puts "============" -puts "" -####################################################################### -# Funny (giraffe-like) shading of torus meshed with specific parameters (WNT) -####################################################################### - -set BugNumber OCC21757 - -vinit -vsetdispmode 1 -vclear - -# variant 1: mesh explicitly -ptorus result 200 50 45 -incmesh result 0.4 -vdisplay result -vfit -checkcolor 200 200 0.89 0.63 0.109 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - diff --git a/tests/bugs/vis/bug21757_2 b/tests/bugs/vis/bug21757_2 deleted file mode 100644 index 531fdf539c..0000000000 --- a/tests/bugs/vis/bug21757_2 +++ /dev/null @@ -1,23 +0,0 @@ -puts "============" -puts "OCC21757" -puts "============" -puts "" -####################################################################### -# Funny (giraffe-like) shading of torus meshed with specific parameters (WNT) -####################################################################### - -set BugNumber OCC21757 - -vinit -vsetdispmode 1 -vclear - -# variant 2: alternative implicit method of setting deflection -plane pl2 0 0 200 0 0 1 -ptorus result pl2 200 50 45 -vdisplay result -vsetshading result 0.0004 -vfit -checkcolor 200 200 0.89 0.63 0.109 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21798 b/tests/bugs/vis/bug21798 deleted file mode 100755 index ed79652467..0000000000 --- a/tests/bugs/vis/bug21798 +++ /dev/null @@ -1,19 +0,0 @@ -puts "============" -puts "OCC21798" -puts "============" -puts "" -####################################################################### -# Attached face hangs during visualization in OCC Viewer 3D . -####################################################################### - -set BugNumber OCC21798 - -restore [locate_data_file OCC21798.brep] result -vinit -vdisplay result -vfit - -vsetdispmode 1 -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug22304 b/tests/bugs/vis/bug22304 deleted file mode 100755 index 53e2fcf5b6..0000000000 --- a/tests/bugs/vis/bug22304 +++ /dev/null @@ -1,21 +0,0 @@ -puts "===========" -puts "OCC22304" -puts "===========" -puts "" -####################################################################### -# Incorrect triangulation on face of the attached file -####################################################################### - -set BugNumber OCC22304 - -restore [locate_data_file OCC22304-face_976_badvisu.brep] result - -tclean result -vinit -vdisplay result -vfit - -vsetdispmode 1 - -checktrinfo result -tri -nod -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug22368 b/tests/bugs/vis/bug22368 deleted file mode 100755 index 98cd8698d0..0000000000 --- a/tests/bugs/vis/bug22368 +++ /dev/null @@ -1,31 +0,0 @@ -puts "========================" -puts "OCC22368" -puts "========================" -puts "" -####################################################################### -# AIS_Trihedron's highlight presentation isn't updated on trihedron relocation -####################################################################### - -set BugNumber OCC22368 - -vclear -vinit View1 -vtrihedron trihedron -OCC74_set trihedron 3 - -set x1 200 -set x2 220 -set x3 210 - -set y 190 - -vselect ${x3} ${y} - -vsetlocation trihedron 100 100 100 - -set status 0 -for {set i ${x1} } {$i <= ${x2} } {incr i} { - checkcolor ${i} ${y} 0 0 0 -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug22483_1 b/tests/bugs/vis/bug22483_1 deleted file mode 100755 index 89d3267c3a..0000000000 --- a/tests/bugs/vis/bug22483_1 +++ /dev/null @@ -1,16 +0,0 @@ -puts "============" -puts "OCC22483" -puts "============" -puts "" -####################################################################### -# ZBufferTrihedron loses user-defined color -####################################################################### - -set BugNumber OCC22483 - -vinit -vzbufftrihedron - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - diff --git a/tests/bugs/vis/bug22483_2 b/tests/bugs/vis/bug22483_2 deleted file mode 100755 index 297dcb1509..0000000000 --- a/tests/bugs/vis/bug22483_2 +++ /dev/null @@ -1,14 +0,0 @@ -puts "============" -puts "OCC22483" -puts "============" -puts "" -####################################################################### -# ZBufferTrihedron loses user-defined color -####################################################################### - -set BugNumber OCC22483 - -vinit View1 -vzbufftrihedron -position left_lower -scale 0.1 -type zbuffer -colorLabels WHITE - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug22483_3 b/tests/bugs/vis/bug22483_3 deleted file mode 100755 index 51ca2a5bf2..0000000000 --- a/tests/bugs/vis/bug22483_3 +++ /dev/null @@ -1,14 +0,0 @@ -puts "============" -puts "OCC22483" -puts "============" -puts "" -####################################################################### -# ZBufferTrihedron loses user-defined color -####################################################################### - -set BugNumber OCC22483 - -vinit View1 -vzbufftrihedron -position right_upper -scale 0.2 -type zbuffer -colorLabels 0.78 0.20 1.0 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug22483_4 b/tests/bugs/vis/bug22483_4 deleted file mode 100755 index 2113f1dfa8..0000000000 --- a/tests/bugs/vis/bug22483_4 +++ /dev/null @@ -1,14 +0,0 @@ -puts "============" -puts "OCC22483" -puts "============" -puts "" -####################################################################### -# ZBufferTrihedron loses user-defined color -####################################################################### - -set BugNumber OCC22483 - -vinit View1 -vzbufftrihedron -position center -scale 0.1 -type wireframe -colorLabels 0.0 0.59 1.0 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug22507 b/tests/bugs/vis/bug22507 deleted file mode 100755 index 4266e1e010..0000000000 --- a/tests/bugs/vis/bug22507 +++ /dev/null @@ -1,29 +0,0 @@ -puts "============" -puts "OCC22507" -puts "============" -puts "" -####################################################################### -# Regression: shading of face is bad (wrong normals) -####################################################################### - -set BugNumber OCC22507 - -restore [locate_data_file OCC22507-bug589_f77_badshading.brep] result -vinit -vdisplay result -vfit - -vsetdispmode 1 - -set x 200 -set y 220 - -set RED_R1 0.96470499038696289 -set GREEN_R1 0.68627399206161499 -set BLUE_R1 0.12156800180673599 - -vmoveto $x $y - -checkcolor $x $y ${RED_R1} ${GREEN_R1} ${BLUE_R1} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug22652 b/tests/bugs/vis/bug22652 deleted file mode 100755 index 3029d7480e..0000000000 --- a/tests/bugs/vis/bug22652 +++ /dev/null @@ -1,21 +0,0 @@ -puts "============" -puts "OCC22652" -puts "============" -puts "" -####################################################################### -# No mesh for face (regression) -####################################################################### - -set BugNumber OCC22652 - -pload ALL - -restore [locate_data_file OCC22652-faceNoMesh.brep] result -vinit -vdisplay result -vfit - -vsetdispmode 1 - -checktrinfo result -tri -nod -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug22735 b/tests/bugs/vis/bug22735 deleted file mode 100755 index fd35fd8a70..0000000000 --- a/tests/bugs/vis/bug22735 +++ /dev/null @@ -1,22 +0,0 @@ -puts "========" -puts "OCC22735" -puts "========" -puts "" -########################################################### -# Data races in BRepMesh working in parallel mode -########################################################### - -set BugNumber OCC22735 - -vinit -vsetdispmode 1 -mpparallel 1 - -restore [locate_data_file OCC22735-march_cube.brep] result - -vdisplay result - -checktrinfo result -tri 48 -nod 96 -defl 0 -tol_rel_defl 0.001 -tol_rel_tri 0.001 -tol_rel_nod 0.001 - -vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug22796_1 b/tests/bugs/vis/bug22796_1 deleted file mode 100755 index 98d42d2ffa..0000000000 --- a/tests/bugs/vis/bug22796_1 +++ /dev/null @@ -1,20 +0,0 @@ -puts "============" -puts "OCC22796" -puts "============" -puts "" -####################################################################### -# Possibility to display multi-line text in 3D -####################################################################### - -vfont add [locate_data_file DejaVuSans.ttf] SansFont - -set BugNumber OCC22796 - -vinit -vdrawtext text0 "MyTest1\rHello,\tWor\vld!\nMyTest2\t\a\bMyTest3" -pos 0 0 0 -color WHITE -halign left -valign bottom -angle 0 -zoom 1 -height 50 -aspect regular -font SansFont - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - - - diff --git a/tests/bugs/vis/bug22835 b/tests/bugs/vis/bug22835 deleted file mode 100755 index 5bb570af8c..0000000000 --- a/tests/bugs/vis/bug22835 +++ /dev/null @@ -1,17 +0,0 @@ -puts "============" -puts "CR22835" -puts "============" -puts "" -########################################################################################################## -# IncrementalMesh generates FLT exceptions when running in parallel mode -########################################################################################################## - -mpparallel 1 -restore [locate_data_file bug22835_hello.brep] result -vinit -vdisplay result -vsetdispmode 1 -tclean result -vdisplay result - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug22847 b/tests/bugs/vis/bug22847 deleted file mode 100755 index 3c1a65944d..0000000000 --- a/tests/bugs/vis/bug22847 +++ /dev/null @@ -1,51 +0,0 @@ -puts "============" -puts "OCC22847" -puts "============" -puts "" -############################################################################################## -# DrawTrSurf: provide interface for configuring visualization properties in axonometric viewer -############################################################################################## - -set BugNumber OCC22847 - -axo -point p1 0 0 0 -point p2 30 0 0 -point p3 60 0 0 -point p4 90 0 0 -point p5 120 0 0 -point a1 0 30 0 -point a2 0 60 0 -point a3 0 90 0 -point a4 0 120 0 -point b1 0 0 30 -point b2 0 0 60 -point b3 0 0 90 -point b4 0 0 120 - -changepointcolor white p1 -changepointcolor red p2 -changepointcolor blue p3 -changepointcolor green p4 -changepointcolor cyan p5 -changepointcolor golden a1 -changepointcolor brown a3 -changepointcolor orange a4 -changepointcolor pink a2 -changepointcolor coral b1 -changepointcolor violet b2 -changepointcolor pink b3 -changepointcolor pink b4 - -changepointmarker square p5 -changepointmarker diamond p4 -changepointmarker x p3 -changepointmarker plus a4 -changepointmarker circle a3 -changepointmarker circle b3 - -setpointcolor white -setpointmarker square -point f 100 50 50 - -puts "It's a visualization bug. There are not results. See photo." \ No newline at end of file diff --git a/tests/bugs/vis/bug22849 b/tests/bugs/vis/bug22849 deleted file mode 100755 index 5d53da5353..0000000000 --- a/tests/bugs/vis/bug22849 +++ /dev/null @@ -1,40 +0,0 @@ -puts "TODO CR30056 ALL: Meshing statuses: SelfIntersectingWire Failure" - -puts "============" -puts "OCC22849" -puts "============" -puts "" -####################################################################### -# Bad import of a STEP file (error during triangulation) -####################################################################### - -set BugNumber OCC22849 - -catch {pload XDE} - -stepread [locate_data_file OCC22849-2520-6002_step.stp] a * -checkshape a_1 -##tole a_1 -incmesh a_1 0.1 -tricheck a_1 -explode a_1 f - -set info1 [fromshape a_1_67] -regexp {Shape a_1_67 : imported from entity ([-0-9.+eE]+:#[-0-9.+eE]+)} $info1 full entity1 -set word1 [string compare $entity1 4973:#5009] - -set info2 [fromshape a_1_73] -regexp {Shape a_1_73 : imported from entity ([-0-9.+eE]+:#[-0-9.+eE]+)} $info2 full entity2 -set word2 [string compare $entity2 5157:#5193] - -set info3 [fromshape a_1_91] -regexp {Shape a_1_91 : imported from entity ([-0-9.+eE]+:#[-0-9.+eE]+)} $info3 full entity3 -set word3 [string compare $entity3 5659:#5695] - -if { ${word1} == 0 && ${word2} == 0 && ${word3} == 0 } { - puts "OK ${BugNumber}" -} else { - puts "Faulty ${BugNumber}" -} - -checkview -display result -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug22900 b/tests/bugs/vis/bug22900 deleted file mode 100755 index f8d32dd30f..0000000000 --- a/tests/bugs/vis/bug22900 +++ /dev/null @@ -1,32 +0,0 @@ -puts "================" -puts "OCC22900" -puts "================" -puts "" -####################################################################################### -# Problem with shape displaying in shading mode -###################################################################################### - -set BugNumber OCC22900 - -set x1 204 -set y1 202 - -vertex v1 0 0 0 -vertex v2 0 0 30 -edge e1 v1 v2 -pcone con1 5 0 10 -ttranslate con1 0 0 30 -compound con1 e1 c1 -don c1 -fit -vinit -vdisplay c1 -vfit -vsetcolor c1 RED -vsetcolor c1 GREEN -vsetdispmode 1 -vsetcolor c1 RED - -checkcolor ${x1} ${y1} 1 0 0 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug22912 b/tests/bugs/vis/bug22912 deleted file mode 100644 index bc9b9e1bc6..0000000000 --- a/tests/bugs/vis/bug22912 +++ /dev/null @@ -1,32 +0,0 @@ -puts "===========" -puts "OCC22912" -puts "===========" -puts "" -######################################################################################################################## -# After calling AIS_InteractiveContext::UnsetColor objects are drawn with the same color when transparency is changed -######################################################################################################################## - -restore [locate_data_file bug22912_p.brep] p -explode p -vinit -vdisplay p_1 -vdisplay p_2 -vfit -vsetdispmode p_1 1 -vsetdispmode p_2 1 -vsetcolor p_1 red -vsetcolor p_2 green -vunsetcolor p_1 -vunsetcolor p_2 -vsetcolor p_1 red -vsetcolor p_2 green -vsettransparency p_1 0.5 -vsettransparency p_1 0 - -checkcolor 120 150 0.831 0.000 0.000 -checkcolor 180 273 0.000 0.753 0.000 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - - diff --git a/tests/bugs/vis/bug23062 b/tests/bugs/vis/bug23062 deleted file mode 100755 index 2218bdc5d8..0000000000 --- a/tests/bugs/vis/bug23062 +++ /dev/null @@ -1,21 +0,0 @@ -puts "========" -puts "CR23062" -puts "========" -puts "" - -####################################################### -## Incorrect display of edge in draw axo viewer -####################################################### - -restore [locate_data_file bug23062_ProblemWire.brep] result - -smallview -display result -fit - -explode result v - -vinit -vdisplay result - -checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug23065 b/tests/bugs/vis/bug23065 deleted file mode 100755 index a71e69bd97..0000000000 --- a/tests/bugs/vis/bug23065 +++ /dev/null @@ -1,34 +0,0 @@ -puts "================" -puts "OCC23065" -puts "================" -puts "" -########################################################################################## -# This is desirable to add general DRAW command to estimate visualization performance -########################################################################################## - -set BugNumber OCC23065 - -vinit -set Log [vfps] - -set status 0 -if { [llength ${Log}] == 5} { - set word1 [string compare [lindex ${Log} end] "msec"] - set word2 [string compare [lindex ${Log} end-2] "CPU:"] - set word3 [string compare [lindex ${Log} end-4] "FPS:"] - if { ${word1} == 0 && ${word2} == 0 && ${word3} == 0 } { - set status 0 - } else { - set status 1 - } -} else { - set status 1 -} - -# Resume -puts "" -if { ${status} == 0 } { - puts "OK ${BugNumber}" -} else { - puts "Faulty ${BugNumber}" -} diff --git a/tests/bugs/vis/bug23067 b/tests/bugs/vis/bug23067 deleted file mode 100755 index 67a774796f..0000000000 --- a/tests/bugs/vis/bug23067 +++ /dev/null @@ -1,20 +0,0 @@ -puts "===========" -puts "OCC23067" -puts "===========" -puts "" -################################################################################ -# OpenGl package API needed by UserDraw feature is not exported -################################################################################ - -set BugNumber OCC23067 -set x1 321 -set y1 159 - -vinit -vuserdraw a -vfit -checkcolor ${x1} ${y1} 1 1 0 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - diff --git a/tests/bugs/vis/bug23069 b/tests/bugs/vis/bug23069 deleted file mode 100755 index f80c353234..0000000000 --- a/tests/bugs/vis/bug23069 +++ /dev/null @@ -1,25 +0,0 @@ -puts "===========" -puts "OCC23069" -puts "===========" -puts "" -################################################################################ -# OpenGL state extraction for GL_RENDER_MODE significantly impact performance -# -# Execution of the test case is actual only for testing on specific hardware. -# Test case will be updated after starting testing on hardware. -################################################################################ - -set BugNumber OCC23069 - -#vinit - -#for {set anInter 1} {$anInter <= 1000} {incr anInter} { -# box b${anInter} [expr $anInter * 20] 0 0 10 20 30 -# vdisplay b${anInter} -#} - -#vfit - -#set Log [vfps] - -# it's necessary to check value of CPU and FPS diff --git a/tests/bugs/vis/bug230_1 b/tests/bugs/vis/bug230_1 deleted file mode 100644 index 8b4feba799..0000000000 --- a/tests/bugs/vis/bug230_1 +++ /dev/null @@ -1,17 +0,0 @@ -puts "========" -puts "OCC230" -puts "OCC489" -puts "========" -puts "" -############################################ -## Numeric Error occurs in V2d_View::WindowFit() , Magnify() -############################################ - -point p1 0 10 -point p2 10 20 - -if [catch { OCC230 tc p1 p2 } ] { - puts "OCC230: Error" -} else { - puts "OCC230: OK" -} diff --git a/tests/bugs/vis/bug230_2 b/tests/bugs/vis/bug230_2 deleted file mode 100644 index 094f1e32cc..0000000000 --- a/tests/bugs/vis/bug230_2 +++ /dev/null @@ -1,18 +0,0 @@ -puts "========" -puts "OCC230" -puts "OCC489" -puts "========" -puts "" -############################################ -## Numeric Error occurs in V2d_View::WindowFit() , Magnify() -############################################ - -point p1 0 10 -point p2 10 20 - -if [catch { OCC230 tc p2 p1 } ] { - puts "OCC230: Error" -} else { - puts "OCC230: OK" -} - diff --git a/tests/bugs/vis/bug23102 b/tests/bugs/vis/bug23102 deleted file mode 100755 index b2e688b7b3..0000000000 --- a/tests/bugs/vis/bug23102 +++ /dev/null @@ -1,33 +0,0 @@ -puts "================" -puts "OCC23102" -puts "================" -puts "" -################################################################################################### -# Change the algorithm of rendering the 3d viewer background using tiled texture -################################################################################################### - -set BugNumber OCC23102 - -vinit -vbackground -image [locate_data_file OCC23102.bmp] -imageMode TILED - -set x1 58 -set y1 4 -set R_bg 0.70196002721786499 -set G_bg 0.78039199113845825 -set B_bg 0.86274499999999998 - -set WrongColor "$R_bg $G_bg $B_bg" - -set Color [vreadpixel ${x1} ${y1} rgb] - -#Resume -puts "" -if { "[vreadpixel ${x1} ${y1} rgb]" != "$WrongColor" } { - puts "OK ${BugNumber}" -} else { - puts "Faulty ${BugNumber}" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - diff --git a/tests/bugs/vis/bug23120 b/tests/bugs/vis/bug23120 deleted file mode 100755 index d75da7e2db..0000000000 --- a/tests/bugs/vis/bug23120 +++ /dev/null @@ -1,30 +0,0 @@ -puts "============" -puts "OCC23120" -puts "============" -puts "" -########################################################################### -# Transform persistence is not restored -########################################################################### - -box b1 10 20 30 -box b2 10 20 30 -ttranslate b2 50 50 0 -vinit -vdisplay b1 -trihedron center - -vdisplay b2 -vfit -vsetdispmode 1 -vzoom 0.5 -vpan 100 0 - -set x_coord 300 -set y_coord 130 - -checkcolor $x_coord $y_coord 0.78 0.55 0.9 - -if { $stat != 1 } { - puts "Error : Transform persistence is not restored" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug23123 b/tests/bugs/vis/bug23123 deleted file mode 100755 index cb107306d1..0000000000 --- a/tests/bugs/vis/bug23123 +++ /dev/null @@ -1,28 +0,0 @@ -puts "============" -puts "OCC23123" -puts "============" -puts "" -####################################################################### -# Bug/Regression in visualization of XDE documents in shaded mode -####################################################################### - -set BugNumber OCC23123 - -catch { pload XDE } - -ReadStep D [locate_data_file OCC23123-test.step] -XShow D -vfit -vsetdispmode 1 - -puts "Point color test:" -set x1 310 -set y1 225 -set r1 0.04 -set g1 0.04 -set b1 0.67 - -checkcolor $x1 $y1 $r1 $g1 $b1 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - diff --git a/tests/bugs/vis/bug23186 b/tests/bugs/vis/bug23186 deleted file mode 100755 index fe851c4e89..0000000000 --- a/tests/bugs/vis/bug23186 +++ /dev/null @@ -1,20 +0,0 @@ -puts "============" -puts "OCC23186" -puts "============" -puts "" -############################################################################ -# Unable to display Graphic3d_ArrayOfPoints after migrating from OCCT 6.5.2 -############################################################################ - -set BugNumber OCC23186 - -vinit -vdrawparray a points v 0 0 0 v 0 0 10 v 0 10 10 v 0 10 0 -vfit - -checkcolor 321 2 1 1 0 -checkcolor 321 271 1 1 0 -checkcolor 87 137 1 1 0 -checkcolor 87 406 1 1 0 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug23385 b/tests/bugs/vis/bug23385 deleted file mode 100755 index 285f09fce8..0000000000 --- a/tests/bugs/vis/bug23385 +++ /dev/null @@ -1,30 +0,0 @@ -puts "============" -puts "OCC23385" -puts "============" -puts "" -#################################################################################### -# Bug in AIS_TexturedShape::Compute() -#################################################################################### - -set BugNumber OCC23385 - -vinit -restore [locate_data_file OCC23115-bottle.brep] b -explode b F -vdisplay b_16 -vtexture b_16 [locate_data_file OCC23385-carrelage1.gif] -vtexrepeat b_16 3 2 -vsetdispmode b_16 1 -vfit - -if { "[vreadpixel 85 73 rgb name]" != "BLACK" } { - puts "OK ${BugNumber}" -} else { - puts "Faulty ${BugNumber}" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - - - diff --git a/tests/bugs/vis/bug23400 b/tests/bugs/vis/bug23400 deleted file mode 100755 index 023be0936a..0000000000 --- a/tests/bugs/vis/bug23400 +++ /dev/null @@ -1,16 +0,0 @@ -puts "============" -puts "OCC23400" -puts "============" -puts "" -####################################################################### -# Triangulation of thin ring contains gap -####################################################################### - -restore [locate_data_file bug23400_thinring.brep] a -vinit -vsetdispmode 1 -vdisplay a -vtop -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug23407_1 b/tests/bugs/vis/bug23407_1 deleted file mode 100755 index ed38114030..0000000000 --- a/tests/bugs/vis/bug23407_1 +++ /dev/null @@ -1,37 +0,0 @@ -puts "============" -puts "CR23407" -puts "============" -puts "" -####################################################################### -# Draw face outlines for XDE objects -####################################################################### -pload XDEDRAW - -XNewDoc Doc1 -ReadStep Doc1 [locate_data_file screw.step] -XShow Doc1 0:1:1:1 -XShowFaceBoundary Doc1 0:1:1:1 1 255 0 0 10 1 -vfit -vsetdispmode 1 - -set x_coord 178 -set y_coord 36 - -checkcolor $x_coord $y_coord 1 0 0 - -if { $stat != 1 } { - puts "Error : Boundary of face is not changed" -} - -set x_coord 244 -set y_coord 89 - -checkcolor $x_coord $y_coord 1 0 0 - -if { $stat != 01} { - puts "Error : Boundary of face is not changed" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - diff --git a/tests/bugs/vis/bug23422 b/tests/bugs/vis/bug23422 deleted file mode 100644 index 477fb0b630..0000000000 --- a/tests/bugs/vis/bug23422 +++ /dev/null @@ -1,20 +0,0 @@ -puts "============" -puts "CR23422" -puts "============" -puts "" -####################################################################### -# Selection problems when using SetLocation. -####################################################################### - -box b 50 50 50 -vinit -vsetdispmode 1 -vdisplay b -vtrihedron t - -vsetlocation b 30 30 130 - -vmoveto 240 150 - -set anImage ${imagedir}/${casename}.png -vdump ${anImage} diff --git a/tests/bugs/vis/bug23484_1 b/tests/bugs/vis/bug23484_1 deleted file mode 100644 index 378433d4f1..0000000000 --- a/tests/bugs/vis/bug23484_1 +++ /dev/null @@ -1,23 +0,0 @@ -puts "============" -puts "OCC23484" -puts "============" -puts "" -############################################################################################ -puts "Visualization, TKOpenGl - primitive arrays to become the only way to render geometry" -puts "Tests wireframe trihedron rendering with primitive arrays" -############################################################################################ - -set anImage1 $imagedir/${casename}_1.png -set anImage2 $imagedir/${casename}_2.png - -vinit View1 -vfit -vaxo - -vzbufftrihedron -scale 0.1 -type wireframe -position left_lower -vdump $anImage1 - -vzbufftrihedron -scale 0.1 -type wireframe -position center -vdump $anImage2 - -vclear diff --git a/tests/bugs/vis/bug23484_2 b/tests/bugs/vis/bug23484_2 deleted file mode 100644 index 56409a20a9..0000000000 --- a/tests/bugs/vis/bug23484_2 +++ /dev/null @@ -1,27 +0,0 @@ -puts "============" -puts "OCC23484" -puts "============" -puts "" -############################################################################################ -puts "Visualization, TKOpenGl - primitive arrays to become the only way to render geometry" -puts "Tests clipping plane rendering with primitive arrays" -############################################################################################ - -set anImage $imagedir/${casename}_1.png - -vinit View1 -vclear -vaxo -vsetdispmode 1 -box b 1 1 1 -vdisplay b -vfit - -vclipplane create pln -vclipplane set pln view Driver1/Viewer1/View1 -vclipplane change pln equation 0 1 0 -0.5 -vclipplane change pln capping on - -vdump $anImage - -vclear diff --git a/tests/bugs/vis/bug23539_2 b/tests/bugs/vis/bug23539_2 deleted file mode 100644 index cc71f86429..0000000000 --- a/tests/bugs/vis/bug23539_2 +++ /dev/null @@ -1,33 +0,0 @@ - - -puts "============" -puts "CR23539" -puts "============" -puts "" -############################# -## Test case for polygonal shift selection -############################# - -box a 10 10 10 -box b 50 50 50 10 10 10 -vinit -vdisplay a b -vfit -vselmode 2 1 -vselect 0 0 -vselect 58 300 -vselect 300 200 300 60 400 60 407 150 -xor - -set NbSelected1 [vnbselected] -if { ${NbSelected1} != 13 } { - puts "Error : Polygonal shift selection doesn't work properly" -} - -vselect 350 120 -xor - -set NbSelected1 [vnbselected] -if { ${NbSelected1} != 12 } { - puts "Error : (case 2)" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug23670_2 b/tests/bugs/vis/bug23670_2 deleted file mode 100644 index b4b5f1a911..0000000000 --- a/tests/bugs/vis/bug23670_2 +++ /dev/null @@ -1,28 +0,0 @@ -puts "============" -puts "OCC23670" -puts "============" -puts "" -############################################################################ -# Support for multiple 3D views -############################################################################ - -#test case for vinit, vclose and vviewlist commands -#create view with default name Driver1/Viewer1/View1 -vinit -vinit MyDriver/MyViewer/View1 -vinit MyDriver/MyViewer/MyView -#close MyDriver/MyViewer/View1 -vclose View1 -set ResultBefore [vviewlist] -vinit Driver1/Viewer1/MyView -vclose MyView -vinit Driver1/Viewer1/View2 - -set ResultAfter [vviewlist] -set Result [string equal $ResultBefore $ResultAfter] -#compare outputs of two vviewlist calls -if {$Result != 0} { -puts "Error. Different view lists are equal." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug23705 b/tests/bugs/vis/bug23705 deleted file mode 100755 index f8f8acd426..0000000000 --- a/tests/bugs/vis/bug23705 +++ /dev/null @@ -1,22 +0,0 @@ -puts "========" -puts "CR23705" -puts "========" -puts "" -############################################################### -## Isoline in the AIS viewer is not trimmed -############################################################### - -restore [locate_data_file bug23705_plancher20igs_face.brep] result - -vinit -visos 10 10 1 - -vdisplay result -vfit - -set x 326 -set y 295 - -checkcolor $x $y 0 0 0 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug23709_1 b/tests/bugs/vis/bug23709_1 deleted file mode 100644 index dbf4749db2..0000000000 --- a/tests/bugs/vis/bug23709_1 +++ /dev/null @@ -1,30 +0,0 @@ -puts "============" -puts "OCC23709" -puts "============" -puts "" -############################################################################ -# Redesign of hlrtest command -############################################################################ - -pcone a 5 0 10 -box b 15 0 0 10 10 10 -vinit -vdisplay a -vdisplay b -vrotate 35 0 0 -vfit -vhlr on -vhlrtype polyalgo b - -set x_coord 290 -set y_coord 170 -vaspects -setwidth 5 -if { "[vreadpixel $x_coord $y_coord rgb name]" != "YELLOW" } { - puts "Error : color is not yellow" -} - -set x_coord 86 -set y_coord 221 -checkcolor $x_coord $y_coord 0 0 0 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug23709_2 b/tests/bugs/vis/bug23709_2 deleted file mode 100644 index 20e4f13de0..0000000000 --- a/tests/bugs/vis/bug23709_2 +++ /dev/null @@ -1,30 +0,0 @@ -puts "============" -puts "OCC23709" -puts "============" -puts "" -############################################################################ -# Redesign of hlrtest command -############################################################################ - -pcone a 5 0 10 -box b 15 0 0 10 10 10 -vinit -vdisplay a -vdisplay b -vrotate 35 0 0 -vfit -vhlr on -vhlrtype algo a - -set x_coord 290 -set y_coord 170 -vaspects -setwidth 5 -if { "[vreadpixel $x_coord $y_coord rgb name]" != "YELLOW" } { - puts "Error : color is not yellow" -} - -set x_coord 86 -set y_coord 221 -checkcolor $x_coord $y_coord 0 0 0 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug23709_3 b/tests/bugs/vis/bug23709_3 deleted file mode 100644 index c26e12d695..0000000000 --- a/tests/bugs/vis/bug23709_3 +++ /dev/null @@ -1,25 +0,0 @@ -puts "===========" -puts "OCC23709" -puts "===========" -puts "" -################################## -# Redesign of hlrtest command -################################## - -set x_coord 183 -set y_coord 267 - -restore [locate_data_file bug23709_solidcone.brep] result -vinit -vdisplay result -vrotate 35 0 0 -vfit -vhlr on -vhlrtype algo result - -vaspects -setwidth 5 -if { "[vreadpixel $x_coord $y_coord rgb name]" != "YELLOW" } { - puts "Error : color is not yellow" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug23709_4 b/tests/bugs/vis/bug23709_4 deleted file mode 100644 index 9c2ce2a9e0..0000000000 --- a/tests/bugs/vis/bug23709_4 +++ /dev/null @@ -1,25 +0,0 @@ -puts "===========" -puts "OCC23709" -puts "===========" -puts "" -################################## -# Redesign of hlrtest command -################################## - -set x_coord 183 -set y_coord 267 - -restore [locate_data_file bug23709_surfcone.brep] result -vinit -vdisplay result -vrotate 35 0 0 -vfit -vhlr on -vhlrtype algo result - -vaspects -setwidth 5 -if { "[vreadpixel $x_coord $y_coord rgb name]" != "YELLOW" } { - puts "Error : color is not yellow" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug23743 b/tests/bugs/vis/bug23743 deleted file mode 100755 index fda8889be0..0000000000 --- a/tests/bugs/vis/bug23743 +++ /dev/null @@ -1,13 +0,0 @@ -puts "================" -puts "CR23743" -puts "================" -puts "" -####################################################################### -# AIS_Triangulation crashes if Poly_Triangulation has no normals -####################################################################### - -vinit -vdrawsphere result 100 -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug23984 b/tests/bugs/vis/bug23984 deleted file mode 100644 index a93b3e29f9..0000000000 --- a/tests/bugs/vis/bug23984 +++ /dev/null @@ -1,19 +0,0 @@ -puts "============" -puts "CR23984" -puts "============" -puts "" -######################################################## -# Incorrect visualization of wires in wireframe mode -######################################################## - -vinit View1 -restore [locate_data_file bug23984_bug.brep] result -vdisplay result -vsetdispmode 0 -vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - -axo -fit -checkview -screenshot -2d -path ${imagedir}/${test_image}.png - diff --git a/tests/bugs/vis/bug24133_1 b/tests/bugs/vis/bug24133_1 deleted file mode 100644 index 108f2e8004..0000000000 --- a/tests/bugs/vis/bug24133_1 +++ /dev/null @@ -1,27 +0,0 @@ -puts "============" -puts "CR24133" -puts "============" -puts "" -####################################################################### -# Development of improvement of dimensions implementation -# Length dimension -####################################################################### -pload VISUALIZATION - -vfont add [locate_data_file DejaVuSans.ttf] SansFont - -vinit -vpoint lengthP1 0 0 0 -vpoint lengthP2 50 50 50 -vdimension dim1 -length -plane xoy -shapes lengthP1 lengthP2 -font SansFont -vfit -vmoveto 82 254 - -set x_coord 362 -set y_coord 102 -checkcolor $x_coord $y_coord 0 1 1 -if { $stat != 1 } { - puts "Error : Highlighting of length dimension is wrong." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug24133_2 b/tests/bugs/vis/bug24133_2 deleted file mode 100644 index db3edb0f6b..0000000000 --- a/tests/bugs/vis/bug24133_2 +++ /dev/null @@ -1,46 +0,0 @@ -puts "============" -puts "CR24133" -puts "============" -puts "" -####################################################################### -# Development of improvement of dimensions implementation -# Angle dimension -####################################################################### -pload VISUALIZATION - -vfont add [locate_data_file DejaVuSans.ttf] SansFont - -vinit -vpoint angle1P1 0 0 0 -vpoint angle1P2 50 50 50 -vpoint angle1P3 50 50 100 -vdimension dim1 -angle -shapes angle1P1 angle1P2 angle1P3 -font SansFont -vfit -vmoveto 249 206 - -set x_coord 249 -set y_coord 200 - -checkcolor $x_coord $y_coord 0 1 1 - -if { $stat != 1 } { - puts "Error : Highlighting of angle dimension with 2d text is wrong." -} -vinit Viewer2/View2 -vpoint angle2P1 0 0 0 -vpoint angle2P2 50 50 50 -vpoint angle2P3 50 50 100 -vdimension dim2 -angle -text 3d -shapes angle2P1 angle2P2 angle2P3 -font SansFont -vfit -vmoveto 263 251 - -set x_coord 335 -set y_coord 319 - -checkcolor $x_coord $y_coord 0 1 1 - -if { $stat != 1 } { - puts "Error : Highlighting of angle dimension with 3d text is wrong." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug24133_3 b/tests/bugs/vis/bug24133_3 deleted file mode 100644 index 636de0c8fe..0000000000 --- a/tests/bugs/vis/bug24133_3 +++ /dev/null @@ -1,47 +0,0 @@ -puts "============" -puts "CR24133" -puts "============" -puts "" -####################################################################### -# Development of improvement of dimensions implementation -# Radius dimension -####################################################################### -pload VISUALIZATION - -vfont add [locate_data_file DejaVuSans.ttf] SansFont - -vinit -vpoint radP1 0 0 0 -vpoint radP2 50 50 0 -vpoint radP3 100 0 0 -vcircle circle1 radP1 radP2 radP3 0 -verase radP1 radP2 radP3 -vdimension dim1 -radius -shapes circle1 -font SansFont -vfit -vmoveto 123 158 - -set x_coord 112 -set y_coord 151 - -checkcolor $x_coord $y_coord 0 1 1 - -if { $stat != 1 } { - puts "Error : Highlighting of radius dimension with 2d text is wrong." -} - -vinit Viewer2/View2 -vcircle circle2 radP1 radP2 radP3 0 -vdimension dim2 -radius -text 3d -shapes circle2 -font SansFont -vfit -vmoveto 191 196 - -set x_coord 112 -set y_coord 151 - -checkcolor $x_coord $y_coord 0 1 1 - -if { $stat != 1 } { - puts "Error : Highlighting of radius dimension with 3d text is wrong." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug24133_4 b/tests/bugs/vis/bug24133_4 deleted file mode 100644 index e21948ecea..0000000000 --- a/tests/bugs/vis/bug24133_4 +++ /dev/null @@ -1,47 +0,0 @@ -puts "============" -puts "CR24133" -puts "============" -puts "" -####################################################################### -# Development of improvement of dimensions implementation -# Diameter dimension -####################################################################### -pload VISUALIZATION - -vfont add [locate_data_file DejaVuSans.ttf] SansFont - -vinit -vpoint diamP1 0 0 0 -vpoint diamP2 50 50 0 -vpoint diamP3 100 0 0 -vcircle circle1 diamP1 diamP2 diamP3 0 -verase diamP1 diamP2 diamP3 -vdimension dim1 -diameter -shapes circle1 -font SansFont -vfit -vmoveto 208 205 - -set x_coord 296 -set y_coord 257 - -checkcolor $x_coord $y_coord 0 1 1 - -if { $stat != 1 } { - puts "Error : Highlighting of diameter dimension with 2d text is wrong." -} - -vinit Viewer2/View2 -vcircle circle2 diamP1 diamP2 diamP3 0 -vdimension dim2 -diameter -text 3d -shapes circle2 -font SansFont -vfit -vmoveto 208 205 - -set x_coord 296 -set y_coord 257 - -checkcolor $x_coord $y_coord 0 1 1 - -if { $stat != 1 } { - puts "Error : Highlighting of diameter dimension with 3d text is wrong." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug24288_1 b/tests/bugs/vis/bug24288_1 deleted file mode 100644 index 204e2f196d..0000000000 --- a/tests/bugs/vis/bug24288_1 +++ /dev/null @@ -1,47 +0,0 @@ -puts "============" -puts "CR24288" -puts "============" -puts "" -####################################################################### -# Provide a text flipping -# Test for text flipping after X rotation -####################################################################### -pload VISUALIZATION - -vfont add [locate_data_file DejaVuSans.ttf] SansFont - -set m_pi 3,14 -set m_pi2 1,57 -vinit -vpoint radP1 0 0 0 -vpoint radP2 50 50 0 -vpoint radP3 100 0 0 -vcircle circle radP1 radP2 radP3 0 -vrotate 0 -$m_pi2 0 -verase radP1 radP2 radP3 -vdimension dim -radius -text 3d -shapes circle -font SansFont -vfit -vmoveto 110 111 - -set x_coord 196 -set y_coord 196 -checkcolor $x_coord $y_coord 0 1 1 - -if { $stat != 1 } { - puts "Error : Highlighting of radius dimension with 3d text before flipping is wrong." -} - -# X axis rotation -vrotate $m_pi 0 0 -vfit -vmoveto 208 200 - -set x_coord 295 -set y_coord 113 -checkcolor $x_coord $y_coord 0 1 1 - -if { $stat != 1 } { - puts "Error : Highlighting of radius dimension with 3d text with flipping after x rotation is wrong." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug24288_2 b/tests/bugs/vis/bug24288_2 deleted file mode 100644 index f85aca5dea..0000000000 --- a/tests/bugs/vis/bug24288_2 +++ /dev/null @@ -1,47 +0,0 @@ -puts "============" -puts "CR24288" -puts "============" -puts "" -####################################################################### -# Provide a text flipping -# Test for text flipping after Y rotation -####################################################################### -pload VISUALIZATION - -vfont add [locate_data_file DejaVuSans.ttf] SansFont - -set m_pi 3,14 -set m_pi2 1,57 -vinit -vpoint radP1 0 0 0 -vpoint radP2 50 50 0 -vpoint radP3 100 0 0 -vcircle circle radP1 radP2 radP3 0 -vrotate 0 -$m_pi2 0 -verase radP1 radP2 radP3 -vdimension dim -radius -text 3d -shapes circle -font SansFont -vfit -vmoveto 110 111 - -set x_coord 196 -set y_coord 196 -checkcolor $x_coord $y_coord 0 1 1 - -if { $stat != 1 } { - puts "Error : Highlighting of radius dimension with 3d text before flipping is wrong." -} - -# Y axis rotation -vrotate 0 $m_pi 0 -vfit -vmoveto 159 246 - -set x_coord 113 -set y_coord 294 -checkcolor $x_coord $y_coord 0 1 1 - -if { $stat != 1 } { - puts "Error : Highlighting of radius dimension with 3d text with flipping after y rotation is wrong." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug24288_3 b/tests/bugs/vis/bug24288_3 deleted file mode 100644 index 318f68f727..0000000000 --- a/tests/bugs/vis/bug24288_3 +++ /dev/null @@ -1,47 +0,0 @@ -puts "============" -puts "CR24288" -puts "============" -puts "" -####################################################################### -# Provide a text flipping -# Test for text flipping after Z rotation -####################################################################### -pload VISUALIZATION - -vfont add [locate_data_file DejaVuSans.ttf] SansFont - -set m_pi 3,14 -set m_pi2 1,57 -vinit -vpoint radP1 0 0 0 -vpoint radP2 50 50 0 -vpoint radP3 100 0 0 -vcircle circle radP1 radP2 radP3 0 -vrotate 0 -$m_pi2 0 -verase radP1 radP2 radP3 -vdimension dim -radius -text 3d -shapes circle -font SansFont -vfit -vmoveto 110 111 - -set x_coord 196 -set y_coord 196 -checkcolor $x_coord $y_coord 0 1 1 - -if { $stat != 1 } { - puts "Error : Highlighting of radius dimension with 3d text before flipping is wrong." -} - -# Z axis rotation -vrotate 0 0 $m_pi -vfit -vmoveto 221 217 - -set x_coord 209 -set y_coord 208 -checkcolor $x_coord $y_coord 0 1 1 - -if { $stat != 1 } { - puts "Error : Highlighting of radius dimension with 3d text with flipping after z rotation is wrong." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug24293 b/tests/bugs/vis/bug24293 deleted file mode 100644 index 2e5128ea3f..0000000000 --- a/tests/bugs/vis/bug24293 +++ /dev/null @@ -1,25 +0,0 @@ -puts "============" -puts "CR24293" -puts "============" -puts "" -####################################################################### -# Dimension flyout lines don't belong to the dimension sensitive entity. -####################################################################### - -vfont add [locate_data_file DejaVuSans.ttf] SansFont - -vinit View1 -vpoint lengthP1 0 0 0 -vpoint lengthP2 10 10 10 -vdimension dim1 -length -plane xoy -shapes lengthP1 lengthP2 -font SansFont -vfit -vmoveto 202 191 - -set x_coord 272 -set y_coord 198 -checkcolor $x_coord $y_coord 0 1 1 -if { $stat != 1 } { - puts "Error : Highlighting of length dimension is wrong." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug24358 b/tests/bugs/vis/bug24358 deleted file mode 100644 index d13af6161f..0000000000 --- a/tests/bugs/vis/bug24358 +++ /dev/null @@ -1,30 +0,0 @@ -puts "===========" -puts "OCC24358" -puts "===========" -puts "" -########################################################################### -# 0024358: TKV3d - connected structures are not re-computed on device lost -########################################################################### - -set Image1 $imagedir/${casename}_1.png -set Image2 $imagedir/${casename}_2.png - -pload MODELING -pload VISUALIZATION -box b1 0 0 0 1 2 3 -box b2 3 0 0 3 2 1 -vinit View1 -vclear -vaxo -vsetdispmode 1 -vconnect b1c -3 0 0 b1 b2 -vfit - -vdump $Image1 - -vclose View1 1 -vinit View1 -vdisplay b1c -vfit - -vdump $Image2 diff --git a/tests/bugs/vis/bug24374 b/tests/bugs/vis/bug24374 deleted file mode 100644 index f1c03842d0..0000000000 --- a/tests/bugs/vis/bug24374 +++ /dev/null @@ -1,28 +0,0 @@ -puts "============" -puts "CR24374" -puts "============" -puts "" -####################################################################### -# Flipping affects highlight presentation of dimension -####################################################################### -vfont add [locate_data_file DejaVuSans.ttf] SansFont - -box b 100 100 100 -explode b e -vdisplay b -vdisplay b_9 -vdimension dim1 -length -shapes b_9 -text 3d -plane zox -font SansFont -vselmode b 2 1 -vselmode dim1 2 1 -vfit -vmoveto 130 352 - -set x_coord 130 -set y_coord 352 -checkcolor $x_coord $y_coord 0 1 1 - -if { $stat != 1 } { - puts "Error : Highlighting of dimension with flipping in local context failed." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug24388_1 b/tests/bugs/vis/bug24388_1 deleted file mode 100644 index 9b0cbdae4e..0000000000 --- a/tests/bugs/vis/bug24388_1 +++ /dev/null @@ -1,37 +0,0 @@ -puts "===========" -puts "OCC24388" -puts "===========" -puts "" -################################################################## -# 0024388: Option to enable visualization of hidden lines in DRAW -# Checks if dotted hidden lines are highlighted properly. -################################################################## - -box b 15 0 0 10 10 10 -vinit -vdisplay b -vrotate 35 0 0 -vfit -vhlr on 1 -vhlrtype algo b - -vmoveto 76 304 - -set x_coord 115 -set y_coord 203 -checkcolor $x_coord $y_coord 0 1 1 - -if { $stat != 1 } { - puts "Error : Highlighting of dotted hidden lines in the box is wrong." -} - -set x_coord 122 -set y_coord 200 - -checkcolor $x_coord $y_coord 0 0 0 - -if { $stat != 1 } { - puts "Error : Highlighting of dotted hidden lines in the box is wrong." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug24388_2 b/tests/bugs/vis/bug24388_2 deleted file mode 100644 index e7d0e7c7fe..0000000000 --- a/tests/bugs/vis/bug24388_2 +++ /dev/null @@ -1,44 +0,0 @@ -puts "===========" -puts "OCC24388" -puts "===========" -puts "" -################################################################## -# 0024388: Option to enable visualization of hidden lines in DRAW -# Checks if dotted hidden lines are displayed properly in HLR mode. -################################################################## - -set m_pi2 1,57 -pcone a 5 0 10 -vinit -vdisplay a -vrotate 35 0 0 -vfit -vhlr on 0 -vhlrtype algo a -vrotate -$m_pi2 -$m_pi2 0 -vfit - -set x_coord 131 -set y_coord 240 - -checkcolor $x_coord $y_coord 0 0 0 - -if { $stat != 1 } { - puts "Error : Drawing hidden lines as dotted lines produces wrong result." -} - -vdump $imagedir/${casename}_without_lines.png - -vhlr on 1 - -set x_coord 131 -set y_coord 240 - -# Check display of dotted hidden lines -checkcolor $x_coord $y_coord 0.2 0.2 0.2 - -if { $stat != 1 } { - puts "Error : Drawing hidden lines as dotted lines produces wrong result." -} - -vdump $imagedir/${casename}_with_lines.png \ No newline at end of file diff --git a/tests/bugs/vis/bug24391 b/tests/bugs/vis/bug24391 deleted file mode 100644 index bae0c71760..0000000000 --- a/tests/bugs/vis/bug24391 +++ /dev/null @@ -1,25 +0,0 @@ -puts "============" -puts "OCC24391" -puts "============" -puts "" -####################################################################### -# Erased AIS object can not be displayed in AIS_InteractiveContext -# after AIS_InteractiveContext::Remove -####################################################################### - -pload VISUALLIZATION -vinit -box a 1 1 1 -vdisplay a -verase a -vremove -context a -vdisplay a -vfit - -vaspects -setwidth 5 -vmoveto 204 205 -if { "[vreadpixel 204 205 rgb name]" != "CYAN" } { - puts "Error : Erased object is not displayed after its removing." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug24394 b/tests/bugs/vis/bug24394 deleted file mode 100644 index ed3552628b..0000000000 --- a/tests/bugs/vis/bug24394 +++ /dev/null @@ -1,19 +0,0 @@ -puts "========" -puts "OCC24394" -puts "========" -puts "" -################################################################################# -# Visualization - implement more general way for rendering of immediate objects -################################################################################# - -box b1 0 0 0 1 2 3 -box b2 3 0 0 2 3 1 -vinit View1 -vclear -vaxo -vsetdispmode 1 -vdisplay b1 -vdisplay -top b1 -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug24412_2 b/tests/bugs/vis/bug24412_2 deleted file mode 100644 index da6239d428..0000000000 --- a/tests/bugs/vis/bug24412_2 +++ /dev/null @@ -1,47 +0,0 @@ -puts "============" -puts "CR24412" -puts "============" -puts "" -####################################################################### -# TKV3d, Dimensions - Possibility to customize text position was lost -# Test position setting for angular dimension -####################################################################### -pload ALL - -vfont add [locate_data_file DejaVuSans.ttf] SansFont - -set anImage1 $imagedir/${casename}_1.png -set anImage2 $imagedir/${casename}_2.png - -vinit Viewer1/View1 -vpoint ang_p1 0 0 30 -vpoint ang_p2 30 0 0 -vpoint ang_p3 60 0 30 -vdimension ang -angle -shapes ang_p1 ang_p2 ang_p3 -font SansFont -vmovedim ang 5 0 5 -vfit - -# Check that text position was changed and the text is not aligned -set x_coord 60 -set y_coord 189 -checkcolor $x_coord $y_coord 0.46 0.9 0 -if { $stat != 1 } { - puts "Error : Text position of dimension is incorrect." -} - -vdump $anImage1 - - -# Update dimension parameters and set automatic text positioning -vdimparam ang -flyout -5 -vfit - -# Check that text position was changed according to flyout -set x_coord 206 -set y_coord 312 -checkcolor $x_coord $y_coord 0.46 0.9 0 -if { $stat != 1 } { - puts "Error : Text position of dimension after layout changing is incorrect." -} - -vdump $anImage2 diff --git a/tests/bugs/vis/bug24539 b/tests/bugs/vis/bug24539 deleted file mode 100644 index 99016e342c..0000000000 --- a/tests/bugs/vis/bug24539 +++ /dev/null @@ -1,16 +0,0 @@ -puts "============" -puts "OCC24539" -puts "============" -puts "" -############################################################# -# Visualization (new camera) - small objects displayed with visual artifacts -############################################################# - -box b 0.001 0.001 0.001 -vinit View1 -vclear -vsetdispmode 1 -vdisplay b -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug24606 b/tests/bugs/vis/bug24606 deleted file mode 100644 index 8e261674c0..0000000000 --- a/tests/bugs/vis/bug24606 +++ /dev/null @@ -1,40 +0,0 @@ -puts "============" -puts "OCC24606" -puts "============" -puts "" -#################################################################################### -# Tests ::FitDepth and ::FitAll implementation of V3d_View. -#################################################################################### - -set check_x 402 -set check_y 320 - -restore [locate_data_file bug24606.brep] shape - -vinit View1 -vautozfit 0 -vsetdispmode 1 -vdisplay shape -OCC24606 -vmoveto $check_x $check_y - -checkcolor $check_x $check_y 0 1 1 - -if {$stat != 1} { - puts "Error : V3d view ::FitAll is broken." -} -vdump ${imagedir}/${casename}_1.png - -vinit View2 -vautozfit 1 -vsetdispmode 1 -vdisplay shape -OCC24606 -vmoveto $check_x $check_y - -checkcolor $check_x $check_y 0 1 1 - -if {$stat != 1} { - puts "Error : V3d view ::FitAll is broken." -} -vdump ${imagedir}/${casename}_2.png diff --git a/tests/bugs/vis/bug24610 b/tests/bugs/vis/bug24610 deleted file mode 100644 index 6fe0ba79e1..0000000000 --- a/tests/bugs/vis/bug24610 +++ /dev/null @@ -1,24 +0,0 @@ -puts "============" -puts "OCC24610" -puts "============" -puts "" -####################################################################### -# Erased AIS object should not be taken into account by FitAll operation -####################################################################### - -pload VISUALIZATION -vinit -box b1 200 200 200 -vdisplay b1 -vfit -box b2 2 2 2 -vdisplay b2 -set color_1 [vreadpixel 32 305] -verase b1 -vfit -set color_2 [vreadpixel 32 305] -if {$color_1 == $color_2} { - puts "ERROR: OCC24610 is reproduced" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug24623_4 b/tests/bugs/vis/bug24623_4 deleted file mode 100644 index 2f1615d262..0000000000 --- a/tests/bugs/vis/bug24623_4 +++ /dev/null @@ -1,43 +0,0 @@ -puts "============" -puts "OCC24623_4" -puts "============" -puts "" -####################################################################### -puts "Visualization - improve selection mechanism" -# tests memory leaks in creation of selection primitives for connected -# interactive objects: checks that there is no "dead links" to reference -# interactives after its clearing -####################################################################### - -puts "" -pload MODELING VISUALIZATION -psphere s 0.5 -tclean s -incmesh s 0.001 -trinfo s -vinit -vclear - -set aMemInit [meminfo h] -set anIterNb 100 - -for {set anIterCount 0} {$anIterCount < $anIterNb} {incr anIterCount} { - set aNb 11 - - vconnectto i_1 0 0 0 s -nodisplay - vloadselection i_1 - for {set i 2} {$i < $aNb} {incr i} { vconnectto i_${i} ${i} 0 0 i_1 -nodisplay; vloadselection i_${i} } - vclear -} - -set aMemClear [meminfo h] - -puts "Initial memory : [expr $aMemInit / (1024 * 1024)] MiB" -puts "Clearing : [expr $aMemClear / (1024 * 1024)] MiB" - -set aRatio [expr $aMemClear / double($aMemInit)] - -# check if the memory difference is greater than 20% -if {[expr $aRatio > 1.2]} { - puts "Error : TEST FAILED" -} diff --git a/tests/bugs/vis/bug24717 b/tests/bugs/vis/bug24717 deleted file mode 100644 index fcf06a538c..0000000000 --- a/tests/bugs/vis/bug24717 +++ /dev/null @@ -1,29 +0,0 @@ -puts "============" -puts "OCC24717" -puts "============" -puts "" -#################################################################################### -# TKOpenGl - globally defined clipping planes blink when operating with view -# Test checks that state of clippings always corresponds to a state of viewed -# scene. -#################################################################################### - -set check_x 204 -set check_y 204 - -vinit View1 -vsetdispmode 1 -box b 1 1 1 -vdisplay b -vmoveto $check_x $check_y -vclipplane create pln1 -vclipplane set pln1 view Driver1/Viewer1/View1 -vclipplane change pln1 equation 0 1 0 0 -vfit -vaspects -setwidth 5 - -if { "[vreadpixel $check_x $check_y rgb name]" != "CYAN" } { - puts "Error : Viewer clipping is broken." -} - -vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug24725 b/tests/bugs/vis/bug24725 deleted file mode 100644 index 461d032515..0000000000 --- a/tests/bugs/vis/bug24725 +++ /dev/null @@ -1,44 +0,0 @@ -puts "============" -puts "CR24725" -puts "============" -puts "" - -######################################################## -# Test texture color modulation for AIS_TexturedShape -######################################################## - -set aV "Driver1/Viewer1/View1" -vinit name=$aV l=32 t=32 w=400 h=400 -vactivate $aV -vclear - -box b 1 2 3 -vdisplay b -vsetdispmode 1 -vtexture b 0 -vlight clear -vlight add ambient color white -vfit - -set check_x 142 -set check_y 352 - -vtexture b -modulate off - -checkcolor $check_x $check_y 1 1 1 - -if { $stat != 1 } { - puts "Error : color of non-modulated texture is incorrect" -} - -vdump $imagedir/${casename}_1.png - -vtexture b -modulate on - -checkcolor $check_x $check_y 0.329 0.224 0.027 - -if { $stat != 1 } { - puts "Error : color of modulated texture is incorrect" -} - -vdump $imagedir/${casename}_2.png diff --git a/tests/bugs/vis/bug24756 b/tests/bugs/vis/bug24756 deleted file mode 100644 index 9b46631c53..0000000000 --- a/tests/bugs/vis/bug24756 +++ /dev/null @@ -1,18 +0,0 @@ -puts "============" -puts "CR24756" -puts "============" -puts "" -####################################################################### -# AIS_ConnectedInteractive does not support nested AIS_ConnectedInteractive -####################################################################### - -vinit -box b 1 1 1 -vdisplay b -vconnectto b1 2 0 0 b -vconnectto b2 2 0 0 b1 -vsetlocation b1 2 1 0 -vfit - -set anImage ${imagedir}/${casename}.png -vdump ${anImage} diff --git a/tests/bugs/vis/bug24835 b/tests/bugs/vis/bug24835 deleted file mode 100644 index ca8fbb4864..0000000000 --- a/tests/bugs/vis/bug24835 +++ /dev/null @@ -1,21 +0,0 @@ -puts "============" -puts "CR24835" -puts "============" -puts "" -#################################################################################################### -# Graphic structure for highlighting is not erased if presentable object for highlight is deleted. -#################################################################################################### - -pload ALL -vinit v -box b 1 1 1 -vdisplay b -vfit -vselmode b 1 1 -vmoveto 380 104 -vmoveto 29 103 -vremove b -vclose v 1 -vinit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug24837_1 b/tests/bugs/vis/bug24837_1 deleted file mode 100644 index cffd324ab4..0000000000 --- a/tests/bugs/vis/bug24837_1 +++ /dev/null @@ -1,41 +0,0 @@ -puts "============" -puts "CR24837_1" -puts "============" -puts "" -####################################################################### -# Visualization - revise design and implementation of connected Interactive Objects -####################################################################### - -pload MODELING VISUALIZATION -vinit -box b 1 1 1 -psphere s 0.5 -vdisplay b s -vsetlocation s 0 2.5 0 -box d 0.5 0.5 3 -box d2 0.5 3 0.5 -vdisplay d d2 -vconnectto b1 -2 0 0 b -vconnect z 2 0 0 b s -vconnect z2 4 0 0 d d2 -vconnect z3 6 0 0 z z2 -vconnect z4 10 0 0 z3 z2 -vfit -set anImage ${imagedir}/${casename}_1_1.png -vdump ${anImage} - -vaddconnected z4 0 4 0 s -vdisconnect z4 1 -vfit -set anImage ${imagedir}/${casename}_1_2.png -vdump ${anImage} - -vhlr on -set anImage ${imagedir}/${casename}_1_3.png -vdump ${anImage} - -vhlr off -vsetdispmode 1 -vmoveto 320 330 -set anImage ${imagedir}/${casename}_1_4.png -vdump ${anImage} diff --git a/tests/bugs/vis/bug24901 b/tests/bugs/vis/bug24901 deleted file mode 100755 index 8661ec5338..0000000000 --- a/tests/bugs/vis/bug24901 +++ /dev/null @@ -1,25 +0,0 @@ -puts "============" -puts "CR24901" -puts "============" -puts "" -####################################################################### -# Visualization - Incorrect area filled with capping color -####################################################################### - -vinit View1 -box b 10 10 10 -vdisplay b -vsetdispmode 1 - -vclipplane create pln1 -vclipplane set pln1 object b -vclipplane change pln1 equation 0 1 0 -5 -vclipplane change pln1 capping on -vfit -vmoveto 304 146 - -if { "[vreadpixel 304 146 rgb name]" != "CYAN" } { - puts "Error : Highlighting is broken." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug24989 b/tests/bugs/vis/bug24989 deleted file mode 100755 index c4447834bf..0000000000 --- a/tests/bugs/vis/bug24989 +++ /dev/null @@ -1,11 +0,0 @@ -puts "============" -puts "OCC24989" -puts "============" -puts "" -####################################################################### -# Visualization - workaround vc12 32-bit compiler optimizer bug resulted in crash in AIS_Axis -####################################################################### - -vinit -vtrihedron vtr -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug25027 b/tests/bugs/vis/bug25027 deleted file mode 100755 index 60e82d1ffa..0000000000 --- a/tests/bugs/vis/bug25027 +++ /dev/null @@ -1,17 +0,0 @@ -puts "============" -puts "OCC25027" -puts "============" -puts "" -####################################################################### -# Visualization - 2D layer viewport is updated incorrectly on resize -####################################################################### - -box b 1 2 3 -vinit View1 w=1024 h=512 -vsetdispmode 1 -vdisplay b -vfit -vcolorscale cs -range 10 20 100 -font 16 -textpos right -xy 0 0 -vmoveto 512 250 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug25060 b/tests/bugs/vis/bug25060 deleted file mode 100644 index 342e0e2954..0000000000 --- a/tests/bugs/vis/bug25060 +++ /dev/null @@ -1,27 +0,0 @@ -puts "============" -puts "CR25060" -puts "============" -puts "" -####################################################################### -# Capping breaks highlighting of shaded AIS_Shape with displayed edges. -####################################################################### -vinit View1 -box b 10 10 10 -vdisplay b -vaspects b -setFaceBoundaryDraw 1 -vclipplane create pln1 -vclipplane set pln1 object b -vclipplane change pln1 equation 0 1 0 -5 -vclipplane change pln1 capping on -vsetdispmode 1 -vfit -vmoveto 304 146 - -set x_coord 304 -set y_coord 146 -checkcolor $x_coord $y_coord 0 1 1 -if { $stat != 1 } { - puts "Error : Highlighting is broken." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug25063 b/tests/bugs/vis/bug25063 deleted file mode 100644 index 08508da18f..0000000000 --- a/tests/bugs/vis/bug25063 +++ /dev/null @@ -1,14 +0,0 @@ -puts "===========" -puts "OCC25063" -puts "===========" -puts "" -########################################################################## -# Visualization - 2D objects are not displayed at some camera positions -########################################################################## - -vinit -vtop -vline 1 -90 -90 130 90 90 130 -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug25178 b/tests/bugs/vis/bug25178 deleted file mode 100644 index 7ebf012a6d..0000000000 --- a/tests/bugs/vis/bug25178 +++ /dev/null @@ -1,16 +0,0 @@ -puts "=======" -puts "CR25178" -puts "=======" -puts "" -########################################################################### -# Visualization - edges of the model are still clipped after vfit command -########################################################################### - -restore [locate_data_file bug25179_nurbs-with-partial-seam.brep] a - -vinit -vdisplay a -vleft -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug25229 b/tests/bugs/vis/bug25229 deleted file mode 100644 index f3b50c70b9..0000000000 --- a/tests/bugs/vis/bug25229 +++ /dev/null @@ -1,27 +0,0 @@ -puts "============" -puts "CR25229" -puts "============" -puts "" -####################################################################### -# Cappings have gray tint if setting color with vclipplane command. -####################################################################### -box b 100 100 100 -vinit -vsetdispmode 1 -vdisplay b -vclipplane create pln1 -vclipplane change pln1 equation 0 0 -1 20 -vclipplane set pln1 object b -vclipplane change pln1 capping on -vclipplane change pln1 capping color 1.0 1.0 1.0 -vtop -vfit - -set x_coord 100 -set y_coord 100 -checkcolor $x_coord $y_coord 1 1 1 -if { $stat != 1 } { - puts "Error : Capping color is broken." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug25335 b/tests/bugs/vis/bug25335 deleted file mode 100644 index f8835cf4e1..0000000000 --- a/tests/bugs/vis/bug25335 +++ /dev/null @@ -1,24 +0,0 @@ -puts "================" -puts "OCC25335" -puts "================" -puts "" -####################################################################################### -# Visualization - method ::SelectedShape() in AIS_LocalContext and AIS_InteractiveContext overrides shape transformation -####################################################################################### - -vinit - -box b 1 1 1 -vdisplay b -btranslate b 1 0 0 -vselmode 2 1 -vfit -vselect 299 352 -vpickselected -vsetlocation b 0 1 0 -vzfit -vselect 233 188 -vpickselected -vsetlocation b -2 2 0 -vfit - diff --git a/tests/bugs/vis/bug25466 b/tests/bugs/vis/bug25466 deleted file mode 100644 index f64cee3d76..0000000000 --- a/tests/bugs/vis/bug25466 +++ /dev/null @@ -1,25 +0,0 @@ -puts "============" -puts "CR25466" -puts "============" -puts "" -####################################################################### -# Visualization - Impossible to change the display mode when a local context is opened -####################################################################### - -box b1 0 0 0 1 2 3 -box b2 3 0 0 2 3 1 - -vinit View1 -vclear -vaxo - -vsetdispmode 0 -vdisplay b1 b2 -vfit - -vselmode b1 4 1 -vsetdispmode b1 1 - -checkcolor 100 100 0.78 0.55 0.09 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug25492 b/tests/bugs/vis/bug25492 deleted file mode 100644 index 57135f95e8..0000000000 --- a/tests/bugs/vis/bug25492 +++ /dev/null @@ -1,32 +0,0 @@ -puts "============" -puts "CR25492" -puts "============" -puts "" -####################################################################### -# The selected subshape does not have topological relationship -# with original shape in OCC680 -####################################################################### -pload ALL - -set isEqual 0 -vinit -box aShape 5 5 5 3 3 3 -vdisplay aShape -vfit -vselmode 4 1 -vselect 100 200 -vpickselected aSub -explode aShape F - - -for {set i 1} {$i <= 6 } {incr i} { - set aRes [compare aShape_$i aSub]; - if { [lsearch $aRes equal] != -1} { - set isEqual 1 - } -} - -if {$isEqual == 0} { -puts "Error: No selected sub-shape was found in exploded sub-shapes" -} -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug25507 b/tests/bugs/vis/bug25507 deleted file mode 100644 index 5448cd89be..0000000000 --- a/tests/bugs/vis/bug25507 +++ /dev/null @@ -1,25 +0,0 @@ -puts "============" -puts "CR25507" -puts "============" -puts "" -####################################################################### -# Visualization - the method V3d_View::Place() is incorrect -####################################################################### - -vinit View1 -vsetdispmode 1 - -box b1 2 1 1 -vdisplay b1 -box b2 1 1 1 -vdisplay b2 -vsetlocation b2 5 0 0 -vfit - -vselect 80 140 -vplace 80 140 - -vmoveto 200 180 -checkcolor 200 180 0.78 0.55 0.09 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug25611_1 b/tests/bugs/vis/bug25611_1 deleted file mode 100644 index 120c8977e2..0000000000 --- a/tests/bugs/vis/bug25611_1 +++ /dev/null @@ -1,20 +0,0 @@ -puts "========" -puts "OCC25611" -puts "========" -puts "" -############################################################################ -puts "Displaying \'zbufftrihedron\' interferes with \'vgraduatedtrihedron\'" -############################################################################ - -set anImage $imagedir/${casename}.png - -vinit View1 -psphere s 10 -vdisplay s -vaxo -vfit -vsetdispmode s 1 -vgraduatedtrihedron -on -vzbufftrihedron - -vdump $anImage diff --git a/tests/bugs/vis/bug25732_1 b/tests/bugs/vis/bug25732_1 deleted file mode 100644 index f869de3fe6..0000000000 --- a/tests/bugs/vis/bug25732_1 +++ /dev/null @@ -1,31 +0,0 @@ -puts "========" -puts "OCC25732" -puts "========" -puts "" -######################################################################################### -# Visualization, TKOpenGl - back face culling should not affect textured font rendering -######################################################################################### - -vfont add [locate_data_file DejaVuSans.ttf] SansFont - -box b -100 0 -200 50 100 200 - -vinit View1 -vclear -vaxo - -vdisplay b -vfit -vsetdispmode b 1 - -vdrawtext text "Open\nCASCADE" -pos 0 0 0 -color RED -halign center -valign center -angle -45 -zoom 1 -height 50 -aspect regular -font SansFont - -set x_coord 255 -set y_coord 277 - -set bug_info [vreadpixel ${x_coord} ${y_coord} rgb name] -if {$bug_info != "RED"} { - puts "ERROR: OCC25732 is reproduced. Text is missed." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug25732_2 b/tests/bugs/vis/bug25732_2 deleted file mode 100644 index 736ff00466..0000000000 --- a/tests/bugs/vis/bug25732_2 +++ /dev/null @@ -1,27 +0,0 @@ -puts "========" -puts "OCC25732" -puts "========" -puts "" -######################################################################################### -# Visualization, TKOpenGl - back face culling should not affect textured font rendering -######################################################################################### - -vfont add [locate_data_file DejaVuSans.ttf] SansFont - -box b 1 2 3 -explode b F - -vinit -vsetdispmode 1 - -vdisplay b_1 b_2 -vfit - -vdrawtext text "SAMPLE TEXT" -pos 1 0 3 -color RED -halign left -valign bottom -angle 0 -zoom 0 -height 30 -aspect regular -font SansFont - -set bug_info [vreadpixel 260 137 rgb name] -if {$bug_info != "RED"} { - puts "ERROR: OCC25732 is reproduced. Text is missed." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug25767 b/tests/bugs/vis/bug25767 deleted file mode 100644 index 479f6262c9..0000000000 --- a/tests/bugs/vis/bug25767 +++ /dev/null @@ -1,16 +0,0 @@ -puts "==========" -puts "OCC25767" -puts "==========" -puts "" -######################################### -# "vdisplay" command rises exception -######################################### - -vinit View -vclear -vaxo -vpoint p1 -108.4710001 -108.56800009999999 -145.30700009999998 -vpoint p2 8.4813999999999999e+102 117.1230001 128.35480981703273 -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug25852 b/tests/bugs/vis/bug25852 deleted file mode 100644 index 31ae32c70f..0000000000 --- a/tests/bugs/vis/bug25852 +++ /dev/null @@ -1,23 +0,0 @@ -puts "============" -puts "CR25852" -puts "============" -puts "" - -################################################################ -# Text to BRep algorithm produces bad faces for circled symbols -################################################################ - -text2brep t "\u00ae" Courier 10 -whatis t - -vinit View1 -vclear -vtop -vsetdispmode 1 -vdisplay t -vfit - -vmoveto 250 250 -checkshape t - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug25867 b/tests/bugs/vis/bug25867 deleted file mode 100644 index 23e0be8823..0000000000 --- a/tests/bugs/vis/bug25867 +++ /dev/null @@ -1,20 +0,0 @@ -puts "============" -puts "OCC25867" -puts "============" -puts "" -################################################################################# -puts "Visualization, TKOpenGl - fix misprint in transformation persistence math" -################################################################################# - -set anImage1 $imagedir/${casename}_1.png -set anImage2 $imagedir/${casename}_2.png -vinit -box b1 -1 -1 -1 3 3 3 -box b2 4 4 4 15 10 10 -vdisplay b1 -vdisplay b2 -trsfPers zoom -trsfPersPos 0 0 0 -vfit -vdump $anImage1 - -vdisplay b2 -trsfPers zoom -trsfPersPos 1 1 1 -vdump $anImage2 diff --git a/tests/bugs/vis/bug26035_1 b/tests/bugs/vis/bug26035_1 deleted file mode 100644 index c77179928e..0000000000 --- a/tests/bugs/vis/bug26035_1 +++ /dev/null @@ -1,31 +0,0 @@ -puts "============" -puts "CR26035" -puts "============" -puts "" -####################################################################### -# Dimension drawing between two vertices -####################################################################### - -vfont add [locate_data_file DejaVuSans.ttf] SansFont - -vinit View1 -vclear -vaxo - -set x1 10 -set y1 0 -set z1 0 - -set x2 10 -set y2 0 -set z2 10 - -vertex v1 $x1 $y1 $z1 -vertex v2 $x2 $y2 $z2 - -vdimension len -length -shapes v1 v2 -plane yoz -font SansFont - -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - diff --git a/tests/bugs/vis/bug26139 b/tests/bugs/vis/bug26139 deleted file mode 100644 index 5ed565cd31..0000000000 --- a/tests/bugs/vis/bug26139 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "CR26139" -puts "============" -puts "" - -########################################################################################## -puts "AIS_InteractiveContext::Display performance regression" -# To measure performance downgrade, the time elapsed should be greater than on previous version -########################################################################################## - -pload VISUALIZATION -pload QAcommands - -vinit View1 -OCC26139 diff --git a/tests/bugs/vis/bug26284 b/tests/bugs/vis/bug26284 deleted file mode 100644 index 63d92a028d..0000000000 --- a/tests/bugs/vis/bug26284 +++ /dev/null @@ -1,15 +0,0 @@ -puts "========" -puts "OCC26284" -puts "========" -puts "" -################################################################## -puts "Visualization - eliminate recursion in SelectMgr_SelectionManager" -################################################################## - -pload QAcommands VISUALIZATION - -vinit -OCC26284 - -vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug26317 b/tests/bugs/vis/bug26317 deleted file mode 100644 index 2b5b013498..0000000000 --- a/tests/bugs/vis/bug26317 +++ /dev/null @@ -1,21 +0,0 @@ -puts "============" -puts "CR26317" -puts "============" -puts "" - -########################################################################################## -puts "Visualization, AIS_LengthDimension::CheckPlane is incorrect" -########################################################################################## - -pload VISUALIZATION MODELING - -box b 100 200 300 -vinit View1 -vclear -vaxo -explode b F -vdisplay b_1 b_2 -vdimension len -length -shapes b_1 b_2 -plane zox -vfit - -vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug26462_2 b/tests/bugs/vis/bug26462_2 deleted file mode 100644 index b0d713b43d..0000000000 --- a/tests/bugs/vis/bug26462_2 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "CR26462" -puts "============" -puts "" - -########################################################################################## -puts "Visualization - selection does not adapt to line width change" -########################################################################################## - -pload VISUALIZATION QAcommands - -vinit -OCC26462 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug26538 b/tests/bugs/vis/bug26538 deleted file mode 100755 index d93cd07d62..0000000000 --- a/tests/bugs/vis/bug26538 +++ /dev/null @@ -1,27 +0,0 @@ -puts "============" -puts "OCC26538" -puts "============" -puts "" -####################################################################### -# Visualization - Infinite growth of maxtrix stack in OpenGl_Structure::Render -####################################################################### - -box b1 1 1 1 -box b2 1 1 1 - -vinit -vdisplay b1 -vdisplay b2 -vsetlocation b2 10 10 10 -vfit - -set listmem {} - -set i_max 3 -for {set i 1} {${i} <= ${i_max}} {incr i} { - vfps 1000 - lappend listmem [meminfo h] - checktrend $listmem 0 1 "Memory leak detected" -} - -vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug26641 b/tests/bugs/vis/bug26641 deleted file mode 100644 index 0052afa766..0000000000 --- a/tests/bugs/vis/bug26641 +++ /dev/null @@ -1,35 +0,0 @@ -puts "============" -puts "CR26641" -puts "============" -puts "" - -############################################################################################################## -# 0026641: Visualization, TKOpenGl - handle correctly transformation persistence within perspective projection -############################################################################################################## - -vinit -vclear - -box b0 30 0 0 10 10 10 -box b1 -30 -30 30 10 30 20 -vdisplay b0 -vdisplay b1 -vfit - -vdump ${imagedir}/${casename}_none_pers_ortho.png - -vdisplay b1 -trsfPers zoom -trsfPersPos -30 -30 30 -vfit - -vdump ${imagedir}/${casename}_zoom_pers_ortho.png - -vcamera -persp -vfit - -vdump ${imagedir}/${casename}_zoom_pers_persp.png - -vselect 30 70 - -if {[vnbselected] != 1} { - puts "ERROR: Transform persistence object is not selected!" -} diff --git a/tests/bugs/vis/bug26754 b/tests/bugs/vis/bug26754 deleted file mode 100644 index 8d0a8f78c5..0000000000 --- a/tests/bugs/vis/bug26754 +++ /dev/null @@ -1,31 +0,0 @@ -puts "================================================================" -puts "CR26754" -puts "Visualization - provide API to display AIS_Trihedron presentation without axes labels" -puts "================================================================" -puts "" - -set anImage1 $imagedir/${casename}_1.png -set anImage2 $imagedir/${casename}_2.png -set anImage3 $imagedir/${casename}_3.png - -vinit -vclear -vaxo - -vtrihedron t -hidelabels on -vzoom 4 - -vdump $anImage1 - -set anX 204 -set anY 100 - -vselect $anX $anY - -vdump $anImage2 - -vselmode 2 1 - -vselect $anX $anY - -vdump $anImage3 \ No newline at end of file diff --git a/tests/bugs/vis/bug26975 b/tests/bugs/vis/bug26975 deleted file mode 100644 index 11c3b0c3d1..0000000000 --- a/tests/bugs/vis/bug26975 +++ /dev/null @@ -1,27 +0,0 @@ -puts "============" -puts "CR26975" -puts "============" -puts "" - -########################################################################################## -puts "Visualization, TKOpenGl - handle triangle strips correctly within Ray-Tracing core" -########################################################################################## - -pload MODELING VISUALIZATION -vclear -vinit View1 -vraytrace 0 -vdrawparray s trianglestrips v 0 0 0 n 0 0 1 v 0 2 0 n 0 0 1 v 2 0 0 n 0 0 1 v 2 2 0 n 0 0 1 -vfit - -vdump $imagedir/${casename}_rt_off.png - -vraytrace 1 - -vdump $imagedir/${casename}_rt_on.png - -set color [vreadpixel 250 250 rgb name] -puts $color -if { $color == "BLACK" } { - puts "ERROR: CR26975 is reproduced. Triangle strips incorrect within Ray-Tracing core." -} diff --git a/tests/bugs/vis/bug27374 b/tests/bugs/vis/bug27374 deleted file mode 100644 index 008e1ce62e..0000000000 --- a/tests/bugs/vis/bug27374 +++ /dev/null @@ -1,20 +0,0 @@ -puts "========" -puts "OCC27374" -puts "========" -puts "" -################################################################################ -puts "Visualization - add support zoom persistence objects for FitAll operation" -################################################################################ - -vinit -vclear - -box b0 30 0 0 3 3 3 -box b1 -30 -30 30 10 20 30 -box b2 30 0 30 100 100 100 -vdisplay b0 -vdisplay b1 -trsfPers zoom -perspos 10 0 0 -vdisplay b2 -trsfPers zoom -perspos 40 0 30 -vfit - -vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug27523 b/tests/bugs/vis/bug27523 deleted file mode 100644 index 3173c61964..0000000000 --- a/tests/bugs/vis/bug27523 +++ /dev/null @@ -1,15 +0,0 @@ -puts "============" -puts "OCC27523" -puts "============" -puts "" -#################################################################################### -# Visualization - selection owner contains obsolete shape -#################################################################################### - - -pload QAcommands VISUALIZATION - -vinit -OCC27523 - -checkview -screenshot -3d -path ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug27621_1 b/tests/bugs/vis/bug27621_1 deleted file mode 100644 index c7eea682ab..0000000000 --- a/tests/bugs/vis/bug27621_1 +++ /dev/null @@ -1,21 +0,0 @@ -puts "========" -puts "CR27621_1" -puts "========" -puts "" -################################################################### -puts "Highlighting with color remains visible when shape is erased" -################################################################### - -vclear -vinit View1 - -box b 1 2 3 -vdisplay b -dispmode 1 -vfit -vmoveto 250 250 - -vdump $imagedir/${casename}_highlighted.png - -verase b - -vdump $imagedir/${casename}_erased.png diff --git a/tests/bugs/vis/bug27621_2 b/tests/bugs/vis/bug27621_2 deleted file mode 100644 index 192cef5531..0000000000 --- a/tests/bugs/vis/bug27621_2 +++ /dev/null @@ -1,21 +0,0 @@ -puts "========" -puts "CR27621_2" -puts "========" -puts "" -################################################################### -puts "Highlighting with color remains visible when shape is erased" -################################################################### - -vclear -vinit View1 - -box b 1 2 3 -vdisplay b -dispmode 1 -vfit -vmoveto 250 250 - -vdump $imagedir/${casename}_highlighted.png - -vclear - -vdump $imagedir/${casename}_erased.png diff --git a/tests/bugs/vis/bug27624 b/tests/bugs/vis/bug27624 deleted file mode 100644 index b3ac09030c..0000000000 --- a/tests/bugs/vis/bug27624 +++ /dev/null @@ -1,14 +0,0 @@ -puts "========" -puts "CR27624" -puts "========" -puts "" -################################################################## -puts "Draw Harness, ViewerTest - vdrawtext command ignores text display options" -################################################################## - -vfont add [locate_data_file DejaVuSans.ttf] SansFont - -vinit -vdrawtext t1 "Subtitle" -height 20 -font SansFont -color GREEN -disptype subtitle -subcolor 4C4C4C -vfit -vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug27655 b/tests/bugs/vis/bug27655 deleted file mode 100644 index d6eddc0aef..0000000000 --- a/tests/bugs/vis/bug27655 +++ /dev/null @@ -1,19 +0,0 @@ -puts "========" -puts "CR27655" -puts "========" -puts "" -############################################################################################ -puts "Visualization - AIS_Triangulation don't disappears after setting non-zero transparency" -############################################################################################ - -vclear -vinit View1 - -box b 10 10 10 -vdisplay b -dispMode 1 -vdrawsphere s 100 -vsettransparency s 0.7 - -vfit - -vdump $imagedir/${casename}_0.png diff --git a/tests/bugs/vis/bug27700 b/tests/bugs/vis/bug27700 deleted file mode 100644 index 07702addd9..0000000000 --- a/tests/bugs/vis/bug27700 +++ /dev/null @@ -1,16 +0,0 @@ -puts "========" -puts "CR27700" -puts "========" -puts "" -############################################################################################ -puts "Visualization - glPolygonMode() used for frame drawing affects label text shading" -############################################################################################ - -vclear -vinit View1 - -OCC27700 -vtop -vfit - -vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug28107 b/tests/bugs/vis/bug28107 deleted file mode 100644 index 0e80ff76d6..0000000000 --- a/tests/bugs/vis/bug28107 +++ /dev/null @@ -1,18 +0,0 @@ -puts "===========" -puts "OCC28107" -puts "===========" -puts "" -########################################################################## -# Visualization - provide a flexible interface to set custom hatch styles -########################################################################## - -pload VISUALIZATION MODELING - -box b 1 1 1 - -vinit View1 -vdisplay b -dispMode 1 -vfit - -vaspects b -setHatch 4 -vdump $imagedir/${casename}_hatch.png diff --git a/tests/bugs/vis/bug281_1 b/tests/bugs/vis/bug281_1 deleted file mode 100755 index f40f625803..0000000000 --- a/tests/bugs/vis/bug281_1 +++ /dev/null @@ -1,31 +0,0 @@ -puts "========" -puts "OCC281" -puts "========" - -vinit - -set x 205 -set y 208 -set TypeOfMarker 0 - -set scale 50.0521 -set proj_X 0.57735 -set proj_Y -0.57735 -set proj_Z 0.57735 -set up_X -0.408248 -set up_Y 0.408248 -set up_Z 0.816497 -set at_X 0 -set at_Y 0 -set at_Z 0 - -vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} - -OCC281 ${x} ${y} ${TypeOfMarker} -OCC281 ${x} ${y} ${TypeOfMarker} - -OCC281 200 200 0 -OCC281 200 200 0 -puts "Type of marker mast be blue point!" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug281_10 b/tests/bugs/vis/bug281_10 deleted file mode 100644 index c23c413cc9..0000000000 --- a/tests/bugs/vis/bug281_10 +++ /dev/null @@ -1,12 +0,0 @@ -puts "========" -puts "OCC281" -puts "========" -puts '' - -vinit - -OCC281 200 290 9 -OCC281 200 290 9 -puts "Type of marker mast be a ball with 1 color and different saturations!" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug281_11 b/tests/bugs/vis/bug281_11 deleted file mode 100644 index e06f2a37e8..0000000000 --- a/tests/bugs/vis/bug281_11 +++ /dev/null @@ -1,12 +0,0 @@ -puts "========" -puts "OCC281" -puts "========" -puts '' - -vinit - -OCC281 200 300 10 -OCC281 200 300 10 -puts "Type of marker mast be blue large ring!" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug281_12 b/tests/bugs/vis/bug281_12 deleted file mode 100644 index 24d21c097e..0000000000 --- a/tests/bugs/vis/bug281_12 +++ /dev/null @@ -1,12 +0,0 @@ -puts "========" -puts "OCC281" -puts "========" -puts '' - -vinit - -OCC281 200 310 11 -OCC281 200 310 11 -puts "Type of marker mast be blue medium ring!" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug281_13 b/tests/bugs/vis/bug281_13 deleted file mode 100644 index 4baa1b9617..0000000000 --- a/tests/bugs/vis/bug281_13 +++ /dev/null @@ -1,12 +0,0 @@ -puts "========" -puts "OCC281" -puts "========" -puts "" - -vinit - -OCC281 200 320 12 -OCC281 200 320 12 -puts "Type of marker mast be blue small ring!" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug281_2 b/tests/bugs/vis/bug281_2 deleted file mode 100644 index 4752d9476d..0000000000 --- a/tests/bugs/vis/bug281_2 +++ /dev/null @@ -1,12 +0,0 @@ -puts "========" -puts "OCC281" -puts "========" -puts "" - -vinit - -OCC281 200 210 1 -OCC281 200 210 1 -puts "Type of marker mast be blue plus!" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug281_3 b/tests/bugs/vis/bug281_3 deleted file mode 100644 index 61bf8d82bc..0000000000 --- a/tests/bugs/vis/bug281_3 +++ /dev/null @@ -1,12 +0,0 @@ -puts "========" -puts "OCC281" -puts "========" -puts "" - -vinit - -OCC281 200 220 2 -OCC281 200 220 2 -puts "Type of marker mast be blue star!" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug281_4 b/tests/bugs/vis/bug281_4 deleted file mode 100644 index 71a202f638..0000000000 --- a/tests/bugs/vis/bug281_4 +++ /dev/null @@ -1,12 +0,0 @@ -puts "========" -puts "OCC281" -puts "========" -puts "" - -vinit - -OCC281 200 230 3 -OCC281 200 230 3 -puts "Type of marker mast be blue circle!" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug281_5 b/tests/bugs/vis/bug281_5 deleted file mode 100644 index fe65200ecc..0000000000 --- a/tests/bugs/vis/bug281_5 +++ /dev/null @@ -1,12 +0,0 @@ -puts "========" -puts "OCC281" -puts "========" -puts "" - -vinit - -OCC281 200 240 4 -OCC281 200 240 4 -puts "Type of marker mast be blue cross!" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug281_6 b/tests/bugs/vis/bug281_6 deleted file mode 100644 index 537e8b3243..0000000000 --- a/tests/bugs/vis/bug281_6 +++ /dev/null @@ -1,12 +0,0 @@ -puts "========" -puts "OCC281" -puts "========" -puts "" - -vinit - -OCC281 200 250 5 -OCC281 200 250 5 -puts "Type of marker mast be blue point in a circle!" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug281_7 b/tests/bugs/vis/bug281_7 deleted file mode 100644 index 6ce97ae824..0000000000 --- a/tests/bugs/vis/bug281_7 +++ /dev/null @@ -1,12 +0,0 @@ -puts "========" -puts "OCC281" -puts "========" -puts "" - -vinit - -OCC281 200 260 6 -OCC281 200 260 6 -puts "Type of marker mast be blue plus in a circle!" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug281_8 b/tests/bugs/vis/bug281_8 deleted file mode 100644 index cef9866af8..0000000000 --- a/tests/bugs/vis/bug281_8 +++ /dev/null @@ -1,12 +0,0 @@ -puts "========" -puts "OCC281" -puts "========" -puts "" - -vinit - -OCC281 200 270 7 -OCC281 200 270 7 -puts "Type of marker mast be blue star in a circle!" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug281_9 b/tests/bugs/vis/bug281_9 deleted file mode 100644 index 14f8fff0ec..0000000000 --- a/tests/bugs/vis/bug281_9 +++ /dev/null @@ -1,12 +0,0 @@ -puts "========" -puts "OCC281" -puts "========" -puts "" - -vinit - -OCC281 200 280 8 -OCC281 200 280 8 -puts "Type of marker mast be blue cross in a circle!" - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug28310 b/tests/bugs/vis/bug28310 deleted file mode 100644 index 68098c0c03..0000000000 --- a/tests/bugs/vis/bug28310 +++ /dev/null @@ -1,14 +0,0 @@ -puts "===========" -puts "OCC28310" -puts "===========" -puts "" -########################################################################## -# Visualization - crash on iteration through detected interactive objects -########################################################################## - -pload VISUALIZATION QAcommands - -vinit View1 - -# Sequence of C++ commands crashes the application -OCC28310 diff --git a/tests/bugs/vis/bug2883_1 b/tests/bugs/vis/bug2883_1 deleted file mode 100644 index d1e46604cf..0000000000 --- a/tests/bugs/vis/bug2883_1 +++ /dev/null @@ -1,26 +0,0 @@ -puts "==========" -puts "OCC2883" -puts "==========" -puts "" -######################################################################## -# It is impossible to set material, color and transparency to compound -######################################################################## - -vertex v -20 10 -30 -vertex ve1 -10 10 10 -vertex ve2 0 10 10 -edge e ve1 ve2 -sphere s -80 0 0 150 -mkface f s 0.1 0.7 0.2 0.9 -box s -60 0 0 30 60 40 -compound v e f s c - -vinit View1 -vclear -vaxo -vsetdispmode 1 -vdisplay c -vfit -vsetmaterial c JADE -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - diff --git a/tests/bugs/vis/bug288_10 b/tests/bugs/vis/bug288_10 deleted file mode 100755 index 1d3675e07a..0000000000 --- a/tests/bugs/vis/bug288_10 +++ /dev/null @@ -1,23 +0,0 @@ -puts "================" -puts "OCC288" -puts "================" -puts "" -####################################################################################### -# Currently meshing (for shading) of some shapes looks incorrect -###################################################################################### - -set BugNumber OCC288 - -restore [locate_data_file shading_151.brep] result - -checkprops result -s 52620.1 -checkshape result - -checknbshapes result -vertex 20 -edge 37 -wire 21 -face 19 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 98 -vinit -tclean result -vsetdispmode 1 -vdisplay result -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug288_7 b/tests/bugs/vis/bug288_7 deleted file mode 100755 index 5fc52cd79d..0000000000 --- a/tests/bugs/vis/bug288_7 +++ /dev/null @@ -1,23 +0,0 @@ -puts "================" -puts "OCC288" -puts "================" -puts "" -####################################################################################### -# Currently meshing (for shading) of some shapes looks incorrect -###################################################################################### - -set BugNumber OCC288 - -restore [locate_data_file shading_058.brep] result - -checkprops result -s 14125.5 -checkshape result - -checknbshapes result -vertex 23 -edge 40 -wire 19 -face 19 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 104 -vinit -tclean result -vsetdispmode 1 -vdisplay result -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug288_8 b/tests/bugs/vis/bug288_8 deleted file mode 100755 index f375269476..0000000000 --- a/tests/bugs/vis/bug288_8 +++ /dev/null @@ -1,22 +0,0 @@ -puts "================" -puts "OCC288" -puts "================" -puts "" -####################################################################################### -# Currently meshing (for shading) of some shapes looks incorrect -###################################################################################### - -set BugNumber OCC288 - -restore [locate_data_file shading_105.brep] result - -checkprops result -l 265.239 -checksection result -checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 7 -vinit -tclean result -vsetdispmode 1 -vdisplay result -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug288_9 b/tests/bugs/vis/bug288_9 deleted file mode 100755 index 2c00c8f86e..0000000000 --- a/tests/bugs/vis/bug288_9 +++ /dev/null @@ -1,23 +0,0 @@ -puts "================" -puts "OCC288" -puts "================" -puts "" -####################################################################################### -# Currently meshing (for shading) of some shapes looks incorrect -###################################################################################### - -set BugNumber OCC288 - -restore [locate_data_file shading_107.brep] result - -checkprops result -s 329710 -checkshape result - -checknbshapes result -vertex 18 -edge 36 -wire 18 -face 18 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 91 -vinit -tclean result -vsetdispmode 1 -vdisplay result -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug28936 b/tests/bugs/vis/bug28936 deleted file mode 100644 index 21675b4e9f..0000000000 --- a/tests/bugs/vis/bug28936 +++ /dev/null @@ -1,23 +0,0 @@ -puts "============" -puts "OCC28936" -puts "============" -puts "" -####################################################################### -# Visualization - Draw freezes while making a 3d representation -####################################################################### - -pload VISUALIZATION - -restore [locate_data_file bug28936_Holsterbro_sofabed.brep] sh - -checkshape sh -checkprops sh -s 18308978.50927943 - -vinit View1 -vclear -vsetdispmode 1 -vdisplay sh -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - \ No newline at end of file diff --git a/tests/bugs/vis/bug29651 b/tests/bugs/vis/bug29651 deleted file mode 100644 index b0fd702e6f..0000000000 --- a/tests/bugs/vis/bug29651 +++ /dev/null @@ -1,17 +0,0 @@ -puts "========" -puts "OCC29651" -puts "========" -puts "" -########################################## -# ViewerTest - vtexture command crashes -########################################## - -vinit -vsetdispmode 1 -box b 1 2 3 -vdisplay b -vfit -vtexture b 0 -vtexture b off - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug316 b/tests/bugs/vis/bug316 deleted file mode 100755 index f2cc81f28b..0000000000 --- a/tests/bugs/vis/bug316 +++ /dev/null @@ -1,19 +0,0 @@ -puts "================" -puts "OCC316" -puts "================" -puts "" -######################################################################### -## Exception is raised in the application during visualization. (#2054) -######################################################################### - -restore [locate_data_file OCC316.brep] result - -tclean result -vinit -vdisplay result -vsetdispmode result 1 -vfit - -checktrinfo result -tri !212909 -nod !158362 -checktrinfo result -tri -nod -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug331 b/tests/bugs/vis/bug331 deleted file mode 100755 index 8b4af3c34b..0000000000 --- a/tests/bugs/vis/bug331 +++ /dev/null @@ -1,24 +0,0 @@ - puts "========================" -puts " OCC331 " -puts "========================" -puts "" -####################################################### -## Dark spot on a sphere after nurbsconvert -####################################################### - -box b -5 -5 -5 10 10 10 -psphere s 6 - -bfuse res s b - -nurbsconvert result res - -tclean result -vinit -vdisplay result -vfit -vsetdispmode result 1 -vfit - -checktrinfo result -tri !3808 -nod !2188 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug331_1 b/tests/bugs/vis/bug331_1 deleted file mode 100755 index e91ccbdaf7..0000000000 --- a/tests/bugs/vis/bug331_1 +++ /dev/null @@ -1,24 +0,0 @@ -puts "================" -puts "OCC331" -puts "================" -puts "" -####################################################################################### -# Dark spot on a sphere after nurbsconvert -###################################################################################### - -set BugNumber OCC331 - -box b -5 -5 -5 10 10 10 -psphere s 6 -fuse res2 s b -nurbsconvert result res2 - -vinit -tclean result -vsetdispmode 1 -vdisplay result -vfit - -checkprops result -s 619.595 -checkshape result -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug346 b/tests/bugs/vis/bug346 deleted file mode 100755 index 6f704c9c40..0000000000 --- a/tests/bugs/vis/bug346 +++ /dev/null @@ -1,18 +0,0 @@ -puts "TODO OCC12345 ALL: An exception was caught" -puts "TODO OCC12345 ALL: TEST INCOMPLETE" -puts "================" -puts "0000346: Avoiding e x c e p t i o n when the 2 vertices of the edge are the same" -puts "================" -puts "" - -set x 10 -set y 10 -set z 10 - -vertex v1 $x $y $z -vertex v2 $x $y $z - -edge result v1 v2 - -checkview -display result -2d -path ${imagedir}/${test_image}.png - diff --git a/tests/bugs/vis/bug362 b/tests/bugs/vis/bug362 deleted file mode 100755 index fff62e2298..0000000000 --- a/tests/bugs/vis/bug362 +++ /dev/null @@ -1,9 +0,0 @@ -puts "========" -puts "OCC362" -puts "BUC60997" -puts "========" - -smallview -box b 10 10 10 -sphere s -30 -30 -30 20 -wzoom 1 -86 -72 -13 10 diff --git a/tests/bugs/vis/bug378 b/tests/bugs/vis/bug378 deleted file mode 100755 index 7761bf7e01..0000000000 --- a/tests/bugs/vis/bug378 +++ /dev/null @@ -1,23 +0,0 @@ -puts "========================" -puts "BUC61058" -puts " OCC378 " -puts "========================" -puts "" -######################################################################## -##Regression on KAS:dev:ros. Draw hangs after try to load 6381.brep shape to 3D Viewer. Case : cgg/004/S2 -######################################################################## - -restore [locate_data_file OCC378.brep] result - -tclean result -vinit - -if [catch {vdisplay result } res] { - puts "Error : function VDISPLAY works wrongly" -} - -vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - diff --git a/tests/bugs/vis/bug443 b/tests/bugs/vis/bug443 deleted file mode 100755 index b36d2f3af0..0000000000 --- a/tests/bugs/vis/bug443 +++ /dev/null @@ -1,20 +0,0 @@ -puts "========" -puts "OCC443" -puts "========" -puts "" -############################################################### -##"Fit all view" ives not centered picture during fitting the view (SAM024). -############################################################### - -restore [locate_data_file OCC443.brep] result - -vinit -vdisplay result -vfit - -set x_coord 31 -set y_coord 304 - -checkcolor $x_coord $y_coord 0 0 0 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug4894 b/tests/bugs/vis/bug4894 deleted file mode 100755 index 5fee8d6c88..0000000000 --- a/tests/bugs/vis/bug4894 +++ /dev/null @@ -1,19 +0,0 @@ -puts "============" -puts "OCC4894" -puts "============" -puts "" -####################################################################### -# Problems with sharding in vdisplay -####################################################################### - -restore [locate_data_file bug4894_face_cyl] result - -vinit -vdisplay result -tclean result -trinfo result -vsetdispmode 1 -vfit - -checktrinfo result -tri -nod -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug544 b/tests/bugs/vis/bug544 deleted file mode 100755 index c5873a5e31..0000000000 --- a/tests/bugs/vis/bug544 +++ /dev/null @@ -1,45 +0,0 @@ -puts "========" -puts "OCC544" -puts "========" -puts "" -################################# -## Problems with the results of MakePipeShell -################################# - -vinit -vsetdispmode 1 -OCC544 -vdisplay result -vsetmaterial result PLASTIC -vsetcolor result MATRABLUE -vsettransparency result 0.5 -vsetdispmode 1 -vfit - -set scale 2.05374 -set proj_X 0.135192 -set proj_Y -0.978297 -set proj_Z -0.157031 -set up_X -0.399854 -set up_Y -0.198875 -set up_Z 0.894743 -set at_X 415.781529476262 -set at_Y 349.647084890243 -set at_Z 417.026634136105 - -vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} - -set x1 300 -set y1 70 - -set x2 190 -set y2 110 - -set x3 220 -set y3 110 - -vmoveto ${x1} ${y1} - -checkcolor $x3 $y3 0.04 0.04 0.5 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug591 b/tests/bugs/vis/bug591 deleted file mode 100755 index 7706b0c517..0000000000 --- a/tests/bugs/vis/bug591 +++ /dev/null @@ -1,24 +0,0 @@ -puts "========" -puts "OCC591" -puts "========" -puts "" - -restore [locate_data_file OCC591.brep] result -tclean result -vinit -vdisplay result -vfit -vsetdispmode result 1 -vsettransparency result .5 - - -set x_coord 250 -set y_coord 115 - -checkcolor $x_coord $y_coord 0.58 0.41 0.07 - -if {$stat != 1} { - puts "Error : Function VSETTRANSPARENCY works wrongly." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug5988 b/tests/bugs/vis/bug5988 deleted file mode 100755 index a6efa74f7a..0000000000 --- a/tests/bugs/vis/bug5988 +++ /dev/null @@ -1,39 +0,0 @@ -puts "============" -puts "OCC5988" -puts "============" -puts "" -####################################################################### -# A textured shape (AIS_TextureShape) becomes black if we display an AIS_PlaneTrihedron with it -####################################################################### - -set BugNumber OCC5988 - -vinit -vclear -box box 100 100 100 -vdisplay box -vfit -puts "display box" - -set x 200 -set y 200 -checkcolor $x $y 0 0 0 - -puts "display trihedron" -vtrihedron vtr - -puts "display textured box" -vtexture box [locate_data_file OCC5988_2d_floor.rgb] - -set x 200 -set y 200 -if { "[vreadpixel $x $y rgb name]" != "BLACK" } { - puts "box is not black - OK" - puts "OK ${BugNumber}" -} else { - puts "box is black - Faulty" - puts "Faulty ${BugNumber}" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - diff --git a/tests/bugs/vis/bug5990 b/tests/bugs/vis/bug5990 deleted file mode 100755 index 2f1851a95a..0000000000 --- a/tests/bugs/vis/bug5990 +++ /dev/null @@ -1,49 +0,0 @@ -puts "================" -puts "OCC5990" -puts "================" -puts "" -####################################################################################### -# SetColor does not change color of wireframe entities in shading mode -###################################################################################### - -set BugNumber OCC5990 - -set x1 162 -set y1 159 -set x2 204 -set y2 269 -set x3 348 -set y3 238 - -set KUB_R 0.00 -set KUB_G 0.00 -set KUB_B 0.83 - -set LINE_R 0.00 -set LINE_G 0.00 -set LINE_B 1.00 - - -box b1 10 10 10 -vertex v1 20 0 0 -vertex v2 20 0 10 -vertex v3 30 0 0 -vertex v4 30 0 10 -vertex v5 30 10 10 -edge e1 v1 v2 -edge e2 v3 v4 -edge e3 v4 v5 -compound e2 e3 c1 -vinit -vdisplay b1 e1 c1 -vsetdispmode 1 -vfit -vsetcolor b1 BLUE -vsetcolor e1 BLUE -vsetcolor c1 BLUE - -checkcolor ${x1} ${y1} ${KUB_R} ${KUB_G} ${KUB_B} -checkcolor ${x2} ${y2} ${LINE_R} ${LINE_G} ${LINE_B} -checkcolor ${x3} ${y3} ${LINE_R} ${LINE_G} ${LINE_B} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug6132 b/tests/bugs/vis/bug6132 deleted file mode 100644 index d0bf880fcb..0000000000 --- a/tests/bugs/vis/bug6132 +++ /dev/null @@ -1,15 +0,0 @@ -puts "================" -puts "OCC6132" -puts "================" -puts "" -####################################################################################### -# Bad isos presentation in Draw for a face built on a periodic surface -####################################################################################### - -set BugNumber OCC6132 - -restore [locate_data_file OCC6132.brep] result -checkshape result - -checkview -display result -2d -path ${imagedir}/${test_image}.png - diff --git a/tests/bugs/vis/bug6145 b/tests/bugs/vis/bug6145 deleted file mode 100755 index 0668db80cd..0000000000 --- a/tests/bugs/vis/bug6145 +++ /dev/null @@ -1,46 +0,0 @@ -puts "============" -puts "OCC6145" -puts "============" -puts "" -################################################################## -# Incorrect rendering of a transparent object -################################################################## - -set BugNumber OCC6145 - -box b 200 100 100 - -plane p 20 20 50 -pcylinder c1 p 10 80 - -tcopy c1 c2 -ttranslate c2 40 0 0 -tcopy c2 c3 -ttranslate c3 40 0 0 -tcopy c3 c4 -ttranslate c4 40 0 0 -tcopy c4 c5 -ttranslate c5 40 0 0 - -compound c1 c2 c3 c4 c5 co -bcut r b co - -vinit -vsetdispmode 1 -vdisplay r -vfit - -set x_coord 270 -set y_coord 230 - -checkcolor $x_coord $y_coord 0.78 0.55 0.09 - -vsettransparency r 0.5 - -checkcolor $x_coord $y_coord 0.8 0.56 0.1 - -set RED_3 0.86274498701095581 -set GREEN_3 0.61176401376724243 -set BLUE_3 0.10196000337600708 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug6652 b/tests/bugs/vis/bug6652 deleted file mode 100755 index 6b2cb2ddba..0000000000 --- a/tests/bugs/vis/bug6652 +++ /dev/null @@ -1,28 +0,0 @@ -puts "============" -puts "OCC6652" -puts "============" -puts "" -###################################################### -# Problem of mesh selection -###################################################### - -pload XDE -set BugNumber OCC6652 - -vinit - -meshfromstl result [locate_data_file OCC6652.stl] - -vsetdispmode result 3 -vselmode result 8 1 - -vselect 5 5 400 400 - -if {[vnbselected] != 26966} { - puts "Faulty ${BugNumber}" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - - diff --git a/tests/bugs/vis/bug708 b/tests/bugs/vis/bug708 deleted file mode 100755 index c7ae24283e..0000000000 --- a/tests/bugs/vis/bug708 +++ /dev/null @@ -1,18 +0,0 @@ -puts "========" -puts "OCC708" -puts "OCC1011" -puts "========" -puts "" -####################################################### -## UnsetTransformation() of the AIS_InteractiveObject crashes an application -####################################################### -vinit -box result 10 10 10 -vdisplay result -vfit - -if [catch { OCC708 result }] { - puts "Faulty OCC708" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug7691 b/tests/bugs/vis/bug7691 deleted file mode 100644 index 8ebd58359c..0000000000 --- a/tests/bugs/vis/bug7691 +++ /dev/null @@ -1,44 +0,0 @@ -puts "============" -puts "OCC7691" -puts "============" -puts "" -####################################################################### -# Wrong hidden lines computed by HLRBRep_PolyAlgo and -# HLRBRep_PolyHLRToShape in OCC 5.1 -####################################################################### - -set BugNumber OCC7691 -set status 0 - -# load shape -restore [locate_data_file OCC7691-bottle.brep] shape -trotate shape 0 0 0 1 0 0 -90 - -# init viewer and compute hlr shape -vinit -vtop -vcomputehlr shape hlr -vfit - -set colorR 1 -set colorG 0 -set colorB 0 - -# move cursor not to select shape -vmoveto 0 0 - -# start position of color picking -set ptx 2 -set pty 200 -checkcolor $ptx $pty $colorR $colorG $colorB - -if { ${stat} != 0 } { - puts "HLR shape is correct" - puts "OK ${BugNumber}" -} else { - puts "HLR shape is incorrect" - puts "Faulty ${BugNumber}" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - diff --git a/tests/bugs/vis/bug872 b/tests/bugs/vis/bug872 deleted file mode 100755 index 3af52ef308..0000000000 --- a/tests/bugs/vis/bug872 +++ /dev/null @@ -1,21 +0,0 @@ -puts "=======" -puts "OCC872" -puts "SAM1660" -puts "=======" -puts "" - -######################################## -## Exception is raised during visualization attached shape. -######################################## - -cpulimit 3000 -cpulimit 3500 - -restore [locate_data_file OCC872.brep] result - -vinit -vdisplay result -vfit -vsetdispmode 1 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug9517 b/tests/bugs/vis/bug9517 deleted file mode 100755 index 65ada98fa8..0000000000 --- a/tests/bugs/vis/bug9517 +++ /dev/null @@ -1,20 +0,0 @@ -puts "============" -puts "OCC9517" -puts "============" -puts "" -####################################################################### -# Wrong use of the method glTexCoordPointer() in OpenGl_PrimitiveArray.c -####################################################################### - -set BugNumber OCC9517 - -box b 10 10 10 - -vinit -vdisplay b -vtop -vfit - -vtexture b [locate_data_file OCC9517.bmp] - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/opengl/background/cases.list b/tests/opengl/background/cases.list new file mode 100644 index 0000000000..dc159704ab --- /dev/null +++ b/tests/opengl/background/cases.list @@ -0,0 +1 @@ +../data/background diff --git a/tests/opengl/begin b/tests/opengl/begin new file mode 100644 index 0000000000..9af94f6c69 --- /dev/null +++ b/tests/opengl/begin @@ -0,0 +1,7 @@ +cpulimit 300 + +pload VISUALIZATION +vdriver -load OPENGL +vgldebug -glslWarn 1 + +if { [info exists imagedir] == 0 } { set imagedir . } diff --git a/tests/opengl/clipping/cases.list b/tests/opengl/clipping/cases.list new file mode 100644 index 0000000000..bfc5cc3a77 --- /dev/null +++ b/tests/opengl/clipping/cases.list @@ -0,0 +1 @@ +../data/clipping diff --git a/tests/bugs/vis/bug1188 b/tests/opengl/data/background/bug1188 old mode 100755 new mode 100644 similarity index 93% rename from tests/bugs/vis/bug1188 rename to tests/opengl/data/background/bug1188 index e576f7006d..51a73ced63 --- a/tests/bugs/vis/bug1188 +++ b/tests/opengl/data/background/bug1188 @@ -3,6 +3,7 @@ puts "0001188: Impossible to set background image for V3d_View" puts "================" puts "" +pload VISUALIZATION vinit View1 vbackground -image [locate_data_file OCC1188.gif] diff --git a/tests/opengl/data/background/bug21747 b/tests/opengl/data/background/bug21747 new file mode 100644 index 0000000000..0b1ff5ea75 --- /dev/null +++ b/tests/opengl/data/background/bug21747 @@ -0,0 +1,75 @@ +puts "============" +puts "OCC21747" +puts "============" +puts "" + +pload VISUALIZATION +vinit View1 + +puts "Type=NONE, Color from RED to BLUE" +vbackground -gradient RED BLUE -gradientMode NONE +vdump $imagedir/${casename}_none.png + +puts "Type=HORIZONTAL, Color from RED to BLUE, Direction from LEFT to RIGHT" +vbackground -gradient RED BLUE -gradientMode HORIZONTAL +vdump $imagedir/${casename}_hor1.png + +puts "Type=HORIZONTAL, Color from BLUE to RED, Direction from LEFT to RIGHT" +vbackground -gradient BLUE RED -gradientMode HORIZONTAL +vdump $imagedir/${casename}_hor2.png + +puts "Type=VERTICAL, Color from RED to BLUE, Direction from TOP to BOTTOM" +vbackground -gradient RED BLUE -gradientMode VERTICAL +vdump $imagedir/${casename}_vert1.png + +puts "Type=VERTICAL, Color from BLUE to RED, Direction from TOP to BOTTOM" +vbackground -gradient BLUE RED -gradientMode VERTICAL +vdump $imagedir/${casename}_vert2.png + +puts "Type=DIAGONAL1, Color from RED to BLUE, Direction from LEFT TOP CORNER to RIGHT BOTTOM CORNER" +vbackground -gradient RED BLUE -gradientMode DIAGONAL1 +vdump $imagedir/${casename}_diag1.png + +puts "Type=DIAGONAL1, Color from BLUE to RED, Direction from LEFT TOP CORNER to RIGHT BOTTOM CORNER" +vbackground -gradient BLUE RED -gradientMode DIAGONAL1 +vdump $imagedir/${casename}_diag2.png + +puts "Type=DIAGONAL2, Color from RED to BLUE, Direction from RIGHT TOP CORNER to LEFT BOTTOM CORNER" +vbackground -gradient RED BLUE -gradientMode DIAGONAL2 +vdump $imagedir/${casename}_diag3.png + +puts "Type=DIAGONAL2, Color from BLUE to RED, Direction from RIGHT TOP CORNER to LEFT BOTTOM CORNER" +vbackground -gradient BLUE RED -gradientMode DIAGONAL2 +vdump $imagedir/${casename}_diag4.png + +puts "Type=CORNER1, Color from RED to BLUE, Direction from LEFT TOP CORNER" +vbackground -gradient RED BLUE -gradientMode CORNER1 +vdump $imagedir/${casename}_corn1.png + +puts "Type=CORNER2, Color from RED to BLUE, Direction from RIGHT TOP CORNER" +vbackground -gradient RED BLUE -gradientMode CORNER2 +vdump $imagedir/${casename}_corn2.png + +puts "Type=CORNER3, Color from RED to BLUE, Direction from RIGHT BOTTOM CORNER" +vbackground -gradient RED BLUE -gradientMode CORNER3 +vdump $imagedir/${casename}_corn3.png + +puts "Type=CORNER4, Color from RED to BLUE, Direction from LEFT BOTTOM CORNER" +vbackground -gradient RED BLUE -gradientMode CORNER4 +vdump $imagedir/${casename}_corn4.png + +puts "Type=CORNER1, Color from BLUE to RED, Direction from LEFT TOP CORNER" +vbackground -gradient BLUE RED -gradientMode CORNER1 +vdump $imagedir/${casename}_corn5.png + +puts "Type=CORNER2, Color from BLUE to RED, Direction from RIGHT TOP CORNER" +vbackground -gradient BLUE RED -gradientMode CORNER2 +vdump $imagedir/${casename}_corn6.png + +puts "Type=CORNER3, Color from BLUE to RED, Direction from RIGHT BOTTOM CORNER" +vbackground -gradient BLUE RED -gradientMode CORNER3 +vdump $imagedir/${casename}_corn7.png + +puts "Type=CORNER4, Color from BLUE to RED, Direction from LEFT BOTTOM CORNER" +vbackground -gradient BLUE RED -gradientMode CORNER4 +vdump $imagedir/${casename}_corn8.png diff --git a/tests/opengl/data/background/bug23102 b/tests/opengl/data/background/bug23102 new file mode 100644 index 0000000000..7a71b32dfc --- /dev/null +++ b/tests/opengl/data/background/bug23102 @@ -0,0 +1,28 @@ +puts "================" +puts "OCC23102: Change the algorithm of rendering the 3d viewer background using tiled texture" +puts "================" +puts "" + +pload VISUALIZATION +vinit View1 +vbackground -image [locate_data_file OCC23102.bmp] -imageMode TILED + +set x1 58 +set y1 4 +set R_bg 0.70196002721786499 +set G_bg 0.78039199113845825 +set B_bg 0.86274499999999998 + +set WrongColor "$R_bg $G_bg $B_bg" + +set Color [vreadpixel ${x1} ${y1} rgb] + +# Resume +puts "" +if { "[vreadpixel ${x1} ${y1} rgb]" != "$WrongColor" } { + puts "OK OCC23102" +} else { + puts "Faulty OCC23102" +} + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug23363 b/tests/opengl/data/background/bug23363 old mode 100755 new mode 100644 similarity index 87% rename from tests/bugs/vis/bug23363 rename to tests/opengl/data/background/bug23363 index 30f73d7c95..5256348d4c --- a/tests/bugs/vis/bug23363 +++ b/tests/opengl/data/background/bug23363 @@ -3,6 +3,7 @@ puts "0023363: Lost gradient background when switching to the hollow interior st puts "============" puts "" +pload MODELING VISUALIZATION vclear vinit View1 vaxo @@ -15,4 +16,4 @@ set color1 [vreadpixel 10 0 rgb] set rd1 [lindex $color1 0] if { $rd1 == 0 } { puts "Faulty ${BugNumber}" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25475 b/tests/opengl/data/background/bug25475 similarity index 100% rename from tests/bugs/vis/bug25475 rename to tests/opengl/data/background/bug25475 diff --git a/tests/bugs/vis/bug25775 b/tests/opengl/data/background/bug25775 similarity index 100% rename from tests/bugs/vis/bug25775 rename to tests/opengl/data/background/bug25775 diff --git a/tests/bugs/vis/bug26599 b/tests/opengl/data/background/bug26599 old mode 100755 new mode 100644 similarity index 93% rename from tests/bugs/vis/bug26599 rename to tests/opengl/data/background/bug26599 index 0ddb84609d..f211ec7bd3 --- a/tests/bugs/vis/bug26599 +++ b/tests/opengl/data/background/bug26599 @@ -3,6 +3,7 @@ puts "CR26599: Visualization, TKOpenGl - gradient background should reset model puts "============" puts "" +pload MODELING VISUALIZATION vinit View1 vclear vaxo diff --git a/tests/bugs/vis/bug27836 b/tests/opengl/data/background/bug27836 similarity index 100% rename from tests/bugs/vis/bug27836 rename to tests/opengl/data/background/bug27836 diff --git a/tests/bugs/vis/bug22906 b/tests/opengl/data/clipping/bug22906 old mode 100755 new mode 100644 similarity index 70% rename from tests/bugs/vis/bug22906 rename to tests/opengl/data/clipping/bug22906 index 98fd7e1ac9..c3f49d368c --- a/tests/bugs/vis/bug22906 +++ b/tests/opengl/data/clipping/bug22906 @@ -1,11 +1,7 @@ - puts "================" -puts "OCC22906" +puts "OCC22906: Gradient background is clipped by planes" puts "================" puts "" -####################################################################################### -# Gradient background is clipped by planes -###################################################################################### set BugNumber OCC22906 set x1 73 @@ -20,7 +16,8 @@ set y3 123 set x4 87 set y4 232 -vinit +pload MODELING VISUALIZATION +vinit View1 vbackground -gradient RED BLUE -gradientMode DIAGONAL2 set Color1 [vreadpixel ${x1} ${y1} rgb] set Color2 [vreadpixel ${x2} ${y2} rgb] @@ -38,9 +35,9 @@ set ColorRes3 [vreadpixel ${x3} ${y3} rgb] set ColorRes4 [vreadpixel ${x4} ${y4} rgb] if { ${Color1} == ${ColorRes1} && ${Color2} == ${ColorRes2} && ${Color3} == ${ColorRes3} && ${Color4} == ${ColorRes4}} { - puts "OK ${BugNumber}" + puts "OK ${BugNumber}" } else { - puts "Faulty ${BugNumber}" + puts "Faulty ${BugNumber}" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/opengl/data/clipping/bug23484_2 b/tests/opengl/data/clipping/bug23484_2 new file mode 100644 index 0000000000..5fd5be2f34 --- /dev/null +++ b/tests/opengl/data/clipping/bug23484_2 @@ -0,0 +1,21 @@ +puts "============" +puts "OCC23484: Visualization, TKOpenGl - primitive arrays to become the only way to render geometry" +puts "Tests clipping plane rendering with primitive arrays" +puts "============" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +vclear +vaxo +vsetdispmode 1 +box b 1 1 1 +vdisplay b +vfit + +vclipplane create pln +vclipplane set pln view Driver1/Viewer1/View1 +vclipplane change pln equation 0 1 0 -0.5 +vclipplane change pln capping on + +vdump $imagedir/${casename}_1.png diff --git a/tests/bugs/vis/bug24224 b/tests/opengl/data/clipping/bug24224 similarity index 77% rename from tests/bugs/vis/bug24224 rename to tests/opengl/data/clipping/bug24224 index 8ba33feb3b..08c90c424f 100644 --- a/tests/bugs/vis/bug24224 +++ b/tests/opengl/data/clipping/bug24224 @@ -1,10 +1,7 @@ puts "===========" -puts "OCC24224" +puts "OCC24224: Suspicious logics in changing clipping planets at OpenGL_Structure" puts "===========" puts "" -########################################################################## -# Suspicious logics in changing clipping planets at OpenGL_Structure -########################################################################## ## centre rectangle set x1_coord 150 @@ -18,6 +15,7 @@ set y2_coord 320 set x3_coord 73 set y3_coord 150 +pload MODELING VISUALIZATION vclear vinit View1 box b1 0 0 0 10 10 10 @@ -50,4 +48,4 @@ vclipplane set pln2 object b3 checkcolor $x3_coord $y3_coord 0.5 0.5 0.9 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug24522 b/tests/opengl/data/clipping/bug24522 similarity index 53% rename from tests/bugs/vis/bug24522 rename to tests/opengl/data/clipping/bug24522 index 19876731aa..fc4f3751c4 100644 --- a/tests/bugs/vis/bug24522 +++ b/tests/opengl/data/clipping/bug24522 @@ -1,11 +1,9 @@ puts "========" -puts "OCC24522" +puts "OCC24522: Application crashes on view closing in case of using of clipping planes" puts "========" puts "" -########################################################################### -# Application crashes on view closing in case of using of clipping planes -########################################################################### +pload MODELING VISUALIZATION box b 1 1 1 vdisplay b vfit diff --git a/tests/opengl/data/clipping/bug24717 b/tests/opengl/data/clipping/bug24717 new file mode 100644 index 0000000000..6476722e64 --- /dev/null +++ b/tests/opengl/data/clipping/bug24717 @@ -0,0 +1,23 @@ +puts "============" +puts "OCC24717: TKOpenGl - globally defined clipping planes blink when operating with view" +puts "Test checks that state of clippings always corresponds to a state of viewed scene." +puts "============" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +vsetdispmode 1 +box b 1 1 1 +vdisplay b +vmoveto 204 204 +vclipplane create pln1 +vclipplane set pln1 view Driver1/Viewer1/View1 +vclipplane change pln1 equation 0 1 0 0 +vfit +vaspects -setwidth 5 + +if { "[vreadpixel 204 204 rgb name]" != "CYAN" } { + puts "Error : Viewer clipping is broken." +} + +vdump ${imagedir}/${casename}.png diff --git a/tests/opengl/data/clipping/bug24901 b/tests/opengl/data/clipping/bug24901 new file mode 100644 index 0000000000..64ada86cf2 --- /dev/null +++ b/tests/opengl/data/clipping/bug24901 @@ -0,0 +1,23 @@ +puts "============" +puts "CR24901: Visualization - Incorrect area filled with capping color" +puts "============" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +box b 10 10 10 +vdisplay b +vsetdispmode 1 + +vclipplane create pln1 +vclipplane set pln1 object b +vclipplane change pln1 equation 0 1 0 -5 +vclipplane change pln1 capping on +vfit +vmoveto 304 146 + +if { "[vreadpixel 304 146 rgb name]" != "CYAN" } { + puts "Error : Highlighting is broken." +} + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug24902_1 b/tests/opengl/data/clipping/bug24902_1 similarity index 55% rename from tests/bugs/vis/bug24902_1 rename to tests/opengl/data/clipping/bug24902_1 index 16ea9abba9..be99d30ebf 100644 --- a/tests/bugs/vis/bug24902_1 +++ b/tests/opengl/data/clipping/bug24902_1 @@ -1,13 +1,11 @@ puts "===========" -puts "OCC24902" +puts "OCC24902: Visualization - advanced processing of compounds containing solids and other shape types" +puts "Tests capping on solid, shell and unclosed compound" puts "===========" puts "" -########################################################################################### -# Visualization - advanced processing of compounds containing solids and other shape types -# Tests capping on solid, shell and unclosed compound -########################################################################################### -vinit +pload MODELING VISUALIZATION +vinit View1 box b 0 0 0 10 10 10 box b_shell 15 0 0 10 10 10 box b_solid 30 0 0 10 10 10 @@ -29,4 +27,4 @@ vclipplane set pln1 view Driver1/Viewer1/View1 vrotate 0 0.2 0 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug24902_2 b/tests/opengl/data/clipping/bug24902_2 similarity index 53% rename from tests/bugs/vis/bug24902_2 rename to tests/opengl/data/clipping/bug24902_2 index 4300870854..14da8cd318 100644 --- a/tests/bugs/vis/bug24902_2 +++ b/tests/opengl/data/clipping/bug24902_2 @@ -1,13 +1,11 @@ puts "===========" -puts "OCC24902" +puts "OCC24902: Visualization - advanced processing of compounds containing solids and other shape types" +puts "Tests the capping on compound that contains shell and solid" puts "===========" puts "" -########################################################################################### -# Visualization - advanced processing of compounds containing solids and other shape types -# Tests the capping on compound that contains shell and solid -########################################################################################### -vinit +pload MODELING VISUALIZATION +vinit View1 box b 0 0 0 10 10 10 box b_solid 20 0 0 10 10 10 explode b F @@ -28,4 +26,4 @@ vclipplane set pln1 view Driver1/Viewer1/View1 vrotate 0 0.2 0 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25052 b/tests/opengl/data/clipping/bug25052 similarity index 97% rename from tests/bugs/vis/bug25052 rename to tests/opengl/data/clipping/bug25052 index cd53b6343f..4bccf1cf40 100644 --- a/tests/bugs/vis/bug25052 +++ b/tests/opengl/data/clipping/bug25052 @@ -7,9 +7,10 @@ puts "" set Image1 ${imagedir}/${casename}_1.png set Image9 ${imagedir}/${casename}_9.png +pload MODELING VISUALIZATION box b -30 -30 -30 70 80 90 -vinit +vinit View1 vsetdispmode 1 vdisplay b vfit diff --git a/tests/opengl/data/clipping/bug25060 b/tests/opengl/data/clipping/bug25060 new file mode 100644 index 0000000000..0086266818 --- /dev/null +++ b/tests/opengl/data/clipping/bug25060 @@ -0,0 +1,21 @@ +puts "============" +puts "CR25060: Capping breaks highlighting of shaded AIS_Shape with displayed edges." +puts "============" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +box b 10 10 10 +vdisplay b +vaspects b -setFaceBoundaryDraw 1 +vclipplane create pln1 +vclipplane set pln1 object b +vclipplane change pln1 equation 0 1 0 -5 +vclipplane change pln1 capping on +vsetdispmode 1 +vfit +vmoveto 304 146 +checkcolor 304 146 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting is broken." } + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25132 b/tests/opengl/data/clipping/bug25132 similarity index 77% rename from tests/bugs/vis/bug25132 rename to tests/opengl/data/clipping/bug25132 index 192ab749d9..335ace37bf 100644 --- a/tests/bugs/vis/bug25132 +++ b/tests/opengl/data/clipping/bug25132 @@ -1,11 +1,9 @@ puts "============" -puts "OCC25132" +puts "OCC25132: Visualization - Capping algorithm not working sometimes" puts "============" puts "" -#################################################################################### -# Visualization - Capping algorithm not working sometimes -#################################################################################### +pload MODELING VISUALIZATION vinit View1 vsetdispmode 1 vclipplane create pln1 diff --git a/tests/opengl/data/clipping/bug25229 b/tests/opengl/data/clipping/bug25229 new file mode 100644 index 0000000000..aed3ee1331 --- /dev/null +++ b/tests/opengl/data/clipping/bug25229 @@ -0,0 +1,22 @@ +puts "============" +puts "CR25229: Cappings have gray tint if setting color with vclipplane command." +puts "============" +puts "" + +pload MODELING VISUALIZATION +box b 100 100 100 +vinit View1 +vsetdispmode 1 +vdisplay b +vclipplane create pln1 +vclipplane change pln1 equation 0 0 -1 20 +vclipplane set pln1 object b +vclipplane change pln1 capping on +vclipplane change pln1 capping color 1.0 1.0 1.0 +vtop +vfit + +checkcolor 100 100 1 1 1 +if { $stat != 1 } { puts "Error : Capping color is broken." } + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25778 b/tests/opengl/data/clipping/bug25778 similarity index 86% rename from tests/bugs/vis/bug25778 rename to tests/opengl/data/clipping/bug25778 index 55b9839a78..0ac9248c5c 100644 --- a/tests/bugs/vis/bug25778 +++ b/tests/opengl/data/clipping/bug25778 @@ -8,6 +8,7 @@ set aExpectedImg $imagedir/${casename}_expected_img.png set aVerifiedImg $imagedir/${casename}_verified_img.png set aDiff $imagedir/${casename}_diff.png +pload MODELING VISUALIZATION vinit View1 vclear vaxo @@ -21,14 +22,10 @@ vclipplane set pln view Driver1/Viewer1/View1 vclipplane change pln equation 0 1 0 -0.5 vbackground -gradient BLACK BLACK -gradientMode NONE - vdump $aExpectedImg vbackground -gradient BLACK BLACK -gradientMode HORIZONTAL - vdump $aVerifiedImg set aDiffRes [diffimage $aExpectedImg $aVerifiedImg 0.1 0 0 $aDiff] -if {$aDiffRes != 0} { - puts "ERROR : Test failed: gradient background affects clipping." -} +if {$aDiffRes != 0} { puts "ERROR : Test failed: gradient background affects clipping." } diff --git a/tests/bugs/vis/bug26940 b/tests/opengl/data/clipping/bug26940 similarity index 96% rename from tests/bugs/vis/bug26940 rename to tests/opengl/data/clipping/bug26940 index d4bda0e888..354d20d2c0 100644 --- a/tests/bugs/vis/bug26940 +++ b/tests/opengl/data/clipping/bug26940 @@ -4,6 +4,7 @@ puts "Tests capping plane rendering with connected structures" puts "============" puts "" +pload MODELING VISUALIZATION vclear vinit View1 vaxo diff --git a/tests/bugs/vis/bug27751_capping b/tests/opengl/data/clipping/bug27751_capping similarity index 98% rename from tests/bugs/vis/bug27751_capping rename to tests/opengl/data/clipping/bug27751_capping index ac1c1f8445..752d70b241 100644 --- a/tests/bugs/vis/bug27751_capping +++ b/tests/opengl/data/clipping/bug27751_capping @@ -73,3 +73,4 @@ vzoom 0.8 puts "Enable capping planes" vclipplane pln1 -set -equation 0 0 -1 $aPln1Z -capping 1 -color 0.5 0.5 0.5 -texname $aHatch -texscale 0.02 -0.02 -useObjMaterial 1 vclipplane pln2 -set -equation 0 1 0 [expr -$aPln2Y] -capping 1 -color 0.8 0.8 0.9 -texname $aHatch -texscale 0.02 -0.02 +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug27945 b/tests/opengl/data/clipping/bug27945 similarity index 100% rename from tests/bugs/vis/bug27945 rename to tests/opengl/data/clipping/bug27945 diff --git a/tests/bugs/vis/bug29768 b/tests/opengl/data/clipping/bug29768 similarity index 95% rename from tests/bugs/vis/bug29768 rename to tests/opengl/data/clipping/bug29768 index 6d05857988..11f95855cf 100644 --- a/tests/bugs/vis/bug29768 +++ b/tests/opengl/data/clipping/bug29768 @@ -3,6 +3,7 @@ puts "0029768: Visualization, TKOpenGl - structure is entirely clipped by suppre puts "============" puts "" +pload MODELING VISUALIZATION vclear vinit View1 vaxo diff --git a/tests/bugs/vis/bug29874 b/tests/opengl/data/clipping/bug29874 similarity index 100% rename from tests/bugs/vis/bug29874 rename to tests/opengl/data/clipping/bug29874 diff --git a/tests/bugs/vis/bug30756 b/tests/opengl/data/clipping/bug30756 similarity index 100% rename from tests/bugs/vis/bug30756 rename to tests/opengl/data/clipping/bug30756 diff --git a/tests/v3d/glsl/clipping1 b/tests/opengl/data/clipping/clipping1 similarity index 98% rename from tests/v3d/glsl/clipping1 rename to tests/opengl/data/clipping/clipping1 index 40d6f4b7c0..1399ea88fc 100644 --- a/tests/v3d/glsl/clipping1 +++ b/tests/opengl/data/clipping/clipping1 @@ -2,6 +2,7 @@ puts "========" puts "0029729: Visualization, Graphic3d_ClipPlane - add support of clipping plane chains" puts "========" +pload MODELING VISUALIZATION vclear vclose ALL vinit View1 diff --git a/tests/v3d/glsl/bndbox1 b/tests/opengl/data/general/bndbox1 similarity index 100% rename from tests/v3d/glsl/bndbox1 rename to tests/opengl/data/general/bndbox1 diff --git a/tests/bugs/vis/bug25679 b/tests/opengl/data/general/bug25679 similarity index 61% rename from tests/bugs/vis/bug25679 rename to tests/opengl/data/general/bug25679 index 285151e05d..6a267ae414 100644 --- a/tests/bugs/vis/bug25679 +++ b/tests/opengl/data/general/bug25679 @@ -1,12 +1,9 @@ puts "========" -puts "OCC25679" +puts "OCC25679: Visualization, TKOpenGl - View frustum culling clips wrong objects" puts "========" puts "" -############################################################################ -# Visualization, TKOpenGl - View frustum culling clips wrong objects -############################################################################ -pload VISUALIZATION MODELING +pload MODELING VISUALIZATION set LINES_IN_ROW 50 @@ -14,7 +11,7 @@ set aNoCulling $imagedir/${casename}_without.png set aWithCulling $imagedir/${casename}_with.png set aDiff $imagedir/${casename}_diff.png -vinit +vinit View1 for {set i 0} {$i < $LINES_IN_ROW} {incr i} { for {set j 0} {$j < $LINES_IN_ROW} {incr j} { @@ -33,6 +30,4 @@ vrenderparams -frustumculling off vdump $aNoCulling set aDiffRes [diffimage $aWithCulling $aNoCulling 0.1 0 0 $aDiff] -if {$aDiffRes != 0} { - puts "ERROR : Test failed: there is a difference between images rendered with and without frustum culling" -} +if {$aDiffRes != 0} { puts "ERROR : Test failed: there is a difference between images rendered with and without frustum culling" } diff --git a/tests/v3d/glsl/culldist b/tests/opengl/data/general/culldist similarity index 100% rename from tests/v3d/glsl/culldist rename to tests/opengl/data/general/culldist diff --git a/tests/v3d/glsl/cullsize b/tests/opengl/data/general/cullsize similarity index 100% rename from tests/v3d/glsl/cullsize rename to tests/opengl/data/general/cullsize diff --git a/tests/v3d/glsl/depthprepass b/tests/opengl/data/general/depthprepass similarity index 95% rename from tests/v3d/glsl/depthprepass rename to tests/opengl/data/general/depthprepass index be106f0df8..87d7e3e52a 100644 --- a/tests/v3d/glsl/depthprepass +++ b/tests/opengl/data/general/depthprepass @@ -2,6 +2,7 @@ puts "========" puts "0029300: Visualization, TKOpenGl - provide depth pre-pass option" puts "========" +pload MODELING VISUALIZATION vclear vclose ALL vinit View1 diff --git a/tests/v3d/glsl/double_precision b/tests/opengl/data/general/double_precision similarity index 100% rename from tests/v3d/glsl/double_precision rename to tests/opengl/data/general/double_precision diff --git a/tests/v3d/glsl/light_off b/tests/opengl/data/general/light_off similarity index 92% rename from tests/v3d/glsl/light_off rename to tests/opengl/data/general/light_off index 6672a2a887..ccb4fe7001 100644 --- a/tests/v3d/glsl/light_off +++ b/tests/opengl/data/general/light_off @@ -2,6 +2,8 @@ puts "========" puts "Test to verify the lights are turned off after 'vlight clear' (and scene is black)" puts "========" +pload MODELING VISUALIZATION + # create box box b 1 2 3 diff --git a/tests/v3d/glsl/msaa b/tests/opengl/data/general/msaa similarity index 76% rename from tests/v3d/glsl/msaa rename to tests/opengl/data/general/msaa index c69fdb2488..d8ffe487e9 100644 --- a/tests/v3d/glsl/msaa +++ b/tests/opengl/data/general/msaa @@ -32,11 +32,3 @@ vstereo anaglyph vdump $::imagedir/${::casename}_512x512_msaa8stereo.png -stereo blend vdump $::imagedir/${::casename}_1920x1080_msaa8stereo.png -width 1920 -height 1080 -stereo blend vdump $::imagedir/${::casename}_2560x1440_msaa8stereo.png -width 2560 -height 1440 -stereo blend - -vraytrace 1 -vsetdispmode b 1 -vdump $::imagedir/${::casename}_512x512_msaa8stereort.png -stereo blend -vdump $::imagedir/${::casename}_1920x1080_msaa8stereort.png -width 1920 -height 1080 -stereo blend -vdump $::imagedir/${::casename}_2560x1440_msaa8stereort.png -width 2560 -height 1440 -stereo blend -vsetdispmode b 0 -vraytrace 0 diff --git a/tests/v3d/glsl/rendscale b/tests/opengl/data/general/rendscale similarity index 100% rename from tests/v3d/glsl/rendscale rename to tests/opengl/data/general/rendscale diff --git a/tests/v3d/glsl/stereo b/tests/opengl/data/general/stereo similarity index 96% rename from tests/v3d/glsl/stereo rename to tests/opengl/data/general/stereo index b27d0ffbf7..493b8dd80f 100644 --- a/tests/v3d/glsl/stereo +++ b/tests/opengl/data/general/stereo @@ -2,6 +2,8 @@ puts "========" puts "Stereo output modes" puts "========" +pload MODELING VISUALIZATION + restore [locate_data_file occ/fuse.brep] f vclear vclose ALL diff --git a/tests/v3d/glsl/tiles b/tests/opengl/data/general/tiles similarity index 85% rename from tests/v3d/glsl/tiles rename to tests/opengl/data/general/tiles index fcd654a738..76f314ed88 100644 --- a/tests/v3d/glsl/tiles +++ b/tests/opengl/data/general/tiles @@ -83,13 +83,3 @@ vdump $::imagedir/${::casename}_1920x1080_stereotile0.png -width 1920 -height vdump $::imagedir/${::casename}_1920x1080_stereotile128.png -width 1920 -height 1920 -stereo blend -tileSize 128 vdump $::imagedir/${::casename}_1920x1080_stereotile1024.png -width 1920 -height 1920 -stereo blend -tileSize 1024 diffimage $::imagedir/${::casename}_409x409_stereotile0.png $::imagedir/${::casename}_409x409_stereotile128.png 0 0 0 $::imagedir/${::casename}_409x409_stereotile128diff.png - -# check dump with Ray Tracing -vraytrace 1 -vdump $::imagedir/${::casename}_409x409_rttile0.png -stereo blend -vdump $::imagedir/${::casename}_409x409_rttile128.png -stereo blend -tileSize 128 -vdump $::imagedir/${::casename}_409x409_rttile1024.png -stereo blend -tileSize 1024 -vdump $::imagedir/${::casename}_1920x1080_rttile0.png -width 1920 -height 1920 -stereo blend -vdump $::imagedir/${::casename}_1920x1080_rttile128.png -width 1920 -height 1920 -stereo blend -tileSize 128 -vdump $::imagedir/${::casename}_1920x1080_rttile1024.png -width 1920 -height 1920 -stereo blend -tileSize 1024 -vraytrace 0 diff --git a/tests/v3d/glsl/geom1 b/tests/opengl/data/geom/geom1 similarity index 88% rename from tests/v3d/glsl/geom1 rename to tests/opengl/data/geom/geom1 index 872bed0ca0..b507b4b34d 100644 --- a/tests/v3d/glsl/geom1 +++ b/tests/opengl/data/geom/geom1 @@ -45,6 +45,10 @@ box b 1 2 3 vcaps -core vclear vinit View1 +if { [string match "OpenGL ES 2.0*" [vglinfo VERSION]] || [string match "OpenGL ES 3.0*" [vglinfo VERSION]] } { + puts "Skipping test case: OpenGL ES 3.2+ is required" + return +} vaxo vdisplay -dispMode 1 -mutable b vfit diff --git a/tests/v3d/glsl/interior1 b/tests/opengl/data/geom/interior1 similarity index 100% rename from tests/v3d/glsl/interior1 rename to tests/opengl/data/geom/interior1 diff --git a/tests/v3d/glsl/interior2 b/tests/opengl/data/geom/interior2 similarity index 100% rename from tests/v3d/glsl/interior2 rename to tests/opengl/data/geom/interior2 diff --git a/tests/v3d/glsl/tess1 b/tests/opengl/data/geom/tess1 similarity index 91% rename from tests/v3d/glsl/tess1 rename to tests/opengl/data/geom/tess1 index 6021fc6a07..c0a5afd71c 100644 --- a/tests/v3d/glsl/tess1 +++ b/tests/opengl/data/geom/tess1 @@ -63,6 +63,10 @@ explode b F vcaps -core vclear vinit View1 +if { [string match "OpenGL ES 2.0*" [vglinfo VERSION]] || [string match "OpenGL ES 3.0*" [vglinfo VERSION]] } { + puts "Skipping test case: OpenGL ES 3.2+ is required" + return +} vaxo vdisplay -dispMode 1 -mutable b_1 vfit diff --git a/tests/opengl/data/hatch/bug28107 b/tests/opengl/data/hatch/bug28107 new file mode 100644 index 0000000000..c26d0a5ad6 --- /dev/null +++ b/tests/opengl/data/hatch/bug28107 @@ -0,0 +1,13 @@ +puts "===========" +puts "OCC28107: Visualization - provide a flexible interface to set custom hatch styles" +puts "===========" +puts "" + +pload VISUALIZATION MODELING +box b 1 1 1 +vinit View1 +vdisplay b -dispMode 1 +vfit + +vaspects b -setHatch 4 +vdump $imagedir/${casename}_hatch.png diff --git a/tests/bugs/vis/bug28306 b/tests/opengl/data/hatch/bug28306 similarity index 91% rename from tests/bugs/vis/bug28306 rename to tests/opengl/data/hatch/bug28306 index d3ec639bf0..a799745b86 100644 --- a/tests/bugs/vis/bug28306 +++ b/tests/opengl/data/hatch/bug28306 @@ -3,6 +3,7 @@ puts "OCC28306 Visualization - viewer crashes if style for shaded display is set puts "============" puts "" +pload VISUALIZATION MODELING vclear vinit View1 pload MODELING VISUALIZATION diff --git a/tests/bugs/vis/bug31702 b/tests/opengl/data/hatch/bug31702 similarity index 100% rename from tests/bugs/vis/bug31702 rename to tests/opengl/data/hatch/bug31702 diff --git a/tests/bugs/vis/bug26790 b/tests/opengl/data/lines/bug26790 similarity index 65% rename from tests/bugs/vis/bug26790 rename to tests/opengl/data/lines/bug26790 index 7256be4ca1..c77c327797 100644 --- a/tests/bugs/vis/bug26790 +++ b/tests/opengl/data/lines/bug26790 @@ -2,20 +2,15 @@ puts "============" puts "OCC26790 apply view resolution to the line width" puts "============" puts "" -pload VISUALIZATION +pload MODELING VISUALIZATION vclear vclose all - vinit View1 - box b0 1 2 3 - vdisplay b0 vfit - -vdump $imagedir/${casename}_1.png +vdump $imagedir/${casename}_def.png vrenderparams -resolution 144 - -vdump $imagedir/${casename}_2.png +vdump $imagedir/${casename}_144.png diff --git a/tests/bugs/vis/bug30713 b/tests/opengl/data/lines/bug30713 similarity index 92% rename from tests/bugs/vis/bug30713 rename to tests/opengl/data/lines/bug30713 index 57baf18965..fdacd4f50c 100644 --- a/tests/bugs/vis/bug30713 +++ b/tests/opengl/data/lines/bug30713 @@ -3,10 +3,8 @@ puts "0030713: Visualization, TKOpenGl - stipple line artifacts on Intel UHD Gra puts "=============" pload MODELING VISUALIZATION -pload OPENGL box b 1 2 3 vclear -vcaps -core vinit View1 vglinfo vdisplay -dispMode 0 b diff --git a/tests/v3d/glsl/stipple_line1 b/tests/opengl/data/lines/stipple_line1 similarity index 89% rename from tests/v3d/glsl/stipple_line1 rename to tests/opengl/data/lines/stipple_line1 index e66b809a4d..446c6ec3c7 100644 --- a/tests/v3d/glsl/stipple_line1 +++ b/tests/opengl/data/lines/stipple_line1 @@ -1,3 +1,5 @@ +pload VISUALIZATION MODELING + restore [locate_data_file occ/fuse.brep] f vcaps -ffp 1 diff --git a/tests/v3d/glsl/stipple_line2 b/tests/opengl/data/lines/stipple_line2 similarity index 100% rename from tests/v3d/glsl/stipple_line2 rename to tests/opengl/data/lines/stipple_line2 diff --git a/tests/bugs/vis/bug23654_MarkersRecompute b/tests/opengl/data/markers/bug23654_MarkersRecompute similarity index 96% rename from tests/bugs/vis/bug23654_MarkersRecompute rename to tests/opengl/data/markers/bug23654_MarkersRecompute index ccf1f3055b..51aaf6784c 100644 --- a/tests/bugs/vis/bug23654_MarkersRecompute +++ b/tests/opengl/data/markers/bug23654_MarkersRecompute @@ -3,7 +3,6 @@ puts "OCC23654 Markers recompute" puts "========" pload VISUALIZATION -pload OPENGL vcaps -sprites source $env(CSF_OCCTSamplesPath)/tcl/markers.tcl diff --git a/tests/bugs/vis/bug24131_markers_bitmap b/tests/opengl/data/markers/bug24131_markers_bitmap similarity index 94% rename from tests/bugs/vis/bug24131_markers_bitmap rename to tests/opengl/data/markers/bug24131_markers_bitmap index 7519ed19e6..1c5d7a1dc0 100644 --- a/tests/bugs/vis/bug24131_markers_bitmap +++ b/tests/opengl/data/markers/bug24131_markers_bitmap @@ -3,7 +3,6 @@ puts "OCC24131 Markers using deprecated glBitmap" puts "========" pload VISUALIZATION -pload OPENGL vcaps -sprites 0 -ffp 1 source $env(CSF_OCCTSamplesPath)/tcl/markers.tcl vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug24131_markers_core b/tests/opengl/data/markers/bug24131_markers_core similarity index 94% rename from tests/bugs/vis/bug24131_markers_core rename to tests/opengl/data/markers/bug24131_markers_core index f80a905faa..c2c603d146 100644 --- a/tests/bugs/vis/bug24131_markers_core +++ b/tests/opengl/data/markers/bug24131_markers_core @@ -3,7 +3,6 @@ puts "OCC24131 Markers using GLSL programs in Core Profile" puts "========" pload VISUALIZATION -pload OPENGL vcaps -core source $env(CSF_OCCTSamplesPath)/tcl/markers.tcl vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug24131_markers_glsl b/tests/opengl/data/markers/bug24131_markers_glsl similarity index 94% rename from tests/bugs/vis/bug24131_markers_glsl rename to tests/opengl/data/markers/bug24131_markers_glsl index fe2d3c2cdb..6a4e33b1a9 100644 --- a/tests/bugs/vis/bug24131_markers_glsl +++ b/tests/opengl/data/markers/bug24131_markers_glsl @@ -3,7 +3,6 @@ puts "OCC24131 Markers using GLSL programs in Compatible Profile" puts "========" pload VISUALIZATION -pload OPENGL vcaps -compatibleProfile -sprites 1 -ffp 0 source $env(CSF_OCCTSamplesPath)/tcl/markers.tcl vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug24131_markers_sprites b/tests/opengl/data/markers/bug24131_markers_sprites similarity index 94% rename from tests/bugs/vis/bug24131_markers_sprites rename to tests/opengl/data/markers/bug24131_markers_sprites index 150af2bd45..0dff22b659 100644 --- a/tests/bugs/vis/bug24131_markers_sprites +++ b/tests/opengl/data/markers/bug24131_markers_sprites @@ -3,7 +3,6 @@ puts "OCC24131 Markers using Point Sprites and FFP" puts "========" pload VISUALIZATION -pload OPENGL vcaps -sprites 1 -ffp 1 source $env(CSF_OCCTSamplesPath)/tcl/markers.tcl vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug31315 b/tests/opengl/data/markers/bug31315 similarity index 77% rename from tests/bugs/vis/bug31315 rename to tests/opengl/data/markers/bug31315 index 7bb2274a4d..dd8621ce3d 100644 --- a/tests/bugs/vis/bug31315 +++ b/tests/opengl/data/markers/bug31315 @@ -5,6 +5,10 @@ puts "=============" pload MODELING VISUALIZATION vclear vinit View1 +if { [string match "OpenGL ES 2.0*" [vglinfo VERSION]] } { + puts "Skipping test case: OpenGL ES 3.0+ is required" + return +} box b 1 2 3 vdisplay -dispMode 1 -highMode 1 b vtexture b -tex0 3 -tex1 4 diff --git a/tests/v3d/raytrace/bug24130 b/tests/opengl/data/raytrace/bug24130 similarity index 97% rename from tests/v3d/raytrace/bug24130 rename to tests/opengl/data/raytrace/bug24130 index 84dd56a6c0..4d1ab2ce9d 100644 --- a/tests/v3d/raytrace/bug24130 +++ b/tests/opengl/data/raytrace/bug24130 @@ -2,6 +2,8 @@ puts "========" puts "OCC24130 Implementing ray tracing visualization core" puts "========" +pload MODELING VISUALIZATION + # custom shapes set aShape1 [locate_data_file occ/Top.brep] set aShape2 [locate_data_file occ/Bottom.brep] diff --git a/tests/v3d/raytrace/bug24819 b/tests/opengl/data/raytrace/bug24819 similarity index 98% rename from tests/v3d/raytrace/bug24819 rename to tests/opengl/data/raytrace/bug24819 index 748b469e16..946493d04a 100644 --- a/tests/v3d/raytrace/bug24819 +++ b/tests/opengl/data/raytrace/bug24819 @@ -2,6 +2,7 @@ puts "========" puts "OCC24819: TKOpenGl - extend the ray-tracing core by visualization of lines, text and point sprites" puts "========" +pload MODELING VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont # setup 3D viewer content diff --git a/tests/v3d/raytrace/bug25201 b/tests/opengl/data/raytrace/bug25201 similarity index 97% rename from tests/v3d/raytrace/bug25201 rename to tests/opengl/data/raytrace/bug25201 index 9782e88562..37c014ae6a 100644 --- a/tests/v3d/raytrace/bug25201 +++ b/tests/opengl/data/raytrace/bug25201 @@ -2,6 +2,8 @@ puts "========" puts "OCC25201: Visualization - Implementing soft shadows and ambient occlusion in OCCT ray-tracing core" puts "========" +pload MODELING VISUALIZATION + # custom shapes set aShape1 [locate_data_file occ/Top.brep] set aShape2 [locate_data_file occ/Bottom.brep] diff --git a/tests/v3d/raytrace/bug25221 b/tests/opengl/data/raytrace/bug25221 similarity index 85% rename from tests/v3d/raytrace/bug25221 rename to tests/opengl/data/raytrace/bug25221 index 08e8673b46..9f40e51512 100644 --- a/tests/v3d/raytrace/bug25221 +++ b/tests/opengl/data/raytrace/bug25221 @@ -1,9 +1,8 @@ puts "========" -puts "OCC25221" +puts "OCC25221: Visualization - Depth test errors in ray-tracing scene containing face outlines" puts "========" -########################################## -## Visualization - Depth test errors in ray-tracing scene containing face outlines -########################################## + +pload MODELING VISUALIZATION # custom shapes set aShape [locate_data_file occ/Bottom.brep] diff --git a/tests/v3d/raytrace/bug25833 b/tests/opengl/data/raytrace/bug25833 old mode 100755 new mode 100644 similarity index 75% rename from tests/v3d/raytrace/bug25833 rename to tests/opengl/data/raytrace/bug25833 index 46eafc85be..ef687e0251 --- a/tests/v3d/raytrace/bug25833 +++ b/tests/opengl/data/raytrace/bug25833 @@ -1,17 +1,16 @@ puts "========" -puts "OCC25833" +puts "OCC25833: Visualization, Ray Tracing - fix problems with the backside of triangles" puts "========" puts "" -########################################## -## Visualization, Ray Tracing - fix problems with the backside of triangles -########################################## + +pload MODELING VISUALIZATION box b1 100 100 100 explode b1 Fa box b2 10 10 -20 10 10 10 -vsetdispmode 1 -vdisplay b1_5 b1_6 b2 +vinit View1 +vdisplay -dispMode 1 b1_5 b1_6 b2 vsetmaterial b1_5 steel vsetmaterial b1_6 steel vfit @@ -19,7 +18,7 @@ vfit # Problem 1: b1_5 (grey) becomes semi-transparent after the next line, # compare it with b1_6 visible from the frontside vrenderparams -rayTrace -vdump ${imagedir}/${test_image}_1.png +vdump ${imagedir}/${casename}_1.png checkcolor 100 300 0.37647059559822083 0.3803921639919281 0.40392157435417175 if { ${stat} != 1 } { puts "Error : bad color (case 1)" @@ -27,7 +26,7 @@ if { ${stat} != 1 } { # Problem 2: The small box shows through b1_5 vrenderparams -reflections -vdump ${imagedir}/${test_image}_2.png +vdump ${imagedir}/${casename}_2.png checkcolor 190 250 0.37647059559822083 0.3803921639919281 0.40392157435417175 if { ${stat} != 1 } { puts "Error : bad color (case 2)" @@ -35,8 +34,8 @@ if { ${stat} != 1 } { ttranslate b2 30 30 30 # Problem 3: The small box is not reflected from the backface of b1_5 -vdisplay b2 -vdump ${imagedir}/${test_image}_3.png +vdisplay -dispMode 1 b2 +vdump ${imagedir}/${casename}_3.png checkcolor 190 260 0.79607844352722168 0.60784316062927246 0.21960784494876862 if { ${stat} != 1 } { puts "Error : bad color (case 3)" diff --git a/tests/v3d/raytrace/bug26070 b/tests/opengl/data/raytrace/bug26070 old mode 100755 new mode 100644 similarity index 82% rename from tests/v3d/raytrace/bug26070 rename to tests/opengl/data/raytrace/bug26070 index 672def8d62..54633dec0d --- a/tests/v3d/raytrace/bug26070 +++ b/tests/opengl/data/raytrace/bug26070 @@ -1,10 +1,9 @@ puts "============" -puts "OCC26070" +puts "OCC26070: Ray tracing with reflections is poor on rotated presentation" puts "============" puts "" -######################################################################### -# Ray tracing with reflections is poor on rotated presentation -######################################################################### + +pload MODELING VISUALIZATION #source samples/tcl/cad.tc # make base @@ -57,9 +56,8 @@ pcylinder c2 p2 6 15 bcommon res b9 c2 # show result -#donly res trotate res 0 0 0 0 0 1 90 -#vinit +vinit View1 vdisplay res vsetdispmode 1 #vaspects res -setFaceBoundaryDraw 1 -setFaceBoundaryColor WHITE @@ -68,3 +66,4 @@ vfit vrenderparams -rayTrace -reflections vlocation res -rotate 0 0 0 0 0 1 180 vfit +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug26404 b/tests/opengl/data/raytrace/bug26404 similarity index 64% rename from tests/bugs/vis/bug26404 rename to tests/opengl/data/raytrace/bug26404 index e88575a225..a9bd52bc59 100644 --- a/tests/bugs/vis/bug26404 +++ b/tests/opengl/data/raytrace/bug26404 @@ -1,13 +1,16 @@ puts "========" -puts "OCC26404" +puts "OCC26404: Visualization, Ray Tracing - use solid background color when gradient color is disabled" puts "========" puts "" -########################################################################################### -# Visualization, Ray Tracing - use solid background color when gradient color is disabled -########################################################################################### +pload MODELING VISUALIZATION box b 1 2 3 vinit View1 +if { [string match "OpenGL ES 2.0*" [vglinfo VERSION]] || [string match "OpenGL ES 3.0*" [vglinfo VERSION]] } { + puts "Skipping test case: OpenGL ES 3.2+ is required" + return +} + vclear vaxo vsetdispmode 1 diff --git a/tests/v3d/raytrace/bug26617 b/tests/opengl/data/raytrace/bug26617 similarity index 68% rename from tests/v3d/raytrace/bug26617 rename to tests/opengl/data/raytrace/bug26617 index c13b898217..e27a03788f 100644 --- a/tests/v3d/raytrace/bug26617 +++ b/tests/opengl/data/raytrace/bug26617 @@ -1,11 +1,9 @@ puts "============" -puts "CR26617" +puts "CR26617: Visualization, Ray Tracing - adopt progressive rendering Path Tracing for rendering stereoscopic pair" puts "============" puts "" -########################################################################################## -# Visualization, Ray Tracing - adopt progressive rendering Path Tracing for rendering stereoscopic pair -########################################################################################## +pload MODELING VISUALIZATION # custom shapes set aShape1 [locate_data_file occ/Top.brep] @@ -36,3 +34,5 @@ vstereo on vstereo -mode anaglyph vcamera -iod 0.1 vfit +vfps 200 +vdump ${imagedir}/${casename}.png -stereo blend diff --git a/tests/bugs/vis/bug26676 b/tests/opengl/data/raytrace/bug26676 similarity index 54% rename from tests/bugs/vis/bug26676 rename to tests/opengl/data/raytrace/bug26676 index 50a8e01442..e686140501 100644 --- a/tests/bugs/vis/bug26676 +++ b/tests/opengl/data/raytrace/bug26676 @@ -1,12 +1,9 @@ puts "============" -puts "CR26676" +puts "0026676: Visualization, Ray Tracing - correct rendering if stereo pair" puts "============" puts "" -########################################################################################## -# 0026676: Visualization, Ray Tracing - correct rendering if stereo pair -########################################################################################## - +pload MODELING VISUALIZATION vinit View1 w=400 h=400 vclear diff --git a/tests/opengl/data/raytrace/bug26975 b/tests/opengl/data/raytrace/bug26975 new file mode 100644 index 0000000000..f8337db1f8 --- /dev/null +++ b/tests/opengl/data/raytrace/bug26975 @@ -0,0 +1,19 @@ +puts "============" +puts "CR26975: Visualization, TKOpenGl - handle triangle strips correctly within Ray-Tracing core" +puts "============" +puts "" + +pload MODELING VISUALIZATION +vclear +vinit View1 +vraytrace 0 +vdrawparray s trianglestrips v 0 0 0 n 0 0 1 v 0 2 0 n 0 0 1 v 2 0 0 n 0 0 1 v 2 2 0 n 0 0 1 +vfit +vdump $imagedir/${casename}_rt_off.png + +vraytrace 1 +vdump $imagedir/${casename}_rt_on.png + +set color [vreadpixel 250 250 rgb name] +puts $color +if { $color == "BLACK" } { puts "ERROR: CR26975 is reproduced. Triangle strips incorrect within Ray-Tracing core." } diff --git a/tests/bugs/vis/bug27083 b/tests/opengl/data/raytrace/bug27083 similarity index 99% rename from tests/bugs/vis/bug27083 rename to tests/opengl/data/raytrace/bug27083 index 1faa5f9c93..de0b56b3b1 100644 --- a/tests/bugs/vis/bug27083 +++ b/tests/opengl/data/raytrace/bug27083 @@ -4,12 +4,9 @@ puts "========" puts "" pload VISUALIZATION MODELING - box b 1 1 1 - vclear vinit View1 - vdisplay -noupdate -dispMode 1 b vfit vaspects b -setFaceBoundaryDraw 1 -setFaceBoundaryColor RED -setFaceBoundaryWidth 3 diff --git a/tests/v3d/raytrace/bug27130 b/tests/opengl/data/raytrace/bug27130 similarity index 99% rename from tests/v3d/raytrace/bug27130 rename to tests/opengl/data/raytrace/bug27130 index 56fd98dcbe..4af2b2e0d4 100644 --- a/tests/v3d/raytrace/bug27130 +++ b/tests/opengl/data/raytrace/bug27130 @@ -4,10 +4,8 @@ puts "============" puts "" pload VISUALIZATION MODELING - vinit View1 vsetdispmode 1 - restore [locate_data_file face1.brep] f vdisplay f box b1 25 25 25 diff --git a/tests/bugs/vis/bug27337 b/tests/opengl/data/raytrace/bug27337 similarity index 80% rename from tests/bugs/vis/bug27337 rename to tests/opengl/data/raytrace/bug27337 index 59ecaa278c..e62301a06b 100644 --- a/tests/bugs/vis/bug27337 +++ b/tests/opengl/data/raytrace/bug27337 @@ -3,11 +3,6 @@ puts "0027337: \[Regression vs. 6.9.1\] Selection highlight is poor in ray trace puts "================" pload MODELING VISUALIZATION - -# Ray-Tracing doesn't work with Compatible Profile on macOS -pload OPENGL -if { $::tcl_platform(os) == "Darwin" } { vcaps -core } - box b 10 10 10 vdisplay b vsetdispmode 1 diff --git a/tests/bugs/vis/bug29395 b/tests/opengl/data/raytrace/bug29395 similarity index 100% rename from tests/bugs/vis/bug29395 rename to tests/opengl/data/raytrace/bug29395 diff --git a/tests/v3d/raytrace/bug31279 b/tests/opengl/data/raytrace/bug31279 similarity index 92% rename from tests/v3d/raytrace/bug31279 rename to tests/opengl/data/raytrace/bug31279 index 8bf7a934e5..3bd303210d 100644 --- a/tests/v3d/raytrace/bug31279 +++ b/tests/opengl/data/raytrace/bug31279 @@ -15,4 +15,4 @@ vcamera -persp vdump $imagedir/${casename}_persp.png vcamera -ortho -vdump $imagedir/${casename}_ortho.png \ No newline at end of file +vdump $imagedir/${casename}_ortho.png diff --git a/tests/v3d/raytrace/connected b/tests/opengl/data/raytrace/connected similarity index 89% rename from tests/v3d/raytrace/connected rename to tests/opengl/data/raytrace/connected index aac69bef39..f15f29bc9d 100644 --- a/tests/v3d/raytrace/connected +++ b/tests/opengl/data/raytrace/connected @@ -2,6 +2,8 @@ puts "========" puts "Ray Tracing - check rendering of multi-connected structures" puts "========" +pload MODELING VISUALIZATION + # create boxes box b1 0 0 0 1 2 3 box b2 3 0 0 3 2 1 @@ -28,3 +30,4 @@ vdump $::imagedir/${::casename}_rt1.png vclear vconnect b1c -3 0 0 b1 b2 +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/raytrace/dof_mono b/tests/opengl/data/raytrace/dof_mono similarity index 83% rename from tests/v3d/raytrace/dof_mono rename to tests/opengl/data/raytrace/dof_mono index f06431cfc2..b5ea196a06 100644 --- a/tests/v3d/raytrace/dof_mono +++ b/tests/opengl/data/raytrace/dof_mono @@ -6,3 +6,5 @@ source $env(CSF_OCCTSamplesPath)/tcl/pathtrace_cube.tcl vrenderparams -ray -gi -rayDepth 10 -iss vrenderparams -aperture 0.1 -focal 2.0 +vfps 200 +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/raytrace/dof_stereo b/tests/opengl/data/raytrace/dof_stereo similarity index 83% rename from tests/v3d/raytrace/dof_stereo rename to tests/opengl/data/raytrace/dof_stereo index 61e1c289cf..9e8d46260b 100644 --- a/tests/v3d/raytrace/dof_stereo +++ b/tests/opengl/data/raytrace/dof_stereo @@ -12,3 +12,5 @@ vstereo on vstereo -mode anaglyph vcamera -iod 0.1 vfit +vfps 200 +vdump ${imagedir}/${casename}.png -stereo blend diff --git a/tests/v3d/raytrace/helmet b/tests/opengl/data/raytrace/helmet similarity index 100% rename from tests/v3d/raytrace/helmet rename to tests/opengl/data/raytrace/helmet diff --git a/tests/opengl/data/raytrace/msaa b/tests/opengl/data/raytrace/msaa new file mode 100644 index 0000000000..a75b753998 --- /dev/null +++ b/tests/opengl/data/raytrace/msaa @@ -0,0 +1,27 @@ +puts "========" +puts "Multisampling FBOs" +puts "========" + +pload MODELING VISUALIZATION +box b 2 3 1 +vclear +vclose ALL +vinit View1 w=512 h=512 +vraytrace 1 +vbackground -gradient B4C8FF B4B4B4 -gradientMode VERTICAL +vsetdispmode 0 +vdisplay -dispMode 1 b +vfit +vrotate 0.5 0 0 +vzbufftrihedron + +vrenderparams -msaa 8 +vdump $::imagedir/${::casename}_512x512_msaa8.png +vdump $::imagedir/${::casename}_1920x1080_msaa8.png -width 1920 -height 1080 +vdump $::imagedir/${::casename}_2560x1440_msaa8.png -width 2560 -height 1440 + +# check dump with stereo +vstereo anaglyph +vdump $::imagedir/${::casename}_512x512_msaa8stereo.png -stereo blend +vdump $::imagedir/${::casename}_1920x1080_msaa8stereo.png -width 1920 -height 1080 -stereo blend +vdump $::imagedir/${::casename}_2560x1440_msaa8stereo.png -width 2560 -height 1440 -stereo blend diff --git a/tests/v3d/raytrace/normal_map b/tests/opengl/data/raytrace/normal_map similarity index 100% rename from tests/v3d/raytrace/normal_map rename to tests/opengl/data/raytrace/normal_map diff --git a/tests/v3d/raytrace/pbr_spheres b/tests/opengl/data/raytrace/pbr_spheres similarity index 97% rename from tests/v3d/raytrace/pbr_spheres rename to tests/opengl/data/raytrace/pbr_spheres index 8fc7c621fe..e2fbf0f72a 100644 --- a/tests/v3d/raytrace/pbr_spheres +++ b/tests/opengl/data/raytrace/pbr_spheres @@ -5,6 +5,7 @@ puts "========" cpulimit 600 +pload MODELING VISUALIZATION vclear vclose ALL source $env(CSF_OCCTSamplesPath)/tcl/vis_pbr_spheres.tcl diff --git a/tests/v3d/raytrace/plastic b/tests/opengl/data/raytrace/plastic similarity index 92% rename from tests/v3d/raytrace/plastic rename to tests/opengl/data/raytrace/plastic index e8cb157cae..36063b75b5 100644 --- a/tests/v3d/raytrace/plastic +++ b/tests/opengl/data/raytrace/plastic @@ -2,6 +2,8 @@ puts "========" puts "Ray Tracing - check lighting on Plastic material" puts "========" +pload MODELING VISUALIZATION + # create box box b 1 2 3 @@ -31,3 +33,4 @@ set aColorR [vreadpixel 250 250 rgb name] #if { "$aColorL" != "GREEN3" || "$aColorR" != "GREEN4" } { # puts "Error: wrong color (Ray Tracing)!" #} +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/raytrace/refraction b/tests/opengl/data/raytrace/refraction similarity index 95% rename from tests/v3d/raytrace/refraction rename to tests/opengl/data/raytrace/refraction index 8a4c7ace1c..952c1320eb 100644 --- a/tests/v3d/raytrace/refraction +++ b/tests/opengl/data/raytrace/refraction @@ -2,6 +2,7 @@ puts "========" puts "Ray Tracing - check refraction" puts "========" +pload MODELING VISUALIZATION vinit View1 vclear vrenderparams -rasterization @@ -73,3 +74,4 @@ vfit vlight -change 0 -dir -0.577 -0.577 -0.577 vlight add directional vrenderparams -raytrace -raydepth 5 -shadows off -reflections -fsaa +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/raytrace/sample_ball b/tests/opengl/data/raytrace/sample_ball similarity index 100% rename from tests/v3d/raytrace/sample_ball rename to tests/opengl/data/raytrace/sample_ball diff --git a/tests/v3d/raytrace/sample_ball_alpha b/tests/opengl/data/raytrace/sample_ball_alpha similarity index 100% rename from tests/v3d/raytrace/sample_ball_alpha rename to tests/opengl/data/raytrace/sample_ball_alpha diff --git a/tests/v3d/raytrace/sample_ball_iss b/tests/opengl/data/raytrace/sample_ball_iss similarity index 100% rename from tests/v3d/raytrace/sample_ball_iss rename to tests/opengl/data/raytrace/sample_ball_iss diff --git a/tests/v3d/raytrace/sample_ball_wood b/tests/opengl/data/raytrace/sample_ball_wood similarity index 100% rename from tests/v3d/raytrace/sample_ball_wood rename to tests/opengl/data/raytrace/sample_ball_wood diff --git a/tests/v3d/raytrace/sample_cube b/tests/opengl/data/raytrace/sample_cube similarity index 78% rename from tests/v3d/raytrace/sample_cube rename to tests/opengl/data/raytrace/sample_cube index 33109d8fea..44c965afa9 100644 --- a/tests/v3d/raytrace/sample_cube +++ b/tests/opengl/data/raytrace/sample_cube @@ -4,3 +4,5 @@ puts "============" puts "" source $env(CSF_OCCTSamplesPath)/tcl/pathtrace_cube.tcl +vfps 200 +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/raytrace/sample_cube_clamp b/tests/opengl/data/raytrace/sample_cube_clamp similarity index 92% rename from tests/v3d/raytrace/sample_cube_clamp rename to tests/opengl/data/raytrace/sample_cube_clamp index 7f603d00a9..338c7358b0 100644 --- a/tests/v3d/raytrace/sample_cube_clamp +++ b/tests/opengl/data/raytrace/sample_cube_clamp @@ -19,4 +19,4 @@ vdump $imagedir/${casename}_10.png vrenderparams -maxrad 100.0 vfps 100 -vdump $imagedir/${casename}_100.png \ No newline at end of file +vdump $imagedir/${casename}_100.png diff --git a/tests/v3d/raytrace/sample_cube_twosided b/tests/opengl/data/raytrace/sample_cube_twosided similarity index 100% rename from tests/v3d/raytrace/sample_cube_twosided rename to tests/opengl/data/raytrace/sample_cube_twosided diff --git a/tests/v3d/raytrace/sample_materials b/tests/opengl/data/raytrace/sample_materials similarity index 100% rename from tests/v3d/raytrace/sample_materials rename to tests/opengl/data/raytrace/sample_materials diff --git a/tests/v3d/raytrace/textures b/tests/opengl/data/raytrace/textures similarity index 95% rename from tests/v3d/raytrace/textures rename to tests/opengl/data/raytrace/textures index 0cff9b38ad..f35bbd2287 100644 --- a/tests/v3d/raytrace/textures +++ b/tests/opengl/data/raytrace/textures @@ -2,6 +2,7 @@ puts "========" puts "Ray Tracing - check refraction" puts "========" +pload MODELING VISUALIZATION vinit View1 vclear vrenderparams -rasterization @@ -76,3 +77,4 @@ vlight -add directional -dir -0.577 -0.577 -0.577 -head 1 vlight -add directional -dir 0.577 0.577 0.577 -head 0 vrenderparams -raytrace -raydepth 3 -shadows on -reflections -fsaa +vdump ${imagedir}/${casename}.png diff --git a/tests/opengl/data/raytrace/tiles b/tests/opengl/data/raytrace/tiles new file mode 100644 index 0000000000..42009a656e --- /dev/null +++ b/tests/opengl/data/raytrace/tiles @@ -0,0 +1,83 @@ +puts "========" +puts "Tiled image dump" +puts "========" + +set aFontFile "" +catch { set aFontFile [locate_data_file DejaVuSans.ttf] } + +pload MODELING VISUALIZATION +box b 2 3 1 +box b2 50 20 30 + +set aLabelFont "Arial" +if { "$aFontFile" != "" } { + vfont add "$aFontFile" SansFont + set aLabelFont "SansFont" +} + +vclear +vclose ALL +vinit View1 +vraytrace 1 +vbackground -gradient B4C8FF B4B4B4 -gradientMode VERTICAL +vsetdispmode 0 +vdisplay -dispMode 1 b +vfit +vrotate 0.5 0 0 +vzbufftrihedron + +catch { vzlayer del 1 } +set aLayerId [vzlayer add] +vzlayer $aLayerId -enable depthClear -disable rayTracing + +vtrihedron trh +vdisplay -noupdate trh -layer $aLayerId -trihedron topRight 100 100 + +text2brep tcc "Center" -font $aLabelFont -height 30 -pos -40 0 0 +vdisplay -noupdate tcc -2d center -layer $aLayerId -dispMode 1 +polyline lcc -50 -50 0 -50 50 0 50 50 0 50 0 0 0 -50 0 -50 -50 0 +vdisplay -noupdate lcc -2d center -layer $aLayerId +vsetwidth -noupdate lcc 2 + +text2brep tbl "Bottom-Left" -font $aLabelFont -height 30 -pos 0 3 5 +vdisplay -noupdate tbl -2d bottomLeft -layer $aLayerId -dispMode 1 +polyline lbl 0 0 0 0 100 0 100 100 0 100 50 0 50 0 0 0 0 0 +vdisplay -noupdate lbl -2d bottomLeft -layer $aLayerId +vsetwidth -noupdate lbl 2 + +text2brep ttl "Top-Left" -font $aLabelFont -height 30 -pos 0 -30 0 +vdisplay -noupdate ttl -2d topLeft -layer $aLayerId -dispMode 1 +polyline ltl 0 -100 0 0 0 0 100 0 0 100 -50 0 50 -100 0 0 -100 0 +vdisplay -noupdate ltl -2d topLeft -layer $aLayerId +vsetwidth -noupdate ltl 2 + +text2brep ttr "Top-Right" -font $aLabelFont -height 30 -pos -130 -30 0 +vdisplay -noupdate ttr -2d topRight -layer $aLayerId -dispMode 1 +polyline ltr -100 -100 0 -100 0 0 0 0 0 0 -50 0 -50 -100 0 -100 -100 0 +vdisplay -noupdate ltr -2d topRight -layer $aLayerId +vsetwidth -noupdate ltr 2 + +text2brep tbr "Bottom-Right" -font $aLabelFont -height 30 -pos -180 3 0 +vdisplay -noupdate tbr -2d bottomRight -layer $aLayerId -dispMode 1 +polyline lbr -100 0 0 -100 100 0 0 100 0 0 50 0 -50 0 0 -100 0 0 +vdisplay -noupdate lbr -2d bottomRight -layer $aLayerId +vsetwidth -noupdate lbr 2 + +vdrawtext t2 "Label" -pos 1 0 1 -font $aLabelFont +vdisplay b2 -trsfPers zoom -trsfPersPos 1 0 1 + +vdump $::imagedir/${::casename}_409x409_rttile0.png +vdump $::imagedir/${::casename}_409x409_rttile128.png +vdump $::imagedir/${::casename}_409x409_rttile1024.png +vdump $::imagedir/${::casename}_1920x1080_rttile0.png -width 1920 -height 1920 +vdump $::imagedir/${::casename}_1920x1080_rttile128.png -width 1920 -height 1920 -tileSize 128 +vdump $::imagedir/${::casename}_1920x1080_rttile1024.png -width 1920 -height 1920 -tileSize 1024 + +# check dump with stereo +vstereo anaglyph +vdump $::imagedir/${::casename}_409x409_stereotile0.png -stereo blend +vdump $::imagedir/${::casename}_409x409_stereotile128.png -stereo blend -tileSize 128 +vdump $::imagedir/${::casename}_409x409_stereotile1024.png -stereo blend -tileSize 1024 +vdump $::imagedir/${::casename}_1920x1080_stereotile0.png -width 1920 -height 1920 -stereo blend +vdump $::imagedir/${::casename}_1920x1080_stereotile128.png -width 1920 -height 1920 -stereo blend -tileSize 128 +vdump $::imagedir/${::casename}_1920x1080_stereotile1024.png -width 1920 -height 1920 -stereo blend -tileSize 1024 diff --git a/tests/v3d/raytrace/tone_mapping b/tests/opengl/data/raytrace/tone_mapping similarity index 84% rename from tests/v3d/raytrace/tone_mapping rename to tests/opengl/data/raytrace/tone_mapping index 91f31b841e..90bd049577 100644 --- a/tests/v3d/raytrace/tone_mapping +++ b/tests/opengl/data/raytrace/tone_mapping @@ -9,3 +9,6 @@ vrenderparams -ray -gi -rayDepth 10 -iss vrenderparams -tonemapping filmic vrenderparams -exposure -1.0 vrenderparams -whitepoint 7.0 +vfit +vfps 200 +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/glsl/phong_box b/tests/opengl/data/shaderprog/phong_box similarity index 93% rename from tests/v3d/glsl/phong_box rename to tests/opengl/data/shaderprog/phong_box index 583c3b60d1..330009333e 100644 --- a/tests/v3d/glsl/phong_box +++ b/tests/opengl/data/shaderprog/phong_box @@ -2,6 +2,8 @@ puts "========" puts "Per-pixel lighting using GLSL program (Phong shading)" puts "========" +pload MODELING VISUALIZATION + # create box box b 1 2 3 diff --git a/tests/v3d/glsl/phong_couple b/tests/opengl/data/shaderprog/phong_couple similarity index 94% rename from tests/v3d/glsl/phong_couple rename to tests/opengl/data/shaderprog/phong_couple index f5bbf7cd4e..7f623a91f7 100644 --- a/tests/v3d/glsl/phong_couple +++ b/tests/opengl/data/shaderprog/phong_couple @@ -2,6 +2,8 @@ puts "========" puts "Per-pixel lighting using GLSL program (Phong shading)" puts "========" +pload MODELING VISUALIZATION + # import model restore [locate_data_file occ/fuse.brep] f tclean f diff --git a/tests/v3d/glsl/phong_fuse b/tests/opengl/data/shaderprog/phong_fuse similarity index 94% rename from tests/v3d/glsl/phong_fuse rename to tests/opengl/data/shaderprog/phong_fuse index a2f350f42f..01267ab430 100644 --- a/tests/v3d/glsl/phong_fuse +++ b/tests/opengl/data/shaderprog/phong_fuse @@ -2,6 +2,8 @@ puts "========" puts "Per-pixel lighting using GLSL program (Phong shading)" puts "========" +pload MODELING VISUALIZATION + # import model restore [locate_data_file occ/fuse.brep] f tclean f diff --git a/tests/v3d/glsl/phong_fuse2 b/tests/opengl/data/shaderprog/phong_fuse2 similarity index 96% rename from tests/v3d/glsl/phong_fuse2 rename to tests/opengl/data/shaderprog/phong_fuse2 index e81fe63ea7..98cf4f8c86 100644 --- a/tests/v3d/glsl/phong_fuse2 +++ b/tests/opengl/data/shaderprog/phong_fuse2 @@ -2,6 +2,8 @@ puts "========" puts "Per-pixel lighting using GLSL program (Phong shading)" puts "========" +pload MODELING VISUALIZATION + # import model restore [locate_data_file occ/fuse.brep] f tclean f diff --git a/tests/v3d/glsl/phong_plastic b/tests/opengl/data/shaderprog/phong_plastic similarity index 92% rename from tests/v3d/glsl/phong_plastic rename to tests/opengl/data/shaderprog/phong_plastic index c79d5f717f..874761aa55 100644 --- a/tests/v3d/glsl/phong_plastic +++ b/tests/opengl/data/shaderprog/phong_plastic @@ -2,6 +2,8 @@ puts "========" puts "Per-pixel lighting using GLSL program (Phong shading), check plastic material" puts "========" +pload MODELING VISUALIZATION + # create box box b 1 2 3 @@ -27,3 +29,4 @@ vshaderprog b phong set aColorL [vreadpixel 150 250 rgb name] set aColorR [vreadpixel 250 250 rgb name] if { "$aColorL" != "GREEN3" || "$aColorR" != "GREEN4" } { puts "Error: wrong color (Phong shader)!" } +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/glsl/phong_sides b/tests/opengl/data/shaderprog/phong_sides similarity index 65% rename from tests/v3d/glsl/phong_sides rename to tests/opengl/data/shaderprog/phong_sides index 3aa6794504..bacc5a12d2 100644 --- a/tests/v3d/glsl/phong_sides +++ b/tests/opengl/data/shaderprog/phong_sides @@ -2,6 +2,8 @@ puts "========" puts "Per-pixel lighting using GLSL program (Phong shading), check lighting of back faces" puts "========" +pload MODELING VISUALIZATION + # create box box b 1 2 3 explode b F @@ -20,19 +22,13 @@ vrotate 0.2 0.0 0.0 vdump $::imagedir/${::casename}_OFF.png set aColorB [vreadpixel 150 150 rgb name] set aColorF [vreadpixel 250 250 rgb name] -if { "$aColorB" != "$aColorF"} { - puts "Error: front/back colors are different!" -} +if { "$aColorB" != "$aColorF"} { puts "Error: front/back colors are different!" } set aColorFixed $aColorF # activate phong shader vshaderprog phong set aColorB [vreadpixel 150 150 rgb name] set aColorF [vreadpixel 250 250 rgb name] -if { "$aColorB" != "$aColorF"} { - puts "Error: front/back colors are different!" -} - -if { "$aColorF" != "$aColorFixed"} { - puts "Error: colors are different!" -} +if { "$aColorB" != "$aColorF"} { puts "Error: front/back colors are different!" } +if { "$aColorF" != "$aColorFixed"} { puts "Error: colors are different!" } +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/glsl/phong_views b/tests/opengl/data/shaderprog/phong_views similarity index 93% rename from tests/v3d/glsl/phong_views rename to tests/opengl/data/shaderprog/phong_views index 3b65fc9d0d..2fa20171c9 100644 --- a/tests/v3d/glsl/phong_views +++ b/tests/opengl/data/shaderprog/phong_views @@ -2,6 +2,8 @@ puts "========" puts "Per-pixel lighting using GLSL program (Phong shading)" puts "========" +pload MODELING VISUALIZATION + # create box box b 1 2 3 diff --git a/tests/v3d/glsl/texture_multi1 b/tests/opengl/data/shaderprog/texture_multi1 similarity index 100% rename from tests/v3d/glsl/texture_multi1 rename to tests/opengl/data/shaderprog/texture_multi1 diff --git a/tests/bugs/vis/bug30102 b/tests/opengl/data/shading/bug30102 similarity index 100% rename from tests/bugs/vis/bug30102 rename to tests/opengl/data/shading/bug30102 diff --git a/tests/v3d/glsl/distinguish_off b/tests/opengl/data/shading/distinguish_off similarity index 62% rename from tests/v3d/glsl/distinguish_off rename to tests/opengl/data/shading/distinguish_off index af105dc0bb..69dfb6d8d6 100644 --- a/tests/v3d/glsl/distinguish_off +++ b/tests/opengl/data/shading/distinguish_off @@ -24,11 +24,14 @@ vclipplane set pln view Driver1/Viewer1/View1 vclipplane change pln equation -1 0 0 5 # FFP on -vcaps -ffp 1 -set aColorFfp [vreadpixel 200 200 rgb name] -if { "$aColorFfp" != "RED" } { puts "Error: RED color is expected at the back side (FFP)" } +if { [vdriver -default] == "TKOpenGl" } { + vcaps -ffp 1 + set aColorFfp [vreadpixel 200 200 rgb name] + if { "$aColorFfp" != "RED" } { puts "Error: RED color is expected at the back side (FFP)" } +} # GLSL on vcaps -ffp 0 set aColorGlsl [vreadpixel 200 200 rgb name] -if { "$aColorGlsl" != "FIREBRICK" } { puts "Error: FIREBRICK color is expected at the back side (GLSL)" } +if { "$aColorGlsl" != "FIREBRICK" && "$aColorGlsl" != "RED" } { puts "Error: FIREBRICK color is expected at the back side (GLSL)" } +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/glsl/flat_fuse1 b/tests/opengl/data/shading/flat_fuse1 similarity index 100% rename from tests/v3d/glsl/flat_fuse1 rename to tests/opengl/data/shading/flat_fuse1 diff --git a/tests/v3d/glsl/gouraud_dir1 b/tests/opengl/data/shading/gouraud_dir1 similarity index 86% rename from tests/v3d/glsl/gouraud_dir1 rename to tests/opengl/data/shading/gouraud_dir1 index b8c7e0c17e..1c30fcac65 100644 --- a/tests/v3d/glsl/gouraud_dir1 +++ b/tests/opengl/data/shading/gouraud_dir1 @@ -3,7 +3,7 @@ puts "Per-vertex lighting using built-in GLSL program, one directional light sou puts "Visual comparison with the reference snapshot should be performed for this test case." puts "========" -# setup viewer +pload MODELING VISUALIZATION vclear vclose ALL vinit View1 @@ -17,3 +17,4 @@ vdisplay f -dispmode 1 vfit vrotate -0.5 0.0 0.0 vfit +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/glsl/gouraud_dir2 b/tests/opengl/data/shading/gouraud_dir2 similarity index 91% rename from tests/v3d/glsl/gouraud_dir2 rename to tests/opengl/data/shading/gouraud_dir2 index dcf0598dda..43b99ec858 100644 --- a/tests/v3d/glsl/gouraud_dir2 +++ b/tests/opengl/data/shading/gouraud_dir2 @@ -3,7 +3,7 @@ puts "Per-vertex lighting using built-in GLSL program, two directional light sou puts "Visual comparison with the reference snapshot should be performed for this test case." puts "========" -# setup viewervclear +pload MODELING VISUALIZATION vclear vclose ALL vinit View1 @@ -25,3 +25,4 @@ vdisplay f -dispmode 1 vfit vrotate -0.5 0.0 0.0 vfit +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/glsl/gouraud_pos1 b/tests/opengl/data/shading/gouraud_pos1 similarity index 94% rename from tests/v3d/glsl/gouraud_pos1 rename to tests/opengl/data/shading/gouraud_pos1 index d83e4d1159..be6d8443be 100644 --- a/tests/v3d/glsl/gouraud_pos1 +++ b/tests/opengl/data/shading/gouraud_pos1 @@ -3,6 +3,7 @@ puts "Per-vertex lighting using built-in GLSL program, one positional light sour puts "Visual comparison with the reference snapshot should be performed for this test case." puts "========" +pload MODELING VISUALIZATION vclear vclose ALL vinit View1 @@ -41,3 +42,4 @@ set aColor4 [vreadpixel 205 306 rgb name] if { "$aColor3" != "RED4" || "$aColor4" != "RED4" } { puts "Error: expected color far from the light spot is RED4" } +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/glsl/gouraud_spot1 b/tests/opengl/data/shading/gouraud_spot1 similarity index 94% rename from tests/v3d/glsl/gouraud_spot1 rename to tests/opengl/data/shading/gouraud_spot1 index 05b0533746..a4cffc60b8 100644 --- a/tests/v3d/glsl/gouraud_spot1 +++ b/tests/opengl/data/shading/gouraud_spot1 @@ -3,6 +3,7 @@ puts "Per-vertex lighting using built-in GLSL program, one spot light source." puts "Visual comparison with the reference snapshot should be performed for this test case." puts "========" +pload MODELING VISUALIZATION vclear vclose ALL vinit View1 @@ -41,3 +42,4 @@ set aColor4 [vreadpixel 205 280 rgb name] if { "$aColor3" != "RED" || "$aColor4" != "RED4" } { puts "Error: expected color mid from the light spot is RED4" } +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/glsl/pbr_attenuation b/tests/opengl/data/shading/pbr_attenuation similarity index 100% rename from tests/v3d/glsl/pbr_attenuation rename to tests/opengl/data/shading/pbr_attenuation diff --git a/tests/v3d/glsl/pbr_spheres b/tests/opengl/data/shading/pbr_spheres similarity index 96% rename from tests/v3d/glsl/pbr_spheres rename to tests/opengl/data/shading/pbr_spheres index 7f8454d81d..e3f3628304 100644 --- a/tests/v3d/glsl/pbr_spheres +++ b/tests/opengl/data/shading/pbr_spheres @@ -3,6 +3,8 @@ puts "0030700: Visualization, TKOpenGl - support PBR Metallic-Roughness shading puts "Spheres grid with different roughness values" puts "========" +pload MODELING VISUALIZATION + # PBR doesn't work with Compatible Profile on macOS if { $::tcl_platform(os) == "Darwin" } { vcaps -core } diff --git a/tests/v3d/glsl/phong_dir1 b/tests/opengl/data/shading/phong_dir1 similarity index 86% rename from tests/v3d/glsl/phong_dir1 rename to tests/opengl/data/shading/phong_dir1 index e090d83637..f66f64f7e3 100644 --- a/tests/v3d/glsl/phong_dir1 +++ b/tests/opengl/data/shading/phong_dir1 @@ -3,6 +3,8 @@ puts "Per-fragment lighting using built-in GLSL program, one directional light s puts "Visual comparison with the reference snapshot should be performed for this test case." puts "========" +pload MODELING VISUALIZATION + # setup viewer vclear vclose ALL @@ -17,3 +19,4 @@ vdisplay f -dispmode 1 vfit vrotate -0.5 0.0 0.0 vfit +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/glsl/phong_dir2 b/tests/opengl/data/shading/phong_dir2 similarity index 91% rename from tests/v3d/glsl/phong_dir2 rename to tests/opengl/data/shading/phong_dir2 index 77f346f087..3a3b024d48 100644 --- a/tests/v3d/glsl/phong_dir2 +++ b/tests/opengl/data/shading/phong_dir2 @@ -3,6 +3,8 @@ puts "Per-fragment lighting using built-in GLSL program, two directional light s puts "Visual comparison with the reference snapshot should be performed for this test case." puts "========" +pload MODELING VISUALIZATION + # setup viewer vclear vclose ALL @@ -25,3 +27,4 @@ vdisplay f -dispmode 1 vfit vrotate -0.5 0.0 0.0 vfit +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/glsl/phong_pos1 b/tests/opengl/data/shading/phong_pos1 similarity index 86% rename from tests/v3d/glsl/phong_pos1 rename to tests/opengl/data/shading/phong_pos1 index 69f8437ccd..0b9006db03 100644 --- a/tests/v3d/glsl/phong_pos1 +++ b/tests/opengl/data/shading/phong_pos1 @@ -3,6 +3,7 @@ puts "Per-fragment lighting using built-in GLSL program, one positional light so puts "Visual comparison with the reference snapshot should be performed for this test case." puts "========" +pload MODELING VISUALIZATION vclear vclose ALL vinit View1 @@ -40,7 +41,9 @@ if { "$aColor1" != "RED" || "$aColor2" != "RED" } { set aColor3 [vreadpixel 205 132 rgb name] set aColor4 [vreadpixel 205 280 rgb name] if { "$aColor3" != "RED3" || "$aColor4" != "RED3" } { - puts "Error: expected color mid from the light spot is RED3" + if { "$aColor3" != "RED4" && "$aColor4" != "RED4" } { + puts "Error: expected color mid from the light spot is RED3" + } } set aColor5 [vreadpixel 205 100 rgb name] @@ -48,3 +51,4 @@ set aColor6 [vreadpixel 205 306 rgb name] if { "$aColor5" != "RED4" || "$aColor6" != "RED4" } { puts "Error: expected color far from the light spot is RED4" } +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/glsl/phong_pos2 b/tests/opengl/data/shading/phong_pos2 similarity index 100% rename from tests/v3d/glsl/phong_pos2 rename to tests/opengl/data/shading/phong_pos2 diff --git a/tests/v3d/glsl/phong_pos3 b/tests/opengl/data/shading/phong_pos3 similarity index 100% rename from tests/v3d/glsl/phong_pos3 rename to tests/opengl/data/shading/phong_pos3 diff --git a/tests/v3d/glsl/phong_pos4 b/tests/opengl/data/shading/phong_pos4 similarity index 96% rename from tests/v3d/glsl/phong_pos4 rename to tests/opengl/data/shading/phong_pos4 index 69a3fd6405..54592c0be2 100644 --- a/tests/v3d/glsl/phong_pos4 +++ b/tests/opengl/data/shading/phong_pos4 @@ -33,3 +33,4 @@ for { set anZIter -50 } { $anZIter <= 50 } { set anZIter [expr $anZIter + 10] } set aLightIndex [expr $aLightIndex + 1] } } +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/glsl/phong_spot1 b/tests/opengl/data/shading/phong_spot1 similarity index 86% rename from tests/v3d/glsl/phong_spot1 rename to tests/opengl/data/shading/phong_spot1 index 79e20b4997..643082d810 100644 --- a/tests/v3d/glsl/phong_spot1 +++ b/tests/opengl/data/shading/phong_spot1 @@ -3,6 +3,7 @@ puts "Per-fragment lighting using built-in GLSL program, one spot light source." puts "Visual comparison with the reference snapshot should be performed for this test case." puts "========" +pload MODELING VISUALIZATION vclear vclose ALL vinit View1 @@ -45,5 +46,8 @@ if { "$aColor3" != "RED4" || "$aColor4" != "RED4" } { set aColor5 [vreadpixel 205 100 rgb name] set aColor6 [vreadpixel 205 306 rgb name] if { "$aColor5" != "GRAY7" || "$aColor6" != "GRAY8" } { - puts "Error: expected color far from the light spot is GRAY7" + if { "$aColor5" != "GRAY2" && "$aColor6" != "GRAY2" } { + puts "Error: expected color far from the light spot is GRAY7" + } } +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/glsl/shading_models b/tests/opengl/data/shading/shading_models similarity index 98% rename from tests/v3d/glsl/shading_models rename to tests/opengl/data/shading/shading_models index e7b9350bd0..76306ae990 100644 --- a/tests/v3d/glsl/shading_models +++ b/tests/opengl/data/shading/shading_models @@ -2,6 +2,8 @@ puts "========" puts "Test various Shading Models assigned per-object" puts "========" +pload MODELING VISUALIZATION + # PBR doesn't work with Compatible Profile on macOS #if { $::tcl_platform(os) == "Darwin" } { vcaps -core } diff --git a/tests/v3d/glsl/vert_color b/tests/opengl/data/shading/vert_color similarity index 100% rename from tests/v3d/glsl/vert_color rename to tests/opengl/data/shading/vert_color diff --git a/tests/v3d/shadows/buggy b/tests/opengl/data/shadows/buggy similarity index 81% rename from tests/v3d/shadows/buggy rename to tests/opengl/data/shadows/buggy index ec23299400..e321333cb3 100644 --- a/tests/v3d/shadows/buggy +++ b/tests/opengl/data/shadows/buggy @@ -18,8 +18,10 @@ vdisplay -dispMode 1 bb vaspects bb -material STONE vlight -change 0 -head 0 -dir -1 -1 -1 -castShadows 1 -vraytrace 1 -vdump $::imagedir/${::casename}_raytrace.png +if { ![string match "OpenGL ES 2.0*" [vglinfo VERSION]] && ![string match "OpenGL ES 3.0*" [vglinfo VERSION]] } { + vraytrace 1 + vdump $::imagedir/${::casename}_raytrace.png +} vraytrace 0 vrenderparams -shadingModel phong diff --git a/tests/v3d/shadows/dir1 b/tests/opengl/data/shadows/dir1 similarity index 80% rename from tests/v3d/shadows/dir1 rename to tests/opengl/data/shadows/dir1 index 2a58e5268b..9fa3c8467b 100644 --- a/tests/v3d/shadows/dir1 +++ b/tests/opengl/data/shadows/dir1 @@ -18,8 +18,10 @@ vaspects bb -material STONE vfit vlight -change 0 -castShadows 1 -direction 1 1 -1 -head 0 -vraytrace 1 -vdump $::imagedir/${::casename}_raytrace.png +if { ![string match "OpenGL ES 2.0*" [vglinfo VERSION]] && ![string match "OpenGL ES 3.0*" [vglinfo VERSION]] } { + vraytrace 1 + vdump $::imagedir/${::casename}_raytrace.png +} vraytrace 0 vrenderparams -shadingModel phong diff --git a/tests/v3d/shadows/dir2 b/tests/opengl/data/shadows/dir2 similarity index 83% rename from tests/v3d/shadows/dir2 rename to tests/opengl/data/shadows/dir2 index ceefcbb88e..381de31dc0 100644 --- a/tests/v3d/shadows/dir2 +++ b/tests/opengl/data/shadows/dir2 @@ -22,8 +22,10 @@ vlight -add AMBIENT vlight -add DIRECTIONAL -direction 0.2 0.2 -1 -head 0 -castShadows 1 -color RED vlight -add DIRECTIONAL -direction -0.2 -0.2 -1 -head 0 -castShadows 1 -color GREEN -vraytrace 1 -vdump $::imagedir/${::casename}_raytrace.png +if { ![string match "OpenGL ES 2.0*" [vglinfo VERSION]] && ![string match "OpenGL ES 3.0*" [vglinfo VERSION]] } { + vraytrace 1 + vdump $::imagedir/${::casename}_raytrace.png +} vraytrace 0 vrenderparams -shadingModel phong diff --git a/tests/v3d/shadows/dir3 b/tests/opengl/data/shadows/dir3 similarity index 81% rename from tests/v3d/shadows/dir3 rename to tests/opengl/data/shadows/dir3 index 603e77b615..1b3d3c59f5 100644 --- a/tests/v3d/shadows/dir3 +++ b/tests/opengl/data/shadows/dir3 @@ -20,8 +20,10 @@ vfit vselect 250 200 vlight -change 0 -castShadows 1 -direction 1 1 -1 -head 0 -vraytrace 1 -vdump $::imagedir/${::casename}_raytrace.png +if { ![string match "OpenGL ES 2.0*" [vglinfo VERSION]] && ![string match "OpenGL ES 3.0*" [vglinfo VERSION]] } { + vraytrace 1 + vdump $::imagedir/${::casename}_raytrace.png +} vraytrace 0 vrenderparams -shadingModel phong diff --git a/tests/v3d/shadows/dirhead b/tests/opengl/data/shadows/dirhead similarity index 81% rename from tests/v3d/shadows/dirhead rename to tests/opengl/data/shadows/dirhead index 152673bd88..be49df5349 100644 --- a/tests/v3d/shadows/dirhead +++ b/tests/opengl/data/shadows/dirhead @@ -19,8 +19,10 @@ vaspects bb -material STONE vfit vlight -change 0 -castShadows 1 -direction -0.2 0.2 -1 -head 1 -vraytrace 1 -vdump $::imagedir/${::casename}_raytrace.png +if { ![string match "OpenGL ES 2.0*" [vglinfo VERSION]] && ![string match "OpenGL ES 3.0*" [vglinfo VERSION]] } { + vraytrace 1 + vdump $::imagedir/${::casename}_raytrace.png +} vraytrace 0 vrenderparams -shadingModel phong diff --git a/tests/v3d/shadows/double_precision b/tests/opengl/data/shadows/double_precision similarity index 100% rename from tests/v3d/shadows/double_precision rename to tests/opengl/data/shadows/double_precision diff --git a/tests/v3d/glsl/outline1 b/tests/opengl/data/silhouette/outline1 similarity index 100% rename from tests/v3d/glsl/outline1 rename to tests/opengl/data/silhouette/outline1 diff --git a/tests/v3d/glsl/outline2 b/tests/opengl/data/silhouette/outline2 similarity index 100% rename from tests/v3d/glsl/outline2 rename to tests/opengl/data/silhouette/outline2 diff --git a/tests/3rdparty/fonts/A1 b/tests/opengl/data/text/A1 old mode 100755 new mode 100644 similarity index 67% rename from tests/3rdparty/fonts/A1 rename to tests/opengl/data/text/A1 index 1f9af06dc6..b2a7de4d6b --- a/tests/3rdparty/fonts/A1 +++ b/tests/opengl/data/text/A1 @@ -4,7 +4,9 @@ puts "OCC21450" puts "============" puts "" +pload TOPTEST VISUALIZATION +vinit View1 vcolorscale cs -range 10 20 100 -font 16 -textpos right -xy 0 0 vglinfo -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/3rdparty/fonts/A2 b/tests/opengl/data/text/A2 old mode 100755 new mode 100644 similarity index 97% rename from tests/3rdparty/fonts/A2 rename to tests/opengl/data/text/A2 index 3081622fa2..ae71ca2ca1 --- a/tests/3rdparty/fonts/A2 +++ b/tests/opengl/data/text/A2 @@ -4,6 +4,9 @@ puts "OCC21450" puts "============" puts "" +pload TOPTEST VISUALIZATION +vinit View1 + vfont add [locate_data_file DejaVuSansMono.ttf] MonoFont vfont add [locate_data_file DejaVuSans.ttf] SansFont vfont add [locate_data_file DejaVuSerif.ttf] SerifFont @@ -66,7 +69,7 @@ vdrawtext OC20 OpenCascade -pos -200 -200 250 -color 00FF05 -halign left -vali vdrawtext OC21 OpenCascade -pos -200 -200 300 -color FF0005 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font monospace vglinfo -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png vsensdis -checkview -screenshot -3d -path ${imagedir}/${test_image}_sensitive.png \ No newline at end of file +vdump $imagedir/${casename}_sensitive.png diff --git a/tests/3rdparty/fonts/A3 b/tests/opengl/data/text/A3 similarity index 88% rename from tests/3rdparty/fonts/A3 rename to tests/opengl/data/text/A3 index 98132202ea..c03d24471f 100644 --- a/tests/3rdparty/fonts/A3 +++ b/tests/opengl/data/text/A3 @@ -4,6 +4,9 @@ puts "Test case performs rendering of single huge text label" puts "============" puts "" +pload TOPTEST VISUALIZATION +vinit View1 + vfont add [locate_data_file DejaVuSans.ttf] SansFont vtrihedron trihedr @@ -19,7 +22,5 @@ vfit vdrawtext text "$aText" -pos 100 100 -400 -color CYAN -halign left -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont -vfps - vglinfo -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/3rdparty/fonts/A4 b/tests/opengl/data/text/A4 similarity index 90% rename from tests/3rdparty/fonts/A4 rename to tests/opengl/data/text/A4 index c956d29365..214a43b228 100644 --- a/tests/3rdparty/fonts/A4 +++ b/tests/opengl/data/text/A4 @@ -4,6 +4,11 @@ puts "Test case performs rendering of big number of small text labels" puts "============" puts "" +cpulimit 1000 + +pload TOPTEST VISUALIZATION +vinit View1 + vfont add [locate_data_file DejaVuSans.ttf] SansFont vtrihedron trihedr @@ -33,4 +38,4 @@ vzoom 20 vfps vglinfo -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/3rdparty/fonts/A5 b/tests/opengl/data/text/A5 similarity index 96% rename from tests/3rdparty/fonts/A5 rename to tests/opengl/data/text/A5 index 2a6a60217c..079b0694d2 100644 --- a/tests/3rdparty/fonts/A5 +++ b/tests/opengl/data/text/A5 @@ -4,6 +4,9 @@ puts "Test case prints 3D labels with different text alignment styles" puts "============" puts "" +pload TOPTEST VISUALIZATION +vinit View1 + vfont add [locate_data_file DejaVuSans.ttf] SansFont vtrihedron trihedr @@ -37,7 +40,5 @@ vdrawtext Text8 "Bottom-Right\nFirst line\nLion The Second\n3rd" -pos 700 100 - vfit -vfps - vglinfo -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/3rdparty/fonts/A6 b/tests/opengl/data/text/A6 similarity index 96% rename from tests/3rdparty/fonts/A6 rename to tests/opengl/data/text/A6 index fb70d1180e..20aabaeb60 100644 --- a/tests/3rdparty/fonts/A6 +++ b/tests/opengl/data/text/A6 @@ -4,6 +4,9 @@ puts "Test case prints 3D labels with different text alignment styles and extra puts "============" puts "" +pload TOPTEST VISUALIZATION +vinit View1 + set THE_FONT_NAME sans-serif dtracelevel trace vfont -verbose 1 @@ -38,7 +41,5 @@ vpoint pBR 700 100 -700 vdrawtext Text8 " Bottom-Right\nFirst line \nLion The Second\n 3rd " -pos 700 100 -700 -color YELLOW -halign right -valign bottom -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME vfit -vfps - vglinfo -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/3rdparty/fonts/A7 b/tests/opengl/data/text/A7 similarity index 97% rename from tests/3rdparty/fonts/A7 rename to tests/opengl/data/text/A7 index d2d756e136..b221d45cf1 100644 --- a/tests/3rdparty/fonts/A7 +++ b/tests/opengl/data/text/A7 @@ -4,6 +4,9 @@ puts "Test case prints overlay labels with different subtitle styles" puts "============" puts "" +pload TOPTEST VISUALIZATION +vinit View1 + vfont add [locate_data_file DejaVuSans.ttf] SansFont set aParams "-height 16 -font SansFont -2d -persPos -1 1 -subColor BLUE" diff --git a/tests/3rdparty/fonts/A8 b/tests/opengl/data/text/A8 similarity index 98% rename from tests/3rdparty/fonts/A8 rename to tests/opengl/data/text/A8 index f28d7fb125..8c7b718b1d 100644 --- a/tests/3rdparty/fonts/A8 +++ b/tests/opengl/data/text/A8 @@ -6,6 +6,9 @@ puts "" # Draw the text with different fonts. ################################################# +pload TOPTEST VISUALIZATION +vinit View1 + dtracelevel trace vfont -verbose 1 @@ -64,4 +67,4 @@ vdrawtext OC20 OpenCascade -pos -200 -200 250 -color 00FF05 -halign left -valig vdrawtext OC21 OpenCascade -pos -200 -200 300 -color FF0005 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font Arial vglinfo -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/3rdparty/fonts/C1 b/tests/opengl/data/text/C1 similarity index 82% rename from tests/3rdparty/fonts/C1 rename to tests/opengl/data/text/C1 index bfbd7110fd..8ca897afa0 100644 --- a/tests/3rdparty/fonts/C1 +++ b/tests/opengl/data/text/C1 @@ -2,14 +2,13 @@ puts "============" puts "OCC26298 make font resolution configurable" puts "============" puts "" + pload VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont vclear -vclose all - -vinit +vinit View1 vtop vrenderparams -resolution 72 @@ -17,15 +16,11 @@ vrenderparams -resolution 72 vdrawtext t0 TopLeftText -pos -100 100 0 -font SansFont -color yellow -valign top -halign left vdrawtext t1 CenterText -pos 0 0 0 -font SansFont -color green -valign center -halign center vdrawtext t2 BottomRightText -pos 100 -100 0 -font SansFont -color red -valign bottom -halign right - vfit - -vdump $imagedir/${casename}_1.png +vdump $imagedir/${casename}_72.png vrenderparams -resolution 96 - -vdump $imagedir/${casename}_2.png +vdump $imagedir/${casename}_96.png vrenderparams -resolution 144 - -vdump $imagedir/${casename}_3.png +vdump $imagedir/${casename}_144.png diff --git a/tests/3rdparty/fonts/C2 b/tests/opengl/data/text/C2 similarity index 100% rename from tests/3rdparty/fonts/C2 rename to tests/opengl/data/text/C2 diff --git a/tests/3rdparty/fonts/C3 b/tests/opengl/data/text/C3 similarity index 95% rename from tests/3rdparty/fonts/C3 rename to tests/opengl/data/text/C3 index caa7fcd4f7..e3b2e04ee6 100644 --- a/tests/3rdparty/fonts/C3 +++ b/tests/opengl/data/text/C3 @@ -6,6 +6,8 @@ puts "" puts "REQUIRED All: Font_FontMgr, error: unable to find any font!" puts "REQUIRED All: Font_FontMgr, error: unable to find Western fallback font!" +pload MODELING VISUALIZATION + dtracelevel trace pload VISUALIZATION diff --git a/tests/3rdparty/fonts/C4 b/tests/opengl/data/text/C4 similarity index 100% rename from tests/3rdparty/fonts/C4 rename to tests/opengl/data/text/C4 diff --git a/tests/3rdparty/text3d/A1 b/tests/opengl/data/text/D1 similarity index 92% rename from tests/3rdparty/text3d/A1 rename to tests/opengl/data/text/D1 index 636d0ff484..4f80a1d0b5 100644 --- a/tests/3rdparty/text3d/A1 +++ b/tests/opengl/data/text/D1 @@ -3,9 +3,10 @@ puts "0026343: Visualization - Zoom persistent text with 3D orientation" puts "" puts "===========" +pload MODELING VISUALIZATION + vfont add [locate_data_file DejaVuSans.ttf] SansFont -pload ALL vinit View1 vclear vaxo @@ -27,4 +28,4 @@ vdrawtext t3 "First line\nSecond line" -pos $x/2 0 $z/2 -color 0.0 0.0 1.0 -heig vfit vglinfo -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug22149 b/tests/opengl/data/text/bug22149 old mode 100755 new mode 100644 similarity index 97% rename from tests/bugs/vis/bug22149 rename to tests/opengl/data/text/bug22149 index eb62133484..3b636c200e --- a/tests/bugs/vis/bug22149 +++ b/tests/opengl/data/text/bug22149 @@ -3,8 +3,7 @@ puts "0022149: Strings with Japanese characters can not be displayed in 3D viewe puts "================" puts "" -set BugNumber OCC22149 - +pload VISUALIZATION dtracelevel trace vfont -verbose 1 vfont add [locate_data_file bug22149_mona.ttf] Mona diff --git a/tests/opengl/data/text/bug22796_1 b/tests/opengl/data/text/bug22796_1 new file mode 100644 index 0000000000..40017255a7 --- /dev/null +++ b/tests/opengl/data/text/bug22796_1 @@ -0,0 +1,12 @@ +puts "============" +puts "OCC22796: Possibility to display multi-line text in 3D" +puts "============" +puts "" + +pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + +vinit View1 +vdrawtext text0 "MyTest1\rHello,\tWor\vld!\nMyTest2\t\a\bMyTest3" -pos 0 0 0 -color WHITE -halign left -valign bottom -angle 0 -zoom 1 -height 50 -aspect regular -font SansFont + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug22796_2 b/tests/opengl/data/text/bug22796_2 old mode 100755 new mode 100644 similarity index 51% rename from tests/bugs/vis/bug22796_2 rename to tests/opengl/data/text/bug22796_2 index 5c8e94bc8f..3baf1b2f2e --- a/tests/bugs/vis/bug22796_2 +++ b/tests/opengl/data/text/bug22796_2 @@ -1,17 +1,12 @@ puts "============" -puts "OCC22796" +puts "OCC22796: Possibility to display multi-line text in 3D" puts "============" puts "" -####################################################################### -# Possibility to display multi-line text in 3D -####################################################################### -set BugNumber OCC22796 - -vinit +pload VISUALIZATION +vinit View1 vfont add [locate_data_file bug22149_mona.ttf] Mona set s [encoding convertfrom unicode "\x42\x30\x09\x00\x79\x30\x0A\x00\x6F\x30\x42\x26"] vdrawtext text0 $s -pos 0 0 0 -color WHITE -halign left -valign bottom -angle 0 -zoom 1 -height 50 -aspect regular -font Mona -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug24555 b/tests/opengl/data/text/bug24555 old mode 100755 new mode 100644 similarity index 59% rename from tests/bugs/vis/bug24555 rename to tests/opengl/data/text/bug24555 index 6c229a5d48..d31f993154 --- a/tests/bugs/vis/bug24555 +++ b/tests/opengl/data/text/bug24555 @@ -1,14 +1,12 @@ puts "============" -puts "OCC24555" +puts "OCC24555: Visualization - the same text is rendered with shift at second time" puts "============" puts "" -####################################################################### -# Visualization - the same text is rendered with shift at second time -####################################################################### +pload VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont -vinit +vinit View1 vclear vaxo vdrawtext text0 "This program" -pos 0 0 0 -color GREEN -halign left -valign bottom -angle 0 -zoom 0 -height 50 -aspect regular -font SansFont @@ -23,9 +21,9 @@ set G 0.9843137264251709 set B 0 if {"[vreadpixel $x $y rgb]" == "$R $G $B" } { - puts "Error : color is bad" + puts "Error : color is bad" } else { - puts "OK : color is good" + puts "OK : color is good" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25121 b/tests/opengl/data/text/bug25121 similarity index 78% rename from tests/bugs/vis/bug25121 rename to tests/opengl/data/text/bug25121 index 3485ef6b6b..5afe35fa0c 100644 --- a/tests/bugs/vis/bug25121 +++ b/tests/opengl/data/text/bug25121 @@ -1,14 +1,12 @@ puts "================" -puts "OCC25121" +puts "OCC25121: Visualization, OpenGl_Text - correct scaling factor for fixed-size text at 3D point" puts "================" puts "" -####################################################################################### -# Visualization, OpenGl_Text - correct scaling factor for fixed-size text at 3D point -####################################################################################### +pload MODELING VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont -vinit +vinit View1 box b -5 -5 0 10 10 1 vdisplay -noupdate b @@ -24,4 +22,4 @@ vdrawtext t2 "001 2D" -2d -perspos -1 1 -pos 100 -250 0 -height 16 -font SansFon vdrawtext t3 "101 2D" -2d -perspos -1 1 -pos 100 -300 0 -height 16 -font SansFont -color WHITE -disptype normal -subcolor BLUE vdrawtext t4 "110 2D" -2d -perspos -1 1 -pos 100 -350 0 -height 16 -font SansFont -color WHITE -disptype normal -subcolor BLUE -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/opengl/data/text/bug25732_1 b/tests/opengl/data/text/bug25732_1 new file mode 100644 index 0000000000..829ac4529b --- /dev/null +++ b/tests/opengl/data/text/bug25732_1 @@ -0,0 +1,27 @@ +puts "========" +puts "OCC25732: Visualization, TKOpenGl - back face culling should not affect textured font rendering" +puts "========" +puts "" + +pload MODELING VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + +box b -100 0 -200 50 100 200 + +vinit View1 +vclear +vaxo + +vdisplay b +vfit +vsetdispmode b 1 + +vdrawtext text "Open\nCASCADE" -pos 0 0 0 -color RED -halign center -valign center -angle -45 -zoom 1 -height 50 -aspect regular -font SansFont + +set x_coord 255 +set y_coord 277 + +set bug_info [vreadpixel ${x_coord} ${y_coord} rgb name] +if {$bug_info != "RED"} { puts "ERROR: OCC25732 is reproduced. Text is missed." } + +vdump $imagedir/${casename}.png diff --git a/tests/opengl/data/text/bug25732_2 b/tests/opengl/data/text/bug25732_2 new file mode 100644 index 0000000000..478417366a --- /dev/null +++ b/tests/opengl/data/text/bug25732_2 @@ -0,0 +1,23 @@ +puts "========" +puts "OCC25732: Visualization, TKOpenGl - back face culling should not affect textured font rendering" +puts "========" +puts "" + +pload MODELING VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + +box b 1 2 3 +explode b F + +vinit View1 +vsetdispmode 1 + +vdisplay b_1 b_2 +vfit + +vdrawtext text "SAMPLE TEXT" -pos 1 0 3 -color RED -halign left -valign bottom -angle 0 -zoom 0 -height 30 -aspect regular -font SansFont + +set bug_info [vreadpixel 260 137 rgb name] +if {$bug_info != "RED"} { puts "ERROR: OCC25732 is reproduced. Text is missed." } + +vdump $imagedir/${casename}.png diff --git a/tests/opengl/data/text/bug27624 b/tests/opengl/data/text/bug27624 new file mode 100644 index 0000000000..81f1f17439 --- /dev/null +++ b/tests/opengl/data/text/bug27624 @@ -0,0 +1,12 @@ +puts "========" +puts "CR27624: Draw Harness, ViewerTest - vdrawtext command ignores text display options" +puts "========" +puts "" + +pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + +vinit View1 +vdrawtext t1 "Subtitle" -height 20 -font SansFont -color GREEN -disptype subtitle -subcolor 4C4C4C +vfit +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug28099_text_core b/tests/opengl/data/text/bug28099_text_core similarity index 99% rename from tests/bugs/vis/bug28099_text_core rename to tests/opengl/data/text/bug28099_text_core index 6b5efdced4..9014f053aa 100644 --- a/tests/bugs/vis/bug28099_text_core +++ b/tests/opengl/data/text/bug28099_text_core @@ -5,8 +5,6 @@ puts "============" puts "" pload MODELING VISUALIZATION -pload OPENGL - vclear vcaps -core 1 vinit View1 diff --git a/tests/bugs/vis/bug30922 b/tests/opengl/data/text/bug30922 similarity index 96% rename from tests/bugs/vis/bug30922 rename to tests/opengl/data/text/bug30922 index 1208fc0d98..b5e72b7b35 100644 --- a/tests/bugs/vis/bug30922 +++ b/tests/opengl/data/text/bug30922 @@ -2,6 +2,7 @@ puts "=============" puts "0030922: Visualization - OpenGl_Text wrong local transformation if text has not own attach point" puts "=============" +pload VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont vinit View1 diff --git a/tests/bugs/vis/bug31193 b/tests/opengl/data/text/bug31193 similarity index 96% rename from tests/bugs/vis/bug31193 rename to tests/opengl/data/text/bug31193 index 133fe1f396..cf3eab8ab6 100644 --- a/tests/bugs/vis/bug31193 +++ b/tests/opengl/data/text/bug31193 @@ -2,6 +2,7 @@ puts "=============" puts "0031193: Visualization - OpenGl_Flipping wrong text position if local transformation set" puts "=============" +pload VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont vinit View1 diff --git a/tests/3rdparty/fonts/tabs b/tests/opengl/data/text/tabs similarity index 99% rename from tests/3rdparty/fonts/tabs rename to tests/opengl/data/text/tabs index 21f0a5eed4..879b80638c 100644 --- a/tests/3rdparty/fonts/tabs +++ b/tests/opengl/data/text/tabs @@ -2,6 +2,7 @@ puts "============" puts "0031762: Visualization, Font_TextFormatter - tabulation length is respected with one extra symbol shift" puts "============" puts "" + pload VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont diff --git a/tests/3rdparty/text3d/text_wrapped b/tests/opengl/data/text/text_wrapped similarity index 100% rename from tests/3rdparty/text3d/text_wrapped rename to tests/opengl/data/text/text_wrapped diff --git a/tests/v3d/glsl/alpha_mask b/tests/opengl/data/textures/alpha_mask similarity index 96% rename from tests/v3d/glsl/alpha_mask rename to tests/opengl/data/textures/alpha_mask index f8d32dbfb1..5cf2f6ea71 100644 --- a/tests/v3d/glsl/alpha_mask +++ b/tests/opengl/data/textures/alpha_mask @@ -2,6 +2,8 @@ puts "========" puts "Alpha test modes" puts "========" +pload MODELING VISUALIZATION + # create box box b 1 2 3 diff --git a/tests/opengl/data/textures/bug23385 b/tests/opengl/data/textures/bug23385 new file mode 100644 index 0000000000..30b39f9c42 --- /dev/null +++ b/tests/opengl/data/textures/bug23385 @@ -0,0 +1,22 @@ +puts "============" +puts "OCC23385: Bug in AIS_TexturedShape::Compute()" +puts "============" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +restore [locate_data_file OCC23115-bottle.brep] b +explode b F +vdisplay b_16 +vtexture b_16 [locate_data_file OCC23385-carrelage1.gif] +vtexrepeat b_16 3 2 +vsetdispmode b_16 1 +vfit + +if { "[vreadpixel 85 73 rgb name]" != "BLACK" } { + puts "OK OCC23385" +} else { + puts "Faulty OCC23385" +} + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug23747_1 b/tests/opengl/data/textures/bug23747_1 similarity index 94% rename from tests/bugs/vis/bug23747_1 rename to tests/opengl/data/textures/bug23747_1 index b2bbaa65f8..2096494146 100644 --- a/tests/bugs/vis/bug23747_1 +++ b/tests/opengl/data/textures/bug23747_1 @@ -4,7 +4,8 @@ puts "Check that enabling environment mapping does not break text rendering" puts "============" puts "" -vinit +pload MODELING VISUALIZATION +vinit View1 vclear vaxo vtrihedron t diff --git a/tests/bugs/vis/bug23747_2 b/tests/opengl/data/textures/bug23747_2 similarity index 99% rename from tests/bugs/vis/bug23747_2 rename to tests/opengl/data/textures/bug23747_2 index c29fcff8df..6fe122a363 100644 --- a/tests/bugs/vis/bug23747_2 +++ b/tests/opengl/data/textures/bug23747_2 @@ -7,7 +7,6 @@ puts "" pload MODELING VISUALIZATION # enable FFP until bug-fix for GLSL -pload OPENGL vcaps -ffp 1 vinit View1 diff --git a/tests/bugs/vis/bug23804 b/tests/opengl/data/textures/bug23804 similarity index 63% rename from tests/bugs/vis/bug23804 rename to tests/opengl/data/textures/bug23804 index e408aaeab8..a14bb7e6e6 100644 --- a/tests/bugs/vis/bug23804 +++ b/tests/opengl/data/textures/bug23804 @@ -1,14 +1,11 @@ puts "============" -puts "CR23804" +puts "CR23804: Unexpected color modulation during texture mapping" puts "============" puts "" -############################################################ -# Unexpected color modulation during texture mapping -############################################################ - +pload MODELING VISUALIZATION box b 100 100 100 -vinit +vinit View1 vdisplay b vfit vsetdispmode b 1 diff --git a/tests/bugs/vis/bug23813 b/tests/opengl/data/textures/bug23813 similarity index 66% rename from tests/bugs/vis/bug23813 rename to tests/opengl/data/textures/bug23813 index 0d712097a2..4f847e4834 100644 --- a/tests/bugs/vis/bug23813 +++ b/tests/opengl/data/textures/bug23813 @@ -1,18 +1,16 @@ ## It's impossible to make vdump with non-default parameters (width and height) on remote PC puts "============" -puts "OCC23813" +puts "OCC23813: TKOpenGl, OpenGl_Texture ignores stride image property" puts "============" puts "" -####################################################################### -# TKOpenGl, OpenGl_Texture ignores stride image property -####################################################################### file delete -force ${imagedir}/texture_412.png file delete -force ${imagedir}/texture_409.png +pload MODELING VISUALIZATION box b 1 2 3 -vinit +vinit View1 vsetdispmode 1 vdisplay b vfit @@ -25,4 +23,4 @@ vtexture b ${imagedir}/texture_412.png # texture is corrupted during uploading to OpenGL vtexture b ${imagedir}/texture_409.png -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug24376 b/tests/opengl/data/textures/bug24376 old mode 100755 new mode 100644 similarity index 56% rename from tests/bugs/vis/bug24376 rename to tests/opengl/data/textures/bug24376 index b1bb0ba86b..a0e6859bff --- a/tests/bugs/vis/bug24376 +++ b/tests/opengl/data/textures/bug24376 @@ -1,15 +1,13 @@ puts "============" -puts "OCC24376" +puts "OCC24376: BMP image cannot be read" puts "============" puts "" -####################################################################### -# BMP image cannot be read -####################################################################### +pload MODELING VISUALIZATION box b 1 1 1 explode b FACE -vinit +vinit View1 vdisplay b_1 vtexture b_1 [locate_data_file bug24376_Soap.bmp] vfit @@ -22,4 +20,4 @@ set x_coord 200 set y_coord 90 checkcolor $x_coord $y_coord 0.78039216995239258 0.55294120311737061 0.094117648899555206 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/opengl/data/textures/bug24725 b/tests/opengl/data/textures/bug24725 new file mode 100644 index 0000000000..41a021ea2e --- /dev/null +++ b/tests/opengl/data/textures/bug24725 @@ -0,0 +1,30 @@ +puts "============" +puts "CR24725: Test texture color modulation for AIS_TexturedShape" +puts "============" +puts "" + +pload MODELING VISUALIZATION +set aV "Driver1/Viewer1/View1" +vinit name=$aV l=32 t=32 w=400 h=400 +vactivate $aV +vclear + +box b 1 2 3 +vdisplay b +vsetdispmode 1 +vtexture b 0 +vlight clear +vlight add ambient color white +vfit + +vtexture b -modulate off +checkcolor 142 352 1 1 1 +if { $stat != 1 } { puts "Error : color of non-modulated texture is incorrect" } + +vdump $imagedir/${casename}_1.png + +vtexture b -modulate on +checkcolor 142 352 0.329 0.224 0.027 +if { $stat != 1 } { puts "Error : color of modulated texture is incorrect" } + +vdump $imagedir/${casename}_2.png diff --git a/tests/bugs/vis/bug24930 b/tests/opengl/data/textures/bug24930 old mode 100755 new mode 100644 similarity index 94% rename from tests/bugs/vis/bug24930 rename to tests/opengl/data/textures/bug24930 index 2886083fdb..8807f0e897 --- a/tests/bugs/vis/bug24930 +++ b/tests/opengl/data/textures/bug24930 @@ -3,10 +3,10 @@ puts "OCC24930" puts "============" puts "" -pload QAcommands +pload MODELING VISUALIZATION QAcommands box b 10 10 10 -vinit +vinit View1 vdisplay b vsetdispmode b 1 vfit diff --git a/tests/bugs/vis/bug25544_graytexture b/tests/opengl/data/textures/bug25544_graytexture similarity index 95% rename from tests/bugs/vis/bug25544_graytexture rename to tests/opengl/data/textures/bug25544_graytexture index e7c3574cf4..bec8ccf617 100644 --- a/tests/bugs/vis/bug25544_graytexture +++ b/tests/opengl/data/textures/bug25544_graytexture @@ -3,6 +3,7 @@ puts "0025544: Visualization, TKOpenGl - support grayscale textures" puts "============" puts "" +pload MODELING VISUALIZATION vclear vinit View1 diff --git a/tests/bugs/vis/bug26434 b/tests/opengl/data/textures/bug26434 similarity index 62% rename from tests/bugs/vis/bug26434 rename to tests/opengl/data/textures/bug26434 index 3920a10db4..6109cfb8b5 100644 --- a/tests/bugs/vis/bug26434 +++ b/tests/opengl/data/textures/bug26434 @@ -1,12 +1,8 @@ puts "============" -puts "CR26434" +puts "CR26434: Visualization - Textured objects should have priority over the environment mapping" puts "============" puts "" -########################################################################################## -puts "Visualization - Textured objects should have priority over the environment mapping" -########################################################################################## - pload MODELING VISUALIZATION vclear diff --git a/tests/opengl/data/textures/bug29651 b/tests/opengl/data/textures/bug29651 new file mode 100644 index 0000000000..36b3abaf7a --- /dev/null +++ b/tests/opengl/data/textures/bug29651 @@ -0,0 +1,15 @@ +puts "========" +puts "OCC29651: ViewerTest - vtexture command crashes" +puts "========" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +vsetdispmode 1 +box b 1 2 3 +vdisplay b +vfit +vtexture b 0 +vtexture b off + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug30946 b/tests/opengl/data/textures/bug30946 similarity index 100% rename from tests/bugs/vis/bug30946 rename to tests/opengl/data/textures/bug30946 diff --git a/tests/opengl/data/textures/bug9517 b/tests/opengl/data/textures/bug9517 new file mode 100644 index 0000000000..d0818b0223 --- /dev/null +++ b/tests/opengl/data/textures/bug9517 @@ -0,0 +1,15 @@ +puts "============" +puts "OCC9517: Wrong use of the method glTexCoordPointer() in OpenGl_PrimitiveArray.c" +puts "============" +puts "" + +pload MODELING VISUALIZATION +box b 10 10 10 +vinit View1 +vdisplay b +vtop +vfit + +vtexture b [locate_data_file OCC9517.bmp] + +vdump $imagedir/${casename}.png diff --git a/tests/opengl/data/textures/cubemap_1x6 b/tests/opengl/data/textures/cubemap_1x6 new file mode 100644 index 0000000000..a5a6a6ae8a --- /dev/null +++ b/tests/opengl/data/textures/cubemap_1x6 @@ -0,0 +1,25 @@ +puts "============" +puts "0030807: Visualization, TKOpenGl - supporting cubemaps" +puts "Test vertical 1x6 tiles orientation" +puts "============" +puts "" + +set aCubeMap_V [locate_data_file Circus_CubeMap_V.png] +set aCubeMap_V_021345 [locate_data_file Circus_CubeMap_V_021345.png] + +pload MODELING VISUALIZATION +vclear +vinit v -w 512 -h 512 +vcamera -fovy 100 + +# vertical tiles orientation +vbackground -cubemap $aCubeMap_V +foreach {i} { front back top bottom left right } { v$i; vdump $imagedir/${casename}_${i}.png } + +# test of flipping +vbackground -cubemap $aCubeMap_V -invertedz +foreach {i} { front back top bottom left right } { v$i; vdump $imagedir/${casename}_flip_${i}.png } + +# vertical tiles orientation (disordered) +vbackground -cubemap $aCubeMap_V_021345 -order 0 2 1 3 4 5 +foreach {i} { front back top bottom left right } { v$i; vdump $imagedir/${casename}_021345_${i}.png } diff --git a/tests/opengl/data/textures/cubemap_2x3 b/tests/opengl/data/textures/cubemap_2x3 new file mode 100644 index 0000000000..5943d7d6d8 --- /dev/null +++ b/tests/opengl/data/textures/cubemap_2x3 @@ -0,0 +1,21 @@ +puts "============" +puts "0030807: Visualization, TKOpenGl - supporting cubemaps" +puts "Test vertical 2x3 tiles orientation" +puts "============" +puts "" + +set aCubeMap_GridV [locate_data_file Circus_CubeMap_GridV.png] +set aCubeMap_GridV_021345 [locate_data_file Circus_CubeMap_GridV_021345.png] + +pload MODELING VISUALIZATION +vclear +vinit v -w 512 -h 512 +vcamera -fovy 100 + +# vertical grid tile orientation +vbackground -cubemap $aCubeMap_GridV +foreach {i} { front back top bottom left right } { v$i; vdump $imagedir/${casename}_${i}.png } + +# vertical grid tile orientation (disordered) +vbackground -cubemap $aCubeMap_GridV_021345 -order 0 2 1 3 4 5 +foreach {i} { front back top bottom left right } { v$i; vdump $imagedir/${casename}_021345_${i}.png } diff --git a/tests/opengl/data/textures/cubemap_3x2 b/tests/opengl/data/textures/cubemap_3x2 new file mode 100644 index 0000000000..de0d38b717 --- /dev/null +++ b/tests/opengl/data/textures/cubemap_3x2 @@ -0,0 +1,21 @@ +puts "============" +puts "0030807: Visualization, TKOpenGl - supporting cubemaps" +puts "Test horizontal 3x2 tile orientation" +puts "============" +puts "" + +set aCubeMap_GridH [locate_data_file Circus_CubeMap_GridH.png] +set aCubeMap_GridH_021345 [locate_data_file Circus_CubeMap_GridH_021345.png] + +pload MODELING VISUALIZATION +vclear +vinit v -w 512 -h 512 +vcamera -fovy 100 + +# horizontal grid tile orientation +vbackground -cubemap $aCubeMap_GridH +foreach {i} { front back top bottom left right } { v$i; vdump $imagedir/${casename}_${i}.png } + +# horizontal grid tile orientation (disordered) +vbackground -cubemap $aCubeMap_GridH_021345 -order 0 2 1 3 4 5 +foreach {i} { front back top bottom left right } { v$i; vdump $imagedir/${casename}_021345_${i}.png } diff --git a/tests/opengl/data/textures/cubemap_6x1 b/tests/opengl/data/textures/cubemap_6x1 new file mode 100644 index 0000000000..c53801e6fc --- /dev/null +++ b/tests/opengl/data/textures/cubemap_6x1 @@ -0,0 +1,16 @@ +puts "============" +puts "0030807: Visualization, TKOpenGl - supporting cubemaps" +puts "Test horizontal 6x1 tile orientation" +puts "============" +puts "" + +set aCubeMap_H [locate_data_file Circus_CubeMap_H.png] + +pload MODELING VISUALIZATION +vclear +vinit v -w 512 -h 512 +vcamera -fovy 100 + +# horizontal tile orientation +vbackground -cubemap $aCubeMap_H +foreach {i} { front back top bottom left right } { v$i; vdump $imagedir/${casename}_${i}.png } diff --git a/tests/v3d/glsl/cubemap_dds b/tests/opengl/data/textures/cubemap_dds similarity index 67% rename from tests/v3d/glsl/cubemap_dds rename to tests/opengl/data/textures/cubemap_dds index d948955c66..60c727298e 100644 --- a/tests/v3d/glsl/cubemap_dds +++ b/tests/opengl/data/textures/cubemap_dds @@ -3,8 +3,16 @@ puts "0031478: Visualization, TKOpenGl - allow uploading Cubemap in compressed D puts "============" puts "" -# PBR doesn't work with Compatible Profile on macOS -if { $::tcl_platform(os) == "Darwin" } { vcaps -core } +pload MODELING VISUALIZATION + +if { $::tcl_platform(os) == "Darwin" } { + # PBR doesn't work with Compatible Profile on macOS + vcaps -core +} +if { [vdriver -default] == "TKOpenGles" } { + puts "Skipping test case 'DDS texture': OpenGL ES does not support sRGB S3TC_DXT1 texture format" + return +} set aCubeMapPNG [locate_data_file cubemap_labels.png] set aCubeMapDDS [locate_data_file cubemap_labels.dds] diff --git a/tests/opengl/data/textures/cubemap_jpg b/tests/opengl/data/textures/cubemap_jpg new file mode 100644 index 0000000000..31aa2ff052 --- /dev/null +++ b/tests/opengl/data/textures/cubemap_jpg @@ -0,0 +1,25 @@ +puts "============" +puts "0030807: Visualization, TKOpenGl - supporting cubemaps" +puts "Test multi-image cubemap" +puts "============" +puts "" + +set aCubeMap_posx [locate_data_file SF_CubeMap_posx.jpg] +set aCubeMap_negx [locate_data_file SF_CubeMap_negx.jpg] +set aCubeMap_posy [locate_data_file SF_CubeMap_posy.jpg] +set aCubeMap_negy [locate_data_file SF_CubeMap_negy.jpg] +set aCubeMap_posz [locate_data_file SF_CubeMap_posz.jpg] +set aCubeMap_negz [locate_data_file SF_CubeMap_negz.jpg] + +pload MODELING VISUALIZATION +vclear +vinit v -w 512 -h 512 +vcamera -fovy 100 +if { [checkplatform -windows] && [vdriver -default] == "TKOpenGles" } { + # Mipmaps cannot be generated for GL_SRGB8 texture format + puts "TODO OCC30807 ALL: TKOpenGl | Type: Error" + puts "TODO OCC30807 ALL: Unable to generate mipmap of cubemap" +} + +vbackground -cubemap $aCubeMap_posx $aCubeMap_negx $aCubeMap_posy $aCubeMap_negy $aCubeMap_posz $aCubeMap_negz +foreach {i} { front back top bottom left right } { v$i; vdump $imagedir/${casename}_${i}.png } diff --git a/tests/v3d/glsl/pbr_tangent_normal b/tests/opengl/data/textures/pbr_tangent_normal similarity index 100% rename from tests/v3d/glsl/pbr_tangent_normal rename to tests/opengl/data/textures/pbr_tangent_normal diff --git a/tests/v3d/glsl/texture_trsf b/tests/opengl/data/textures/texture_trsf similarity index 99% rename from tests/v3d/glsl/texture_trsf rename to tests/opengl/data/textures/texture_trsf index b8856aba7d..500bd867c3 100644 --- a/tests/v3d/glsl/texture_trsf +++ b/tests/opengl/data/textures/texture_trsf @@ -3,6 +3,7 @@ puts "Texture 2D transformation (UV coordinates generation)" puts "========" set aTexture [locate_data_file bug26122_texture_trsf_ref.png] + pload MODELING VISUALIZATION box b 1 1 1 explode b F diff --git a/tests/v3d/glsl/texture_trsf2 b/tests/opengl/data/textures/texture_trsf2 similarity index 99% rename from tests/v3d/glsl/texture_trsf2 rename to tests/opengl/data/textures/texture_trsf2 index 18aab8728d..fd35b8173d 100644 --- a/tests/v3d/glsl/texture_trsf2 +++ b/tests/opengl/data/textures/texture_trsf2 @@ -3,6 +3,7 @@ puts "Texture 2D transformation (presentation trsf)" puts "========" set aTexture [locate_data_file bug26122_texture_trsf_ref.png] + pload MODELING VISUALIZATION box b 1 1 1 explode b F diff --git a/tests/v3d/glsl/texture_trsf3 b/tests/opengl/data/textures/texture_trsf3 similarity index 87% rename from tests/v3d/glsl/texture_trsf3 rename to tests/opengl/data/textures/texture_trsf3 index b719cce32f..a8e0848e89 100644 --- a/tests/v3d/glsl/texture_trsf3 +++ b/tests/opengl/data/textures/texture_trsf3 @@ -3,7 +3,13 @@ puts "Texture 2D transformation (presentation trsf) on DDS texture" puts "========" set aTexture [locate_data_file bug31478_texture_trsf_ref_dxt3.dds] + pload MODELING VISUALIZATION +if { [vdriver -default] == "TKOpenGles" } { + puts "Skipping test case 'DDS texture': OpenGL ES does not support sRGB S3TC_DXT1 texture format" + return +} + box b 1 1 1 explode b F diff --git a/tests/v3d/transparency/blend b/tests/opengl/data/transparency/blend similarity index 97% rename from tests/v3d/transparency/blend rename to tests/opengl/data/transparency/blend index 70bb018ff5..00b895df82 100644 --- a/tests/v3d/transparency/blend +++ b/tests/opengl/data/transparency/blend @@ -6,6 +6,7 @@ puts "========" set aShape1 [locate_data_file occ/Top.brep] set aShape2 [locate_data_file occ/Bottom.brep] +pload MODELING VISUALIZATION vinit View1 vsetdispmode 1 vbackground -gradient B4B4B4 WHITE -gradientMode VERTICAL diff --git a/tests/bugs/vis/bug28127 b/tests/opengl/data/transparency/bug28127 similarity index 100% rename from tests/bugs/vis/bug28127 rename to tests/opengl/data/transparency/bug28127 diff --git a/tests/bugs/vis/bug32143 b/tests/opengl/data/transparency/bug32143 similarity index 83% rename from tests/bugs/vis/bug32143 rename to tests/opengl/data/transparency/bug32143 index d37fcfadf0..d9666a9d6d 100644 --- a/tests/bugs/vis/bug32143 +++ b/tests/opengl/data/transparency/bug32143 @@ -18,7 +18,7 @@ vdisplay -dispMode 1 logo -topmost -2d bottomRight [expr $dx+25] 25 vtexture logo "$logoPath" vaspects logo -alphaMode BLEND -shadingModel UNLIT vdisplay logo -underlay -if { [vreadpixel 320 440 -rgb -name] != "DEEPSKYBLUE3" } { puts "Error: Unexpected color for BLEND" } +if { [vreadpixel 320 440 -rgb -name] != "DEEPSKYBLUE3" && [vreadpixel 320 440 -rgb -name] != "TURQUOISE2" } { puts "Error: Unexpected color for BLEND" } vaspects logo -alphaMode MASKBLEND 0.001 -shadingModel UNLIT if { [vreadpixel 320 440 -rgb -name] != "DARKGOLDENROD" } { puts "Error: Unexpected color for MASKBLEND" } diff --git a/tests/v3d/transparency/highlight b/tests/opengl/data/transparency/highlight similarity index 83% rename from tests/v3d/transparency/highlight rename to tests/opengl/data/transparency/highlight index 4b1320d953..624628ae5b 100644 --- a/tests/v3d/transparency/highlight +++ b/tests/opengl/data/transparency/highlight @@ -2,6 +2,7 @@ puts "========" puts "Transparency - shading highlight" puts "========" +pload MODELING VISUALIZATION psphere s 1 vinit View1 vdisplay -dispMode 1 s @@ -14,3 +15,4 @@ checkcolor 250 250 0 1 1 if { $stat != 1 } { puts "Error : Highlighting is broken." } +vdump $imagedir/${casename}.png diff --git a/tests/v3d/materials/ior b/tests/opengl/data/transparency/ior similarity index 80% rename from tests/v3d/materials/ior rename to tests/opengl/data/transparency/ior index 537a2b4bce..1dd6f66da8 100644 --- a/tests/v3d/materials/ior +++ b/tests/opengl/data/transparency/ior @@ -3,7 +3,6 @@ puts "0031284: Visualization - XCAFDoc_VisMaterialPBR lacks Index of Refraction" puts "========" pload MODELING XDE OCAF VISUALIZATION -# Ray-Tracing doesn't work with Compatible Profile on macOS if { $::tcl_platform(os) == "Darwin" } { vcaps -core } box b 0.5 1.0 -0.5 3 1 1 @@ -41,10 +40,12 @@ vbackground -cubemap $aCubeMap vrenderparams -shadingModel PBR -raster vdump $imagedir/${casename}_pbr.png -vrenderparams -raytrace -gi 0 -reflections 1 -rayDepth 10 -vfps 200 -vdump $imagedir/${casename}_rt.png +if { ![string match "OpenGL ES 2.0*" [vglinfo VERSION]] && ![string match "OpenGL ES 3.0*" [vglinfo VERSION]] } { + vrenderparams -raytrace -gi 0 -reflections 1 -rayDepth 10 + vfps 200 + vdump $imagedir/${casename}_rt.png -vrenderparams -raytrace -gi 1 -vfps 200 -vdump $imagedir/${casename}_pt.png + vrenderparams -raytrace -gi 1 + vfps 200 + vdump $imagedir/${casename}_pt.png +} diff --git a/tests/v3d/transparency/oit b/tests/opengl/data/transparency/oit similarity index 76% rename from tests/v3d/transparency/oit rename to tests/opengl/data/transparency/oit index 2d5e23ce59..3c47477845 100644 --- a/tests/v3d/transparency/oit +++ b/tests/opengl/data/transparency/oit @@ -4,8 +4,6 @@ puts "========" pload MODELING VISUALIZATION if { $::tcl_platform(os) == "Darwin" } { vcaps -core } -set hasVtk 1 -if { [catch { pload VIS }] } { set hasVtk 0 } # create objects pcylinder c 0.5 1 @@ -24,9 +22,11 @@ vfit vaxo vzoom 0.9 -vraytrace 1 -vrenderparams -rayDepth 10 -vdump $imagedir/${casename}_raytrace.png +if { ![string match "OpenGL ES 2.0*" [vglinfo VERSION]] && ![string match "OpenGL ES 3.0*" [vglinfo VERSION]] } { + vraytrace 1 + vrenderparams -rayDepth 10 + vdump $imagedir/${casename}_raytrace.png +} vraytrace 0 vrenderparams -oit off @@ -36,7 +36,12 @@ vdump $imagedir/${casename}_weight.png vrenderparams -oit peeling 4 vdump $imagedir/${casename}_peel.png -# vtk viewer +# VTK viewer, just for comparison +set hasVtk 0 +if { [vdriver -default] == "TKOpenGl" } { + set hasVtk 1 + if { [catch { pload VIS }] } { set hasVtk 0 } +} if { $hasVtk == 1 } { ivtkinit -msaa 0 -srgb 0 ivtkdisplay c b1 b2 b3 diff --git a/tests/v3d/glsl/transp1 b/tests/opengl/data/transparency/transp1 similarity index 98% rename from tests/v3d/glsl/transp1 rename to tests/opengl/data/transparency/transp1 index c671f6e002..3e3aff606f 100644 --- a/tests/v3d/glsl/transp1 +++ b/tests/opengl/data/transparency/transp1 @@ -2,6 +2,8 @@ puts "========" puts "Test various Shading Models assigned per-object with transparency" puts "========" +pload MODELING VISUALIZATION + # PBR doesn't work with Compatible Profile on macOS if { $::tcl_platform(os) == "Darwin" } { vcaps -core } diff --git a/tests/bugs/vis/bug24728 b/tests/opengl/drivers/bug24728 similarity index 100% rename from tests/bugs/vis/bug24728 rename to tests/opengl/drivers/bug24728 diff --git a/tests/v3d/glsl/d3dhost b/tests/opengl/drivers/d3dhost similarity index 100% rename from tests/v3d/glsl/d3dhost rename to tests/opengl/drivers/d3dhost diff --git a/tests/v3d/glsl/glinfo b/tests/opengl/drivers/glinfo similarity index 100% rename from tests/v3d/glsl/glinfo rename to tests/opengl/drivers/glinfo diff --git a/tests/v3d/glsl/opengles b/tests/opengl/drivers/opengles similarity index 100% rename from tests/v3d/glsl/opengles rename to tests/opengl/drivers/opengles diff --git a/tests/opengl/end b/tests/opengl/end new file mode 100644 index 0000000000..4668a76e69 --- /dev/null +++ b/tests/opengl/end @@ -0,0 +1,2 @@ +catch { vglinfo } +puts "TEST COMPLETED" diff --git a/tests/opengl/general/cases.list b/tests/opengl/general/cases.list new file mode 100644 index 0000000000..c77e232208 --- /dev/null +++ b/tests/opengl/general/cases.list @@ -0,0 +1 @@ +../data/general diff --git a/tests/opengl/geom/cases.list b/tests/opengl/geom/cases.list new file mode 100644 index 0000000000..c52f40ee1c --- /dev/null +++ b/tests/opengl/geom/cases.list @@ -0,0 +1 @@ +../data/geom diff --git a/tests/opengl/grids.list b/tests/opengl/grids.list new file mode 100644 index 0000000000..79c8e28698 --- /dev/null +++ b/tests/opengl/grids.list @@ -0,0 +1,16 @@ +000 drivers +001 background +002 clipping +004 general +005 geom +006 hatch +007 lines +008 markers +009 raytrace +010 shaderprog +011 shading +012 shadows +013 silhouette +014 text +015 textures +016 transparency diff --git a/tests/opengl/hatch/cases.list b/tests/opengl/hatch/cases.list new file mode 100644 index 0000000000..6763b0e240 --- /dev/null +++ b/tests/opengl/hatch/cases.list @@ -0,0 +1 @@ +../data/hatch diff --git a/tests/opengl/lines/cases.list b/tests/opengl/lines/cases.list new file mode 100644 index 0000000000..b2b1141b27 --- /dev/null +++ b/tests/opengl/lines/cases.list @@ -0,0 +1 @@ +../data/lines diff --git a/tests/opengl/markers/cases.list b/tests/opengl/markers/cases.list new file mode 100644 index 0000000000..590c14c833 --- /dev/null +++ b/tests/opengl/markers/cases.list @@ -0,0 +1 @@ +../data/markers diff --git a/tests/opengl/parse.rules b/tests/opengl/parse.rules new file mode 100644 index 0000000000..b21b912b35 --- /dev/null +++ b/tests/opengl/parse.rules @@ -0,0 +1,2 @@ +FAILED /\bFaulty\b/ error +IGNORE /Could not open: TKIVtkDraw/skip VTK diff --git a/tests/opengl/raytrace/begin b/tests/opengl/raytrace/begin new file mode 100644 index 0000000000..e246b12712 --- /dev/null +++ b/tests/opengl/raytrace/begin @@ -0,0 +1,4 @@ +if { $::tcl_platform(os) == "Darwin" } { + # Ray-Tracing doesn't work with Compatible Profile on macOS + vcaps -core +} diff --git a/tests/opengl/raytrace/cases.list b/tests/opengl/raytrace/cases.list new file mode 100644 index 0000000000..44fed3a3c9 --- /dev/null +++ b/tests/opengl/raytrace/cases.list @@ -0,0 +1 @@ +../data/raytrace diff --git a/tests/opengl/shaderprog/cases.list b/tests/opengl/shaderprog/cases.list new file mode 100644 index 0000000000..ba57c287ba --- /dev/null +++ b/tests/opengl/shaderprog/cases.list @@ -0,0 +1 @@ +../data/shaderprog diff --git a/tests/opengl/shading/cases.list b/tests/opengl/shading/cases.list new file mode 100644 index 0000000000..6ed1aaab7b --- /dev/null +++ b/tests/opengl/shading/cases.list @@ -0,0 +1 @@ +../data/shading diff --git a/tests/opengl/shadows/cases.list b/tests/opengl/shadows/cases.list new file mode 100644 index 0000000000..91a8969039 --- /dev/null +++ b/tests/opengl/shadows/cases.list @@ -0,0 +1 @@ +../data/shadows diff --git a/tests/opengl/silhouette/cases.list b/tests/opengl/silhouette/cases.list new file mode 100644 index 0000000000..e7ca264981 --- /dev/null +++ b/tests/opengl/silhouette/cases.list @@ -0,0 +1 @@ +../data/silhouette diff --git a/tests/opengl/text/cases.list b/tests/opengl/text/cases.list new file mode 100644 index 0000000000..1aa8819f4f --- /dev/null +++ b/tests/opengl/text/cases.list @@ -0,0 +1 @@ +../data/text diff --git a/tests/opengl/textures/cases.list b/tests/opengl/textures/cases.list new file mode 100644 index 0000000000..8f33dfdf2d --- /dev/null +++ b/tests/opengl/textures/cases.list @@ -0,0 +1 @@ +../data/textures diff --git a/tests/opengl/transparency/cases.list b/tests/opengl/transparency/cases.list new file mode 100644 index 0000000000..9379e99421 --- /dev/null +++ b/tests/opengl/transparency/cases.list @@ -0,0 +1 @@ +../data/transparency diff --git a/tests/opengles2/background/cases.list b/tests/opengles2/background/cases.list new file mode 100644 index 0000000000..fff08f13aa --- /dev/null +++ b/tests/opengles2/background/cases.list @@ -0,0 +1 @@ +../../opengl/data/background diff --git a/tests/opengles2/begin b/tests/opengles2/begin new file mode 100644 index 0000000000..bc12dc482c --- /dev/null +++ b/tests/opengles2/begin @@ -0,0 +1,13 @@ +cpulimit 300 +if { ![checkplatform -windows] } { + puts "TEST COMPLETED" + return -code 1 "Skipping testgrid 'opengles2': OpenGL ES can be reliably fixed to 2.0 only by ANGLE library" +} + +pload VISUALIZATION +vdriver -load GLES +vcaps -maxVersion 2 0 +vcaps -useWinBuffer 0 +vgldebug -glslWarn 1 + +if { [info exists imagedir] == 0 } { set imagedir . } diff --git a/tests/opengles2/clipping/cases.list b/tests/opengles2/clipping/cases.list new file mode 100644 index 0000000000..194696bca3 --- /dev/null +++ b/tests/opengles2/clipping/cases.list @@ -0,0 +1 @@ +../../opengl/data/clipping diff --git a/tests/opengles2/end b/tests/opengles2/end new file mode 100644 index 0000000000..4668a76e69 --- /dev/null +++ b/tests/opengles2/end @@ -0,0 +1,2 @@ +catch { vglinfo } +puts "TEST COMPLETED" diff --git a/tests/opengles2/general/cases.list b/tests/opengles2/general/cases.list new file mode 100644 index 0000000000..30e5b5f230 --- /dev/null +++ b/tests/opengles2/general/cases.list @@ -0,0 +1 @@ +../../opengl/data/general diff --git a/tests/opengles2/grids.list b/tests/opengles2/grids.list new file mode 100644 index 0000000000..4ffa3b4af2 --- /dev/null +++ b/tests/opengles2/grids.list @@ -0,0 +1,16 @@ +#000 drivers +#001 background +#002 clipping +004 general +#005 geom +#006 hatch +007 lines +008 markers +#009 raytrace +#010 shaderprog +011 shading +012 shadows +013 silhouette +014 text +#015 textures +#016 transparency diff --git a/tests/opengles2/lines/cases.list b/tests/opengles2/lines/cases.list new file mode 100644 index 0000000000..054ad5b011 --- /dev/null +++ b/tests/opengles2/lines/cases.list @@ -0,0 +1 @@ +../../opengl/data/lines diff --git a/tests/opengles2/markers/cases.list b/tests/opengles2/markers/cases.list new file mode 100644 index 0000000000..19bc0915c8 --- /dev/null +++ b/tests/opengles2/markers/cases.list @@ -0,0 +1 @@ +../../opengl/data/markers diff --git a/tests/opengles2/parse.rules b/tests/opengles2/parse.rules new file mode 100644 index 0000000000..631892c9fe --- /dev/null +++ b/tests/opengles2/parse.rules @@ -0,0 +1,3 @@ +FAILED /\bFaulty\b/ error +IGNORE /Could not open: TKIVtkDraw/skip VTK +IGNORE /Tcl Exception: Skipping test/skipping unsupported driver diff --git a/tests/opengles2/shaderprog/cases.list b/tests/opengles2/shaderprog/cases.list new file mode 100644 index 0000000000..8458096e56 --- /dev/null +++ b/tests/opengles2/shaderprog/cases.list @@ -0,0 +1 @@ +../../opengl/data/shaderprog diff --git a/tests/opengles2/shading/cases.list b/tests/opengles2/shading/cases.list new file mode 100644 index 0000000000..2904908525 --- /dev/null +++ b/tests/opengles2/shading/cases.list @@ -0,0 +1 @@ +../../opengl/data/shading diff --git a/tests/opengles2/shadows/cases.list b/tests/opengles2/shadows/cases.list new file mode 100644 index 0000000000..70b31da104 --- /dev/null +++ b/tests/opengles2/shadows/cases.list @@ -0,0 +1 @@ +../../opengl/data/shadows diff --git a/tests/opengles2/silhouette/cases.list b/tests/opengles2/silhouette/cases.list new file mode 100644 index 0000000000..571204b343 --- /dev/null +++ b/tests/opengles2/silhouette/cases.list @@ -0,0 +1 @@ +../../opengl/data/silhouette diff --git a/tests/opengles2/text/cases.list b/tests/opengles2/text/cases.list new file mode 100644 index 0000000000..135e4b02be --- /dev/null +++ b/tests/opengles2/text/cases.list @@ -0,0 +1 @@ +../../opengl/data/text diff --git a/tests/opengles2/textures/cases.list b/tests/opengles2/textures/cases.list new file mode 100644 index 0000000000..bd129de407 --- /dev/null +++ b/tests/opengles2/textures/cases.list @@ -0,0 +1 @@ +../../opengl/data/textures diff --git a/tests/opengles2/transparency/cases.list b/tests/opengles2/transparency/cases.list new file mode 100644 index 0000000000..5de7fdf058 --- /dev/null +++ b/tests/opengles2/transparency/cases.list @@ -0,0 +1 @@ +../../opengl/data/transparency diff --git a/tests/opengles3/background/cases.list b/tests/opengles3/background/cases.list new file mode 100644 index 0000000000..fff08f13aa --- /dev/null +++ b/tests/opengles3/background/cases.list @@ -0,0 +1 @@ +../../opengl/data/background diff --git a/tests/opengles3/begin b/tests/opengles3/begin new file mode 100644 index 0000000000..083a50e8ba --- /dev/null +++ b/tests/opengles3/begin @@ -0,0 +1,13 @@ +cpulimit 300 + +if { $::tcl_platform(os) == "Darwin" } { + puts "TEST COMPLETED" + return -code 1 "Skipping testgrid 'opengles3': not configured for macOS" +} + +pload VISUALIZATION +vdriver -load GLES +vgldebug -glslWarn 1 +vcaps -useWinBuffer 0 + +if { [info exists imagedir] == 0 } { set imagedir . } diff --git a/tests/opengles3/clipping/cases.list b/tests/opengles3/clipping/cases.list new file mode 100644 index 0000000000..194696bca3 --- /dev/null +++ b/tests/opengles3/clipping/cases.list @@ -0,0 +1 @@ +../../opengl/data/clipping diff --git a/tests/opengles3/end b/tests/opengles3/end new file mode 100644 index 0000000000..4668a76e69 --- /dev/null +++ b/tests/opengles3/end @@ -0,0 +1,2 @@ +catch { vglinfo } +puts "TEST COMPLETED" diff --git a/tests/opengles3/general/cases.list b/tests/opengles3/general/cases.list new file mode 100644 index 0000000000..30e5b5f230 --- /dev/null +++ b/tests/opengles3/general/cases.list @@ -0,0 +1 @@ +../../opengl/data/general diff --git a/tests/opengles3/geom/cases.list b/tests/opengles3/geom/cases.list new file mode 100644 index 0000000000..221695f48d --- /dev/null +++ b/tests/opengles3/geom/cases.list @@ -0,0 +1 @@ +../../opengl/data/geom diff --git a/tests/opengles3/grids.list b/tests/opengles3/grids.list new file mode 100644 index 0000000000..b820315ea0 --- /dev/null +++ b/tests/opengles3/grids.list @@ -0,0 +1,16 @@ +#000 drivers +001 background +002 clipping +004 general +005 geom +#006 hatch +007 lines +008 markers +009 raytrace +010 shaderprog +011 shading +012 shadows +013 silhouette +014 text +015 textures +016 transparency diff --git a/tests/opengles3/lines/cases.list b/tests/opengles3/lines/cases.list new file mode 100644 index 0000000000..054ad5b011 --- /dev/null +++ b/tests/opengles3/lines/cases.list @@ -0,0 +1 @@ +../../opengl/data/lines diff --git a/tests/opengles3/markers/cases.list b/tests/opengles3/markers/cases.list new file mode 100644 index 0000000000..19bc0915c8 --- /dev/null +++ b/tests/opengles3/markers/cases.list @@ -0,0 +1 @@ +../../opengl/data/markers diff --git a/tests/opengles3/parse.rules b/tests/opengles3/parse.rules new file mode 100644 index 0000000000..631892c9fe --- /dev/null +++ b/tests/opengles3/parse.rules @@ -0,0 +1,3 @@ +FAILED /\bFaulty\b/ error +IGNORE /Could not open: TKIVtkDraw/skip VTK +IGNORE /Tcl Exception: Skipping test/skipping unsupported driver diff --git a/tests/opengles3/raytrace/begin b/tests/opengles3/raytrace/begin new file mode 100644 index 0000000000..26f08741ec --- /dev/null +++ b/tests/opengles3/raytrace/begin @@ -0,0 +1,4 @@ +if { [checkplatform -windows] && [vdriver -default] == "TKOpenGles" } { + puts "TEST COMPLETED" + return -code 1 "Skipping testgrid 'raytracing': OpenGL ES 3.2 is required which ANGLE doesn't yet provide" +} diff --git a/tests/opengles3/raytrace/cases.list b/tests/opengles3/raytrace/cases.list new file mode 100644 index 0000000000..32faa6e26d --- /dev/null +++ b/tests/opengles3/raytrace/cases.list @@ -0,0 +1 @@ +../../opengl/data/raytrace diff --git a/tests/opengles3/shaderprog/cases.list b/tests/opengles3/shaderprog/cases.list new file mode 100644 index 0000000000..8458096e56 --- /dev/null +++ b/tests/opengles3/shaderprog/cases.list @@ -0,0 +1 @@ +../../opengl/data/shaderprog diff --git a/tests/opengles3/shading/cases.list b/tests/opengles3/shading/cases.list new file mode 100644 index 0000000000..2904908525 --- /dev/null +++ b/tests/opengles3/shading/cases.list @@ -0,0 +1 @@ +../../opengl/data/shading diff --git a/tests/opengles3/shadows/cases.list b/tests/opengles3/shadows/cases.list new file mode 100644 index 0000000000..70b31da104 --- /dev/null +++ b/tests/opengles3/shadows/cases.list @@ -0,0 +1 @@ +../../opengl/data/shadows diff --git a/tests/opengles3/silhouette/cases.list b/tests/opengles3/silhouette/cases.list new file mode 100644 index 0000000000..571204b343 --- /dev/null +++ b/tests/opengles3/silhouette/cases.list @@ -0,0 +1 @@ +../../opengl/data/silhouette diff --git a/tests/opengles3/text/cases.list b/tests/opengles3/text/cases.list new file mode 100644 index 0000000000..135e4b02be --- /dev/null +++ b/tests/opengles3/text/cases.list @@ -0,0 +1 @@ +../../opengl/data/text diff --git a/tests/opengles3/textures/cases.list b/tests/opengles3/textures/cases.list new file mode 100644 index 0000000000..bd129de407 --- /dev/null +++ b/tests/opengles3/textures/cases.list @@ -0,0 +1 @@ +../../opengl/data/textures diff --git a/tests/opengles3/transparency/cases.list b/tests/opengles3/transparency/cases.list new file mode 100644 index 0000000000..5de7fdf058 --- /dev/null +++ b/tests/opengles3/transparency/cases.list @@ -0,0 +1 @@ +../../opengl/data/transparency diff --git a/tests/v3d/anim/videorecorder b/tests/v3d/anim/videorecorder index ee403a40d2..e3f4fc23fa 100644 --- a/tests/v3d/anim/videorecorder +++ b/tests/v3d/anim/videorecorder @@ -11,6 +11,7 @@ file delete -force ${aFile} # Ray-Tracing doesn't work with Compatible Profile on macOS pload VISUALIZATION +pload OPENGL if { $::tcl_platform(os) == "Darwin" } { vcaps -core } source $env(CSF_OCCTTestsPath)/v3d/anim/propeller diff --git a/tests/v3d/begin b/tests/v3d/begin index ef09111512..9634ef9e55 100755 --- a/tests/v3d/begin +++ b/tests/v3d/begin @@ -1,15 +1,3 @@ -cpulimit 300 -set group "v3d" +cpulimit 1000 -pload VISUALIZATION TOPTEST - -pload OPENGL -vgldebug -glslWarn 1 - -if { [info exists imagedir] == 0 } { - set imagedir . -} - -if { [info exists test_image ] == 0 } { - set test_image photo -} +if { [info exists imagedir] == 0 } { set imagedir . } diff --git a/tests/v3d/bugs/buc60659 b/tests/v3d/bugs/buc60659 new file mode 100644 index 0000000000..7311459c69 --- /dev/null +++ b/tests/v3d/bugs/buc60659 @@ -0,0 +1,13 @@ +puts "==========================" +puts "BUC60659: There was E x c e p t i o n after vsetshading command" +puts "==========================" +puts "" + +pload MODELING VISUALIZATION +box a 10 30 50 +vinit View1 +vdisplay a +vfit +vsetshading a + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/buc60661 b/tests/v3d/bugs/buc60661 old mode 100755 new mode 100644 similarity index 59% rename from tests/bugs/vis/buc60661 rename to tests/v3d/bugs/buc60661 index 5b916c36d9..552f1569d1 --- a/tests/bugs/vis/buc60661 +++ b/tests/v3d/bugs/buc60661 @@ -1,16 +1,11 @@ puts "==================================" puts "BUC60661" -puts "It takes visual check for this BUG" +puts "It is impossible to nominate sheding mode in 3D-viewer for the some shapes in C30 (SUN station)," +puts "which were stored in IGES format previously and then were retrieved again into BREP format." puts "==================================" puts "" -pload XDE - -################################################################## -##DESCRIPTION: It is impossible to nominate "sheding" mode in 3D-viewer for the some shapes in -## C30 (SUN station), which were stored in "IGES" format previously and then were retrieved again -## into "BREP" format. -################################################################## +pload MODELING XDE VISUALIZATION restore [locate_data_file buc60661a.brep] buc60661 checkshape buc60661 @@ -31,10 +26,10 @@ if [catch { igesbrep ${imagedir}/buc60661.igs a * } res] { tpcompound result checkshape result -vinit +vinit View1 tclean result vdisplay result vsetdispmode result 1 checktrinfo result -tri -nod -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/buc60701 b/tests/v3d/bugs/buc60701 old mode 100755 new mode 100644 similarity index 73% rename from tests/bugs/vis/buc60701 rename to tests/v3d/bugs/buc60701 index d1d4e86733..9a07d9ded8 --- a/tests/bugs/vis/buc60701 +++ b/tests/v3d/bugs/buc60701 @@ -1,12 +1,12 @@ - puts "========================" puts "BUC60701" puts "========================" - + +pload MODELING VISUALIZATION box result 10 10 10 -vinit +vinit View1 vdisplay result -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png ### Photo of V3Dview is less than image in the viewer (only half-part of viewer is present on a photo). diff --git a/tests/bugs/vis/buc60738 b/tests/v3d/bugs/buc60738 old mode 100755 new mode 100644 similarity index 93% rename from tests/bugs/vis/buc60738 rename to tests/v3d/bugs/buc60738 index b7e55c1005..cbbde012dd --- a/tests/bugs/vis/buc60738 +++ b/tests/v3d/bugs/buc60738 @@ -3,6 +3,7 @@ puts "BUC60738" puts "========================" puts "" +pload MODELING VISUALIZATION vclear vinit View1 vaxo diff --git a/tests/v3d/bugs/buc60740 b/tests/v3d/bugs/buc60740 new file mode 100644 index 0000000000..c6494d33df --- /dev/null +++ b/tests/v3d/bugs/buc60740 @@ -0,0 +1,18 @@ +puts "===========" +puts "BUC60740" +puts "===========" + +pload MODELING VISUALIZATION +vinit View1 +box b 0 0 0 10 10 10 +pcylinder c 10 10 +vdisplay b +vsetdispmode b 1 +vdisplay c +vsetdispmode c 1 +vfit +vsettransparency c 0.5 +checkcolor 154 257 0.6 0.4 0.07 +if {$stat != 1} { puts "Error :function vsettransparency works WRONGLY" } + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/buc60774 b/tests/v3d/bugs/buc60774 new file mode 100644 index 0000000000..3ff4acc767 --- /dev/null +++ b/tests/v3d/bugs/buc60774 @@ -0,0 +1,10 @@ +puts "========" +puts "BUC60774" +puts "========" +puts "" + +pload MODELING VISUALIZATION QAcommands +vinit View1 +catch {BUC60774} +vfit +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/buc60832 b/tests/v3d/bugs/buc60832 new file mode 100644 index 0000000000..86e99cd1c6 --- /dev/null +++ b/tests/v3d/bugs/buc60832 @@ -0,0 +1,18 @@ +puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_" + +puts "============" +puts "BUC60832: Try to display this shape in the viewer 3D by means of the method AIS_InteractiveContext::Display()." +puts "This method calls StdSelect_BRepSelectionTool::ComputeSelection() a recursive method which hangs up an application." +puts "============" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file BUC60832.brep] result +checkshape result + +tclean result +vinit +vdisplay result +vsetdispmode result 1 +vfit +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/buc60857 b/tests/v3d/bugs/buc60857 old mode 100755 new mode 100644 similarity index 97% rename from tests/bugs/vis/buc60857 rename to tests/v3d/bugs/buc60857 index bb9bd1affd..a82b3f2c16 --- a/tests/bugs/vis/buc60857 +++ b/tests/v3d/bugs/buc60857 @@ -2,7 +2,8 @@ puts "========" puts "BUC60857" puts "========" -vinit +pload MODELING VISUALIZATION QAcommands +vinit View1 BUC60857 vfit @@ -86,4 +87,4 @@ if {${delta_H_RB} > ${maxdelta_H}} { puts "BUC60857: OK (case 4)" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/buc60858 b/tests/v3d/bugs/buc60858 old mode 100755 new mode 100644 similarity index 55% rename from tests/bugs/vis/buc60858 rename to tests/v3d/bugs/buc60858 index 45541256ef..668e12b99f --- a/tests/bugs/vis/buc60858 +++ b/tests/v3d/bugs/buc60858 @@ -1,19 +1,16 @@ puts "TODO CR30056 ALL: Meshing statuses: Failure UnorientedWire" puts "============" -puts "BUC60858" +puts "BUC60858: crash within BRepMesh1" puts "============" puts "" -###################################################################### -## When I gave command "vdisplay a" , where a is shape restored from attached file.DRAW crashes -## with segmentation fault. Exception is raised in the file BRepMesh/triangle.cxx. -###################################################################### +pload MODELING VISUALIZATION restore [locate_data_file BUC60858.brep] result tclean result isos 0 -vinit +vinit View1 incmesh result 0.01 vdisplay result vfit @@ -26,4 +23,4 @@ isos result 0 triangles result checktrinfo result -tri -nod -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/buc60915 b/tests/v3d/bugs/buc60915 new file mode 100644 index 0000000000..876c657e2f --- /dev/null +++ b/tests/v3d/bugs/buc60915 @@ -0,0 +1,12 @@ +puts "===========" +puts "BUC60915" +puts "===========" + +pload VISUALIZATION QAcommands +vinit View1 +BUC60915 + +checkcolor 300 164 0.51 0.98 0 +if {$stat != 1} { puts "Error : Cannot set the arrow size when using AIS_LengthDimension or AIS_RadiusDimensin." } + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug112 b/tests/v3d/bugs/bug112 new file mode 100644 index 0000000000..21c5d894e9 --- /dev/null +++ b/tests/v3d/bugs/bug112 @@ -0,0 +1,17 @@ +puts "========" +puts "BUC60956: When restoring a TopoDS_Shape containing a valid Meshing (computed for display) the meshing is computed again when displaying it." +puts "OCC112" +puts "========" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file OCC20.brep] result +tclean result +vinit View1 +vdisplay result +vfit +vsetdispmode result 1 + +checkcolor 140 115 0.77 0.54 0.9 + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug112_1 b/tests/v3d/bugs/bug112_1 old mode 100755 new mode 100644 similarity index 73% rename from tests/bugs/vis/bug112_1 rename to tests/v3d/bugs/bug112_1 index e581960c68..b21e94eb49 --- a/tests/bugs/vis/bug112_1 +++ b/tests/v3d/bugs/bug112_1 @@ -3,6 +3,7 @@ puts " BUC60956 " puts " OCC112 " puts "========================" +pload MODELING VISUALIZATION restore [locate_data_file OCC20.brep] res checkshape res @@ -13,15 +14,13 @@ tclean res catch {file delete ${imagedir}/vrem.brep} save res ${imagedir}/vrem.brep -vinit +vinit View1 restore ${imagedir}/vrem.brep result vdisplay result vsetdispmode result 1 set second [trinfo result] -if {$first == $second} { - puts "Faulty OCC112 : Mesh for shading was recalculated !!!" -} +if {$first == $second} { puts "Faulty OCC112 : Mesh for shading was recalculated !!!" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug11615 b/tests/v3d/bugs/bug11615 new file mode 100644 index 0000000000..e8db39168d --- /dev/null +++ b/tests/v3d/bugs/bug11615 @@ -0,0 +1,41 @@ +puts "============" +puts "OCC11615: Anisotropic scaling in 3D view" +puts "============" +puts "" + +pload MODELING VISUALIZATION + +box b 10 10 10 +vinit View1 +vdisplay b +vfit +vscale 1 1 1 + +set x1 [list 165 340 70] +set y1 [list 384 283 79] +vaspects -setwidth 5 +puts "" +for {set i 0} {$i < 3} {incr i} { + set x_coord [lindex ${x1} $i] + set y_coord [lindex ${y1} $i] + if { "[vreadpixel $x_coord $y_coord rgb name]" != "YELLOW" } { + puts "Error : color is not yellow" + } +} + +vscale 0.5 1.5 0.7 +vfit + +set x2 [list 80 390 25] +set y2 [list 390 218 167] + +puts "" +for {set i 0} {$i < 3} {incr i} { + set x_coord [lindex ${x2} $i] + set y_coord [lindex ${y2} $i] + if { "[vreadpixel $x_coord $y_coord rgb name]" != "YELLOW" } { + puts "Error : color is not yellow" + } +} + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug1174 b/tests/v3d/bugs/bug1174 old mode 100755 new mode 100644 similarity index 71% rename from tests/bugs/vis/bug1174 rename to tests/v3d/bugs/bug1174 index df90b4e5ad..8d47754270 --- a/tests/bugs/vis/bug1174 +++ b/tests/v3d/bugs/bug1174 @@ -1,10 +1,9 @@ puts "================" -puts "OCC1174" +puts "OCC1174: Impossible to set different properties for different sides of a (sur)face" puts "================" puts "" -######################################################################################## -# puts "Impossible to set different properties for different sides of a (sur)face" -######################################################################################## + +pload MODELING VISUALIZATION QAcommands set x 200 set y 200 @@ -14,7 +13,7 @@ set Black_G 0 set Black_B 0 restore [locate_data_file OCC1174.brep] a -vinit +vinit View1 OCC1174_1 a vdisplay a vfit @@ -49,21 +48,21 @@ set GREEN_2 [lindex $ColorList2 1] set BLUE_2 [lindex $ColorList2 2] if {${RED_1} == 0 && ${GREEN_1} > 0 && ${BLUE_1} == 0} { - set IsGreen 1 + set IsGreen 1 } else { - set IsGreen 0 + set IsGreen 0 } if {${RED_2} == 0 && ${GREEN_2} == 0 && ${BLUE_2} > 0} { - set IsBlue 1 + set IsBlue 1 } else { - set IsBlue 0 + set IsBlue 0 } if {${IsGreen} == 1 && ${IsBlue} == 1} { - puts "OCC1174: OK" + puts "OCC1174: OK" } else { - puts "OCC1174: Error" + puts "OCC1174: Error" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug12584 b/tests/v3d/bugs/bug12584 new file mode 100644 index 0000000000..ecaf35016d --- /dev/null +++ b/tests/v3d/bugs/bug12584 @@ -0,0 +1,10 @@ +puts "============" +puts "OCC12584" +puts "============" +puts "" + +pload VISUALIZATION QAcommands +vinit View1 +OCC12584 + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug128 b/tests/v3d/bugs/bug128 new file mode 100644 index 0000000000..7de95692f7 --- /dev/null +++ b/tests/v3d/bugs/bug128 @@ -0,0 +1,12 @@ +puts "================" +puts "OCC128: The shading is false: objects seem to be situated in front of the others while they are behind." +puts "================" + +pload VISUALIZATION QAcommands +vinit View1 +OCC128 +vviewparams -scale 4.9487928 -proj 0.7329295 0.59461397 0.33052679 -up -0.536849 0.2071041 0.81786 -at 32.4556665273951 52.9347942181675 -5.1270029887922 + +checkcolor 171 171 0.43 0.48 0.54 + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug136 b/tests/v3d/bugs/bug136 old mode 100755 new mode 100644 similarity index 56% rename from tests/bugs/vis/bug136 rename to tests/v3d/bugs/bug136 index 1e54e4935c..ff5dfb2a70 --- a/tests/bugs/vis/bug136 +++ b/tests/v3d/bugs/bug136 @@ -3,14 +3,11 @@ puts "================" puts "OCC136" puts "================" -set x_coord 211 -set y_coord 215 - -vinit +pload VISUALIZATION QAcommands +vinit View1 OCC136 vfit -checkcolor $x_coord $y_coord 0.8 0.8 0.8 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +checkcolor 211 215 0.8 0.8 0.8 +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug138_1 b/tests/v3d/bugs/bug138_1 old mode 100755 new mode 100644 similarity index 56% rename from tests/bugs/vis/bug138_1 rename to tests/v3d/bugs/bug138_1 index f267c6c7d6..32ae60928c --- a/tests/bugs/vis/bug138_1 +++ b/tests/v3d/bugs/bug138_1 @@ -1,11 +1,10 @@ puts "========" -puts "OCC138" +puts "OCC138: Viewer problem: Selection of objects on global context" puts "========" puts "" -####################################### -## Viewer problem: Selection of objects on global context -####################################### -vinit + +pload VISUALIZATION QAcommands +vinit View1 set info [OCC138] set ll [llength ${info}] @@ -19,4 +18,4 @@ if {${ll} < 5 } { } vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug138_2 b/tests/v3d/bugs/bug138_2 old mode 100755 new mode 100644 similarity index 79% rename from tests/bugs/vis/bug138_2 rename to tests/v3d/bugs/bug138_2 index 23cc2f52ba..dda123d574 --- a/tests/bugs/vis/bug138_2 +++ b/tests/v3d/bugs/bug138_2 @@ -2,7 +2,8 @@ puts "========" puts "OCC138" puts "========" -vinit +pload VISUALIZATION QAcommands +vinit View1 set info [OCC138LC] set ll [llength ${info}] @@ -16,4 +17,4 @@ if {${ll} < 5 } { } vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug16950_1 b/tests/v3d/bugs/bug16950_1 new file mode 100644 index 0000000000..2fa97f1ccb --- /dev/null +++ b/tests/v3d/bugs/bug16950_1 @@ -0,0 +1,21 @@ +puts "===========" +puts "OCC16950: OCC Visualization fails to display empty nested compounds" +puts "===========" + +pload MODELING VISUALIZATION + +puts "Make compound containing another (empty) one" +compound c +compound c result + +puts "And display it" +vinit +vdisplay result + +# Resume +if [catch { vsetdispmode 1 } res] { + puts "Faulty OCC16950" +} else { + puts "OK OCC16950" +} +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug16950_2 b/tests/v3d/bugs/bug16950_2 new file mode 100644 index 0000000000..138f580b62 --- /dev/null +++ b/tests/v3d/bugs/bug16950_2 @@ -0,0 +1,21 @@ +puts "===========" +puts "OCC16950: OCC Visualization fails to display empty nested compound" +puts "===========" + +pload MODELING VISUALIZATION + +puts "Make compound containing another (empty) one" +compound c +compound c result + +puts "And display it" +vinit View1 +vdisplay result + +# Resume +if [catch { vsetdispmode 2 } res] { + puts "Faulty OCC16950" +} else { + puts "OK OCC16950" +} +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug16950_3 b/tests/v3d/bugs/bug16950_3 old mode 100755 new mode 100644 similarity index 55% rename from tests/bugs/vis/bug16950_3 rename to tests/v3d/bugs/bug16950_3 index 51461e924e..f4d05d6b89 --- a/tests/bugs/vis/bug16950_3 +++ b/tests/v3d/bugs/bug16950_3 @@ -1,11 +1,8 @@ puts "===========" -puts "OCC16950" +puts "OCC16950: OCC Visualization fails to display empty nested compounds" puts "===========" -###################################################### -# OCC Visualization fails to display empty nested compounds -###################################################### -pload DCAF +pload MODELING VISUALIZATION DCAF set BugNumber OCC16950 @@ -23,8 +20,8 @@ XShow D # Resume if [catch { vsetdispmode 1 } res] { - puts "Faulty ${BugNumber}" + puts "Faulty OCC16950" } else { - puts "OK ${BugNumber}" + puts "OK OCC16950" } - +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug16950_4 b/tests/v3d/bugs/bug16950_4 old mode 100755 new mode 100644 similarity index 51% rename from tests/bugs/vis/bug16950_4 rename to tests/v3d/bugs/bug16950_4 index 877bcbb4c8..8b483a513c --- a/tests/bugs/vis/bug16950_4 +++ b/tests/v3d/bugs/bug16950_4 @@ -1,13 +1,8 @@ puts "===========" -puts "OCC16950" +puts "OCC16950: OCC Visualization fails to display empty nested compounds" puts "===========" -###################################################### -# OCC Visualization fails to display empty nested compounds -###################################################### -pload DCAF - -set BugNumber OCC16950 +pload MODELING VISUALIZATION DCAF puts "Make compound containing another (empty) one" compound c @@ -23,7 +18,8 @@ XShow D # Resume if [catch { vsetdispmode 2 } res] { - puts "Faulty ${BugNumber}" + puts "Faulty OCC16950" } else { - puts "OK ${BugNumber}" + puts "OK OCC16950" } +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug17126 b/tests/v3d/bugs/bug17126 new file mode 100644 index 0000000000..997d893523 --- /dev/null +++ b/tests/v3d/bugs/bug17126 @@ -0,0 +1,12 @@ +puts "================" +puts "OCC17126: Visualisation in 3d viewer in Draw hangs up" +puts "================" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file bug17126_ff_1285_viz.brep] a + +vinit View1 +vdisplay a +vfit +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug173_1 b/tests/v3d/bugs/bug173_1 new file mode 100644 index 0000000000..7dd4b8d279 --- /dev/null +++ b/tests/v3d/bugs/bug173_1 @@ -0,0 +1,26 @@ +puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_" +puts "========" +puts "OCC173: Impossible to change the material or the transparency of the attached BREP shape." +puts "(case 1)" +puts "========" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file OCC173.brep] result +checkshape result + +vinit View1 +tclean result +vdisplay result +vfit +vsetdispmode result 1 + +checkcolor 175 195 1 0.75 0.15 +if { $stat != 1 } { puts "Error : Shading is missing in 3D Viewer" } + +######################################################## +vsetmaterial result COPPER +checkcolor 175 195 0.77 0.32 0.23 +if { $stat != 1 } { puts "Error : material of shape is not COPPER" } + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug173_2 b/tests/v3d/bugs/bug173_2 old mode 100755 new mode 100644 similarity index 63% rename from tests/bugs/vis/bug173_2 rename to tests/v3d/bugs/bug173_2 index 55ba1def2d..fcf2cb499c --- a/tests/bugs/vis/bug173_2 +++ b/tests/v3d/bugs/bug173_2 @@ -1,17 +1,15 @@ puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_" puts "========" -puts "OCC173" +puts "OCC173: Impossible to change the material or the transparency of the attached BREP shape." puts "(case 2)" puts "========" puts "" -########################################################### -## Impossible to change the material or the transparency of the attached BREP shape. -########################################################### +pload MODELING VISUALIZATION restore [locate_data_file OCC173.brep] result checkshape result -vinit +vinit View1 tclean result vdisplay result vfit @@ -30,7 +28,7 @@ set gr2 [lindex $color2 1] set bl2 [lindex $color2 2] if { ${rd2} == ${rd1} || ${gr2} == ${gr1} || ${bl2} == ${bl1} } { - puts "Error : material of the shape was NOT changed" + puts "Error : material of the shape was NOT changed" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug173_3 b/tests/v3d/bugs/bug173_3 old mode 100755 new mode 100644 similarity index 65% rename from tests/bugs/vis/bug173_3 rename to tests/v3d/bugs/bug173_3 index 72b0f9f489..4dd049f2b5 --- a/tests/bugs/vis/bug173_3 +++ b/tests/v3d/bugs/bug173_3 @@ -1,18 +1,16 @@ puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_" puts "========" -puts "OCC173" +puts "OCC173: Impossible to change the material or the transparency of the attached BREP shape." puts "(case 3)" puts "========" puts "" -########################################################### -## Impossible to change the material or the transparency of the attached BREP shape. -########################################################### +pload MODELING VISUALIZATION restore [locate_data_file OCC173.brep] result checkshape result -vinit +vinit View1 tclean result vdisplay result vfit @@ -32,8 +30,7 @@ set gr2 [lindex $color2 1] set bl2 [lindex $color2 2] if { ${rd2} == ${rd1} || ${gr2} == ${gr1} || ${bl2} == ${bl1} } { - puts "Error : vsettransparency of shape was NOT made" + puts "Error : vsettransparency of shape was NOT made" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug185 b/tests/v3d/bugs/bug185 new file mode 100644 index 0000000000..0444b313fe --- /dev/null +++ b/tests/v3d/bugs/bug185 @@ -0,0 +1,24 @@ +puts "========" +puts "OCC185" +puts "========" + +pload XDE MODELING VISUALIZATION + +igesbrep [locate_data_file OCC185.igs] a * + +tpcompound result +tclean result + +vinit View1 +vdisplay result +vfit +vsetdispmode result 1 + +checkcolor 235 214 0.78 0.55 0.9 +if { $stat != 1 } { puts "Error : Shading is OFF, but should be ON" } + +vsetdispmode result 0 +checkcolor 235 214 0 1 0 +if { $stat != 1 } { puts "Error : Shading is ON, but should be OFF" } + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug19_2 b/tests/v3d/bugs/bug19_2 old mode 100755 new mode 100644 similarity index 77% rename from tests/bugs/vis/bug19_2 rename to tests/v3d/bugs/bug19_2 index 853399ab86..f1628fc7de --- a/tests/bugs/vis/bug19_2 +++ b/tests/v3d/bugs/bug19_2 @@ -3,15 +3,16 @@ puts "OCC19" puts "================" puts "" +pload MODELING VISUALIZATION restore [locate_data_file OCC19.brep] result checkshape result tclean result -vinit +vinit View1 vdisplay result vsetdispmode result 1 isos result 0 triangles result checktrinfo result -tri 50 -nod 52 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug20373 b/tests/v3d/bugs/bug20373 new file mode 100644 index 0000000000..9edf39ffbd --- /dev/null +++ b/tests/v3d/bugs/bug20373 @@ -0,0 +1,17 @@ +puts "============" +puts "OCC20373: Shading doesn't work on b-spline sphere" +puts "============" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file OCC20373.brep] result + +vinit View1 +vdisplay result +vsetdispmode 1 +vfit + +checktrinfo result -tri +checkprops result -s 9.92128e+06 +checkshape result +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug204_1 b/tests/v3d/bugs/bug204_1 old mode 100755 new mode 100644 similarity index 51% rename from tests/bugs/vis/bug204_1 rename to tests/v3d/bugs/bug204_1 index acc6e36276..8025e1726d --- a/tests/bugs/vis/bug204_1 +++ b/tests/v3d/bugs/bug204_1 @@ -4,17 +4,11 @@ puts "========" puts "OCC204" puts "========" -vinit +pload VISUALIZATION QAcommands +vinit View1 OCC204 0 vfit +checkcolor 150 200 0.8 0.8 0.8 +if { ${stat} != 1 } { puts "Error : 3 boxes missing in the viewer!" } -set x_coord 150 -set y_coord 200 - -checkcolor $x_coord $y_coord 0.8 0.8 0.8 - -if { ${stat} != 1 } { - puts "Error : 3 boxes missing in the viewer!" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug204_2 b/tests/v3d/bugs/bug204_2 new file mode 100644 index 0000000000..0e5f02f2fb --- /dev/null +++ b/tests/v3d/bugs/bug204_2 @@ -0,0 +1,12 @@ +puts "========" +puts "OCC204" +puts "========" + +pload VISUALIZATION QAcommands +vinit View1 +OCC204 1 +vfit +checkcolor 150 200 0 0 0 +if { ${stat} != 1 } { puts "Error : There are 3 boxes in the viewer! (should be nothing)" } + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug21171_1 b/tests/v3d/bugs/bug21171_1 new file mode 100644 index 0000000000..ead96baa8d --- /dev/null +++ b/tests/v3d/bugs/bug21171_1 @@ -0,0 +1,18 @@ +puts "============" +puts "OCC21171: Problem with vfit of vertex and edge " +puts "============" +puts "" + +pload MODELING VISUALIZATION +box result 100 100 100 +explode result e + +vinit View1 +vdisplay result_1 +vfit + +# Resume +puts "" +puts "1 edge is not fit" + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug21171_2 b/tests/v3d/bugs/bug21171_2 new file mode 100644 index 0000000000..2e18d977be --- /dev/null +++ b/tests/v3d/bugs/bug21171_2 @@ -0,0 +1,19 @@ +puts "============" +puts "OCC21171: Problem with vfit of vertex and edge " +puts "============" +puts "" + +pload MODELING VISUALIZATION +box result 100 100 100 +explode result e + +vinit View1 +vdisplay result_1 +vdisplay result_2 +vfit + +# Resume +puts "" +puts "2 edges are fit" + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug21171_3 b/tests/v3d/bugs/bug21171_3 new file mode 100644 index 0000000000..aed73ec419 --- /dev/null +++ b/tests/v3d/bugs/bug21171_3 @@ -0,0 +1,18 @@ +puts "============" +puts "OCC21171: Problem with vfit of vertex and edge " +puts "============" +puts "" + +pload MODELING VISUALIZATION +box result 100 100 100 +explode result v + +vinit View1 +vdisplay result_8 +vfit + +# Resume +puts "" +puts "1 vertex is not fit" + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug21171_4 b/tests/v3d/bugs/bug21171_4 new file mode 100644 index 0000000000..4394bbdf35 --- /dev/null +++ b/tests/v3d/bugs/bug21171_4 @@ -0,0 +1,19 @@ +puts "============" +puts "OCC21171: Problem with vfit of vertex and edge " +puts "============" +puts "" + +pload MODELING VISUALIZATION +box result 100 100 100 +explode result v + +vinit View1 +vdisplay result_8 +vdisplay result_1 +vfit + +# Resume +puts "" +puts "2 vertexes are fit" + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug215 b/tests/v3d/bugs/bug215 old mode 100755 new mode 100644 similarity index 80% rename from tests/bugs/vis/bug215 rename to tests/v3d/bugs/bug215 index dc04ed64df..870e878f58 --- a/tests/bugs/vis/bug215 +++ b/tests/v3d/bugs/bug215 @@ -2,11 +2,12 @@ puts "========" puts "OCC215" puts "========" +pload MODELING VISUALIZATION restore [locate_data_file OCC215.brep] result checkshape result tclean result -vinit +vinit View1 vdisplay result vfit @@ -20,13 +21,6 @@ set up_Z 0.876742839813232 set at_X 39.9465644699194 set at_Y 74.2135758209193 set at_Z 37.7440421525395 - vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} - -set x_coord 229 -set y_coord 94 - -checkcolor $x_coord $y_coord 1 1 0 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - +checkcolor 229 94 1 1 0 +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug21578 b/tests/v3d/bugs/bug21578 old mode 100755 new mode 100644 similarity index 59% rename from tests/bugs/vis/bug21578 rename to tests/v3d/bugs/bug21578 index 8835246e5e..622b8945f5 --- a/tests/bugs/vis/bug21578 +++ b/tests/v3d/bugs/bug21578 @@ -3,24 +3,20 @@ puts "TODO OCC11111 ALL: Error: Number of nodes" puts "TODO OCC11111 ALL: Error : The area of result shape is" puts "============" -puts "OCC21578" +puts "OCC21578: Attached shape is not visualized in the shaded mode" puts "============" puts "" -###################################################### -# Attached shape is not visualized in the shaded mode -###################################################### - -set BugNumber OCC21578 +pload MODELING VISUALIZATION restore [locate_data_file OCC21578.brep] result -vinit +vinit View1 tclean result vsetdispmode 1 vdisplay result vfit checktrinfo result -tri 231 -nod 236 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png checkprops result -s 0 checkshape result diff --git a/tests/bugs/vis/bug21753 b/tests/v3d/bugs/bug21753 similarity index 65% rename from tests/bugs/vis/bug21753 rename to tests/v3d/bugs/bug21753 index 7a862e84a2..6cedf0df5f 100644 --- a/tests/bugs/vis/bug21753 +++ b/tests/v3d/bugs/bug21753 @@ -1,12 +1,11 @@ puts "===========" -puts "OCC21753" +puts "OCC21753: Poor display of shading on cones due to Gouraud shading limitations" puts "===========" -puts "==================================" -puts "Poor display of shading on cones due to Gouraud shading limitations" -puts "==================================" + +pload MODELING VISUALIZATION # set rough meshing parameters -vinit +vinit View1 vdefaults -absDefl 10 -devCoeff 0.1 puts "Displaying two equal cones, one with Phong shader" @@ -24,4 +23,4 @@ vsetdispmode p_phong 1 vshaderprog p_phong phong vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug21757 b/tests/v3d/bugs/bug21757 new file mode 100644 index 0000000000..3fac74c010 --- /dev/null +++ b/tests/v3d/bugs/bug21757 @@ -0,0 +1,18 @@ +puts "===========" +puts "OCC21757: Funny (giraffe-like) shading of torus meshed with specific parameters (WNT)" +puts "===========" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +vsetdispmode 1 +vclear + +ptorus result 200 50 45 +incmesh result 0.4 +vdisplay result +vfit + +checkprops result -s 65069.2 +checkshape result +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug21757_1 b/tests/v3d/bugs/bug21757_1 new file mode 100644 index 0000000000..16555b58ac --- /dev/null +++ b/tests/v3d/bugs/bug21757_1 @@ -0,0 +1,18 @@ +puts "============" +puts "OCC21757: Funny (giraffe-like) shading of torus meshed with specific parameters (WNT)" +puts "============" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +vsetdispmode 1 +vclear + +# variant 1: mesh explicitly +ptorus result 200 50 45 +incmesh result 0.4 +vdisplay result +vfit +checkcolor 200 200 0.89 0.63 0.109 + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug21757_2 b/tests/v3d/bugs/bug21757_2 new file mode 100644 index 0000000000..b945b88c3f --- /dev/null +++ b/tests/v3d/bugs/bug21757_2 @@ -0,0 +1,19 @@ +puts "============" +puts "OCC21757: Funny (giraffe-like) shading of torus meshed with specific parameters (WNT)" +puts "============" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +vsetdispmode 1 +vclear + +# variant 2: alternative implicit method of setting deflection +plane pl2 0 0 200 0 0 1 +ptorus result pl2 200 50 45 +vdisplay result +vsetshading result 0.0004 +vfit +checkcolor 200 200 0.89 0.63 0.109 + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug21798 b/tests/v3d/bugs/bug21798 new file mode 100644 index 0000000000..72df98b7fd --- /dev/null +++ b/tests/v3d/bugs/bug21798 @@ -0,0 +1,15 @@ +puts "============" +puts "OCC21798: Attached face hangs during visualization in OCC Viewer 3D." +puts "============" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file OCC21798.brep] result +vinit View1 +vdisplay result +vfit + +vsetdispmode 1 +vfit + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug21970 b/tests/v3d/bugs/bug21970 old mode 100755 new mode 100644 similarity index 64% rename from tests/bugs/vis/bug21970 rename to tests/v3d/bugs/bug21970 index 56e5b3cbcb..a70fb2ccfd --- a/tests/bugs/vis/bug21970 +++ b/tests/v3d/bugs/bug21970 @@ -5,39 +5,33 @@ puts "TODO OCC11111 ALL: Error : The area of result shape is 0" puts "TODO OCC11111 ALL: Error : is WRONG because number of" puts "============" -puts "OCC21970" +puts "OCC21970: FPE e x c e p t i o n in BRepMesh on degenerate face not handled in OCCT DRAW on WNT built with VC8 by WOK" puts "============" puts "" -###################################################### -# FPE exception in BRepMesh on degenerate face not handled in OCCT DRAW on WNT built with VC8 by WOK -###################################################### - -set BugNumber OCC21970 +pload MODELING VISUALIZATION restore [locate_data_file OCC21970-stringers-f485.brep] result set text [incmesh result 1] set r [regexp {Failure} $text] set status1 0 -if {$r == 1} { - set status1 1 -} +if {$r == 1} { set status1 1 } checkprops result -s 624989 checkshape result checknbshapes result -vertex 3806 -edge 3808 -wire 756 -face 730 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 9101 if { ${status1} != 0} { - puts "Faulty ${BugNumber}" + puts "Faulty OCC21970" } else { - puts "OK ${BugNumber}" + puts "OK OCC21970" } -vinit +vinit View1 tclean result vsetdispmode 1 vdisplay result vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug22188 b/tests/v3d/bugs/bug22188 old mode 100755 new mode 100644 similarity index 71% rename from tests/bugs/vis/bug22188 rename to tests/v3d/bugs/bug22188 index 88768391d4..2308933594 --- a/tests/bugs/vis/bug22188 +++ b/tests/v3d/bugs/bug22188 @@ -3,19 +3,15 @@ puts "TODO OCC11111 ALL: Error: Number of nodes" puts "TODO OCC11111 ALL: Error: Maximal deflection" puts "============" -puts "OCC22188" +puts "OCC22188: Visualization of solid fails (in BRepMesh_FastDiscretFace) " puts "============" puts "" -####################################################################### -# Visualization of solid fails (in BRepMesh_FastDiscretFace) -####################################################################### - -set BugNumber OCC22188 +pload MODELING VISUALIZATION restore [locate_data_file OCC22188.brep] result tclean result -vinit +vinit View1 vdisplay result vsetdispmode 1 vfit @@ -34,4 +30,4 @@ checktrinfo result -tri ${good_tri} -nod ${good_nod} -defl ${good_defl} -tol_rel checkprops result -s 32416.7 checkshape result checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 9 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug22240 b/tests/v3d/bugs/bug22240 similarity index 54% rename from tests/bugs/vis/bug22240 rename to tests/v3d/bugs/bug22240 index 061a7c362a..8476555012 100644 --- a/tests/bugs/vis/bug22240 +++ b/tests/v3d/bugs/bug22240 @@ -1,21 +1,17 @@ puts "===========" -puts "OCC22240" +puts "OCC22240: Bad triangulation of transformed shapes" puts "===========" puts "" -############################################ -# Bad triangulation of transformed shapes -############################################ +pload MODELING VISUALIZATION restore [locate_data_file bug22240_Pump_Nut.brep] a restore [locate_data_file bug22240_Pump_Nut.brep] b bscale b 0 0 0 2. -vinit +vinit View1 vdisplay a b vsetdispmode a 1 vsetdispmode b 1 vfit - checkcolor 320 104 0.78 0.55 0.09 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug223 b/tests/v3d/bugs/bug223 old mode 100755 new mode 100644 similarity index 83% rename from tests/bugs/vis/bug223 rename to tests/v3d/bugs/bug223 index 8c99859c40..a079a983e0 --- a/tests/bugs/vis/bug223 +++ b/tests/v3d/bugs/bug223 @@ -1,11 +1,9 @@ puts "========" -puts "OCC223" +puts "OCC223: Shading is not correct for several overlapped faces, converted to B-Spline representation" puts "========" puts "" -###################################################### -# Shading is not correct for several overlapped faces, converted to B-Spline representation -###################################################### +pload MODELING VISUALIZATION restore [locate_data_file OCC223-1.brep] cylinder checkshape cylinder restore [locate_data_file OCC223-2.brep] face @@ -51,7 +49,7 @@ if {$IsGood == 1} { puts "\nFaulty OCC223\n" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png puts "\n------- Additional Comments From Igor FEOKTISTOV 2002-05-20 12:32 -------\n" diff --git a/tests/v3d/bugs/bug22304 b/tests/v3d/bugs/bug22304 new file mode 100644 index 0000000000..621b41c012 --- /dev/null +++ b/tests/v3d/bugs/bug22304 @@ -0,0 +1,16 @@ +puts "===========" +puts "OCC22304: Incorrect triangulation on face of the attached file" +puts "===========" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file OCC22304-face_976_badvisu.brep] result + +tclean result +vinit View1 +vdisplay result +vfit +vsetdispmode 1 + +checktrinfo result -tri -nod +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug22313 b/tests/v3d/bugs/bug22313 old mode 100755 new mode 100644 similarity index 57% rename from tests/bugs/vis/bug22313 rename to tests/v3d/bugs/bug22313 index 50f7a92103..9af892c4c1 --- a/tests/bugs/vis/bug22313 +++ b/tests/v3d/bugs/bug22313 @@ -1,14 +1,17 @@ puts "============" -puts "OCC22313" +puts "OCC22313: Bug in shading mode with attached shape" puts "============" puts "" -####################################################################### -# Bug in shading mode with attached shape -####################################################################### -set BugNumber OCC22313 +pload MODELING VISUALIZATION -# Data +restore [locate_data_file OCC22313-face_shading_problem.brep] result +incmesh result 0.1 +vinit View1 +vdisplay result +vfit +vsetdispmode 1 +vfit set scale 2.9701073117025172 set proj_X 0.4096425473690033 @@ -20,29 +23,7 @@ set up_Z 0.538962721824646 set at_X -632.109173226325 set at_Y -2711.56694941045 set at_Z -1979.06316609577 - - -set x1 300 -set y1 230 - -set Artifact_R 0 -set Artifact_G 0 -set Artifact_B 0 - -# Start - -restore [locate_data_file OCC22313-face_shading_problem.brep] result -incmesh result 0.1 -vinit -vdisplay result -vfit - -vsetdispmode 1 -vfit - - vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} +checkcolor 300 230 0 0 0 -checkcolor ${x1} ${y1} ${Artifact_R} ${Artifact_G} ${Artifact_B} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug22502 b/tests/v3d/bugs/bug22502 old mode 100755 new mode 100644 similarity index 63% rename from tests/bugs/vis/bug22502 rename to tests/v3d/bugs/bug22502 index fe239d6f0f..088934749e --- a/tests/bugs/vis/bug22502 +++ b/tests/v3d/bugs/bug22502 @@ -3,16 +3,11 @@ puts "TODO OCC11111 ALL: Error: Number of nodes" puts "TODO OCC11111 ALL: Error: Maximal deflection" puts "============" -puts "OCC22502" +puts "OCC22502: Triangulation cannot be built on valid face" puts "============" puts "" -####################################################################### -# Triangulation cannot be built on valid face -####################################################################### -set BugNumber OCC22502 - -pload ALL +pload MODELING VISUALIZATION restore [locate_data_file OCC22502-bug601_noshading.brep] result checkshape result @@ -21,13 +16,11 @@ tclean result set Deflection 0.001 incmesh result ${Deflection} - checktrinfo result -tri 170 -nod 172 -defl 0.00061201255663038154 -tol_rel_defl 0.001 -tol_rel_tri 0.001 -tol_rel_nod 0.001 -vinit +vinit View1 vdisplay result vfit - vsetdispmode 1 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug22507 b/tests/v3d/bugs/bug22507 new file mode 100644 index 0000000000..20fabf66f8 --- /dev/null +++ b/tests/v3d/bugs/bug22507 @@ -0,0 +1,19 @@ +puts "============" +puts "OCC22507: Regression: shading of face is bad (wrong normals)" +puts "============" +puts "" + +pload VISUALIZATION +restore [locate_data_file OCC22507-bug589_f77_badshading.brep] result +vinit View1 +vdisplay result +vfit +vsetdispmode 1 + +set RED_R1 0.96470499038696289 +set GREEN_R1 0.68627399206161499 +set BLUE_R1 0.12156800180673599 +vmoveto 200 220 +checkcolor 200 220 ${RED_R1} ${GREEN_R1} ${BLUE_R1} + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug22652 b/tests/v3d/bugs/bug22652 new file mode 100644 index 0000000000..800c6db9fa --- /dev/null +++ b/tests/v3d/bugs/bug22652 @@ -0,0 +1,16 @@ +puts "============" +puts "OCC22652: No mesh for face (regression)" +puts "============" +puts "" + +pload MODELING VISUALIZATION + +restore [locate_data_file OCC22652-faceNoMesh.brep] result +vinit View1 +vdisplay result +vfit + +vsetdispmode 1 + +checktrinfo result -tri -nod +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug22701 b/tests/v3d/bugs/bug22701 old mode 100755 new mode 100644 similarity index 75% rename from tests/bugs/vis/bug22701 rename to tests/v3d/bugs/bug22701 index 3cb6436924..2d9192c80a --- a/tests/bugs/vis/bug22701 +++ b/tests/v3d/bugs/bug22701 @@ -1,15 +1,11 @@ puts "============" -puts "OCC22701" +puts "OCC22701: Regression in 6.5.1 - Wrong visualization" puts "============" puts "" -####################################################################### -# Regression in 6.5.1 - Wrong visualization -####################################################################### -set BugNumber OCC22701 +pload MODELING VISUALIZATION # Data - set scale 276.45658048904141 set proj_X -0.8895147442817688 set proj_Y -0.37965071201324463 @@ -37,7 +33,7 @@ set Hole2_B 0.078431002795696259 # Start restore [locate_data_file PFS04041r1.brep] result -vinit +vinit View1 vdisplay result vfit @@ -50,4 +46,4 @@ vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up checkcolor ${x1} ${y1} ${Hole1_R} ${Hole1_G} ${Hole1_B} checkcolor ${x2} ${y2} ${Hole2_R} ${Hole2_G} ${Hole2_B} -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug22735 b/tests/v3d/bugs/bug22735 new file mode 100644 index 0000000000..529a7e0e74 --- /dev/null +++ b/tests/v3d/bugs/bug22735 @@ -0,0 +1,15 @@ +puts "========" +puts "OCC22735: Data races in BRepMesh working in parallel mode" +puts "========" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +vsetdispmode 1 +mpparallel 1 +restore [locate_data_file OCC22735-march_cube.brep] result +vdisplay result +checktrinfo result -tri 48 -nod 96 -defl 0 -tol_rel_defl 0.001 -tol_rel_tri 0.001 -tol_rel_nod 0.001 + +vfit +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug22795 b/tests/v3d/bugs/bug22795 old mode 100755 new mode 100644 similarity index 62% rename from tests/bugs/vis/bug22795 rename to tests/v3d/bugs/bug22795 index 3646569371..579171289a --- a/tests/bugs/vis/bug22795 +++ b/tests/v3d/bugs/bug22795 @@ -1,13 +1,9 @@ puts "================" -puts "OCC22795" +puts "OCC22795: Make possible to display some presentable objecys in overlay of others, groupped by display priority " puts "================" puts "" -######################################################################################################### -# Make possible to display some presentable objecys in overlay of others, groupped by display priority -######################################################################################################### - -set BugNumber OCC22795 +pload MODELING VISUALIZATION box b 10 10 10 box s 10 10 10 ttranslate s 10 0 0 @@ -27,9 +23,9 @@ set info2 [ vzlayer get ] set status_vzlayer 0 if { [string compare $info1 "0 1 2 3"] == 0 && [string compare $info1 "0 2 3"] == 0 } { - set status_vzlayer 0 + set status_vzlayer 0 } else { - set status_vzlayer 1 + set status_vzlayer 1 } vobjzlayer set b 2 @@ -47,20 +43,14 @@ set word10 [string compare ${info5} "Z layer id: 0"] set status_vobjzlayer 0 if { ${word8} == 0 && ${word9} == 0 && ${word10} == 0 } { - set status_vobjzlayer 0 + set status_vobjzlayer 0 } else { - set status_vobjzlayer 1 + set status_vobjzlayer 1 } if { ${status_vzlayer} != 0 && ${status_vobjzlayer} != 0 } { - puts "Faulty ${BugNumber}" + puts "Faulty OCC22795" } else { - puts "OK ${BugNumber}" + puts "OK OCC22795" } - - - - - - - +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug22835 b/tests/v3d/bugs/bug22835 new file mode 100644 index 0000000000..9dc0c47281 --- /dev/null +++ b/tests/v3d/bugs/bug22835 @@ -0,0 +1,15 @@ +puts "============" +puts "CR22835: IncrementalMesh generates FLT exceptions when running in parallel mode" +puts "============" +puts "" + +pload MODELING VISUALIZATION +mpparallel 1 +restore [locate_data_file bug22835_hello.brep] result +vinit View1 +vdisplay result +vsetdispmode 1 +tclean result +vdisplay result + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug22900 b/tests/v3d/bugs/bug22900 new file mode 100644 index 0000000000..6edfeb023c --- /dev/null +++ b/tests/v3d/bugs/bug22900 @@ -0,0 +1,25 @@ +puts "================" +puts "OCC22900: Problem with shape displaying in shading mode" +puts "================" +puts "" + +pload MODELING VISUALIZATION +vertex v1 0 0 0 +vertex v2 0 0 30 +edge e1 v1 v2 +pcone con1 5 0 10 +ttranslate con1 0 0 30 +compound con1 e1 c1 +don c1 +fit +vinit View1 +vdisplay c1 +vfit +vsetcolor c1 RED +vsetcolor c1 GREEN +vsetdispmode 1 +vsetcolor c1 RED + +checkcolor 204 202 1 0 0 + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug22912 b/tests/v3d/bugs/bug22912 new file mode 100644 index 0000000000..cc90ff3dd6 --- /dev/null +++ b/tests/v3d/bugs/bug22912 @@ -0,0 +1,27 @@ +puts "===========" +puts "OCC22912: After calling AIS_InteractiveContext::UnsetColor objects are drawn with the same color when transparency is changed" +puts "===========" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file bug22912_p.brep] p +explode p +vinit View1 +vdisplay p_1 +vdisplay p_2 +vfit +vsetdispmode p_1 1 +vsetdispmode p_2 1 +vsetcolor p_1 red +vsetcolor p_2 green +vunsetcolor p_1 +vunsetcolor p_2 +vsetcolor p_1 red +vsetcolor p_2 green +vsettransparency p_1 0.5 +vsettransparency p_1 0 + +checkcolor 120 150 0.831 0.000 0.000 +checkcolor 180 273 0.000 0.753 0.000 + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug22985 b/tests/v3d/bugs/bug22985 old mode 100755 new mode 100644 similarity index 58% rename from tests/bugs/vis/bug22985 rename to tests/v3d/bugs/bug22985 index bf703320c3..aee0b5d1ce --- a/tests/bugs/vis/bug22985 +++ b/tests/v3d/bugs/bug22985 @@ -1,16 +1,12 @@ puts "============" -puts "OCC22985" +puts "OCC22985: Regression: no shading on good face" puts "============" puts "" -####################################################################### -# Regression: no shading on good face -####################################################################### - -set BugNumber OCC22985 +pload MODELING VISUALIZATION restore [locate_data_file OCC22985-gt602-f72-noshading.brep] result -vinit +vinit View1 vdisplay result vfit @@ -30,5 +26,4 @@ checkcolor $x $y ${RED_R1} ${GREEN_R1} ${BLUE_R1} checkprops result -s 0.0984334 checkshape result -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug23067 b/tests/v3d/bugs/bug23067 new file mode 100644 index 0000000000..1ab9a3fca7 --- /dev/null +++ b/tests/v3d/bugs/bug23067 @@ -0,0 +1,13 @@ +puts "===========" +puts "OCC23067: OpenGl package API needed by UserDraw feature is not exported" +puts "===========" +puts "" + +pload VISUALIZATION + +vinit View1 +vuserdraw a +vfit +checkcolor 321 159 1 1 0 + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug23123 b/tests/v3d/bugs/bug23123 new file mode 100644 index 0000000000..76a25f9104 --- /dev/null +++ b/tests/v3d/bugs/bug23123 @@ -0,0 +1,15 @@ +puts "============" +puts "OCC23123: Bug/Regression in visualization of XDE documents in shaded mode" +puts "============" +puts "" + +pload XDE VISUALIZATION + +ReadStep D [locate_data_file OCC23123-test.step] +XShow D +vfit +vsetdispmode 1 +puts "Point color test:" +checkcolor 310 225 0.04 0.04 0.67 + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug23153 b/tests/v3d/bugs/bug23153 old mode 100755 new mode 100644 similarity index 58% rename from tests/bugs/vis/bug23153 rename to tests/v3d/bugs/bug23153 index 9f615399bd..d7ca300c1e --- a/tests/bugs/vis/bug23153 +++ b/tests/v3d/bugs/bug23153 @@ -1,14 +1,10 @@ #puts "REQUIRED All: \\*\\*\\* Error on Record" puts "============" -puts "OCC23153" +puts "OCC23153: BRepMesh can't apply a mesh for a face of attached shape" puts "============" puts "" -####################################################################### -# BRepMesh can't apply a mesh for a face of attached shape -####################################################################### -pload XDE -set BugNumber OCC23153 +pload MODELING VISUALIZATION XDE set TheFileName OCC23153-long_furrowed_shape.stp @@ -19,7 +15,7 @@ tpcompound result checkprops result -s 14684.4 checkshape result checknbshapes result -vertex 1152 -edge 1735 -wire 635 -face 581 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 4106 -vinit +vinit View1 vsetdispmode 1 vdisplay result vtop @@ -30,32 +26,30 @@ set x1 223 set y1 195 if { "[vreadpixel $x1 $y1 rgb name]" == "BLACK" } { - set status 1 - puts "Faulty Color1" + set status 1 + puts "Faulty Color1" } set x2 224 set y2 240 if { "[vreadpixel $x2 $y2 rgb name]" == "BLACK" } { - set status 1 - puts "Faulty Color2" + set status 1 + puts "Faulty Color2" } set x3 223 set y3 266 if { "[vreadpixel $x3 $y3 rgb name]" == "BLACK" } { - set status 1 - puts "Faulty Color3" + set status 1 + puts "Faulty Color3" } # Resume puts "" if { ${status} == 0 } { - puts "OK ${BugNumber}" + puts "OK OCC23153" } else { - puts "Faulty ${BugNumber}" + puts "Faulty OCC23153" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug23186 b/tests/v3d/bugs/bug23186 new file mode 100644 index 0000000000..4ff7811382 --- /dev/null +++ b/tests/v3d/bugs/bug23186 @@ -0,0 +1,16 @@ +puts "============" +puts "OCC23186: Unable to display Graphic3d_ArrayOfPoints after migrating from OCCT 6.5.2" +puts "============" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +vdrawparray a points v 0 0 0 v 0 0 10 v 0 10 10 v 0 10 0 +vfit + +checkcolor 321 2 1 1 0 +checkcolor 321 271 1 1 0 +checkcolor 87 137 1 1 0 +checkcolor 87 406 1 1 0 + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug23191 b/tests/v3d/bugs/bug23191 similarity index 51% rename from tests/bugs/vis/bug23191 rename to tests/v3d/bugs/bug23191 index 5f4a3f7b32..a096b3cfbe 100644 --- a/tests/bugs/vis/bug23191 +++ b/tests/v3d/bugs/bug23191 @@ -1,11 +1,9 @@ puts "===========" -puts "OCC23191" +puts "OCC23191: Visualization - small objects displayed with visual artifacts" puts "===========" puts "" -########################################################################################### -# Visualization - small objects displayed with visual artifacts -########################################################################################### +pload MODELING VISUALIZATION restore [locate_data_file bug23191_irons.brep] i explode i @@ -25,4 +23,4 @@ vsetcolor i3 RED vbottom vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug23200 b/tests/v3d/bugs/bug23200 similarity index 97% rename from tests/bugs/vis/bug23200 rename to tests/v3d/bugs/bug23200 index adaf1c3dc5..6bfb3a75f5 100644 --- a/tests/bugs/vis/bug23200 +++ b/tests/v3d/bugs/bug23200 @@ -11,6 +11,7 @@ set aDefaultShape $imagedir/${casename}_shape.png set aShapeAutoTr $imagedir/${casename}_shape_auto_triangulation.png set aShapeNotAutoTr $imagedir/${casename}_shape_not_auto_triangulation.png +pload MODELING VISUALIZATION vinit View1 vclear vaxo diff --git a/tests/bugs/vis/bug23200_1 b/tests/v3d/bugs/bug23200_1 similarity index 95% rename from tests/bugs/vis/bug23200_1 rename to tests/v3d/bugs/bug23200_1 index 1f2fc8398b..45e593a483 100644 --- a/tests/bugs/vis/bug23200_1 +++ b/tests/v3d/bugs/bug23200_1 @@ -6,6 +6,7 @@ puts "But in this case the shape should have special wireframe presentation." puts "============" puts "" +pload MODELING VISUALIZATION vinit View1 vclear vaxo diff --git a/tests/bugs/vis/bug23219 b/tests/v3d/bugs/bug23219 old mode 100755 new mode 100644 similarity index 97% rename from tests/bugs/vis/bug23219 rename to tests/v3d/bugs/bug23219 index eb1a02b4b2..6f12f260e6 --- a/tests/bugs/vis/bug23219 +++ b/tests/v3d/bugs/bug23219 @@ -1,14 +1,9 @@ puts "============" -puts "OCC23219" +puts "OCC23219: Triangulation is not built on a planar face" puts "============" puts "" -####################################################################### -# Triangulation is not built on a planar face -####################################################################### -set BugNumber OCC23219 - -pload XDE +pload XDE MODELING VISUALIZATION polyline ow \ -22.0 0.0 0 \ @@ -545,5 +540,4 @@ set x 200 set y 200 checkcolor $x $y 0.78 0.55 0.09 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug23226 b/tests/v3d/bugs/bug23226 old mode 100755 new mode 100644 similarity index 93% rename from tests/bugs/vis/bug23226 rename to tests/v3d/bugs/bug23226 index edc0a41e4e..86dc048867 --- a/tests/bugs/vis/bug23226 +++ b/tests/v3d/bugs/bug23226 @@ -1,26 +1,14 @@ puts "============" -puts "OCC23226" +puts "OCC23226: Extend OpenGl_Context to store map of shared GPU resources" +puts "this test performs automatic test of primitives array objects by pixel checking" +puts "this test ALSO DUMPS two result images (the primitives on the images should have" +puts "same contours, WIREFRAME OBJECTS ARE IN YELLOW-RED COLORS, SHADED OBJECTS ARE BLUE-GREEN COLORS)" puts "============" puts "" -####################################################################### -# Extend OpenGl_Context to store map of shared GPU resources -####################################################################### -set BugNumber OCC23226 +pload MODELING VISUALIZATION -# -# This test is modified test cdl/934/C2 -# - -# this test performs automatic test of primitives array objects by pixel checking -# this test ALSO DUMPS two result images (the primitives on the images should have -# same contours, WIREFRAME OBJECTS ARE IN YELLOW-RED COLORS, SHADED OBJECTS ARE -# BLUE-GREEN COLORS) - -set BUGNUMBER OCC22583 set status 0 -set ImageName1 "occ22583-image1.png" -set ImageName2 "occ22583-image2.png" # set window width and height, this values should correspond to a # view window sizes to pass the test @@ -316,7 +304,7 @@ rename check_primitive "" checkcolor 200 200 $colorG_R $colorG_G $colorG_B checkcolor 220 200 $colorB_R $colorB_G $colorB_B if { $stat == 1 } { - puts "BUG OK ${BUGNUMBER}" + puts "BUG OK OCC22583" } else { - puts "BUG FAULTY ${BUGNUMBER}" + puts "BUG FAULTY OCC22583" } diff --git a/tests/bugs/vis/bug23253 b/tests/v3d/bugs/bug23253 old mode 100755 new mode 100644 similarity index 77% rename from tests/bugs/vis/bug23253 rename to tests/v3d/bugs/bug23253 index 6d17ed4e2a..97fd17d2e5 --- a/tests/bugs/vis/bug23253 +++ b/tests/v3d/bugs/bug23253 @@ -1,13 +1,9 @@ puts "============" -puts "OCC23253" +puts "OCC23253: Additional viewer 3d draw-commands vleft, vfront, ..." puts "============" puts "" -####################################################################### -# Additional viewer 3d draw-commands vleft, vfront, ... -####################################################################### - -set BugNumber OCC23253 +pload MODELING VISUALIZATION box b 10 20 30 ptorus t 50 10 @@ -104,4 +100,4 @@ set x2 220 set y2 250 checkcolor $x2 $y2 1 1 0.94 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug23400 b/tests/v3d/bugs/bug23400 new file mode 100644 index 0000000000..0fca40fc53 --- /dev/null +++ b/tests/v3d/bugs/bug23400 @@ -0,0 +1,14 @@ +puts "============" +puts "OCC23400: Triangulation of thin ring contains gap" +puts "============" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file bug23400_thinring.brep] a +vinit View1 +vsetdispmode 1 +vdisplay a +vtop +vfit + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug23407_1 b/tests/v3d/bugs/bug23407_1 new file mode 100644 index 0000000000..ade491da38 --- /dev/null +++ b/tests/v3d/bugs/bug23407_1 @@ -0,0 +1,21 @@ +puts "============" +puts "CR23407: Draw face outlines for XDE objects" +puts "============" +puts "" + +pload XDEDRAW VISUALIZATION + +XNewDoc Doc1 +ReadStep Doc1 [locate_data_file screw.step] +XShow Doc1 0:1:1:1 +XShowFaceBoundary Doc1 0:1:1:1 1 255 0 0 10 1 +vfit +vsetdispmode 1 + +checkcolor 178 36 1 0 0 +if { $stat != 1 } { puts "Error : Boundary of face is not changed" } + +checkcolor 244 89 1 0 0 +if { $stat != 01} { puts "Error : Boundary of face is not changed" } + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug23407_2 b/tests/v3d/bugs/bug23407_2 old mode 100755 new mode 100644 similarity index 77% rename from tests/bugs/vis/bug23407_2 rename to tests/v3d/bugs/bug23407_2 index 121a379011..46e9f4a897 --- a/tests/bugs/vis/bug23407_2 +++ b/tests/v3d/bugs/bug23407_2 @@ -3,6 +3,7 @@ puts "CR23407: Draw face outlines for XDE objects" puts "============" puts "" +pload MODELING VISUALIZATION box b 10 10 10 vclear vinit View1 @@ -14,7 +15,7 @@ vaspects -setwidth 10 if { "[vreadpixel 314 344 rgb name]" != "RED" || "[vreadpixel 26 267 rgb name]" != "RED" } { - puts "Error : Boundary of face is not changed" + puts "Error : Boundary of face is not changed" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug23425 b/tests/v3d/bugs/bug23425 old mode 100755 new mode 100644 similarity index 53% rename from tests/bugs/vis/bug23425 rename to tests/v3d/bugs/bug23425 index c17b645a9b..b638a042ee --- a/tests/bugs/vis/bug23425 +++ b/tests/v3d/bugs/bug23425 @@ -1,11 +1,8 @@ puts "============" -puts "CR23425" +puts "CR23425: diffimage generate O S D _ E x c e p t i o n during execution" puts "============" puts "" -####################################################################### -# diffimage generate OSD_Exception during execution -####################################################################### +pload VISUALIZATION diffimage [locate_data_file bug23425_B8_Linux.gif] [locate_data_file bug23425_B8_Win.gif] 0.01 0 1 diffimage [locate_data_file bug23425_B8_Win.gif] [locate_data_file bug23425_B8_Linux.gif] 0.01 0 1 - diff --git a/tests/bugs/vis/bug23525 b/tests/v3d/bugs/bug23525 old mode 100755 new mode 100644 similarity index 50% rename from tests/bugs/vis/bug23525 rename to tests/v3d/bugs/bug23525 index 1c403cec18..cc7130c3a1 --- a/tests/bugs/vis/bug23525 +++ b/tests/v3d/bugs/bug23525 @@ -1,13 +1,10 @@ puts "=======" -puts "CR23525" +puts "CR23525: Disappearing of highlight in screenshot" puts "=======" puts "" -######################################## -## Disappearing of highlight in screenshot -######################################## - -vinit +pload MODELING VISUALIZATION +vinit View1 vclear box t_box 100 100 100 vdisplay t_box @@ -15,14 +12,11 @@ vfit set x_coord 110 set y_coord 352 - vmoveto 0 0 # EDGE ON vselmode 2 1 - vmoveto $x_coord $y_coord - checkcolor $x_coord $y_coord 0 1 1 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug23670_2 b/tests/v3d/bugs/bug23670_2 new file mode 100644 index 0000000000..c4d6f11116 --- /dev/null +++ b/tests/v3d/bugs/bug23670_2 @@ -0,0 +1,20 @@ +puts "============" +puts "OCC23670: Support for multiple 3D views" +puts "============" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +vinit MyDriver/MyViewer/View1 +vinit MyDriver/MyViewer/MyView +vclose View1 +set ResultBefore [vviewlist] +vinit Driver1/Viewer1/MyView +vclose MyView +vinit Driver1/Viewer1/View2 + +set ResultAfter [vviewlist] +set Result [string equal $ResultBefore $ResultAfter] +if {$Result != 0} { puts "Error. Different view lists are equal." } + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug23705 b/tests/v3d/bugs/bug23705 new file mode 100644 index 0000000000..02163642de --- /dev/null +++ b/tests/v3d/bugs/bug23705 @@ -0,0 +1,15 @@ +puts "========" +puts "CR23705: Isoline in the AIS viewer is not trimmed" +puts "========" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file bug23705_plancher20igs_face.brep] result + +vinit View1 +visos 10 10 1 +vdisplay result +vfit +checkcolor 326 295 0 0 0 + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug23709_1 b/tests/v3d/bugs/bug23709_1 new file mode 100644 index 0000000000..f8d3da9628 --- /dev/null +++ b/tests/v3d/bugs/bug23709_1 @@ -0,0 +1,22 @@ +puts "============" +puts "OCC23709: Redesign of hlrtest command" +puts "============" +puts "" + +pload MODELING VISUALIZATION +pcone a 5 0 10 +box b 15 0 0 10 10 10 +vinit View1 +vdisplay a +vdisplay b +vrotate 35 0 0 +vfit +vhlr on +vhlrtype polyalgo b +vaspects -setwidth 5 +if { "[vreadpixel 290 170 rgb name]" != "YELLOW" } { + puts "Error : color is not yellow" +} +checkcolor 86 221 0 0 0 + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug23709_2 b/tests/v3d/bugs/bug23709_2 new file mode 100644 index 0000000000..cce87cfcb0 --- /dev/null +++ b/tests/v3d/bugs/bug23709_2 @@ -0,0 +1,22 @@ +puts "============" +puts "OCC23709: Redesign of hlrtest command" +puts "============" +puts "" + +pload MODELING VISUALIZATION +pcone a 5 0 10 +box b 15 0 0 10 10 10 +vinit View1 +vdisplay a b +vrotate 35 0 0 +vfit +vhlr on +vhlrtype algo a +vaspects -setwidth 5 +if { "[vreadpixel 290 170 rgb name]" != "YELLOW" } { + puts "Error : color is not yellow" +} + +checkcolor 86 221 0 0 0 + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug23709_3 b/tests/v3d/bugs/bug23709_3 new file mode 100644 index 0000000000..2fe9d5b2e7 --- /dev/null +++ b/tests/v3d/bugs/bug23709_3 @@ -0,0 +1,20 @@ +puts "===========" +puts "OCC23709: Redesign of hlrtest command" +puts "===========" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file bug23709_solidcone.brep] result +vinit View1 +vdisplay result +vrotate 35 0 0 +vfit +vhlr on +vhlrtype algo result + +vaspects -setwidth 5 +if { "[vreadpixel 183 267 rgb name]" != "YELLOW" } { + puts "Error : color is not yellow" +} + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug23709_4 b/tests/v3d/bugs/bug23709_4 new file mode 100644 index 0000000000..c3fc71359a --- /dev/null +++ b/tests/v3d/bugs/bug23709_4 @@ -0,0 +1,19 @@ +puts "===========" +puts "OCC23709: Redesign of hlrtest command" +puts "===========" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file bug23709_surfcone.brep] result +vinit View1 +vdisplay result +vrotate 35 0 0 +vfit +vhlr on +vhlrtype algo result +vaspects -setwidth 5 +if { "[vreadpixel 183 267 rgb name]" != "YELLOW" } { + puts "Error : color is not yellow" +} + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug23883 b/tests/v3d/bugs/bug23883 similarity index 90% rename from tests/bugs/vis/bug23883 rename to tests/v3d/bugs/bug23883 index 0e5e32492d..e20f31b542 100644 --- a/tests/bugs/vis/bug23883 +++ b/tests/v3d/bugs/bug23883 @@ -7,6 +7,7 @@ puts "Bound color in the primitive array do not work when displayed using VBO" set x_coord 321 set y_coord 200 +pload MODELING VISUALIZATION vclear vinit View1 vvbo 0 @@ -19,6 +20,4 @@ vvbo 1 vdrawparray pl01 polylines v 0 0 0 v 0 10 0 v 0 10 10 v 0 0 0 b 4 c 1 0 0 checkcolor $x_coord $y_coord 1 0 0 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug23886_1 b/tests/v3d/bugs/bug23886_1 old mode 100755 new mode 100644 similarity index 51% rename from tests/bugs/vis/bug23886_1 rename to tests/v3d/bugs/bug23886_1 index 5815f0c7cf..ee61bdc643 --- a/tests/bugs/vis/bug23886_1 +++ b/tests/v3d/bugs/bug23886_1 @@ -1,14 +1,12 @@ puts "============" -puts "CR23886" +puts "CR23886: Visualizing planar faces with 'notches' depends heavily on the deflection coefficient" puts "============" puts "" -######################################################################################## -# Visualizing planar faces with "notches" depends heavily on the deflection coefficient -######################################################################################## +pload MODELING VISUALIZATION restore [locate_data_file bug23886_face_01.brep] s -vinit +vinit View1 vdisplay s vfit diff --git a/tests/bugs/vis/bug23886_2 b/tests/v3d/bugs/bug23886_2 old mode 100755 new mode 100644 similarity index 51% rename from tests/bugs/vis/bug23886_2 rename to tests/v3d/bugs/bug23886_2 index 8bc69e9a86..d846b85ffc --- a/tests/bugs/vis/bug23886_2 +++ b/tests/v3d/bugs/bug23886_2 @@ -1,14 +1,12 @@ puts "============" -puts "CR23886" +puts "CR23886: Visualizing planar faces with 'notches' depends heavily on the deflection coefficient" puts "============" puts "" -######################################################################################## -# Visualizing planar faces with "notches" depends heavily on the deflection coefficient -######################################################################################## +pload MODELING VISUALIZATION restore [locate_data_file bug23886_face_02.brep] s -vinit +vinit View1 vdisplay s vfit diff --git a/tests/bugs/vis/bug23886_3 b/tests/v3d/bugs/bug23886_3 old mode 100755 new mode 100644 similarity index 51% rename from tests/bugs/vis/bug23886_3 rename to tests/v3d/bugs/bug23886_3 index 8917585e22..1e06895cb3 --- a/tests/bugs/vis/bug23886_3 +++ b/tests/v3d/bugs/bug23886_3 @@ -1,14 +1,12 @@ puts "============" -puts "CR23886" +puts "CR23886: Visualizing planar faces with 'notches' depends heavily on the deflection coefficient" puts "============" puts "" -######################################################################################## -# Visualizing planar faces with "notches" depends heavily on the deflection coefficient -######################################################################################## +pload MODELING VISUALIZATION restore [locate_data_file bug23886_face_03.brep] s -vinit +vinit View1 vdisplay s vfit diff --git a/tests/bugs/vis/bug24001 b/tests/v3d/bugs/bug24001 similarity index 92% rename from tests/bugs/vis/bug24001 rename to tests/v3d/bugs/bug24001 index df937db500..a497aaa3eb 100644 --- a/tests/bugs/vis/bug24001 +++ b/tests/v3d/bugs/bug24001 @@ -1,10 +1,10 @@ puts "========" -puts "OCC24001" -puts "Camera dump test" +puts "OCC24001: Camera dump test" puts "========" +pload MODELING VISUALIZATION box b 1 2 3 -vinit +vinit View1 vdisplay b # initialize camera parameters diff --git a/tests/bugs/vis/bug24282 b/tests/v3d/bugs/bug24282 similarity index 61% rename from tests/bugs/vis/bug24282 rename to tests/v3d/bugs/bug24282 index 723af5943b..0aedcea1ee 100644 --- a/tests/bugs/vis/bug24282 +++ b/tests/v3d/bugs/bug24282 @@ -1,10 +1,10 @@ puts "========" -puts "OCC24282" -#puts "Shaded presentation is not computed due to exception in StdPrs_ToolShadedShape::Normal()" +puts "OCC24282: Shaded presentation is not computed due to e x c e p t i o n in StdPrs_ToolShadedShape::Normal()" puts "========" +pload MODELING VISUALIZATION restore [locate_data_file bug24282_box_no_uv.brep] b -vinit +vinit View1 vdisplay b vfit vsetdispmode b 1 @@ -16,4 +16,4 @@ set GREEN 0.55294120311737061 set BLUE 0.094117648899555206 checkcolor ${x_coord} ${y_coord} ${RED} ${GREEN} ${BLUE} -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug24307_1 b/tests/v3d/bugs/bug24307_1 similarity index 100% rename from tests/bugs/vis/bug24307_1 rename to tests/v3d/bugs/bug24307_1 diff --git a/tests/bugs/vis/bug24307_2 b/tests/v3d/bugs/bug24307_2 similarity index 100% rename from tests/bugs/vis/bug24307_2 rename to tests/v3d/bugs/bug24307_2 diff --git a/tests/v3d/bugs/bug24388_1 b/tests/v3d/bugs/bug24388_1 new file mode 100644 index 0000000000..4d87ef1b63 --- /dev/null +++ b/tests/v3d/bugs/bug24388_1 @@ -0,0 +1,22 @@ +puts "===========" +puts "0024388: Option to enable visualization of hidden lines in DRAW" +puts "Checks if dotted hidden lines are highlighted properly." +puts "===========" +puts "" + +pload MODELING VISUALIZATION +box b 15 0 0 10 10 10 +vinit View1 +vdisplay b +vrotate 35 0 0 +vfit +vhlr on 1 +vhlrtype algo b +vmoveto 76 304 +checkcolor 115 203 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting of dotted hidden lines in the box is wrong." } + +checkcolor 122 200 0 0 0 +if { $stat != 1 } { puts "Error : Highlighting of dotted hidden lines in the box is wrong." } + +vdump ${imagedir}/${casename}_3.png diff --git a/tests/v3d/bugs/bug24388_2 b/tests/v3d/bugs/bug24388_2 new file mode 100644 index 0000000000..4eb6093ff2 --- /dev/null +++ b/tests/v3d/bugs/bug24388_2 @@ -0,0 +1,29 @@ +puts "===========" +puts "0024388: Option to enable visualization of hidden lines in DRAW" +puts "Checks if dotted hidden lines are displayed properly in HLR mode." +puts "===========" +puts "" + +pload MODELING VISUALIZATION +set m_pi2 1,57 +pcone a 5 0 10 +vinit View1 +vdisplay a +vrotate 35 0 0 +vfit +vhlr on 0 +vhlrtype algo a +vrotate -$m_pi2 -$m_pi2 0 +vfit +checkcolor 131 240 0 0 0 + +if { $stat != 1 } { puts "Error : Drawing hidden lines as dotted lines produces wrong result." } +vdump $imagedir/${casename}_without_lines.png + +vhlr on 1 + +# Check display of dotted hidden lines +checkcolor 131 240 0.2 0.2 0.2 +if { $stat != 1 } { puts "Error : Drawing hidden lines as dotted lines produces wrong result." } + +vdump $imagedir/${casename}_with_lines.png diff --git a/tests/v3d/bugs/bug24391 b/tests/v3d/bugs/bug24391 new file mode 100644 index 0000000000..6ce8b98ea1 --- /dev/null +++ b/tests/v3d/bugs/bug24391 @@ -0,0 +1,21 @@ +puts "============" +puts "OCC24391: Erased AIS object can not be displayed in AIS_InteractiveContext after AIS_InteractiveContext::Remove" +puts "============" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +box a 1 1 1 +vdisplay a +verase a +vremove -context a +vdisplay a +vfit + +vaspects -setwidth 5 +vmoveto 204 205 +if { "[vreadpixel 204 205 rgb name]" != "CYAN" } { + puts "Error : Erased object is not displayed after its removing." +} + +vdump $imagedir/${casename}_with_lines.png diff --git a/tests/v3d/bugs/bug24394 b/tests/v3d/bugs/bug24394 new file mode 100644 index 0000000000..ed85a6e69b --- /dev/null +++ b/tests/v3d/bugs/bug24394 @@ -0,0 +1,17 @@ +puts "========" +puts "OCC24394: Visualization - implement more general way for rendering of immediate objects" +puts "========" +puts "" + +pload MODELING VISUALIZATION +box b1 0 0 0 1 2 3 +box b2 3 0 0 2 3 1 +vinit View1 +vclear +vaxo +vsetdispmode 1 +vdisplay b1 +vdisplay -top b1 +vfit + +vdump $imagedir/${casename}_with_lines.png diff --git a/tests/v3d/bugs/bug24539 b/tests/v3d/bugs/bug24539 new file mode 100644 index 0000000000..d449e04b48 --- /dev/null +++ b/tests/v3d/bugs/bug24539 @@ -0,0 +1,14 @@ +puts "============" +puts "OCC24539: Visualization (new camera) - small objects displayed with visual artifacts" +puts "============" +puts "" + +pload MODELING VISUALIZATION +box b 0.001 0.001 0.001 +vinit View1 +vclear +vsetdispmode 1 +vdisplay b +vfit + +vdump $imagedir/${casename}_with_lines.png diff --git a/tests/v3d/bugs/bug24606 b/tests/v3d/bugs/bug24606 new file mode 100644 index 0000000000..2da561f8e6 --- /dev/null +++ b/tests/v3d/bugs/bug24606 @@ -0,0 +1,33 @@ +puts "============" +puts "OCC24606: Tests ::FitDepth and ::FitAll implementation of V3d_View." +puts "============" +puts "" + +pload MODELING VISUALIZATION QAcommands +set check_x 402 +set check_y 320 + +restore [locate_data_file bug24606.brep] shape + +vinit View1 +vautozfit 0 +vsetdispmode 1 +vdisplay shape +OCC24606 +vmoveto $check_x $check_y +checkcolor $check_x $check_y 0 1 1 + +if {$stat != 1} { puts "Error : V3d view ::FitAll is broken." } +vdump ${imagedir}/${casename}_1.png + +vinit View2 +vautozfit 1 +vsetdispmode 1 +vdisplay shape +OCC24606 +vmoveto $check_x $check_y + +checkcolor $check_x $check_y 0 1 1 + +if {$stat != 1} { puts "Error : V3d view ::FitAll is broken." } +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/bugs/bug24610 b/tests/v3d/bugs/bug24610 new file mode 100644 index 0000000000..57b6ba75a3 --- /dev/null +++ b/tests/v3d/bugs/bug24610 @@ -0,0 +1,19 @@ +puts "============" +puts "OCC24610: Erased AIS object should not be taken into account by FitAll operation" +puts "============" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +box b1 200 200 200 +vdisplay b1 +vfit +box b2 2 2 2 +vdisplay b2 +set color_1 [vreadpixel 32 305] +verase b1 +vfit +set color_2 [vreadpixel 32 305] +if {$color_1 == $color_2} { puts "ERROR: OCC24610 is reproduced" } + +vdump ${imagedir}/${casename}_2.png diff --git a/tests/bugs/vis/bug24714 b/tests/v3d/bugs/bug24714 similarity index 65% rename from tests/bugs/vis/bug24714 rename to tests/v3d/bugs/bug24714 index a882379b8e..a4fbf8fbac 100644 --- a/tests/bugs/vis/bug24714 +++ b/tests/v3d/bugs/bug24714 @@ -1,12 +1,9 @@ puts "============" -puts "CR24714" +puts "CR24714: Test V3d_View::SetSize method" puts "============" puts "" -################################## -# Test V3d_View::SetSize method -################################## - +pload MODELING VISUALIZATION set aV "Driver1/Viewer1/View1" vinit name=$aV l=32 t=32 w=400 h=200 vactivate $aV @@ -25,4 +22,4 @@ if { "[vreadpixel 200 9 rgb name]" != "CYAN" } { puts "Error : the view projection size is incorrect!" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug24762_coloredshape b/tests/v3d/bugs/bug24762_coloredshape similarity index 95% rename from tests/bugs/vis/bug24762_coloredshape rename to tests/v3d/bugs/bug24762_coloredshape index 7ed95e3d9a..91f0f076e0 100644 --- a/tests/bugs/vis/bug24762_coloredshape +++ b/tests/v3d/bugs/bug24762_coloredshape @@ -2,7 +2,7 @@ puts "========" puts "OCC24762 new interactive object AIS_ColoredShape with customized subshapes presentations" puts "========" -# draw box in advance which should fit all our markers +pload MODELING VISUALIZATION box b 0 0 0 1 2 3 box bb 3 0 0 2 3 1 diff --git a/tests/bugs/vis/bug24785 b/tests/v3d/bugs/bug24785 similarity index 81% rename from tests/bugs/vis/bug24785 rename to tests/v3d/bugs/bug24785 index 4ef46dda3b..ffa57b33dd 100644 --- a/tests/bugs/vis/bug24785 +++ b/tests/v3d/bugs/bug24785 @@ -1,10 +1,8 @@ -# This test case handles a specific task: -# to draw 2d objects in same scene with 3d objects while -# 2d objects need to be drawn in specific order on 3d plane and -# overlap correctly with 3d objects. +puts "This test case handles a specific task:" +puts "to draw 2d objects in same scene with 3d objects while 2d objects need to be drawn in specific order on 3d plane and overlap correctly with 3d objects." -pload ALL -vinit +pload MODELING VISUALIZATION +vinit View1 # Thin boxes represent overlapping 2d objects in same plane # Normally such configuration would cause z-fighting noise (flickering) box b1 -0.75 -0.75 0 1 1 0.01 @@ -49,3 +47,4 @@ vobjzlayer set b 1 vzlayer enable positiveoffset 1 vfit +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug24835 b/tests/v3d/bugs/bug24835 new file mode 100644 index 0000000000..5653d3732e --- /dev/null +++ b/tests/v3d/bugs/bug24835 @@ -0,0 +1,18 @@ +puts "============" +puts "CR24835: Graphic structure for highlighting is not erased if presentable object for highlight is deleted." +puts "============" +puts "" + +pload MODELING VISUALIZATION +vinit v +box b 1 1 1 +vdisplay b +vfit +vselmode b 1 1 +vmoveto 380 104 +vmoveto 29 103 +vremove b +vclose v 1 +vinit + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug24867 b/tests/v3d/bugs/bug24867 similarity index 73% rename from tests/bugs/vis/bug24867 rename to tests/v3d/bugs/bug24867 index 8e25d75979..0c7ea32fc9 100644 --- a/tests/bugs/vis/bug24867 +++ b/tests/v3d/bugs/bug24867 @@ -1,11 +1,9 @@ puts "============" -puts "OCC24867" +puts "OCC24867: Visualization - polygon offsets look broken" puts "============" puts "" -############################################################# -# [Regression] Visualization - polygon offsets look broken -############################################################# +pload MODELING VISUALIZATION restore [locate_data_file Top.brep] b vinit View1 vdisplay b @@ -25,4 +23,3 @@ vdump $::imagedir/${::casename}_highlighted.png vselect 200 200 vdump $::imagedir/${::casename}_selected.png - diff --git a/tests/bugs/vis/bug24996 b/tests/v3d/bugs/bug24996 similarity index 91% rename from tests/bugs/vis/bug24996 rename to tests/v3d/bugs/bug24996 index 90f150b875..1ff9c983d8 100644 --- a/tests/bugs/vis/bug24996 +++ b/tests/v3d/bugs/bug24996 @@ -3,6 +3,7 @@ puts "0024996: Visualization - newly displayed objects are clipped until first c puts "============" puts "" +pload MODELING VISUALIZATION box b1 0 0 0 1 2 3 box b2 3 2 1 1 2 3 box b3 5 -4 0 1 2 3 diff --git a/tests/v3d/bugs/bug25063 b/tests/v3d/bugs/bug25063 new file mode 100644 index 0000000000..08a62bd31c --- /dev/null +++ b/tests/v3d/bugs/bug25063 @@ -0,0 +1,12 @@ +puts "===========" +puts "OCC25063: Visualization - 2D objects are not displayed at some camera positions" +puts "===========" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +vtop +vline 1 -90 -90 130 90 90 130 +vfit + +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug25071 b/tests/v3d/bugs/bug25071 similarity index 66% rename from tests/bugs/vis/bug25071 rename to tests/v3d/bugs/bug25071 index 2512a346c2..28056f7fbb 100644 --- a/tests/bugs/vis/bug25071 +++ b/tests/v3d/bugs/bug25071 @@ -1,12 +1,10 @@ puts "============" -puts "CR25071" +puts "CR25071: Check that the selected wireframe representation uses exactly the same" +puts "discretization of face boundaries as the face outlines shown in shading mode" puts "============" puts "" -####################################################################### -# Check that the selected wireframe representation uses exactly the same -# discretization of face boundaries as the face outlines shown in shading mode -####################################################################### +pload MODELING VISUALIZATION vinit View1 # Computing wireframe without triangulation, then checking face boundaries and selection diff --git a/tests/bugs/vis/bug25099 b/tests/v3d/bugs/bug25099 similarity index 86% rename from tests/bugs/vis/bug25099 rename to tests/v3d/bugs/bug25099 index 99e2232e3e..99e6b4c151 100644 --- a/tests/bugs/vis/bug25099 +++ b/tests/v3d/bugs/bug25099 @@ -1,11 +1,9 @@ puts "============" -puts "CR25099" +puts "CR25099: Test vertex draw modes" puts "============" puts "" -####################################################################### -# Test vertex draw modes -####################################################################### +pload MODELING VISUALIZATION vinit View1 # Checking that the default behavior is not impacted by the vertex draw mode @@ -50,5 +48,3 @@ vvertexmode -set inherited b2 # The next line should report 'all' (inherited from the default drawer) vvertexmode b2 vdump $imagedir/${casename}_inherited.png - - diff --git a/tests/v3d/bugs/bug25178 b/tests/v3d/bugs/bug25178 new file mode 100644 index 0000000000..523df819cb --- /dev/null +++ b/tests/v3d/bugs/bug25178 @@ -0,0 +1,14 @@ +puts "=======" +puts "CR25178: Visualization - edges of the model are still clipped after vfit command" +puts "=======" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file bug25179_nurbs-with-partial-seam.brep] a + +vinit View1 +vdisplay a +vleft +vfit + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25251 b/tests/v3d/bugs/bug25251 similarity index 60% rename from tests/bugs/vis/bug25251 rename to tests/v3d/bugs/bug25251 index 3cd540f4b0..3df4d006c2 100644 --- a/tests/bugs/vis/bug25251 +++ b/tests/v3d/bugs/bug25251 @@ -1,10 +1,7 @@ puts "============" -puts "OCC25251" +puts "OCC25251: Visualization - Vertex disappearing from the view after switching display mode" puts "============" puts "" -#################################################################################### -# Visualization - Vertex disappearing from the view after switching display mode -#################################################################################### set check_x 204 set check_y 204 @@ -12,7 +9,8 @@ set check_y 204 set x 100 set y 100 -vinit +pload MODELING VISUALIZATION +vinit View1 vertex v 0 0 0 vdisplay v diff --git a/tests/bugs/vis/bug25300_1 b/tests/v3d/bugs/bug25300_1 similarity index 100% rename from tests/bugs/vis/bug25300_1 rename to tests/v3d/bugs/bug25300_1 diff --git a/tests/bugs/vis/bug25300_2 b/tests/v3d/bugs/bug25300_2 similarity index 100% rename from tests/bugs/vis/bug25300_2 rename to tests/v3d/bugs/bug25300_2 diff --git a/tests/bugs/vis/bug25363 b/tests/v3d/bugs/bug25363 similarity index 57% rename from tests/bugs/vis/bug25363 rename to tests/v3d/bugs/bug25363 index e0f2b6d47c..1535f9c97a 100644 --- a/tests/bugs/vis/bug25363 +++ b/tests/v3d/bugs/bug25363 @@ -1,10 +1,7 @@ puts "================" -puts "OCC25335" +puts "OCC25335: Visualization - add test command for V3d_View::FitAll by view area" puts "================" puts "" -####################################################################################### -# Visualization - add test command for V3d_View::FitAll by view area -####################################################################################### set check1_x 2 set check1_y 2 @@ -21,6 +18,7 @@ set check4_y 407 set check5_x 204 set check5_y 204 +pload MODELING VISUALIZATION vinit View1 vtop @@ -36,41 +34,26 @@ vfitarea 4.999 4.999 15.001 15.001 # Check area by 1st point vmoveto ${check1_x} ${check1_y} checkcolor ${check1_x} ${check1_y} 0 1 1 - -if {$stat != 1} { - puts "Error : Fit all by view area is broken." -} +if {$stat != 1} { puts "Error : Fit all by view area is broken." } # Check area by 2nd point vmoveto ${check2_x} ${check2_y} checkcolor ${check2_x} ${check2_y} 0 1 1 - -if {$stat != 1} { - puts "Error : Fit all by view area is broken." -} +if {$stat != 1} { puts "Error : Fit all by view area is broken." } # Check area by 3rd point vmoveto ${check3_x} ${check3_y} checkcolor ${check3_x} ${check3_y} 0 1 1 - -if {$stat != 1} { - puts "Error : Fit all by view area is broken." -} +if {$stat != 1} { puts "Error : Fit all by view area is broken." } # Check area by 4th point vmoveto ${check4_x} ${check4_y} checkcolor ${check4_x} ${check4_y} 0 1 1 - -if {$stat != 1} { - puts "Error : Fit all by view area is broken." -} +if {$stat != 1} { puts "Error : Fit all by view area is broken." } # Check area by 5th point vmoveto ${check5_x} ${check5_y} checkcolor ${check5_x} ${check5_y} 0 1 1 +if {$stat != 1} { puts "Error : Fit all by view area is broken." } -if {$stat != 1} { - puts "Error : Fit all by view area is broken." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug25400 b/tests/v3d/bugs/bug25400 similarity index 68% rename from tests/bugs/vis/bug25400 rename to tests/v3d/bugs/bug25400 index d49c084e58..494e82133c 100644 --- a/tests/bugs/vis/bug25400 +++ b/tests/v3d/bugs/bug25400 @@ -1,13 +1,11 @@ puts "========" -puts "OCC25400" +puts "OCC25400: Visualization, TKOpenGl - Structure disappears if assigned a non-default Z layer" puts "========" puts "" -################################################################################################### -# Visualization, TKOpenGl - Structure disappears if assigned a non-default Z layer -################################################################################################### +pload MODELING VISUALIZATION box b 1 2 3 -vinit +vinit View1 vdisplay b vrenderparams -frustumculling on vfit @@ -39,5 +37,3 @@ vpriority b vpriority b 6 vdump $imagedir/${casename}_new_priority.png - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug25459_coloredshape b/tests/v3d/bugs/bug25459_coloredshape similarity index 87% rename from tests/bugs/vis/bug25459_coloredshape rename to tests/v3d/bugs/bug25459_coloredshape index 92f08d5c25..a8611c05bc 100644 --- a/tests/bugs/vis/bug25459_coloredshape +++ b/tests/v3d/bugs/bug25459_coloredshape @@ -2,6 +2,7 @@ puts "========" puts "OCC25459 AIS_ColoredShape::SetMaterial() should not reset custom colors" puts "========" +pload MODELING VISUALIZATION box b 0 0 0 1 2 3 # prepare view @@ -19,3 +20,4 @@ vaspects b -setmaterial PLASTIC # validate results if { [vreadpixel 128 256 -rgb -name] != "RED4"} { puts "Error: wrong Face color" } +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug25466 b/tests/v3d/bugs/bug25466 new file mode 100644 index 0000000000..35aa70bfeb --- /dev/null +++ b/tests/v3d/bugs/bug25466 @@ -0,0 +1,22 @@ +puts "============" +puts "CR25466: Visualization - Impossible to change the display mode when a local context is opened" +puts "============" +puts "" + +pload MODELING VISUALIZATION +box b1 0 0 0 1 2 3 +box b2 3 0 0 2 3 1 + +vinit View1 +vclear +vaxo + +vsetdispmode 0 +vdisplay b1 b2 +vfit + +vselmode b1 4 1 +vsetdispmode b1 1 +checkcolor 100 100 0.78 0.55 0.09 + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25540 b/tests/v3d/bugs/bug25540 similarity index 97% rename from tests/bugs/vis/bug25540 rename to tests/v3d/bugs/bug25540 index efcacb2b5e..9c14fe8d63 100644 --- a/tests/bugs/vis/bug25540 +++ b/tests/v3d/bugs/bug25540 @@ -5,6 +5,7 @@ puts "wireframe and shaded presentation of shape is identical." puts "============" puts "" +pload MODELING VISUALIZATION vinit View1 w=912 h=912 vclear diff --git a/tests/bugs/vis/bug25552 b/tests/v3d/bugs/bug25552 similarity index 98% rename from tests/bugs/vis/bug25552 rename to tests/v3d/bugs/bug25552 index f30a755fb9..efe310f551 100644 --- a/tests/bugs/vis/bug25552 +++ b/tests/v3d/bugs/bug25552 @@ -8,6 +8,7 @@ set aSubShapeTriang $imagedir/${casename}_subshape_triangulation.png set aShapeTriang $imagedir/${casename}_shape_triangulation.png set aDiff $imagedir/${casename}_diff.png +pload MODELING VISUALIZATION vclear vinit View1 vaxo diff --git a/tests/bugs/vis/bug25671 b/tests/v3d/bugs/bug25671 similarity index 93% rename from tests/bugs/vis/bug25671 rename to tests/v3d/bugs/bug25671 index c1b86bc083..fd4572f675 100644 --- a/tests/bugs/vis/bug25671 +++ b/tests/v3d/bugs/bug25671 @@ -1,11 +1,9 @@ puts "============" -puts "CR25671" +puts "CR25671: V3d_View::Convert doesn't work as expected in GRID active mode." puts "============" puts "" -####################################################################### -# V3d_View::Convert doesn't work as expected in GRID active mode. -####################################################################### -pload VISUALIZATION + +pload MODELING VISUALIZATION vinit View1 w=400 h=400 # 1. Synthetic case for detection with AIS_InteractiveContext::MoveTo @@ -24,9 +22,7 @@ vfit vmoveto $detect_x $detect_y checkcolor $detect_x $detect_y 0 1 1 -if { $stat != 1 } { - puts "Error : Detection does not work correctly with activated grid." -} +if { $stat != 1 } { puts "Error : Detection does not work correctly with activated grid." } vgrid off vremove -all @@ -113,4 +109,4 @@ checkreal "vconvert 25 4.94 35 grid, view 2, Y" [lindex $vconvert_25_5_35_gr checkreal "vconvert 25 4.94 35 grid, view 2, Z" [lindex $vconvert_25_5_35_grid 4] 0.0 0.05 0.0 # do not save any image -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25672 b/tests/v3d/bugs/bug25672 similarity index 78% rename from tests/bugs/vis/bug25672 rename to tests/v3d/bugs/bug25672 index 797bb9dc42..33ca74eebc 100644 --- a/tests/bugs/vis/bug25672 +++ b/tests/v3d/bugs/bug25672 @@ -1,10 +1,8 @@ puts "============" -puts "CR25672" +puts "CR25672: V3d_View::ConvertToGrid doesn't work for grid if the grid plane's origin is not identical to camera origin." puts "============" puts "" -############################################################################################################# -# V3d_View::ConvertToGrid doesn't work for grid if the grid plane's origin is not identical to camera origin. -############################################################################################################# + pload VISUALIZATION vinit View1 @@ -44,4 +42,4 @@ checkreal "vconvert 5.0 5.0 10.0 grid, Y" [lindex $vconvert_res 3] 5.0 1e-7 0.0 checkreal "vconvert 5.0 5.0 10.0 grid, Z" [lindex $vconvert_res 4] 10.0 1e-7 0.0 # do not save any image -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25687_1 b/tests/v3d/bugs/bug25687_1 similarity index 88% rename from tests/bugs/vis/bug25687_1 rename to tests/v3d/bugs/bug25687_1 index c21e6b9d70..de01a2af7c 100644 --- a/tests/bugs/vis/bug25687_1 +++ b/tests/v3d/bugs/bug25687_1 @@ -7,6 +7,7 @@ puts "" set x_check_coord 225 set y_check_coord 32 +pload MODELING VISUALIZATION box b 10 10 10 explode b f @@ -14,15 +15,13 @@ vinit View1 vclear vaxo vsetdispmode 1 - vdisplay b vviewparams -proj 0.5 0.3 0.1 vfit - vaspects b -subshapes b_1 -setcolor GREEN if {"[vreadpixel ${x_check_coord} ${y_check_coord} rgb name]" == "GREEN"} { puts "Error: back-face culling should be turned ON, but back-face is still visible." } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25687_2 b/tests/v3d/bugs/bug25687_2 similarity index 69% rename from tests/bugs/vis/bug25687_2 rename to tests/v3d/bugs/bug25687_2 index dfe931d7f2..b2e78ad330 100644 --- a/tests/bugs/vis/bug25687_2 +++ b/tests/v3d/bugs/bug25687_2 @@ -4,9 +4,7 @@ puts "AIS_ColoredShape should disable back-face culling for Solids with hidden F puts "============" puts "" -set x_check_coord 200 -set y_check_coord 200 - +pload MODELING VISUALIZATION box b 10 10 10 explode b f @@ -14,7 +12,6 @@ vinit View1 vclear vaxo vsetdispmode 1 - vdisplay b vviewparams -proj 0.5 0.3 0.1 vfit @@ -22,8 +19,8 @@ vfit vaspects b -subshapes b_1 -setcolor GREEN vaspects b -subshapes b_2 -setvis 0 -if {"[vreadpixel ${x_check_coord} ${y_check_coord} rgb name]" != "GREEN"} { +if {"[vreadpixel 200 200 rgb name]" != "GREEN"} { puts "Error: back-face culling should be disabled, but seems to be not." } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25695 b/tests/v3d/bugs/bug25695 similarity index 95% rename from tests/bugs/vis/bug25695 rename to tests/v3d/bugs/bug25695 index 98fc475e3a..3e215e9eaf 100644 --- a/tests/bugs/vis/bug25695 +++ b/tests/v3d/bugs/bug25695 @@ -4,7 +4,6 @@ puts "Visualization, AIS_InteractiveContext - define default HilightMode" puts "===========" puts "" -# display a sphere pload MODELING VISUALIZATION psphere s 1 @@ -16,7 +15,6 @@ vfit # setup dynamic highlighting style vselprops dynHighlight -dispMode -1 -transp 0.5 -material PLASTIC vmoveto 250 250 - if { [vreadpixel 250 250 rgb name] != "GRAY58" } { puts "Error: wrong highlighting color" } vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25723 b/tests/v3d/bugs/bug25723 similarity index 95% rename from tests/bugs/vis/bug25723 rename to tests/v3d/bugs/bug25723 index 350791245e..d585cd46eb 100644 --- a/tests/bugs/vis/bug25723 +++ b/tests/v3d/bugs/bug25723 @@ -3,6 +3,7 @@ puts "OCC25723 Calculate the center of rotation taking into account structure vi puts "============" puts "" +pload MODELING VISUALIZATION box b1 0 0 0 10 10 10 box b2 0 0 20 10 10 10 box b3 0 0 -20 10 10 10 diff --git a/tests/bugs/vis/bug25723_1 b/tests/v3d/bugs/bug25723_1 similarity index 97% rename from tests/bugs/vis/bug25723_1 rename to tests/v3d/bugs/bug25723_1 index ff7fc15b08..0a06d71b0f 100644 --- a/tests/bugs/vis/bug25723_1 +++ b/tests/v3d/bugs/bug25723_1 @@ -16,6 +16,7 @@ set y_mouse_move_coord 300 set x_check_coord 220 set y_check_coord 50 +pload MODELING VISUALIZATION box b1 0 0 0 10 10 10 box b2 0 0 20 10 10 10 box b3 0 0 -20 10 10 10 diff --git a/tests/bugs/vis/bug25760_1 b/tests/v3d/bugs/bug25760_1 similarity index 78% rename from tests/bugs/vis/bug25760_1 rename to tests/v3d/bugs/bug25760_1 index 8ab433bd71..227a66e5c1 100644 --- a/tests/bugs/vis/bug25760_1 +++ b/tests/v3d/bugs/bug25760_1 @@ -1,11 +1,9 @@ puts "============" -puts "CR25760" +puts "CR25760: Visualization - precision factor added to ZNear, ZFar in method ZFitAll() of Graphic3d_Camera is not enough" puts "============" puts "" -####################################################################### -# Visualization - precision factor added to ZNear, ZFar in method ZFitAll() of Graphic3d_Camera is not enough -####################################################################### +pload MODELING VISUALIZATION vinit View1 w=409 h=409 vclear @@ -63,17 +61,11 @@ set tcl_precision 16 #################################################################### vcamera -ortho vrenderparams -frustumculling off - -if { [test2d] != 1 } { - puts "Error: 2D projection test failed: view frustum culling is OFF" -} +if { [test2d] != 1 } { puts "Error: 2D projection test failed: view frustum culling is OFF" } #################################################################### # Test orthographic camera with frustum culling. # #################################################################### vcamera -ortho vrenderparams -frustumculling on - -if { [test2d] != 1 } { - puts "Error: 2D projection test failed: view frustum culling is ON" -} +if { [test2d] != 1 } { puts "Error: 2D projection test failed: view frustum culling is ON" } diff --git a/tests/bugs/vis/bug25760_2 b/tests/v3d/bugs/bug25760_2 similarity index 85% rename from tests/bugs/vis/bug25760_2 rename to tests/v3d/bugs/bug25760_2 index a3f327a84d..39f34661fe 100644 --- a/tests/bugs/vis/bug25760_2 +++ b/tests/v3d/bugs/bug25760_2 @@ -1,11 +1,9 @@ puts "============" -puts "CR25760" +puts "CR25760: Visualization - precision factor added to ZNear, ZFar in method ZFitAll() of Graphic3d_Camera is not enough" puts "============" puts "" -####################################################################### -# Visualization - precision factor added to ZNear, ZFar in method ZFitAll() of Graphic3d_Camera is not enough -####################################################################### +pload MODELING VISUALIZATION vinit View1 w=409 h=409 vclear @@ -89,10 +87,7 @@ set tcl_precision 16 vcamera -ortho vviewparams -scale 1e-8 vrenderparams -frustumculling off - -if { [test3d 1e-7] != 1 } { - puts "Error: 3D projection test failed: camera is orthographic, view frustum culling is OFF" -} +if { [test3d 1e-7] != 1 } { puts "Error: 3D projection test failed: camera is orthographic, view frustum culling is OFF" } #################################################################### # Test orthographic camera with frustum culling. # @@ -112,10 +107,7 @@ if { [test3d 1e-7] != 1 } { #################################################################### vcamera -persp vrenderparams -frustumculling off - -if { [test3d 1.0] != 1 } { - puts "Error: 3D projection test failed: camera is perspective, view frustum culling is OFF" -} +if { [test3d 1.0] != 1 } { puts "Error: 3D projection test failed: camera is perspective, view frustum culling is OFF" } #################################################################### # Test perspective camera with frustum culling. # @@ -123,7 +115,4 @@ if { [test3d 1.0] != 1 } { #################################################################### vcamera -persp vrenderparams -frustumculling on - -if { [test3d 1.0] != 1 } { - puts "Error: 3D projection test failed: camera is perspective, view frustum culling is ON" -} +if { [test3d 1.0] != 1 } { puts "Error: 3D projection test failed: camera is perspective, view frustum culling is ON" } diff --git a/tests/v3d/bugs/bug25767 b/tests/v3d/bugs/bug25767 new file mode 100644 index 0000000000..aec32d8507 --- /dev/null +++ b/tests/v3d/bugs/bug25767 @@ -0,0 +1,14 @@ +puts "==========" +puts "OCC25767: 'vdisplay' command raises e x c e p t i o n" +puts "==========" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +vclear +vaxo +vpoint p1 -108.4710001 -108.56800009999999 -145.30700009999998 +vpoint p2 8.4813999999999999e+102 117.1230001 128.35480981703273 +vfit + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25773 b/tests/v3d/bugs/bug25773 similarity index 88% rename from tests/bugs/vis/bug25773 rename to tests/v3d/bugs/bug25773 index a015806ebe..2a107b8182 100644 --- a/tests/bugs/vis/bug25773 +++ b/tests/v3d/bugs/bug25773 @@ -4,6 +4,7 @@ puts "Check that properties of object can be applied to it (set to its drawer)" puts "============" puts "" +pload MODELING VISUALIZATION vinit View1 vclear @@ -23,4 +24,4 @@ checkcolor $x $y 0 0 0 vaspects c_1 -freeboundary on -setfreeboundarycolor 1 0 0 -setfreeboundarywidth 2 checkcolor $x $y 1 0 0 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25777 b/tests/v3d/bugs/bug25777 similarity index 100% rename from tests/bugs/vis/bug25777 rename to tests/v3d/bugs/bug25777 diff --git a/tests/bugs/vis/bug25783_1 b/tests/v3d/bugs/bug25783_1 similarity index 98% rename from tests/bugs/vis/bug25783_1 rename to tests/v3d/bugs/bug25783_1 index de8509fc23..7e961355ae 100644 --- a/tests/bugs/vis/bug25783_1 +++ b/tests/v3d/bugs/bug25783_1 @@ -4,6 +4,7 @@ puts "Draw 2D objects." puts "============" puts "" +pload MODELING VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont vinit View1 diff --git a/tests/bugs/vis/bug25814 b/tests/v3d/bugs/bug25814 similarity index 96% rename from tests/bugs/vis/bug25814 rename to tests/v3d/bugs/bug25814 index c7fbd442e1..f1c87685ca 100644 --- a/tests/bugs/vis/bug25814 +++ b/tests/v3d/bugs/bug25814 @@ -9,6 +9,7 @@ set aSubShapeTriang $imagedir/${casename}_subshape_triangulation.png set aShapeTriang $imagedir/${casename}_shape_triangulation.png set aDiff $imagedir/${casename}_diff.png +pload MODELING VISUALIZATION pcylinder c 100 350 explode c f diff --git a/tests/bugs/vis/bug25853 b/tests/v3d/bugs/bug25853 similarity index 77% rename from tests/bugs/vis/bug25853 rename to tests/v3d/bugs/bug25853 index 9a3248c37a..ad187c10ef 100644 --- a/tests/bugs/vis/bug25853 +++ b/tests/v3d/bugs/bug25853 @@ -1,11 +1,9 @@ puts "==========" -puts "OCC25853" +puts "OCC25853: Edges disappear or reappear when displaying new edges" puts "==========" puts "" -########################################################### -# Edges disappear or reappear when displaying new edges -########################################################### +pload MODELING VISUALIZATION vinit View1 w=1024 h=1024 vsetdispmode View1 1 vclear @@ -49,4 +47,4 @@ draw_lines 10.0 checkcolor 804 483 1 0 0 checkcolor 860 500 1 0 0 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug25867 b/tests/v3d/bugs/bug25867 new file mode 100644 index 0000000000..ba605fafce --- /dev/null +++ b/tests/v3d/bugs/bug25867 @@ -0,0 +1,16 @@ +puts "============" +puts "OCC25867: Visualization, TKOpenGl - fix misprint in transformation persistence math" +puts "============" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +box b1 -1 -1 -1 3 3 3 +box b2 4 4 4 15 10 10 +vdisplay b1 +vdisplay b2 -trsfPers zoom -trsfPersPos 0 0 0 +vfit +vdump $imagedir/${casename}_1.png + +vdisplay b2 -trsfPers zoom -trsfPersPos 1 1 1 +vdump $imagedir/${casename}_2.png diff --git a/tests/bugs/vis/bug25935 b/tests/v3d/bugs/bug25935 similarity index 91% rename from tests/bugs/vis/bug25935 rename to tests/v3d/bugs/bug25935 index f773af714b..0bb6b2fc52 100644 --- a/tests/bugs/vis/bug25935 +++ b/tests/v3d/bugs/bug25935 @@ -8,7 +8,7 @@ pload VISUALIZATION MODELING restore [locate_data_file bug25935.brep] aShape explode aShape Sh -vinit +vinit View1 # check displaying and selection of a sub-shell of the shape vdisplay aShape_3 @@ -26,3 +26,4 @@ vmoveto 213 191 vmoveto 205 205 vmoveto 197 194 checkcolor 205 212 0 1 1 +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug26014 b/tests/v3d/bugs/bug26014 similarity index 96% rename from tests/bugs/vis/bug26014 rename to tests/v3d/bugs/bug26014 index 2e9c5e097b..225f002230 100644 --- a/tests/bugs/vis/bug26014 +++ b/tests/v3d/bugs/bug26014 @@ -6,6 +6,7 @@ puts "But in this case the shape should have special wireframe presentation." puts "============" puts "" +pload MODELING VISUALIZATION vinit View1 vclear vaxo diff --git a/tests/bugs/vis/bug26082 b/tests/v3d/bugs/bug26082 similarity index 100% rename from tests/bugs/vis/bug26082 rename to tests/v3d/bugs/bug26082 diff --git a/tests/v3d/bugs/bug26139 b/tests/v3d/bugs/bug26139 new file mode 100644 index 0000000000..b970cb2224 --- /dev/null +++ b/tests/v3d/bugs/bug26139 @@ -0,0 +1,11 @@ +puts "============" +puts "CR26139: AIS_InteractiveContext::Display performance regression" +puts "To measure performance downgrade, the time elapsed should be greater than on previous version" +puts "============" +puts "" + +pload VISUALIZATION QAcommands + +vinit View1 +OCC26139 +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug26149 b/tests/v3d/bugs/bug26149 similarity index 99% rename from tests/bugs/vis/bug26149 rename to tests/v3d/bugs/bug26149 index d5b5a598da..6ca69cf19d 100644 --- a/tests/bugs/vis/bug26149 +++ b/tests/v3d/bugs/bug26149 @@ -3,9 +3,8 @@ puts "0026149: Visualization - depth buffer should not be written within Z-layer puts "Check that objects drawn in Graphic3d_ZLayerId_BotOSD layer do not overlap objects in Graphic3d_ZLayerId_Default layer." puts "===========" -vfont add [locate_data_file DejaVuSans.ttf] SansFont - pload MODELING VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont vinit View1 vclear vaxo diff --git a/tests/bugs/vis/bug26154 b/tests/v3d/bugs/bug26154 similarity index 51% rename from tests/bugs/vis/bug26154 rename to tests/v3d/bugs/bug26154 index 651cdf4c37..3fc00aa040 100644 --- a/tests/bugs/vis/bug26154 +++ b/tests/v3d/bugs/bug26154 @@ -1,14 +1,12 @@ puts "TODO OCC26154 ALL: ERROR: OCC26154 is reproduced." puts "========" -puts "OCC26154" +puts "OCC26154: 0026154: Visualization - v3d viewer grid disappears due to automatic z-fit" puts "========" puts "" -############################################################################## -# 0026154: Visualization - v3d viewer grid disappears due to automatic z-fit -############################################################################## -vinit +pload MODELING VISUALIZATION +vinit View1 box b 1 1 1 vdisplay b @@ -21,4 +19,4 @@ if {$bug_info != "GRAY50 1"} { puts "ERROR: OCC26154 is reproduced. Grid is not visible." } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug26163 b/tests/v3d/bugs/bug26163 similarity index 100% rename from tests/bugs/vis/bug26163 rename to tests/v3d/bugs/bug26163 diff --git a/tests/bugs/vis/bug26357 b/tests/v3d/bugs/bug26357 similarity index 98% rename from tests/bugs/vis/bug26357 rename to tests/v3d/bugs/bug26357 index 6cd02ee6e7..ebcc39a95d 100644 --- a/tests/bugs/vis/bug26357 +++ b/tests/v3d/bugs/bug26357 @@ -3,6 +3,7 @@ puts "0026357: Visualization - Panning zooms view if aspect ratio > 1" puts "============" puts "" +pload MODELING VISUALIZATION box b 100 100 100 vclear diff --git a/tests/bugs/vis/bug26401 b/tests/v3d/bugs/bug26401 similarity index 81% rename from tests/bugs/vis/bug26401 rename to tests/v3d/bugs/bug26401 index 3939fb45e8..6496a24313 100644 --- a/tests/bugs/vis/bug26401 +++ b/tests/v3d/bugs/bug26401 @@ -1,11 +1,9 @@ puts "========" -puts "OCC26401" +puts "OCC26401: Visualization - small boxes in front of big one disappear in perspective view" puts "========" puts "" -########################################################################################### -# Visualization - small boxes in front of big one disappear in perspective view -########################################################################################### +pload MODELING VISUALIZATION # Boxes {1 x 1 x 1} box b0 0 0 0 1 1 1 box b1 -1 0 0 1 1 1 diff --git a/tests/bugs/vis/bug26435 b/tests/v3d/bugs/bug26435 similarity index 82% rename from tests/bugs/vis/bug26435 rename to tests/v3d/bugs/bug26435 index 46b8f4b564..9f743d7d4b 100644 --- a/tests/bugs/vis/bug26435 +++ b/tests/v3d/bugs/bug26435 @@ -1,11 +1,9 @@ puts "============" -puts "CR26435" +puts "CR26435: Visualization - V3d_View::ConvertToGrid returns wrong coordinates for non-orthogonal projection" puts "============" puts "" -####################################################################### -# Visualization - V3d_View::ConvertToGrid returns wrong coordinates for non-orthogonal projection -####################################################################### +pload MODELING VISUALIZATION vinit View1 w=400 h=400 vgrid -type rectangular -mode lines -origin 0 0 -step 5 5 @@ -44,4 +42,4 @@ checkreal "vconvert top - grid lifted" [lindex $output 3] -5.0 1e-7 0.0 checkreal "vconvert top - grid lifted" [lindex $output 4] 10.0 1e-7 0.0 # do not save any image -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug26792 b/tests/v3d/bugs/bug26792 similarity index 86% rename from tests/bugs/vis/bug26792 rename to tests/v3d/bugs/bug26792 index c8614a3a51..fafb80e57e 100644 --- a/tests/bugs/vis/bug26792 +++ b/tests/v3d/bugs/bug26792 @@ -4,7 +4,8 @@ puts "Visualization, Graphic3d - Z-fit support for transform persistence is miss puts "================================================================" puts "" -vinit +pload MODELING VISUALIZATION +vinit View1 vclear vaxo @@ -18,4 +19,4 @@ checkcolor 238 205 1.0 1.0 0.0 checkcolor 275 182 1.0 1.0 0.0 checkcolor 239 184 1.0 1.0 0.0 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug27374 b/tests/v3d/bugs/bug27374 new file mode 100644 index 0000000000..6aba06d243 --- /dev/null +++ b/tests/v3d/bugs/bug27374 @@ -0,0 +1,18 @@ +puts "========" +puts "OCC27374: Visualization - add support zoom persistence objects for FitAll operation" +puts "========" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +vclear + +box b0 30 0 0 3 3 3 +box b1 -30 -30 30 10 20 30 +box b2 30 0 30 100 100 100 +vdisplay b0 +vdisplay b1 -trsfPers zoom -perspos 10 0 0 +vdisplay b2 -trsfPers zoom -perspos 40 0 30 +vfit + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug27536 b/tests/v3d/bugs/bug27536 similarity index 94% rename from tests/bugs/vis/bug27536 rename to tests/v3d/bugs/bug27536 index 286fd869fb..74d2e26552 100644 --- a/tests/bugs/vis/bug27536 +++ b/tests/v3d/bugs/bug27536 @@ -3,6 +3,7 @@ puts "0027536: Visualization - incorrect behavior of zoom persisted objects" puts "========" puts "" +pload MODELING VISUALIZATION vclear vinit View1 vaxo diff --git a/tests/bugs/vis/bug27629 b/tests/v3d/bugs/bug27629 similarity index 93% rename from tests/bugs/vis/bug27629 rename to tests/v3d/bugs/bug27629 index b2d129b76d..7cc75340ab 100644 --- a/tests/bugs/vis/bug27629 +++ b/tests/v3d/bugs/bug27629 @@ -3,6 +3,7 @@ puts "0027629: Visualization - apply a correct model-world matrix to normals in puts "========" puts "" +pload MODELING VISUALIZATION vinit View1 box b0 25 25 25 vdisplay b0 -dispMode 1 -trsfPers zoom diff --git a/tests/v3d/bugs/bug27655 b/tests/v3d/bugs/bug27655 new file mode 100644 index 0000000000..6a7184529a --- /dev/null +++ b/tests/v3d/bugs/bug27655 @@ -0,0 +1,17 @@ +puts "========" +puts "CR27655: Visualization - AIS_Triangulation don't disappears after setting non-zero transparency" +puts "========" +puts "" + +pload MODELING VISUALIZATION +vclear +vinit View1 + +box b 10 10 10 +vdisplay b -dispMode 1 +vdrawsphere s 100 +vsettransparency s 0.7 + +vfit + +vdump $imagedir/${casename}_0.png diff --git a/tests/v3d/bugs/bug27700 b/tests/v3d/bugs/bug27700 new file mode 100644 index 0000000000..6e3e7d36cf --- /dev/null +++ b/tests/v3d/bugs/bug27700 @@ -0,0 +1,14 @@ +puts "========" +puts "CR27700: Visualization - glPolygonMode() used for frame drawing affects label text shading" +puts "========" +puts "" + +pload MODELING VISUALIZATION QAcommands +vclear +vinit View1 + +OCC27700 +vtop +vfit + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug27821 b/tests/v3d/bugs/bug27821 similarity index 100% rename from tests/bugs/vis/bug27821 rename to tests/v3d/bugs/bug27821 diff --git a/tests/bugs/vis/bug28036_1 b/tests/v3d/bugs/bug28036_1 similarity index 100% rename from tests/bugs/vis/bug28036_1 rename to tests/v3d/bugs/bug28036_1 diff --git a/tests/bugs/vis/bug28036_2 b/tests/v3d/bugs/bug28036_2 similarity index 100% rename from tests/bugs/vis/bug28036_2 rename to tests/v3d/bugs/bug28036_2 diff --git a/tests/bugs/vis/bug28061 b/tests/v3d/bugs/bug28061 similarity index 100% rename from tests/bugs/vis/bug28061 rename to tests/v3d/bugs/bug28061 diff --git a/tests/bugs/vis/bug28093 b/tests/v3d/bugs/bug28093 similarity index 100% rename from tests/bugs/vis/bug28093 rename to tests/v3d/bugs/bug28093 diff --git a/tests/bugs/vis/bug28361 b/tests/v3d/bugs/bug28361 similarity index 100% rename from tests/bugs/vis/bug28361 rename to tests/v3d/bugs/bug28361 index 5cdf810452..4801b99f57 100644 --- a/tests/bugs/vis/bug28361 +++ b/tests/v3d/bugs/bug28361 @@ -3,9 +3,9 @@ puts "OCC28361 Visualization, TKV3d - buggy behavior of Transformation Persisten puts "============" puts "" +pload MODELING VISUALIZATION vclear vinit View1 -pload MODELING VISUALIZATION box b 10 10 10 vdisplay b -trsfPers zoomRotate -trsfPersPos 90 90 90 vmoveto 266 164 diff --git a/tests/bugs/vis/bug28621 b/tests/v3d/bugs/bug28621 similarity index 100% rename from tests/bugs/vis/bug28621 rename to tests/v3d/bugs/bug28621 diff --git a/tests/v3d/bugs/bug2883_1 b/tests/v3d/bugs/bug2883_1 new file mode 100644 index 0000000000..11d948cdec --- /dev/null +++ b/tests/v3d/bugs/bug2883_1 @@ -0,0 +1,23 @@ +puts "==========" +puts "OCC2883: It is impossible to set material, color and transparency to compound" +puts "==========" +puts "" + +pload MODELING VISUALIZATION +vertex v -20 10 -30 +vertex ve1 -10 10 10 +vertex ve2 0 10 10 +edge e ve1 ve2 +sphere s -80 0 0 150 +mkface f s 0.1 0.7 0.2 0.9 +box s -60 0 0 30 60 40 +compound v e f s c + +vinit View1 +vclear +vaxo +vsetdispmode 1 +vdisplay c +vfit +vsetmaterial c JADE +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug28890 b/tests/v3d/bugs/bug28890 similarity index 100% rename from tests/bugs/vis/bug28890 rename to tests/v3d/bugs/bug28890 diff --git a/tests/bugs/vis/bug288_1 b/tests/v3d/bugs/bug288_1 old mode 100755 new mode 100644 similarity index 80% rename from tests/bugs/vis/bug288_1 rename to tests/v3d/bugs/bug288_1 index 59ca1eadde..33bdc3aede --- a/tests/bugs/vis/bug288_1 +++ b/tests/v3d/bugs/bug288_1 @@ -3,11 +3,12 @@ puts " OCC288 " puts "(case 1)" puts "========================" +pload MODELING VISUALIZATION restore [locate_data_file shading_058.brep] result checkshape result tclean result -vinit +vinit View1 vdisplay result vsetdispmode result 1 isos result 0 @@ -15,4 +16,4 @@ triangles result vfit checktrinfo result -tri !5148 -nod !3042 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug288_10 b/tests/v3d/bugs/bug288_10 new file mode 100644 index 0000000000..5908934854 --- /dev/null +++ b/tests/v3d/bugs/bug288_10 @@ -0,0 +1,19 @@ +puts "================" +puts "OCC288: Currently meshing (for shading) of some shapes looks incorrect" +puts "================" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file shading_151.brep] result + +checkprops result -s 52620.1 +checkshape result + +checknbshapes result -vertex 20 -edge 37 -wire 21 -face 19 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 98 +vinit View1 +tclean result +vsetdispmode 1 +vdisplay result +vfit + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug288_2 b/tests/v3d/bugs/bug288_2 old mode 100755 new mode 100644 similarity index 80% rename from tests/bugs/vis/bug288_2 rename to tests/v3d/bugs/bug288_2 index 7435a43023..fdad6f393c --- a/tests/bugs/vis/bug288_2 +++ b/tests/v3d/bugs/bug288_2 @@ -3,11 +3,12 @@ puts " OCC288 " puts "(case 2)" puts "========================" +pload MODELING VISUALIZATION restore [locate_data_file shading_105.brep] result checkshape result tclean result -vinit +vinit View1 vdisplay result vsetdispmode result 1 isos result 0 @@ -15,4 +16,4 @@ triangles result vfit checktrinfo result -tri !1170 -nod !647 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug288_3 b/tests/v3d/bugs/bug288_3 old mode 100755 new mode 100644 similarity index 80% rename from tests/bugs/vis/bug288_3 rename to tests/v3d/bugs/bug288_3 index 7592e93bd9..a639285ab6 --- a/tests/bugs/vis/bug288_3 +++ b/tests/v3d/bugs/bug288_3 @@ -3,11 +3,12 @@ puts " OCC288 " puts "(case 3)" puts "========================" +pload MODELING VISUALIZATION restore [locate_data_file shading_107.brep] result checkshape result tclean result -vinit +vinit View1 vdisplay result vsetdispmode result 1 isos result 0 @@ -15,4 +16,4 @@ triangles result vfit checktrinfo result -tri !1832 -nod !1574 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug288_4 b/tests/v3d/bugs/bug288_4 old mode 100755 new mode 100644 similarity index 80% rename from tests/bugs/vis/bug288_4 rename to tests/v3d/bugs/bug288_4 index 08f3e7a815..78af4b6740 --- a/tests/bugs/vis/bug288_4 +++ b/tests/v3d/bugs/bug288_4 @@ -3,11 +3,12 @@ puts " OCC288 " puts "(case 4)" puts "========================" +pload MODELING VISUALIZATION restore [locate_data_file shading_151.brep] result checkshape result tclean result -vinit +vinit View1 vdisplay result vsetdispmode result 1 isos result 0 @@ -15,4 +16,4 @@ triangles result vfit checktrinfo result -tri !4176 -nod !2857 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug288_5 b/tests/v3d/bugs/bug288_5 old mode 100755 new mode 100644 similarity index 80% rename from tests/bugs/vis/bug288_5 rename to tests/v3d/bugs/bug288_5 index f2829c1a5d..0486edd2bc --- a/tests/bugs/vis/bug288_5 +++ b/tests/v3d/bugs/bug288_5 @@ -1,12 +1,13 @@ puts "============ OCC288 (case 5) ===============" +pload MODELING VISUALIZATION restore [locate_data_file OCC288e.brep] result #Delete invalid (in terms of bug#25109) triangulation tclean result checkshape result -vinit +vinit View1 vdisplay result vsetdispmode result 1 isos result 0 @@ -14,4 +15,4 @@ triangles result vfit checktrinfo result -tri 8048 -nod 8247 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug288_6 b/tests/v3d/bugs/bug288_6 old mode 100755 new mode 100644 similarity index 56% rename from tests/bugs/vis/bug288_6 rename to tests/v3d/bugs/bug288_6 index 4ed097fcb1..128e475e35 --- a/tests/bugs/vis/bug288_6 +++ b/tests/v3d/bugs/bug288_6 @@ -1,25 +1,20 @@ puts "================" -puts "OCC288" +puts "OCC288: Currently meshing (for shading) of some shapes looks incorrect" puts "================" puts "" puts "TODO #23828 MacOS: Tcl Exception: result is not a topological shape!!!" puts "TODO #23828 MacOS: TEST INCOMPLETE" -####################################################################################### -# Currently meshing (for shading) of some shapes looks incorrect -###################################################################################### - -set BugNumber OCC288 - +pload MODELING VISUALIZATION restore [locate_data_file OCC288-shading_176.brep] result checkprops result -s 1.21055e+07 checknbshapes result -vertex 667 -edge 941 -wire 368 -face 289 -shell 6 -solid 6 -compsolid 0 -compound 1 -shape 2278 -vinit +vinit View1 tclean result vsetdispmode 1 vdisplay result vfit checkshape result -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug288_7 b/tests/v3d/bugs/bug288_7 new file mode 100644 index 0000000000..403cf22788 --- /dev/null +++ b/tests/v3d/bugs/bug288_7 @@ -0,0 +1,19 @@ +puts "================" +puts "OCC288: Currently meshing (for shading) of some shapes looks incorrect" +puts "================" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file shading_058.brep] result + +checkprops result -s 14125.5 +checkshape result + +checknbshapes result -vertex 23 -edge 40 -wire 19 -face 19 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 104 +vinit View1 +tclean result +vsetdispmode 1 +vdisplay result +vfit + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug288_8 b/tests/v3d/bugs/bug288_8 new file mode 100644 index 0000000000..58695b525b --- /dev/null +++ b/tests/v3d/bugs/bug288_8 @@ -0,0 +1,18 @@ +puts "================" +puts "OCC288: Currently meshing (for shading) of some shapes looks incorrect" +puts "================" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file shading_105.brep] result + +checkprops result -l 265.239 +checksection result +checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 7 +vinit View1 +tclean result +vsetdispmode 1 +vdisplay result +vfit + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug288_9 b/tests/v3d/bugs/bug288_9 new file mode 100644 index 0000000000..78bbfc28dc --- /dev/null +++ b/tests/v3d/bugs/bug288_9 @@ -0,0 +1,19 @@ +puts "================" +puts "OCC288: Currently meshing (for shading) of some shapes looks incorrect" +puts "================" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file shading_107.brep] result + +checkprops result -s 329710 +checkshape result + +checknbshapes result -vertex 18 -edge 36 -wire 18 -face 18 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 91 +vinit View1 +tclean result +vsetdispmode 1 +vdisplay result +vfit + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug28936 b/tests/v3d/bugs/bug28936 new file mode 100644 index 0000000000..41ffce3d24 --- /dev/null +++ b/tests/v3d/bugs/bug28936 @@ -0,0 +1,20 @@ +puts "============" +puts "OCC28936: Visualization - Draw freezes while making a 3d representation" +puts "============" +puts "" + +pload MODELING VISUALIZATION + +restore [locate_data_file bug28936_Holsterbro_sofabed.brep] sh + +checkshape sh +checkprops sh -s 18308978.50927943 + +vinit View1 +vclear +vsetdispmode 1 +vdisplay sh +vfit + +vdump $imagedir/${casename}.png + \ No newline at end of file diff --git a/tests/bugs/vis/bug29020 b/tests/v3d/bugs/bug29020 similarity index 100% rename from tests/bugs/vis/bug29020 rename to tests/v3d/bugs/bug29020 diff --git a/tests/bugs/vis/bug29051 b/tests/v3d/bugs/bug29051 similarity index 100% rename from tests/bugs/vis/bug29051 rename to tests/v3d/bugs/bug29051 diff --git a/tests/bugs/vis/bug29127 b/tests/v3d/bugs/bug29127 similarity index 100% rename from tests/bugs/vis/bug29127 rename to tests/v3d/bugs/bug29127 diff --git a/tests/bugs/vis/bug29262 b/tests/v3d/bugs/bug29262 similarity index 100% rename from tests/bugs/vis/bug29262 rename to tests/v3d/bugs/bug29262 diff --git a/tests/bugs/vis/bug29787 b/tests/v3d/bugs/bug29787 similarity index 100% rename from tests/bugs/vis/bug29787 rename to tests/v3d/bugs/bug29787 diff --git a/tests/bugs/vis/bug29837 b/tests/v3d/bugs/bug29837 similarity index 100% rename from tests/bugs/vis/bug29837 rename to tests/v3d/bugs/bug29837 diff --git a/tests/bugs/vis/bug29847 b/tests/v3d/bugs/bug29847 similarity index 100% rename from tests/bugs/vis/bug29847 rename to tests/v3d/bugs/bug29847 diff --git a/tests/bugs/vis/bug30076 b/tests/v3d/bugs/bug30076 similarity index 100% rename from tests/bugs/vis/bug30076 rename to tests/v3d/bugs/bug30076 diff --git a/tests/bugs/vis/bug301 b/tests/v3d/bugs/bug301 similarity index 64% rename from tests/bugs/vis/bug301 rename to tests/v3d/bugs/bug301 index 579cfe1dd2..e6be5ca0e1 100644 --- a/tests/bugs/vis/bug301 +++ b/tests/v3d/bugs/bug301 @@ -4,11 +4,12 @@ puts "SAM926" puts "========" puts "" -vinit +pload MODELING VISUALIZATION QAcommands +vinit View1 OCC301 50 5 OCC301 30 3 vtop vfit puts "Angle dimensions have different arrow sizes" -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug30146 b/tests/v3d/bugs/bug30146 similarity index 100% rename from tests/bugs/vis/bug30146 rename to tests/v3d/bugs/bug30146 diff --git a/tests/bugs/vis/bug30182 b/tests/v3d/bugs/bug30182 similarity index 100% rename from tests/bugs/vis/bug30182 rename to tests/v3d/bugs/bug30182 diff --git a/tests/bugs/vis/bug30412 b/tests/v3d/bugs/bug30412 similarity index 100% rename from tests/bugs/vis/bug30412 rename to tests/v3d/bugs/bug30412 diff --git a/tests/bugs/vis/bug30434 b/tests/v3d/bugs/bug30434 similarity index 100% rename from tests/bugs/vis/bug30434 rename to tests/v3d/bugs/bug30434 diff --git a/tests/bugs/vis/bug30437 b/tests/v3d/bugs/bug30437 similarity index 96% rename from tests/bugs/vis/bug30437 rename to tests/v3d/bugs/bug30437 index 1fcefbe93c..d2122884d8 100644 --- a/tests/bugs/vis/bug30437 +++ b/tests/v3d/bugs/bug30437 @@ -24,3 +24,4 @@ set aTrianglesNb [vstatprofiler triangles] # check number of not culled points and triangles if [expr $aPointsNb != 3 || $aTrianglesNb != 2] { puts "Error: unexpected number of culled elements" } +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug30437_1 b/tests/v3d/bugs/bug30437_1 similarity index 96% rename from tests/bugs/vis/bug30437_1 rename to tests/v3d/bugs/bug30437_1 index 7a56410cc2..39e8aab967 100644 --- a/tests/bugs/vis/bug30437_1 +++ b/tests/v3d/bugs/bug30437_1 @@ -29,3 +29,4 @@ vfit vzoom 3 set aPointsNb_2 [vstatprofiler points] if [expr $aPointsNb_2 != 307] { puts "Error: unexpected number of not culled points 2" } +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug30561 b/tests/v3d/bugs/bug30561 similarity index 93% rename from tests/bugs/vis/bug30561 rename to tests/v3d/bugs/bug30561 index 3ca2a5bd7e..280e1f6f61 100644 --- a/tests/bugs/vis/bug30561 +++ b/tests/v3d/bugs/bug30561 @@ -32,4 +32,4 @@ vlocation c4 -setLocation 40 10 0 vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug30630_1 b/tests/v3d/bugs/bug30630_1 similarity index 100% rename from tests/bugs/vis/bug30630_1 rename to tests/v3d/bugs/bug30630_1 diff --git a/tests/bugs/vis/bug30630_2 b/tests/v3d/bugs/bug30630_2 similarity index 100% rename from tests/bugs/vis/bug30630_2 rename to tests/v3d/bugs/bug30630_2 diff --git a/tests/bugs/vis/bug30630_3 b/tests/v3d/bugs/bug30630_3 similarity index 100% rename from tests/bugs/vis/bug30630_3 rename to tests/v3d/bugs/bug30630_3 diff --git a/tests/bugs/vis/bug30823 b/tests/v3d/bugs/bug30823 similarity index 89% rename from tests/bugs/vis/bug30823 rename to tests/v3d/bugs/bug30823 index 62fb999401..fff39bfdd0 100644 --- a/tests/bugs/vis/bug30823 +++ b/tests/v3d/bugs/bug30823 @@ -22,4 +22,4 @@ vchild parent -ignoreParentTrsf -add child2 vfit verase parent -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug30907 b/tests/v3d/bugs/bug30907 similarity index 100% rename from tests/bugs/vis/bug30907 rename to tests/v3d/bugs/bug30907 diff --git a/tests/bugs/vis/bug30949 b/tests/v3d/bugs/bug30949 similarity index 100% rename from tests/bugs/vis/bug30949 rename to tests/v3d/bugs/bug30949 diff --git a/tests/bugs/vis/bug31341 b/tests/v3d/bugs/bug31341 similarity index 100% rename from tests/bugs/vis/bug31341 rename to tests/v3d/bugs/bug31341 diff --git a/tests/v3d/bugs/bug316 b/tests/v3d/bugs/bug316 new file mode 100644 index 0000000000..0de858b6f4 --- /dev/null +++ b/tests/v3d/bugs/bug316 @@ -0,0 +1,17 @@ +puts "================" +puts "OCC316: E x c e p t i o n is raised in the application during visualization. (#2054)" +puts "================" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file OCC316.brep] result + +tclean result +vinit View1 +vdisplay result +vsetdispmode result 1 +vfit + +checktrinfo result -tri !212909 -nod !158362 +checktrinfo result -tri -nod +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug31652 b/tests/v3d/bugs/bug31652 similarity index 100% rename from tests/bugs/vis/bug31652 rename to tests/v3d/bugs/bug31652 diff --git a/tests/bugs/vis/bug31673 b/tests/v3d/bugs/bug31673 similarity index 100% rename from tests/bugs/vis/bug31673 rename to tests/v3d/bugs/bug31673 diff --git a/tests/bugs/vis/bug31688 b/tests/v3d/bugs/bug31688 similarity index 100% rename from tests/bugs/vis/bug31688 rename to tests/v3d/bugs/bug31688 diff --git a/tests/bugs/vis/bug31794 b/tests/v3d/bugs/bug31794 similarity index 100% rename from tests/bugs/vis/bug31794 rename to tests/v3d/bugs/bug31794 diff --git a/tests/bugs/vis/bug319 b/tests/v3d/bugs/bug319 old mode 100755 new mode 100644 similarity index 74% rename from tests/bugs/vis/bug319 rename to tests/v3d/bugs/bug319 index a0fb3915a2..c2c4dd48b9 --- a/tests/bugs/vis/bug319 +++ b/tests/v3d/bugs/bug319 @@ -1,17 +1,15 @@ puts "========" -puts "OCC319" +puts "OCC319: Wrong shading on a shape" puts "========" puts "" -###################################################### -# Wrong shading on a shape -###################################################### cpulimit 3500 +pload MODELING VISUALIZATION restore [locate_data_file OCC319.brep] result tclean result -vinit +vinit View1 vdisplay result vsetdispmode result 1 vfit @@ -31,4 +29,4 @@ vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up checktrinfo result -tri -nod checkprops result -s 8623.6 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug31965 b/tests/v3d/bugs/bug31965 similarity index 100% rename from tests/bugs/vis/bug31965 rename to tests/v3d/bugs/bug31965 diff --git a/tests/v3d/bugs/bug331 b/tests/v3d/bugs/bug331 new file mode 100644 index 0000000000..ccb70d0be7 --- /dev/null +++ b/tests/v3d/bugs/bug331 @@ -0,0 +1,20 @@ +puts "========================" +puts " OCC331: Dark spot on a sphere after nurbsconvert" +puts "========================" +puts "" + +pload MODELING VISUALIZATION +box b -5 -5 -5 10 10 10 +psphere s 6 +bfuse res s b +nurbsconvert result res + +tclean result +vinit View1 +vdisplay result +vfit +vsetdispmode result 1 +vfit + +checktrinfo result -tri !3808 -nod !2188 +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug331_1 b/tests/v3d/bugs/bug331_1 new file mode 100644 index 0000000000..67d580c740 --- /dev/null +++ b/tests/v3d/bugs/bug331_1 @@ -0,0 +1,20 @@ +puts "================" +puts "OCC331: Dark spot on a sphere after nurbsconvert" +puts "================" +puts "" + +pload MODELING VISUALIZATION +box b -5 -5 -5 10 10 10 +psphere s 6 +fuse res2 s b +nurbsconvert result res2 + +vinit View1 +tclean result +vsetdispmode 1 +vdisplay result +vfit + +checkprops result -s 619.595 +checkshape result +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug344 b/tests/v3d/bugs/bug344 old mode 100755 new mode 100644 similarity index 51% rename from tests/bugs/vis/bug344 rename to tests/v3d/bugs/bug344 index 10c710203c..7824526fd3 --- a/tests/bugs/vis/bug344 +++ b/tests/v3d/bugs/bug344 @@ -1,18 +1,15 @@ puts "================" -puts "BUC61047" +puts "BUC61047: An e x c e p t i o n - is raised during visualization." puts "OCC344" puts "================" puts "" -############################################# -## An exception - is raised during visualization. -############################################# - +pload MODELING VISUALIZATION restore [locate_data_file OCC344.brep] result checkshape result tclean result -vinit +vinit View1 vdisplay result vsetdispmode result 1 vfit @@ -21,4 +18,4 @@ isos result 0 triangles result checktrinfo result -tri 8 -nod 8 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug349 b/tests/v3d/bugs/bug349 old mode 100755 new mode 100644 similarity index 100% rename from tests/bugs/vis/bug349 rename to tests/v3d/bugs/bug349 diff --git a/tests/bugs/vis/bug364 b/tests/v3d/bugs/bug364 old mode 100755 new mode 100644 similarity index 53% rename from tests/bugs/vis/bug364 rename to tests/v3d/bugs/bug364 index 58557ce2fa..c88c6cd8a2 --- a/tests/bugs/vis/bug364 +++ b/tests/v3d/bugs/bug364 @@ -1,25 +1,20 @@ puts "========================" -puts "BUC61000" +puts "BUC61000: Face is invisible in the shading mode in the 3D View." puts " OCC364 " puts "========================" puts "" -############################################## -## Face is invisible in the shading mode in the 3D View. -############################################## +pload MODELING VISUALIZATION restore [locate_data_file OCC364.brep] result checkshape result tclean result isos result 0 -vinit +vinit View1 vdisplay result vsetdispmode result 1 vfit triangles result checktrinfo result -tri 96 -nod 96 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - - +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug378 b/tests/v3d/bugs/bug378 new file mode 100644 index 0000000000..92c20437d3 --- /dev/null +++ b/tests/v3d/bugs/bug378 @@ -0,0 +1,15 @@ +puts "========================" +puts "BUC61058: Regression on KAS:dev:ros. Draw hangs after try to load 6381.brep shape to 3D Viewer. Case : cgg/004/S2" +puts " OCC378 " +puts "========================" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file OCC378.brep] result + +tclean result +vinit View1 +if [catch {vdisplay result } res] { puts "Error : function VDISPLAY works wrongly" } + +vfit +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug443 b/tests/v3d/bugs/bug443 new file mode 100644 index 0000000000..bda97d62d2 --- /dev/null +++ b/tests/v3d/bugs/bug443 @@ -0,0 +1,14 @@ +puts "========" +puts "OCC443: 'Fit all view' does not centered picture during fitting the view (SAM024)" +puts "========" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file OCC443.brep] result + +vinit View1 +vdisplay result +vfit + +checkcolor 31 304 0 0 0 +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug4894 b/tests/v3d/bugs/bug4894 new file mode 100644 index 0000000000..06299bc780 --- /dev/null +++ b/tests/v3d/bugs/bug4894 @@ -0,0 +1,17 @@ +puts "============" +puts "OCC4894: Problems with sharding in vdisplay" +puts "============" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file bug4894_face_cyl] result + +vinit View1 +vdisplay result +tclean result +trinfo result +vsetdispmode 1 +vfit + +checktrinfo result -tri -nod +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug591 b/tests/v3d/bugs/bug591 new file mode 100644 index 0000000000..21d3557876 --- /dev/null +++ b/tests/v3d/bugs/bug591 @@ -0,0 +1,17 @@ +puts "========" +puts "OCC591" +puts "========" +puts "" + +pload MODELING VISUALIZATION +restore [locate_data_file OCC591.brep] result +tclean result +vinit View1 +vdisplay result +vfit +vsetdispmode result 1 +vsettransparency result .5 +checkcolor 250 115 0.58 0.41 0.07 +if {$stat != 1} { puts "Error : Function VSETTRANSPARENCY works wrongly." } + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug5990 b/tests/v3d/bugs/bug5990 new file mode 100644 index 0000000000..c7ab344608 --- /dev/null +++ b/tests/v3d/bugs/bug5990 @@ -0,0 +1,34 @@ +puts "================" +puts "OCC5990: SetColor does not change color of wireframe entities in shading mode" +puts "================" +puts "" + +pload MODELING VISUALIZATION + +set LINE_R 0.00 +set LINE_G 0.00 +set LINE_B 1.00 + +box b1 10 10 10 +vertex v1 20 0 0 +vertex v2 20 0 10 +vertex v3 30 0 0 +vertex v4 30 0 10 +vertex v5 30 10 10 +edge e1 v1 v2 +edge e2 v3 v4 +edge e3 v4 v5 +compound e2 e3 c1 +vinit View1 +vdisplay b1 e1 c1 +vsetdispmode 1 +vfit +vsetcolor b1 BLUE +vsetcolor e1 BLUE +vsetcolor c1 BLUE + +checkcolor 162 159 0.00 0.00 0.83 +checkcolor 204 269 ${LINE_R} ${LINE_G} ${LINE_B} +checkcolor 348 238 ${LINE_R} ${LINE_G} ${LINE_B} + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug6145 b/tests/v3d/bugs/bug6145 new file mode 100644 index 0000000000..521bc1a55e --- /dev/null +++ b/tests/v3d/bugs/bug6145 @@ -0,0 +1,34 @@ +puts "============" +puts "OCC6145: Incorrect rendering of a transparent object" +puts "============" +puts "" + +pload MODELING VISUALIZATION + +box b 200 100 100 +plane p 20 20 50 +pcylinder c1 p 10 80 + +tcopy c1 c2 +ttranslate c2 40 0 0 +tcopy c2 c3 +ttranslate c3 40 0 0 +tcopy c3 c4 +ttranslate c4 40 0 0 +tcopy c4 c5 +ttranslate c5 40 0 0 + +compound c1 c2 c3 c4 c5 co +bcut r b co + +vinit View1 +vsetdispmode 1 +vdisplay r +vfit + +checkcolor 270 230 0.78 0.55 0.09 + +vsettransparency r 0.5 +checkcolor 270 230 0.8 0.56 0.1 + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug641 b/tests/v3d/bugs/bug641 old mode 100755 new mode 100644 similarity index 100% rename from tests/bugs/vis/bug641 rename to tests/v3d/bugs/bug641 diff --git a/tests/bugs/vis/bug6897_1 b/tests/v3d/bugs/bug6897_1 similarity index 100% rename from tests/bugs/vis/bug6897_1 rename to tests/v3d/bugs/bug6897_1 diff --git a/tests/v3d/bugs/bug7691 b/tests/v3d/bugs/bug7691 new file mode 100644 index 0000000000..b380872af8 --- /dev/null +++ b/tests/v3d/bugs/bug7691 @@ -0,0 +1,31 @@ +puts "============" +puts "OCC7691: Wrong hidden lines computed by HLRBRep_PolyAlgo and HLRBRep_PolyHLRToShape in OCC 5.1" +puts "============" +puts "" + +# load shape +pload MODELING VISUALIZATION +restore [locate_data_file OCC7691-bottle.brep] shape +trotate shape 0 0 0 1 0 0 -90 + +# init viewer and compute hlr shape +vinit View1 +vtop +vcomputehlr shape hlr +vfit + +# move cursor not to select shape +vmoveto 0 0 + +# start position of color picking +checkcolor 2 200 1 0 0 + +if { ${stat} != 0 } { + puts "HLR shape is correct" + puts "OK OCC7691" +} else { + puts "HLR shape is incorrect" + puts "Faulty OCC7691" +} + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug85_1 b/tests/v3d/bugs/bug85_1 old mode 100755 new mode 100644 similarity index 57% rename from tests/bugs/vis/bug85_1 rename to tests/v3d/bugs/bug85_1 index d12fac6b05..053a5865ea --- a/tests/bugs/vis/bug85_1 +++ b/tests/v3d/bugs/bug85_1 @@ -1,17 +1,10 @@ puts "===========" -puts "BUC60918" +puts "BUC60918: Shape drawn in transparency mode does not always eclipse another shapes" puts "OCC85" puts "===========" puts "" -############################### -## Shape drawn in transparency mode does not always eclipse another shapes -############################### -puts "==================================" -puts "It takes visual check for this BUG" -puts "==================================" - -pload OCAF +pload OCAF MODELING VISUALIZATION box b2 20 20 20 5 5 5 box b3 30 30 30 @@ -43,12 +36,6 @@ SetShape D 0:1:4 b AISSet D 0:1:4 NS AISDisplay D 0:1:4 -set x_coord 273 -set y_coord 115 - -checkcolor $x_coord $y_coord 0.78 0.55 0.9 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - +checkcolor 273 115 0.78 0.55 0.9 +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug85_2 b/tests/v3d/bugs/bug85_2 old mode 100755 new mode 100644 similarity index 67% rename from tests/bugs/vis/bug85_2 rename to tests/v3d/bugs/bug85_2 index f2e267c84c..22780cfb7a --- a/tests/bugs/vis/bug85_2 +++ b/tests/v3d/bugs/bug85_2 @@ -1,17 +1,10 @@ puts "===========" -puts "BUC60918" +puts "BUC60918: Shape drawn in transparency mode does not always eclipse another shapes" puts "OCC85" puts "===========" puts "" -############################### -## Shape drawn in transparency mode does not always eclipse another shapes -############################### -puts "==================================" -puts "It takes visual check for this BUG" -puts "==================================" - -pload OCAF +pload OCAF MODELING VISUALIZATION restore [locate_data_file buc60918-psm1.brep] psm1 restore [locate_data_file buc60918-psm2.brep] psm2 @@ -47,8 +40,4 @@ set y_coord 160 checkcolor $x_coord $y_coord 0.76 0.54 0.9 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - - - +vdump $imagedir/${casename}.png diff --git a/tests/v3d/bugs/bug872 b/tests/v3d/bugs/bug872 new file mode 100644 index 0000000000..c17acd622d --- /dev/null +++ b/tests/v3d/bugs/bug872 @@ -0,0 +1,16 @@ +puts "=======" +puts "OCC872: E x c e p t i o n is raised during visualization attached shape." +puts "SAM1660" +puts "=======" +puts "" + +cpulimit 3500 + +pload MODELING VISUALIZATION +restore [locate_data_file OCC872.brep] result + +vinit View1 +vdisplay result +vfit +vsetdispmode 1 +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/pro20342 b/tests/v3d/bugs/pro20342 old mode 100755 new mode 100644 similarity index 88% rename from tests/bugs/vis/pro20342 rename to tests/v3d/bugs/pro20342 index 8f5ed02900..32b180f4c0 --- a/tests/bugs/vis/pro20342 +++ b/tests/v3d/bugs/pro20342 @@ -7,16 +7,16 @@ puts "=============" ## works properly in C30. There is line in the file "C40/Gallery/ViewerTest.cxx" in the function "Vshading": ############################################################################## -pload XDE +pload XDE MODELING VISUALIZATION igesbrep [locate_data_file fra62523a.igs] result * checkshape result r -vinit +vinit View1 tclean result vdisplay result vsetshading result 0.1 vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/colors/begin b/tests/v3d/colors/begin index b8000f8739..ce5f55fcd4 100644 --- a/tests/v3d/colors/begin +++ b/tests/v3d/colors/begin @@ -5,6 +5,3 @@ proc check3reals {name value1 value2 value3 ref1 ref2 ref3 tol} { checkreal "${name}, component 2" $value2 $ref2 $tol 1e-6 checkreal "${name}, component 3" $value3 $ref3 $tol 1e-6 } - -# weird way to disable unnecessary screen dumps -set to_dump_screen 0 \ No newline at end of file diff --git a/tests/v3d/colors/de2000 b/tests/v3d/colors/de2000 index efeb477b6c..28272d1c83 100644 --- a/tests/v3d/colors/de2000 +++ b/tests/v3d/colors/de2000 @@ -1,5 +1,7 @@ # Check calculation of CIE Ddlta E 2000 color difference +pload VISUALIZATION + # Reference data are obtained using online calculator # http://brucelindbloom.com/index.html?ColorDifferenceCalc.html # or diff --git a/tests/v3d/colors/de2000_sharma b/tests/v3d/colors/de2000_sharma index b399e225b4..e33a899e94 100644 --- a/tests/v3d/colors/de2000_sharma +++ b/tests/v3d/colors/de2000_sharma @@ -1,5 +1,7 @@ # Check calculation of CIE Ddlta E 2000 color difference +pload VISUALIZATION + # Reference data taken from # "The CIEDE2000 Color-Difference Formula: Implementation Notes, # Supplementary Test Data, and Mathematical Observations", diff --git a/tests/v3d/colors/rgb2lab b/tests/v3d/colors/rgb2lab index a0cd3a87d7..df5e7bf0c6 100644 --- a/tests/v3d/colors/rgb2lab +++ b/tests/v3d/colors/rgb2lab @@ -1,5 +1,7 @@ # Check conversion of RGB colors to CIE Lab color space +pload VISUALIZATION + # Samples are obtained (with Ref. White D65, Gamma = 1 for linear RGB) using # http://brucelindbloom.com/index.html?ColorCalculator.html set rgb_to_lab_samples { diff --git a/tests/v3d/colors/rgb2lch b/tests/v3d/colors/rgb2lch index 16218671fd..560ac4ad24 100644 --- a/tests/v3d/colors/rgb2lch +++ b/tests/v3d/colors/rgb2lch @@ -1,5 +1,7 @@ # Check conversion of RGB colors to CIE Lch color space +pload VISUALIZATION + # Samples are obtained (with Ref. White D65, Gamma = 1 for linear RGB) using # http://brucelindbloom.com/index.html?ColorCalculator.html # Note that for c = 0 we have h = 0 (not 270 as in the above link) diff --git a/tests/v3d/colors/stability b/tests/v3d/colors/stability index e6c965f80f..2e6e1bda70 100644 --- a/tests/v3d/colors/stability +++ b/tests/v3d/colors/stability @@ -1,6 +1,8 @@ # Check stability of conversion of RGB colors to CIE Lab and Lch # color spaces and back on random colors +pload VISUALIZATION + # check color diff on random colors for {set i 1} {$i < 1000} {incr i} { set rgb "[expr rand()] [expr rand()] [expr rand()]" diff --git a/tests/bugs/vis/bug22632 b/tests/v3d/colorscale/bug22632 similarity index 90% rename from tests/bugs/vis/bug22632 rename to tests/v3d/colorscale/bug22632 index 7ccfba7ffe..f1b4aa6fc2 100644 --- a/tests/bugs/vis/bug22632 +++ b/tests/v3d/colorscale/bug22632 @@ -1,9 +1,9 @@ puts "============" -puts "OCC22632" -puts "Display logarithmic colorscale." +puts "OCC22632: Display logarithmic colorscale." puts "============" puts "" +pload VISUALIZATION vinit View1 vclear vaxo @@ -28,4 +28,3 @@ vdump ${imagedir}/${casename}_5.png vcolorscale cs -range 1 1000 6 vdump ${imagedir}/${casename}_6.png - diff --git a/tests/bugs/vis/bug22819 b/tests/v3d/colorscale/bug22819 old mode 100755 new mode 100644 similarity index 64% rename from tests/bugs/vis/bug22819 rename to tests/v3d/colorscale/bug22819 index b402a7acbd..efa7cfe4f0 --- a/tests/bugs/vis/bug22819 +++ b/tests/v3d/colorscale/bug22819 @@ -1,10 +1,9 @@ puts "============" -puts "OCC22819" -puts "Redesign of OpenGl driver(Tests ColorScale)" +puts "OCC22819: Redesign of OpenGl driver(Tests ColorScale)" puts "============" puts "" -set BugNumber OCC22819 +pload MODELING VISUALIZATION plane p 100 100 100 0 0 1 1 0 0 psphere result p 30 @@ -17,4 +16,4 @@ vsetdispmode result 1 checkprops result -s 11309.6 checkshape result -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/colorscale/bug25027 b/tests/v3d/colorscale/bug25027 new file mode 100644 index 0000000000..8e25f62574 --- /dev/null +++ b/tests/v3d/colorscale/bug25027 @@ -0,0 +1,16 @@ +puts "============" +puts "OCC25027: Visualization - 2D layer viewport is updated incorrectly on resize" +puts "============" +puts "" + +pload MODELING VISUALIZATION + +box b 1 2 3 +vinit View1 w=1024 h=512 +vsetdispmode 1 +vdisplay b +vfit +vcolorscale cs -range 10 20 100 -font 16 -textpos right -xy 0 0 +vmoveto 512 250 + +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug25136 b/tests/v3d/colorscale/bug25136 similarity index 95% rename from tests/bugs/vis/bug25136 rename to tests/v3d/colorscale/bug25136 index 10c214b382..e0df4179d0 100644 --- a/tests/bugs/vis/bug25136 +++ b/tests/v3d/colorscale/bug25136 @@ -1,9 +1,10 @@ puts "============" -puts "OCC25136" -puts "Display customized colorscale." +puts "OCC25136: Display customized colorscale." puts "============" puts "" +pload VISUALIZATION + vclear vinit View1 vaxo diff --git a/tests/bugs/vis/bug26312 b/tests/v3d/colorscale/bug26312 similarity index 84% rename from tests/bugs/vis/bug26312 rename to tests/v3d/colorscale/bug26312 index 41d75bc5c9..d22a537304 100644 --- a/tests/bugs/vis/bug26312 +++ b/tests/v3d/colorscale/bug26312 @@ -1,9 +1,9 @@ puts "============" -puts "OCC26312" -puts "ColorScale doesn't work as expected." +puts "OCC26312: ColorScale doesn't work as expected." puts "============" puts "" +pload VISUALIZATION vinit View1 vclear vaxo diff --git a/tests/bugs/vis/bug27573 b/tests/v3d/colorscale/bug27573 similarity index 98% rename from tests/bugs/vis/bug27573 rename to tests/v3d/colorscale/bug27573 index d7310a43db..d6c12a0476 100644 --- a/tests/bugs/vis/bug27573 +++ b/tests/v3d/colorscale/bug27573 @@ -3,6 +3,7 @@ puts "0027573: AIS_ColorScale::FindColor does not take into account custom color puts "============" puts "" +pload VISUALIZATION vclose all vinit View1 vclear diff --git a/tests/bugs/vis/bug28004 b/tests/v3d/colorscale/bug28004 similarity index 93% rename from tests/bugs/vis/bug28004 rename to tests/v3d/colorscale/bug28004 index b3a8bca31f..bf13e42c84 100644 --- a/tests/bugs/vis/bug28004 +++ b/tests/v3d/colorscale/bug28004 @@ -1,9 +1,9 @@ puts "============" -puts "OCC28004" -puts "Visualization, AIS_ColorScale - allow defining labels list not equal to intervals list" +puts "OCC28004: Visualization, AIS_ColorScale - allow defining labels list not equal to intervals list" puts "============" puts "" +pload VISUALIZATION vclear vinit View1 vaxo diff --git a/tests/bugs/vis/bug28813 b/tests/v3d/colorscale/bug28813 similarity index 75% rename from tests/bugs/vis/bug28813 rename to tests/v3d/colorscale/bug28813 index f4af7d0cfc..a3c628740e 100644 --- a/tests/bugs/vis/bug28813 +++ b/tests/v3d/colorscale/bug28813 @@ -1,12 +1,10 @@ puts "========" -puts "OCC28813" +puts "OCC28813: Visualization, AIS_ColorScale - color scale title invalid placement" puts "========" puts "" -####################################################################### -# Visualization, AIS_ColorScale - color scale title invalid placement -####################################################################### -vinit +pload VISUALIZATION +vinit View1 set anImage1 $imagedir/${casename}_1.png set anImage2 $imagedir/${casename}_2.png diff --git a/tests/bugs/vis/bug31454 b/tests/v3d/colorscale/bug31454 similarity index 97% rename from tests/bugs/vis/bug31454 rename to tests/v3d/colorscale/bug31454 index a108d5da86..e108f01b11 100644 --- a/tests/bugs/vis/bug31454 +++ b/tests/v3d/colorscale/bug31454 @@ -3,6 +3,8 @@ puts "0031454: Visualization - perceptually uniform color scale" puts "============" puts "" +pload VISUALIZATION + vclear vinit View1 -width 600 #vsetcolorbg 1 1 1 diff --git a/tests/v3d/dimensions/angle180 b/tests/v3d/dimensions/angle180 index 879204fe55..5923ea0315 100644 --- a/tests/v3d/dimensions/angle180 +++ b/tests/v3d/dimensions/angle180 @@ -2,10 +2,9 @@ #puts "OCC28244: Visualization - AIS_AngleDimension throws exception for 180 degree" #puts "============================================================================" +pload MODELING VISUALIZATION vclear -vclose all - -vinit +vinit View1 vpoint p0 -100 0 0 vpoint p1 0 0 0 diff --git a/tests/v3d/dimensions/begin b/tests/v3d/dimensions/begin deleted file mode 100644 index 374295ad12..0000000000 --- a/tests/v3d/dimensions/begin +++ /dev/null @@ -1,2 +0,0 @@ -set subgroup "dimensions" -vinit View1 diff --git a/tests/v3d/dimensions/bug24133_1 b/tests/v3d/dimensions/bug24133_1 new file mode 100644 index 0000000000..5401b9c8a9 --- /dev/null +++ b/tests/v3d/dimensions/bug24133_1 @@ -0,0 +1,18 @@ +puts "============" +puts "CR24133: Development of improvement of dimensions implementation - Length dimension" +puts "============" +puts "" + +pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + +vinit View1 +vpoint lengthP1 0 0 0 +vpoint lengthP2 50 50 50 +vdimension dim1 -length -plane xoy -shapes lengthP1 lengthP2 -font SansFont +vfit +vmoveto 82 254 +checkcolor 362 102 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting of length dimension is wrong." } + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/dimensions/bug24133_2 b/tests/v3d/dimensions/bug24133_2 new file mode 100644 index 0000000000..24de4a16c0 --- /dev/null +++ b/tests/v3d/dimensions/bug24133_2 @@ -0,0 +1,29 @@ +puts "============" +puts "CR24133: Development of improvement of dimensions implementation - Angle dimension" +puts "============" +puts "" + +pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + +vinit View1 +vpoint angle1P1 0 0 0 +vpoint angle1P2 50 50 50 +vpoint angle1P3 50 50 100 +vdimension dim1 -angle -shapes angle1P1 angle1P2 angle1P3 -font SansFont +vfit +vmoveto 249 206 +checkcolor 249 200 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting of angle dimension with 2d text is wrong." } + +vinit Viewer2/View2 +vpoint angle2P1 0 0 0 +vpoint angle2P2 50 50 50 +vpoint angle2P3 50 50 100 +vdimension dim2 -angle -text 3d -shapes angle2P1 angle2P2 angle2P3 -font SansFont +vfit +vmoveto 263 251 +checkcolor 335 319 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting of angle dimension with 3d text is wrong." } + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/dimensions/bug24133_3 b/tests/v3d/dimensions/bug24133_3 new file mode 100644 index 0000000000..e38b4c54b3 --- /dev/null +++ b/tests/v3d/dimensions/bug24133_3 @@ -0,0 +1,29 @@ +puts "============" +puts "CR24133: Development of improvement of dimensions implementation - Radius dimension" +puts "============" +puts "" + +pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + +vinit View1 +vpoint radP1 0 0 0 +vpoint radP2 50 50 0 +vpoint radP3 100 0 0 +vcircle circle1 radP1 radP2 radP3 0 +verase radP1 radP2 radP3 +vdimension dim1 -radius -shapes circle1 -font SansFont +vfit +vmoveto 123 158 +checkcolor 112 151 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting of radius dimension with 2d text is wrong." } + +vinit Viewer2/View2 +vcircle circle2 radP1 radP2 radP3 0 +vdimension dim2 -radius -text 3d -shapes circle2 -font SansFont +vfit +vmoveto 191 196 +checkcolor 112 151 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting of radius dimension with 3d text is wrong." } + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/dimensions/bug24133_4 b/tests/v3d/dimensions/bug24133_4 new file mode 100644 index 0000000000..6be413657d --- /dev/null +++ b/tests/v3d/dimensions/bug24133_4 @@ -0,0 +1,29 @@ +puts "============" +puts "CR24133: Development of improvement of dimensions implementation - Diameter dimension" +puts "============" +puts "" + +pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + +vinit View1 +vpoint diamP1 0 0 0 +vpoint diamP2 50 50 0 +vpoint diamP3 100 0 0 +vcircle circle1 diamP1 diamP2 diamP3 0 +verase diamP1 diamP2 diamP3 +vdimension dim1 -diameter -shapes circle1 -font SansFont +vfit +vmoveto 208 205 +checkcolor 296 257 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting of diameter dimension with 2d text is wrong." } + +vinit Viewer2/View2 +vcircle circle2 diamP1 diamP2 diamP3 0 +vdimension dim2 -diameter -text 3d -shapes circle2 -font SansFont +vfit +vmoveto 208 205 +checkcolor 296 257 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting of diameter dimension with 3d text is wrong." } + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/dimensions/bug24288_1 b/tests/v3d/dimensions/bug24288_1 new file mode 100644 index 0000000000..edf30da84c --- /dev/null +++ b/tests/v3d/dimensions/bug24288_1 @@ -0,0 +1,32 @@ +puts "============" +puts "CR24288: Provide a text flipping" +puts "Test for text flipping after X rotation" +puts "============" +puts "" + +pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + +set m_pi 3,14 +set m_pi2 1,57 +vinit View1 +vpoint radP1 0 0 0 +vpoint radP2 50 50 0 +vpoint radP3 100 0 0 +vcircle circle radP1 radP2 radP3 0 +vrotate 0 -$m_pi2 0 +verase radP1 radP2 radP3 +vdimension dim -radius -text 3d -shapes circle -font SansFont +vfit +vmoveto 110 111 +checkcolor 196 196 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting of radius dimension with 3d text before flipping is wrong." } + +# X axis rotation +vrotate $m_pi 0 0 +vfit +vmoveto 208 200 +checkcolor 295 113 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting of radius dimension with 3d text with flipping after x rotation is wrong." } + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/dimensions/bug24288_2 b/tests/v3d/dimensions/bug24288_2 new file mode 100644 index 0000000000..86e9897603 --- /dev/null +++ b/tests/v3d/dimensions/bug24288_2 @@ -0,0 +1,32 @@ +puts "============" +puts "CR24288: Provide a text flipping" +puts "Test for text flipping after Y rotation" +puts "============" +puts "" + +pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + +set m_pi 3,14 +set m_pi2 1,57 +vinit View1 +vpoint radP1 0 0 0 +vpoint radP2 50 50 0 +vpoint radP3 100 0 0 +vcircle circle radP1 radP2 radP3 0 +vrotate 0 -$m_pi2 0 +verase radP1 radP2 radP3 +vdimension dim -radius -text 3d -shapes circle -font SansFont +vfit +vmoveto 110 111 +checkcolor 196 196 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting of radius dimension with 3d text before flipping is wrong." } + +# Y axis rotation +vrotate 0 $m_pi 0 +vfit +vmoveto 159 246 +checkcolor 113 294 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting of radius dimension with 3d text with flipping after y rotation is wrong." } + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/dimensions/bug24288_3 b/tests/v3d/dimensions/bug24288_3 new file mode 100644 index 0000000000..de026f0fba --- /dev/null +++ b/tests/v3d/dimensions/bug24288_3 @@ -0,0 +1,32 @@ +puts "============" +puts "CR24288: Provide a text flipping" +puts "Test for text flipping after Z rotation" +puts "============" +puts "" + +pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + +set m_pi 3,14 +set m_pi2 1,57 +vinit View1 +vpoint radP1 0 0 0 +vpoint radP2 50 50 0 +vpoint radP3 100 0 0 +vcircle circle radP1 radP2 radP3 0 +vrotate 0 -$m_pi2 0 +verase radP1 radP2 radP3 +vdimension dim -radius -text 3d -shapes circle -font SansFont +vfit +vmoveto 110 111 +checkcolor 196 196 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting of radius dimension with 3d text before flipping is wrong." } + +# Z axis rotation +vrotate 0 0 $m_pi +vfit +vmoveto 221 217 +checkcolor 209 208 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting of radius dimension with 3d text with flipping after z rotation is wrong." } + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/dimensions/bug24293 b/tests/v3d/dimensions/bug24293 new file mode 100644 index 0000000000..969ef4ebb6 --- /dev/null +++ b/tests/v3d/dimensions/bug24293 @@ -0,0 +1,21 @@ +puts "============" +puts "CR24293: Dimension flyout lines don't belong to the dimension sensitive entity." +puts "============" +puts "" + +pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + +vinit View1 +vpoint lengthP1 0 0 0 +vpoint lengthP2 10 10 10 +vdimension dim1 -length -plane xoy -shapes lengthP1 lengthP2 -font SansFont +vfit +vmoveto 202 191 + +set x_coord 272 +set y_coord 198 +checkcolor $x_coord $y_coord 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting of length dimension is wrong." } + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug24351_1 b/tests/v3d/dimensions/bug24351_1 similarity index 87% rename from tests/bugs/vis/bug24351_1 rename to tests/v3d/dimensions/bug24351_1 index 2e02ef0007..08eafe85a3 100644 --- a/tests/bugs/vis/bug24351_1 +++ b/tests/v3d/dimensions/bug24351_1 @@ -1,15 +1,12 @@ puts "============" -puts "CR24351" +puts "CR24351: Test AIS Length dimensions: label position and arrow orientation" puts "============" puts "" -####################################################################### -# Test AIS Length dimensions: label position and arrow orientation -####################################################################### -pload VISUALIZATION +pload VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont -vinit +vinit View1 vfront set hpos "left hcenter right" @@ -72,4 +69,4 @@ for {set r 0} {$r < 3} {incr r} { } vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug24351_2 b/tests/v3d/dimensions/bug24351_2 similarity index 89% rename from tests/bugs/vis/bug24351_2 rename to tests/v3d/dimensions/bug24351_2 index 5faa91bffa..07181075d3 100644 --- a/tests/bugs/vis/bug24351_2 +++ b/tests/v3d/dimensions/bug24351_2 @@ -1,15 +1,12 @@ puts "============" -puts "CR24351" +puts "CR24351: Test AIS Diameter dimensions: label position and arrow orientation" puts "============" puts "" -####################################################################### -# Test AIS Diameter dimensions: label position and arrow orientation -####################################################################### -pload VISUALIZATION +pload VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont -vinit +vinit View1 vfront set hpos "left hcenter right" @@ -80,4 +77,4 @@ for {set r 0} {$r < 3} {incr r} { } vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug24351_3 b/tests/v3d/dimensions/bug24351_3 similarity index 89% rename from tests/bugs/vis/bug24351_3 rename to tests/v3d/dimensions/bug24351_3 index f4548e7dbd..64f1369a30 100644 --- a/tests/bugs/vis/bug24351_3 +++ b/tests/v3d/dimensions/bug24351_3 @@ -1,15 +1,12 @@ puts "============" -puts "CR24351" +puts "CR24351: Test AIS Radius dimensions: label position and arrow orientation" puts "============" puts "" -####################################################################### -# Test AIS Radius dimensions: label position and arrow orientation -####################################################################### -pload VISUALIZATION +pload VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont -vinit +vinit View1 vfront set hpos "left hcenter" @@ -79,4 +76,4 @@ for {set r 0} {$r < 3} {incr r} { } vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug24351_4 b/tests/v3d/dimensions/bug24351_4 similarity index 89% rename from tests/bugs/vis/bug24351_4 rename to tests/v3d/dimensions/bug24351_4 index 6d594467d7..e9bb6a3cca 100644 --- a/tests/bugs/vis/bug24351_4 +++ b/tests/v3d/dimensions/bug24351_4 @@ -1,15 +1,12 @@ puts "============" -puts "CR24351" +puts "CR24351: Test AIS angle dimensions: label position and arrow orientation" puts "============" puts "" -####################################################################### -# Test AIS angle dimensions: label position and arrow orientation -####################################################################### -pload VISUALIZATION +pload VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont -vinit +vinit View1 vfront set hpos "left hcenter right" @@ -75,4 +72,4 @@ for {set r 0} {$r < 3} {incr r} { } vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/dimensions/bug24374 b/tests/v3d/dimensions/bug24374 new file mode 100644 index 0000000000..f9ec0a6836 --- /dev/null +++ b/tests/v3d/dimensions/bug24374 @@ -0,0 +1,21 @@ +puts "============" +puts "CR24374: Flipping affects highlight presentation of dimension" +puts "============" +puts "" + +pload MODELING VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + +box b 100 100 100 +explode b e +vdisplay b +vdisplay b_9 +vdimension dim1 -length -shapes b_9 -text 3d -plane zox -font SansFont +vselmode b 2 1 +vselmode dim1 2 1 +vfit +vmoveto 130 352 +checkcolor 130 352 0 1 1 +if { $stat != 1 } { puts "Error : Highlighting of dimension with flipping in local context failed." } + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug24389 b/tests/v3d/dimensions/bug24389 similarity index 95% rename from tests/bugs/vis/bug24389 rename to tests/v3d/dimensions/bug24389 index 368b3e78fe..76ccda5ec0 100644 --- a/tests/bugs/vis/bug24389 +++ b/tests/v3d/dimensions/bug24389 @@ -1,11 +1,9 @@ puts "============" -puts "CR24389" +puts "CR24389: Invalid highlight of AIS dimension line in local selection" puts "============" puts "" -####################################################################### -# Invalid highlight of AIS dimension line in local selection -####################################################################### +pload MODELING VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont # ----------------------------------------------# @@ -15,10 +13,6 @@ vfont add [locate_data_file DejaVuSans.ttf] SansFont vinit View1 vtop -set anImage1 $imagedir/${casename}_1.png -set anImage2 $imagedir/${casename}_2.png -set anImage3 $imagedir/${casename}_3.png - # length vpoint len_p1 0 0 0 @@ -235,15 +229,15 @@ set shift 0 vselmode 0 1 vselect $xmin $ymin $xmax $ymax $shift -vdump $anImage1 +vdump $imagedir/${casename}_1.png vselect 0 0 0 0 0 vselmode 1 1 vselect $xmin $ymin $xmax $ymax $shift -vdump $anImage2 +vdump $imagedir/${casename}_2.png vselect 0 0 0 0 0 vselmode 0 1 vselmode 2 1 vselect $xmin $ymin $xmax $ymax $shift -vdump $anImage3 +vdump $imagedir/${casename}_3.png diff --git a/tests/bugs/vis/bug24412_1 b/tests/v3d/dimensions/bug24412_1 similarity index 55% rename from tests/bugs/vis/bug24412_1 rename to tests/v3d/dimensions/bug24412_1 index 19c4a9e34d..67153f879a 100644 --- a/tests/bugs/vis/bug24412_1 +++ b/tests/v3d/dimensions/bug24412_1 @@ -1,18 +1,12 @@ puts "============" -puts "CR24412" +puts "CR24412: TKV3d, Dimensions - Possibility to customize text position was lost" +puts "Test position setting for linear dimension" puts "============" puts "" -####################################################################### -# TKV3d, Dimensions - Possibility to customize text position was lost -# Test position setting for linear dimension -####################################################################### -pload ALL +pload MODELING VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont -set anImage1 $imagedir/${casename}_1.png -set anImage2 $imagedir/${casename}_2.png - vinit Viewer1/View1 vpoint circ_p1 0 10 30 vpoint circ_p2 30 10 0 @@ -28,11 +22,9 @@ vfit set x_coord 166 set y_coord 226 checkcolor $x_coord $y_coord 0.46 0.9 0 -if { $stat != 1 } { - puts "Error : Text position of dimension is incorrect." -} +if { $stat != 1 } { puts "Error : Text position of dimension is incorrect." } -vdump $anImage1 +vdump $imagedir/${casename}_1.png # Update dimension parameters and set automatic text positioning vdimparam diam -flyout -5 @@ -42,8 +34,6 @@ vfit set x_coord 213 set y_coord 179 checkcolor $x_coord $y_coord 0.46 0.9 0 -if { $stat != 1 } { - puts "Error : Text position of dimension after layout changing is incorrect." -} +if { $stat != 1 } { puts "Error : Text position of dimension after layout changing is incorrect." } -vdump $anImage2 +vdump $imagedir/${casename}_2.png diff --git a/tests/v3d/dimensions/bug24412_2 b/tests/v3d/dimensions/bug24412_2 new file mode 100644 index 0000000000..bb68b325ea --- /dev/null +++ b/tests/v3d/dimensions/bug24412_2 @@ -0,0 +1,31 @@ +puts "============" +puts "CR24412: TKV3d, Dimensions - Possibility to customize text position was lost" +puts "Test position setting for angular dimension" +puts "============" +puts "" + +pload MODELING VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + +vinit Viewer1/View1 +vpoint ang_p1 0 0 30 +vpoint ang_p2 30 0 0 +vpoint ang_p3 60 0 30 +vdimension ang -angle -shapes ang_p1 ang_p2 ang_p3 -font SansFont +vmovedim ang 5 0 5 +vfit + +# Check that text position was changed and the text is not aligned +checkcolor 60 189 0.46 0.9 0 +if { $stat != 1 } { puts "Error : Text position of dimension is incorrect." } +vdump $imagedir/${casename}_1.png + +# Update dimension parameters and set automatic text positioning +vdimparam ang -flyout -5 +vfit + +# Check that text position was changed according to flyout +checkcolor 206 312 0.46 0.9 0 +if { $stat != 1 } { puts "Error : Text position of dimension after layout changing is incorrect." } + +vdump $imagedir/${casename}_2.png diff --git a/tests/bugs/vis/bug25403 b/tests/v3d/dimensions/bug25403 similarity index 59% rename from tests/bugs/vis/bug25403 rename to tests/v3d/dimensions/bug25403 index ea0f3f84e1..e771bd3237 100644 --- a/tests/bugs/vis/bug25403 +++ b/tests/v3d/dimensions/bug25403 @@ -1,15 +1,12 @@ puts "============" -puts "CR25403" +puts "CR25403: Wrong storage of model units in AIS_AngleDimension" puts "============" puts "" -####################################################################### -# Wrong storage of model units in AIS_AngleDimension -####################################################################### -pload VISUALIZATION +pload VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont -vinit +vinit View1 vpoint angleP1 0 0 0 vpoint angleP2 50 50 50 vpoint angleP3 50 50 100 @@ -17,4 +14,4 @@ vdimension dim1 -angle -value 300 -modelunits deg -shapes angleP1 angleP2 angleP vdimension dim2 -length -value 10 -modelunits mm -showunits -plane yoz -shapes angleP1 angleP3 -font SansFont vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25549_1 b/tests/v3d/dimensions/bug25549_1 similarity index 86% rename from tests/bugs/vis/bug25549_1 rename to tests/v3d/dimensions/bug25549_1 index a36892561b..a5a2c64c8a 100644 --- a/tests/bugs/vis/bug25549_1 +++ b/tests/v3d/dimensions/bug25549_1 @@ -1,9 +1,10 @@ puts "============" puts "CR25549" puts "Visualization - do not crash on attempt to display the Angle dimension between two parallel lines" +puts "Tests case of two edges with the same line but different end points parameters" puts "============" puts "" -puts "Tests case of two edges with the same line but different end points parameters" + pload MODELING VISUALIZATION line l 0 0 0 1 0 0 mkedge e1 l 50 100 @@ -16,7 +17,4 @@ vdisplay e1 e2 vdimension ad -angle -shapes e1 e2 vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - - +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25549_2 b/tests/v3d/dimensions/bug25549_2 similarity index 87% rename from tests/bugs/vis/bug25549_2 rename to tests/v3d/dimensions/bug25549_2 index fb7d577840..e44b84277c 100644 --- a/tests/bugs/vis/bug25549_2 +++ b/tests/v3d/dimensions/bug25549_2 @@ -1,9 +1,9 @@ puts "============" puts "CR25549" puts "Visualization - do not crash on attempt to display the Angle dimension between two parallel lines" +puts "Tests case of two edges with opposite lines directions" puts "============" puts "" -puts "Tests case of two edges with opposite lines directions" pload MODELING VISUALIZATION line Line1 0 0 0 1 0 0 @@ -18,4 +18,4 @@ vaxo vdisplay e1 e2 vdimension ad -angle -shapes e1 e2 vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/dimensions/bug26035_1 b/tests/v3d/dimensions/bug26035_1 new file mode 100644 index 0000000000..4347251b1b --- /dev/null +++ b/tests/v3d/dimensions/bug26035_1 @@ -0,0 +1,19 @@ +puts "============" +puts "CR26035: Dimension drawing between two vertices" +puts "============" +puts "" + +pload MODELING VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + +vinit View1 +vclear +vaxo + +vertex v1 10 0 0 +vertex v2 10 0 10 + +vdimension len -length -shapes v1 v2 -plane yoz -font SansFont + +vfit +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug26035_2 b/tests/v3d/dimensions/bug26035_2 similarity index 57% rename from tests/bugs/vis/bug26035_2 rename to tests/v3d/dimensions/bug26035_2 index ed95362d78..6fd570af5b 100644 --- a/tests/bugs/vis/bug26035_2 +++ b/tests/v3d/dimensions/bug26035_2 @@ -1,12 +1,11 @@ puts "============" -puts "CR26035" +puts "CR26035: E x c e p t i o n when trying to draw dimension between face and point" puts "============" puts "" -####################################################################### -# Exception when trying to draw dimension between face and point -####################################################################### + puts "REQUIRED All: Error: dimension geometry is invalid, -length dimension can't be built on input shapes" +pload MODELING VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont vinit View1 @@ -22,6 +21,4 @@ vpoint p 10 0 0 catch {vdimension len -length -shapes b_1 p -plane zox -font SansFont} vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug26035_3 b/tests/v3d/dimensions/bug26035_3 similarity index 51% rename from tests/bugs/vis/bug26035_3 rename to tests/v3d/dimensions/bug26035_3 index fecfe91653..243d3b851a 100644 --- a/tests/bugs/vis/bug26035_3 +++ b/tests/v3d/dimensions/bug26035_3 @@ -1,11 +1,9 @@ puts "============" -puts "CR26035" +puts "CR26035: Drawing dimension between edge and vertex" puts "============" puts "" -####################################################################### -# Drawing dimension between edge and vertex -####################################################################### +pload MODELING VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont vinit View1 @@ -23,6 +21,4 @@ vdisplay v3 vdimension len -length -shapes e v3 -plane yoz -font SansFont vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug26035_4 b/tests/v3d/dimensions/bug26035_4 similarity index 51% rename from tests/bugs/vis/bug26035_4 rename to tests/v3d/dimensions/bug26035_4 index a8bd7e4691..9c32791bf7 100644 --- a/tests/bugs/vis/bug26035_4 +++ b/tests/v3d/dimensions/bug26035_4 @@ -1,11 +1,9 @@ puts "============" -puts "CR26035" +puts "CR26035: Drawing dimension between vertex and edge" puts "============" puts "" -####################################################################### -# Drawing dimension between vertex and edge -####################################################################### +pload MODELING VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont vinit View1 @@ -23,6 +21,4 @@ vdisplay v3 vdimension len -length -shapes v3 e -plane yoz -font SansFont vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug26035_5 b/tests/v3d/dimensions/bug26035_5 similarity index 50% rename from tests/bugs/vis/bug26035_5 rename to tests/v3d/dimensions/bug26035_5 index 89e2a8845e..ca1a0e2b9f 100644 --- a/tests/bugs/vis/bug26035_5 +++ b/tests/v3d/dimensions/bug26035_5 @@ -1,11 +1,9 @@ puts "============" -puts "CR26035" +puts "CR26035: Drawing dimension between edge and point" puts "============" puts "" -####################################################################### -# Drawing dimension between edge and point -####################################################################### +pload MODELING VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont vinit View1 @@ -22,6 +20,4 @@ vpoint p 10 0 10 vdimension len -length -shapes e p -plane yoz -font SansFont vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug26035_6 b/tests/v3d/dimensions/bug26035_6 similarity index 50% rename from tests/bugs/vis/bug26035_6 rename to tests/v3d/dimensions/bug26035_6 index 34bbcc73e5..08571ac6e9 100644 --- a/tests/bugs/vis/bug26035_6 +++ b/tests/v3d/dimensions/bug26035_6 @@ -1,11 +1,9 @@ puts "============" -puts "CR26035" +puts "CR26035: Drawing dimension between point and edge" puts "============" puts "" -####################################################################### -# Drawing dimension between point and edge -####################################################################### +pload MODELING VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont vinit View1 @@ -22,6 +20,4 @@ vpoint p 10 0 10 vdimension len -length -shapes p e -plane yoz -font SansFont vfit - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug26056 b/tests/v3d/dimensions/bug26056 similarity index 93% rename from tests/bugs/vis/bug26056 rename to tests/v3d/dimensions/bug26056 index a3f76458c0..94d790fefc 100644 --- a/tests/bugs/vis/bug26056 +++ b/tests/v3d/dimensions/bug26056 @@ -1,9 +1,9 @@ puts "============" puts "CR26056" puts "AIS_LengthDimension can not build dimension for face-edge or edge-face" +puts "Tests case of edge-face and face-edge input geometry for dimension" puts "============" puts "" -puts "Tests case of edge-face and face-edge input geometry for dimension" pload MODELING VISUALIZATION @@ -32,4 +32,4 @@ vdimension aDim3 -length -shapes aFace anEdge3 -text 15 3d sh vdimension aDim4 -length -shapes aFace anEdge4 -text 15 3d sh vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/dimensions/bug26317 b/tests/v3d/dimensions/bug26317 new file mode 100644 index 0000000000..af814c59f6 --- /dev/null +++ b/tests/v3d/dimensions/bug26317 @@ -0,0 +1,17 @@ +puts "============" +puts "CR26317: Visualization, AIS_LengthDimension::CheckPlane is incorrect" +puts "============" +puts "" + +pload VISUALIZATION MODELING + +box b 100 200 300 +vinit View1 +vclear +vaxo +explode b F +vdisplay b_1 b_2 +vdimension len -length -shapes b_1 b_2 -plane zox +vfit + +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug27688 b/tests/v3d/dimensions/bug27688 similarity index 83% rename from tests/bugs/vis/bug27688 rename to tests/v3d/dimensions/bug27688 index bd74876f8c..93d4d716b9 100644 --- a/tests/bugs/vis/bug27688 +++ b/tests/v3d/dimensions/bug27688 @@ -1,13 +1,12 @@ puts "========" puts "Visualization, AIS_Dimension - add possibility to set custom text value" +puts "Test case creates three length dimensions where value is set as real," +puts "as text and is reset to auto value state." puts "========" -# Test case creates three length dimensions where value is set as real, -# as text and is reset to auto value state. - pload MODELING VISUALIZATION -vinit +vinit View1 vpoint p1 0 0 0 vpoint p2 50 50 0 diff --git a/tests/bugs/vis/bug27692 b/tests/v3d/dimensions/bug27692 similarity index 80% rename from tests/bugs/vis/bug27692 rename to tests/v3d/dimensions/bug27692 index baa3e02f60..9f4090ddfb 100644 --- a/tests/bugs/vis/bug27692 +++ b/tests/v3d/dimensions/bug27692 @@ -1,10 +1,9 @@ puts "========" puts "Visualization, AIS_AngleDimension - exterior angle and arrows visibility improvements" +puts "Test case creates three angle dimensions with exterior/interior presentation for the angle" +puts "and different visual state of presentation arrows" puts "========" -# Test case creates three angle dimensions with exterior/interior presentation for the angle -# and different visual state of presentation arrows - pload MODELING VISUALIZATION vinit diff --git a/tests/v3d/dimensions/concentric b/tests/v3d/dimensions/concentric index a762d25b77..f107373133 100644 --- a/tests/v3d/dimensions/concentric +++ b/tests/v3d/dimensions/concentric @@ -3,8 +3,9 @@ puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context" puts "Select two circled edges" puts "====================================================================" +pload MODELING VISUALIZATION vclear -vinit +vinit View1 pcylinder c 15 30 vdisplay c diff --git a/tests/v3d/dimensions/equaldistance b/tests/v3d/dimensions/equaldistance index d17a3902cb..30601a5467 100644 --- a/tests/v3d/dimensions/equaldistance +++ b/tests/v3d/dimensions/equaldistance @@ -3,8 +3,9 @@ puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context" puts "Select 4 edges or vertices" puts "====================================================================" +pload MODELING VISUALIZATION vclear -vinit +vinit View1 box b 10 20 30 vdisplay b diff --git a/tests/v3d/dimensions/equalradius b/tests/v3d/dimensions/equalradius index 678b08fdce..7259138b2b 100644 --- a/tests/v3d/dimensions/equalradius +++ b/tests/v3d/dimensions/equalradius @@ -3,8 +3,9 @@ puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context" puts "Select 1 or 2 circled edges" puts "====================================================================" +pload MODELING VISUALIZATION vclear -vinit +vinit View1 pcylinder c 15 30 vdisplay c diff --git a/tests/v3d/dimensions/fix b/tests/v3d/dimensions/fix index 3360bde1e8..4fd491c56a 100644 --- a/tests/v3d/dimensions/fix +++ b/tests/v3d/dimensions/fix @@ -3,8 +3,9 @@ puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context" puts "Select 1 edge" puts "====================================================================" +pload MODELING VISUALIZATION vclear -vinit +vinit View1 box b 10 20 30 vdisplay b diff --git a/tests/v3d/dimensions/identic b/tests/v3d/dimensions/identic index 06e54dbaed..3bee4a12ca 100644 --- a/tests/v3d/dimensions/identic +++ b/tests/v3d/dimensions/identic @@ -3,8 +3,9 @@ puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context" puts "Select 2 edges or vertices" puts "====================================================================" +pload MODELING VISUALIZATION vclear -vinit +vinit View1 box b 10 20 30 vdisplay b diff --git a/tests/v3d/dimensions/lengthparam b/tests/v3d/dimensions/lengthparam index bd5fca9858..1d4ea59e87 100644 --- a/tests/v3d/dimensions/lengthparam +++ b/tests/v3d/dimensions/lengthparam @@ -1,5 +1,5 @@ -pload ALL -vinit +pload MODELING VISUALIZATION +vinit View1 vtrihedron t1 vpoint p11 2 22 0 @@ -28,4 +28,4 @@ vlengthparam dim4 -direction OY vtop vfit vzoom 0.75 - +vdump $imagedir/${casename}.png diff --git a/tests/v3d/dimensions/lengthparam_flyout_reversed b/tests/v3d/dimensions/lengthparam_flyout_reversed index abb3bdf51b..608d3cc6fe 100644 --- a/tests/v3d/dimensions/lengthparam_flyout_reversed +++ b/tests/v3d/dimensions/lengthparam_flyout_reversed @@ -1,5 +1,5 @@ -pload ALL -vinit +pload MODELING VISUALIZATION +vinit View1 vtrihedron t1 vpoint p11 2 22 0 @@ -28,4 +28,4 @@ vlengthparam dim4 -direction OY vtop vfit vzoom 0.75 - +vdump $imagedir/${casename}.png diff --git a/tests/v3d/dimensions/lengthparam_reversed b/tests/v3d/dimensions/lengthparam_reversed index 867b5c7d0d..881909e071 100644 --- a/tests/v3d/dimensions/lengthparam_reversed +++ b/tests/v3d/dimensions/lengthparam_reversed @@ -1,5 +1,5 @@ -pload ALL -vinit +pload MODELING VISUALIZATION +vinit View1 vtrihedron t1 vpoint p11 2 22 0 @@ -28,4 +28,4 @@ vlengthparam dim4 -direction OY vtop vfit vzoom 0.75 - +vdump $imagedir/${casename}.png diff --git a/tests/v3d/dimensions/lengthparam_reversed_direction b/tests/v3d/dimensions/lengthparam_reversed_direction index e6031ce9b2..c605e3569e 100644 --- a/tests/v3d/dimensions/lengthparam_reversed_direction +++ b/tests/v3d/dimensions/lengthparam_reversed_direction @@ -1,5 +1,5 @@ -pload ALL -vinit +pload MODELING VISUALIZATION +vinit View1 vtrihedron t1 vpoint p11 2 22 0 @@ -28,4 +28,4 @@ vlengthparam dim4 -direction 0 -1 0 vtop vfit vzoom 0.75 - +vdump $imagedir/${casename}.png diff --git a/tests/v3d/dimensions/lengthparam_reversed_flyout_reversed b/tests/v3d/dimensions/lengthparam_reversed_flyout_reversed index d30ae25452..62173d4c5f 100644 --- a/tests/v3d/dimensions/lengthparam_reversed_flyout_reversed +++ b/tests/v3d/dimensions/lengthparam_reversed_flyout_reversed @@ -1,5 +1,5 @@ -pload ALL -vinit +pload MODELING VISUALIZATION +vinit View1 vtrihedron t1 vpoint p11 2 22 0 @@ -28,4 +28,4 @@ vlengthparam dim4 -direction OY vtop vfit vzoom 0.75 - +vdump $imagedir/${casename}.png diff --git a/tests/v3d/dimensions/offset b/tests/v3d/dimensions/offset index f077afea54..7f9537e008 100644 --- a/tests/v3d/dimensions/offset +++ b/tests/v3d/dimensions/offset @@ -3,8 +3,9 @@ puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context" puts "Select 2 faces" puts "====================================================================" +pload MODELING VISUALIZATION vclear -vinit +vinit View1 box b -5 -10 -15 10 20 30 vdisplay b diff --git a/tests/v3d/dimensions/parallel b/tests/v3d/dimensions/parallel index 8f149afda5..3f0e769b54 100644 --- a/tests/v3d/dimensions/parallel +++ b/tests/v3d/dimensions/parallel @@ -3,8 +3,9 @@ puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context" puts "Select 2 edges" puts "====================================================================" +pload MODELING VISUALIZATION vclear -vinit +vinit View1 box b -5 -10 -15 10 20 30 vdisplay b diff --git a/tests/v3d/dimensions/perpendicular b/tests/v3d/dimensions/perpendicular index b894b7d1da..f8d699174b 100644 --- a/tests/v3d/dimensions/perpendicular +++ b/tests/v3d/dimensions/perpendicular @@ -3,6 +3,7 @@ puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context" puts "Select 2 edges" puts "====================================================================" +pload MODELING VISUALIZATION vclear vinit diff --git a/tests/v3d/dimensions/symmetric b/tests/v3d/dimensions/symmetric index 72df387c36..1b5172e31a 100644 --- a/tests/v3d/dimensions/symmetric +++ b/tests/v3d/dimensions/symmetric @@ -3,8 +3,9 @@ puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context" puts "Select 3 edges or 1 edge and 2 vertices" puts "====================================================================" +pload MODELING VISUALIZATION vclear -vinit +vinit View1 box b 10 20 30 vdisplay b diff --git a/tests/v3d/edge/begin b/tests/v3d/edge/begin deleted file mode 100644 index a07094a81a..0000000000 --- a/tests/v3d/edge/begin +++ /dev/null @@ -1,2 +0,0 @@ -vinit View1 -set subgroup "edge" diff --git a/tests/v3d/edge_face/begin b/tests/v3d/edge_face/begin deleted file mode 100644 index 427b54c2b5..0000000000 --- a/tests/v3d/edge_face/begin +++ /dev/null @@ -1,2 +0,0 @@ -vinit View1 -set subgroup "edge_face" diff --git a/tests/v3d/edge_solid/begin b/tests/v3d/edge_solid/begin deleted file mode 100644 index dac621c426..0000000000 --- a/tests/v3d/edge_solid/begin +++ /dev/null @@ -1,4 +0,0 @@ -vinit View1 -set subgroup "edge_solid" - - diff --git a/tests/v3d/end b/tests/v3d/end index 6aafde8dfa..73b3acd4ea 100755 --- a/tests/v3d/end +++ b/tests/v3d/end @@ -1,40 +1 @@ -if { [info exists subgroup] && $subgroup != "motion" && $subgroup != "ivtk" && $subgroup != "dimensions" } { - catch { vfit } -} -if { [info exists subgroup] && $subgroup == "raytrace" } { - - # dump final image for raytraced visualization tests - if { ![info exists to_dump_screen] || $to_dump_screen == 1 } { - catch { set render_parameters [vrenderparams] } - catch { set stereo_parameters [vstereo] } - - # for global illumination mode accumulate frames before dumping - regexp {renderMode *: *([A-Za-z]+)} $render_parameters full renderMode - regexp {GI *: *([A-Za-z]+)} $render_parameters full gi_enabled - if { [string equal -nocase "raytrace" $renderMode] && [string equal -nocase "on" $gi_enabled] } { - vfps 200 - } - - set dump_options {} - regexp {Stereo *([A-Za-z]+)} $stereo_parameters full stereo_enabled - regexp {Mode *([A-Za-z]+)} $stereo_parameters full stereo_mode - if { [string equal -nocase "on" $stereo_enabled] } { - set dump_options {-stereo blend} - } - - if { [ catch { vdump $imagedir/${test_image}.png {*}$dump_options } catch_result ] } { - puts $catch_result - } - } -} elseif { [info exists subgroup] && $subgroup == "dimensions" } { - # skip these test cases. -} elseif { ![info exists subgroup] || $subgroup != "mesh" } { - - # dump final image for common visualization tests - if { ![info exists to_dump_screen] && [ catch { vdump $imagedir/${test_image}.png } catch_result ] } { - puts $catch_result - } -} -catch { vglinfo } - puts "TEST COMPLETED" diff --git a/tests/v3d/face/begin b/tests/v3d/face/begin deleted file mode 100644 index 3e56bf5c0e..0000000000 --- a/tests/v3d/face/begin +++ /dev/null @@ -1,2 +0,0 @@ -vinit View1 -set subgroup "face" diff --git a/tests/3rdparty/fonts/B1 b/tests/v3d/fonts/B1 similarity index 89% rename from tests/3rdparty/fonts/B1 rename to tests/v3d/fonts/B1 index 3d6bee69ab..309890a236 100644 --- a/tests/3rdparty/fonts/B1 +++ b/tests/v3d/fonts/B1 @@ -2,13 +2,14 @@ puts "============" puts "OCC24181 Render text as BRep" puts "============" puts "" -pload MODELING -pload VISUALIZATION + +pload MODELING VISUALIZATION set THE_TEXT "The quick brown fox\njumps over the lazy dog!" set THE_FONT_NAME sans-serif set THE_FONT_SIZES {12 18 24} +vinit View1 vsetdispmode 1 vtop @@ -30,6 +31,5 @@ foreach aSize $THE_FONT_SIZES { } vfit - vglinfo -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/3rdparty/fonts/B2 b/tests/v3d/fonts/B2 similarity index 89% rename from tests/3rdparty/fonts/B2 rename to tests/v3d/fonts/B2 index 02cbdeb19e..e471309130 100644 --- a/tests/3rdparty/fonts/B2 +++ b/tests/v3d/fonts/B2 @@ -2,13 +2,14 @@ puts "============" puts "OCC24181 Render text as BRep (composite curve)" puts "============" puts "" -pload MODELING -pload VISUALIZATION + +pload MODELING VISUALIZATION set THE_TEXT "The quick brown fox\njumps over the lazy dog!" set THE_FONT_NAME sans-serif set THE_FONT_SIZES {12 18 24} +vinit View1 vsetdispmode 1 vtop @@ -30,6 +31,5 @@ foreach aSize $THE_FONT_SIZES { } vfit - vglinfo -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/3rdparty/fonts/B3 b/tests/v3d/fonts/B3 similarity index 99% rename from tests/3rdparty/fonts/B3 rename to tests/v3d/fonts/B3 index aa49521cd0..e8e7aed987 100644 --- a/tests/3rdparty/fonts/B3 +++ b/tests/v3d/fonts/B3 @@ -32,6 +32,5 @@ vinit View1 vtop vdisplay -dispMode 1 aBTextN aBTextC vfit - vglinfo vdump ${imagedir}/${casename}.png diff --git a/tests/3rdparty/fonts/B4 b/tests/v3d/fonts/B4 similarity index 96% rename from tests/3rdparty/fonts/B4 rename to tests/v3d/fonts/B4 index 1d2a49c1f9..b90c766c53 100644 --- a/tests/3rdparty/fonts/B4 +++ b/tests/v3d/fonts/B4 @@ -4,6 +4,9 @@ puts "Test case prints 3D brep text with different text alignment styles" puts "============" puts "" +pload MODELING VISUALIZATION +vinit View1 + vtrihedron trihedr vfront @@ -42,8 +45,5 @@ vsetcolor Text3 Text4 Text5 WHITE vsetcolor Text6 Text7 Text8 YELLOW vfit - -vfps - vglinfo -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/3rdparty/fonts/B5 b/tests/v3d/fonts/B5 similarity index 96% rename from tests/3rdparty/fonts/B5 rename to tests/v3d/fonts/B5 index 4ffb8dd9fd..d81068fca7 100644 --- a/tests/3rdparty/fonts/B5 +++ b/tests/v3d/fonts/B5 @@ -4,6 +4,9 @@ puts "Test case prints 3D brep text with different text alignment styles" puts "============" puts "" +pload MODELING VISUALIZATION + +vinit View1 vtrihedron trihedr vfront @@ -42,8 +45,5 @@ vsetcolor Text3 Text4 Text5 WHITE vsetcolor Text6 Text7 Text8 YELLOW vfit - -vfps - vglinfo -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/3rdparty/fonts/B6 b/tests/v3d/fonts/B6 similarity index 100% rename from tests/3rdparty/fonts/B6 rename to tests/v3d/fonts/B6 diff --git a/tests/3rdparty/fonts/B7 b/tests/v3d/fonts/B7 similarity index 94% rename from tests/3rdparty/fonts/B7 rename to tests/v3d/fonts/B7 index c028fd7ddb..351b040e49 100644 --- a/tests/3rdparty/fonts/B7 +++ b/tests/v3d/fonts/B7 @@ -11,6 +11,7 @@ set THE_FONT_SIZES {12 18 24} # register font having only Regular style vfont add [locate_data_file DejaVuSans.ttf] SansFont +vinit View1 vtop dtracelevel trace @@ -31,6 +32,5 @@ foreach aSize $THE_FONT_SIZES { } vfit - vglinfo -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25369 b/tests/v3d/fonts/bug25369 similarity index 54% rename from tests/bugs/vis/bug25369 rename to tests/v3d/fonts/bug25369 index 3629503503..4a79248ae9 100644 --- a/tests/bugs/vis/bug25369 +++ b/tests/v3d/fonts/bug25369 @@ -1,11 +1,9 @@ puts "========" -puts "OCC25369" +puts "OCC25369: Visualization, Image_AlienPixMap - handle UTF-8 names in image read/save operations on Windows" puts "========" puts "" -################################################################################################### -# Visualization, Image_AlienPixMap - handle UTF-8 names in image read/save operations on Windows -################################################################################################### +pload MODELING VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont box b 1 2 3 @@ -20,4 +18,4 @@ vdrawtext text0 $s -pos 0 0 0 -color WHITE -halign left -valign bottom -angle 0 vdump $::imagedir/$s vtexture b $::imagedir/$s file delete $::imagedir/$s -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/fonts/bug25852 b/tests/v3d/fonts/bug25852 new file mode 100644 index 0000000000..ca10bd1e8a --- /dev/null +++ b/tests/v3d/fonts/bug25852 @@ -0,0 +1,20 @@ +puts "============" +puts "CR25852: Text to BRep algorithm produces bad faces for circled symbols" +puts "============" +puts "" + +pload MODELING VISUALIZATION +text2brep t "\u00ae" Courier 10 +whatis t + +vinit View1 +vclear +vtop +vsetdispmode 1 +vdisplay t +vfit + +vmoveto 250 250 +checkshape t + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/glsl/cubemap b/tests/v3d/glsl/cubemap deleted file mode 100644 index 54893254c1..0000000000 --- a/tests/v3d/glsl/cubemap +++ /dev/null @@ -1,158 +0,0 @@ -puts "============" -puts "0030807: Visualization, TKOpenGl - supporting cubemaps" -puts "============" -puts "" - -set aCubeMap_V [locate_data_file Circus_CubeMap_V.png] -set aCubeMap_V_021345 [locate_data_file Circus_CubeMap_V_021345.png] -set aCubeMap_H [locate_data_file Circus_CubeMap_H.png] -set aCubeMap_GridV [locate_data_file Circus_CubeMap_GridV.png] -set aCubeMap_GridV_021345 [locate_data_file Circus_CubeMap_GridV_021345.png] -set aCubeMap_GridH [locate_data_file Circus_CubeMap_GridH.png] -set aCubeMap_GridH_021345 [locate_data_file Circus_CubeMap_GridH_021345.png] -set aCubeMap_posx [locate_data_file SF_CubeMap_posx.jpg] -set aCubeMap_negx [locate_data_file SF_CubeMap_negx.jpg] -set aCubeMap_posy [locate_data_file SF_CubeMap_posy.jpg] -set aCubeMap_negy [locate_data_file SF_CubeMap_negy.jpg] -set aCubeMap_posz [locate_data_file SF_CubeMap_posz.jpg] -set aCubeMap_negz [locate_data_file SF_CubeMap_negz.jpg] - -vclear -vclose ALL -vinit v -w 512 -h 512 -vcamera -fovy 100 - -#vertical tiles orientation -vbackground -cubemap $aCubeMap_V -vfront -vdump $imagedir/${casename}_V_front.png -vback -vdump $imagedir/${casename}_V_back.png -vtop -vdump $imagedir/${casename}_V_top.png -vbottom -vdump $imagedir/${casename}_V_bottom.png -vleft -vdump $imagedir/${casename}_V_left.png -vright -vdump $imagedir/${casename}_V_right.png - -#test of flipping -vbackground -cubemap $aCubeMap_V -invertedz -vfront -vdump $imagedir/${casename}_flip_front.png -vback -vdump $imagedir/${casename}_flip_back.png -vtop -vdump $imagedir/${casename}_flip_top.png -vbottom -vdump $imagedir/${casename}_flip_bottom.png -vleft -vdump $imagedir/${casename}_flip_left.png -vright -vdump $imagedir/${casename}_flip_right.png - -#vertical tiles orientation (disordered) -vbackground -cubemap $aCubeMap_V_021345 -order 0 2 1 3 4 5 -vfront -vdump $imagedir/${casename}_V_021345_front.png -vback -vdump $imagedir/${casename}_V_021345_back.png -vtop -vdump $imagedir/${casename}_V_021345_top.png -vbottom -vdump $imagedir/${casename}_V_021345_bottom.png -vleft -vdump $imagedir/${casename}_V_021345_left.png -vright -vdump $imagedir/${casename}_V_021345_right.png - -#horizontal tile orientation -vbackground -cubemap $aCubeMap_H -vfront -vdump $imagedir/${casename}_H_front.png -vback -vdump $imagedir/${casename}_H_back.png -vtop -vdump $imagedir/${casename}_H_top.png -vbottom -vdump $imagedir/${casename}_H_bottom.png -vleft -vdump $imagedir/${casename}_H_left.png -vright -vdump $imagedir/${casename}_H_right.png - -#vertical grid tile orientation -vbackground -cubemap $aCubeMap_GridV -vfront -vdump $imagedir/${casename}_GridV_front.png -vback -vdump $imagedir/${casename}_GridV_back.png -vtop -vdump $imagedir/${casename}_GridV_top.png -vbottom -vdump $imagedir/${casename}_GridV_bottom.png -vleft -vdump $imagedir/${casename}_GridV_left.png -vright -vdump $imagedir/${casename}_GridV_right.png - -#vertical grid tile orientation (disordered) -vbackground -cubemap $aCubeMap_GridV_021345 -order 0 2 1 3 4 5 -vfront -vdump $imagedir/${casename}_GridV_021345_front.png -vback -vdump $imagedir/${casename}_GridV_021345_back.png -vtop -vdump $imagedir/${casename}_GridV_021345_top.png -vbottom -vdump $imagedir/${casename}_GridV_021345_bottom.png -vleft -vdump $imagedir/${casename}_GridV_021345_left.png -vright -vdump $imagedir/${casename}_GridV_021345_right.png - -#horizontal grid tile orientation -vbackground -cubemap $aCubeMap_GridH -vfront -vdump $imagedir/${casename}_GridH_front.png -vback -vdump $imagedir/${casename}_GridH_back.png -vtop -vdump $imagedir/${casename}_GridH_top.png -vbottom -vdump $imagedir/${casename}_GridH_bottom.png -vleft -vdump $imagedir/${casename}_GridH_left.png -vright -vdump $imagedir/${casename}_GridH_right.png - -#horizontal grid tile orientation (disordered) -vbackground -cubemap $aCubeMap_GridH_021345 -order 0 2 1 3 4 5 -vfront -vdump $imagedir/${casename}_GridH_021345_front.png -vback -vdump $imagedir/${casename}_GridH_021345_back.png -vtop -vdump $imagedir/${casename}_GridH_021345_top.png -vbottom -vdump $imagedir/${casename}_GridH_021345_bottom.png -vleft -vdump $imagedir/${casename}_GridH_021345_left.png -vright -vdump $imagedir/${casename}_GridH_021345_right.png - -#multiimage cubemap -vbackground -cubemap $aCubeMap_posx $aCubeMap_negx $aCubeMap_posy $aCubeMap_negy $aCubeMap_posz $aCubeMap_negz -vfront -vdump $imagedir/${casename}_multi_front.png -vback -vdump $imagedir/${casename}_multi_back.png -vtop -vdump $imagedir/${casename}_multi_top.png -vbottom -vdump $imagedir/${casename}_multi_bottom.png -vleft -vdump $imagedir/${casename}_multi_left.png -vright -vdump $imagedir/${casename}_multi_right.png \ No newline at end of file diff --git a/tests/v3d/grids.list b/tests/v3d/grids.list index 424fa131de..4b19c0167b 100755 --- a/tests/v3d/grids.list +++ b/tests/v3d/grids.list @@ -1,26 +1,16 @@ -001 edge -002 edge_face -003 edge_solid -004 face -005 vertex -006 vertex_edge -007 vertex_face -008 vertex_solid -009 vertex_wire -010 wire -011 wire_solid -013 glsl -014 raytrace -015 materials -016 ivtk -017 mesh -018 point_cloud -019 manipulator -020 anim -021 dimensions -022 transparency -023 viewcube -024 colors -025 quadric -026 shadows -027 light_source +001 anim +002 bugs +003 colors +004 colorscale +005 dimensions +006 fonts +007 light_source +008 manipulator +009 materials +010 memory +011 mesh +012 point_cloud +013 quadric +014 trihedron +015 trsf +016 viewcube diff --git a/tests/v3d/ivtk/begin b/tests/v3d/ivtk/begin deleted file mode 100644 index b0f7620d23..0000000000 --- a/tests/v3d/ivtk/begin +++ /dev/null @@ -1,5 +0,0 @@ -pload VIS - -set to_dump_screen 1 - -set subgroup ivtk diff --git a/tests/bugs/vis/bug30669 b/tests/v3d/manipulator/bug30669 similarity index 100% rename from tests/bugs/vis/bug30669 rename to tests/v3d/manipulator/bug30669 diff --git a/tests/v3d/manipulator/disable_parts b/tests/v3d/manipulator/disable_parts index 66e980f779..a8cf9080b6 100644 --- a/tests/v3d/manipulator/disable_parts +++ b/tests/v3d/manipulator/disable_parts @@ -27,5 +27,3 @@ vmanipulator m -detach vmanipulator m -attach b -parts 1 0 vdump $imagedir/${casename}_4.png - -set to_dump_screen 0 diff --git a/tests/v3d/manipulator/dragg b/tests/v3d/manipulator/dragg index fbd212f280..7cb67c7f1e 100644 --- a/tests/v3d/manipulator/dragg +++ b/tests/v3d/manipulator/dragg @@ -2,6 +2,8 @@ puts "=====================================" puts "AIS_Manipulator - drag an object" puts "=====================================" +pload MODELING VISUALIZATION + set anImage1 $imagedir/${casename}_1.png set anImage2 $imagedir/${casename}_2.png set anImage3 $imagedir/${casename}_3.png diff --git a/tests/v3d/manipulator/rotate b/tests/v3d/manipulator/rotate index 9bbee64948..b648749d73 100644 --- a/tests/v3d/manipulator/rotate +++ b/tests/v3d/manipulator/rotate @@ -2,6 +2,8 @@ puts "==================================" puts "AIS_Manipulator - rotate an object" puts "==================================" +pload MODELING VISUALIZATION + set anImage1 $imagedir/${casename}_1.png set anImage2 $imagedir/${casename}_2.png set anImage3 $imagedir/${casename}_3.png @@ -138,5 +140,3 @@ vmanipulator m -stopTransform vselect 0 0 vmoveto {*}$mouse_drag vdump $anImage5 - -set to_dump_screen 0 \ No newline at end of file diff --git a/tests/v3d/manipulator/scale b/tests/v3d/manipulator/scale index f8e770d5b0..0b9876b20d 100644 --- a/tests/v3d/manipulator/scale +++ b/tests/v3d/manipulator/scale @@ -2,6 +2,8 @@ puts "=================================" puts "AIS_Manipulator - scale an object" puts "=================================" +pload MODELING VISUALIZATION + set anImage1 $imagedir/${casename}_1.png set anImage2 $imagedir/${casename}_2.png @@ -59,5 +61,3 @@ vmanipulator m -transform {*}$mouse_drag vmanipulator m -stopTransform vselect 0 0 vdump $anImage2 - -set to_dump_screen 0 diff --git a/tests/v3d/manipulator/shape_location b/tests/v3d/manipulator/shape_location index 94cd440cf3..98ba1bf29f 100644 --- a/tests/v3d/manipulator/shape_location +++ b/tests/v3d/manipulator/shape_location @@ -15,4 +15,3 @@ vmanipulator m -attach b -adjustPosition 0 vmanipulator m -adjustPosition shapeLocation vdump $imagedir/${casename}.png -set to_dump_screen 0 diff --git a/tests/v3d/manipulator/translate b/tests/v3d/manipulator/translate index b901b1cba7..ddc0ec2563 100644 --- a/tests/v3d/manipulator/translate +++ b/tests/v3d/manipulator/translate @@ -2,6 +2,8 @@ puts "=====================================" puts "AIS_Manipulator - translate an object" puts "=====================================" +pload MODELING VISUALIZATION + set anImage1 $imagedir/${casename}_1.png set anImage2 $imagedir/${casename}_2.png set anImage3 $imagedir/${casename}_3.png @@ -152,5 +154,3 @@ vmanipulator m -stopTransform vselect 0 0 vmoveto {*}$mouse_drag vdump $anImage5 - -set to_dump_screen 0 \ No newline at end of file diff --git a/tests/v3d/manipulator/translate2 b/tests/v3d/manipulator/translate2 index 65773fa4c3..ccf67847d9 100644 --- a/tests/v3d/manipulator/translate2 +++ b/tests/v3d/manipulator/translate2 @@ -34,4 +34,3 @@ regexp {Location:\s*([ 0-9.e+-]+)} $aLocFull aLocTmp aLoc if { [expr abs([lindex $aLoc 0] - 46)] > 0.1 || [lindex $aLoc 1] != 0 || [lindex $aLoc 2] != 0 } { puts "Error: wrong translation" } vdump $imagedir/${casename}.png -set to_dump_screen 0 diff --git a/tests/v3d/manipulator/zoom_persistence b/tests/v3d/manipulator/zoom_persistence index 5d62ef0d8d..2ae29fb657 100644 --- a/tests/v3d/manipulator/zoom_persistence +++ b/tests/v3d/manipulator/zoom_persistence @@ -2,6 +2,8 @@ puts "===============================================" puts "AIS_Manipulator - check zoom persistence option" puts "===============================================" +pload MODELING VISUALIZATION + set anImage1 $imagedir/${casename}_1.png set anImage2 $imagedir/${casename}_2.png set anImage3 $imagedir/${casename}_3.png @@ -83,5 +85,3 @@ vmanipulator m2 -transform {*}$mouse_drag_3 vmanipulator m2 -stopTransform vselect 0 0 vdump $anImage6 - -set to_dump_screen 0 \ No newline at end of file diff --git a/tests/v3d/materials/bug24855 b/tests/v3d/materials/bug24855 index 4d7a9a5a94..fd29ae86ef 100644 --- a/tests/v3d/materials/bug24855 +++ b/tests/v3d/materials/bug24855 @@ -2,7 +2,10 @@ puts "========" puts "0024855: Revision of parameters of standard materials" puts "========" +pload MODELING VISUALIZATION + # Ray-Tracing doesn't work with Compatible Profile on macOS +pload OPENGL if { $::tcl_platform(os) == "Darwin" } { vcaps -core } # custom shapes diff --git a/tests/v3d/materials/bug27617 b/tests/v3d/materials/bug27617 index dfc30d7eac..9da02e998b 100644 --- a/tests/v3d/materials/bug27617 +++ b/tests/v3d/materials/bug27617 @@ -14,3 +14,4 @@ vfit vmoveto 250 150 set aColor [vreadpixel 200 150 name rgb] if { "$aColor" != "TURQUOISE3" } { puts "Error: Wrong dynamic highlight color" } +vdump $imagedir/${casename}.png diff --git a/tests/v3d/materials/bug27818_2 b/tests/v3d/materials/bug27818_2 index b25291d921..f39796e952 100644 --- a/tests/v3d/materials/bug27818_2 +++ b/tests/v3d/materials/bug27818_2 @@ -7,10 +7,9 @@ puts "" # test change of highlight and selection properties for particular objects #################################################################################### - pload QAcommands VISUALIZATION -vinit +vinit View1 OCC27818 vfit diff --git a/tests/v3d/materials/pbr1 b/tests/v3d/materials/pbr1 index 823403f65b..384f1bead5 100644 --- a/tests/v3d/materials/pbr1 +++ b/tests/v3d/materials/pbr1 @@ -1,5 +1,6 @@ # PBR requires OpenGL 3.0+ on macOS pload VISUALIZATION +pload OPENGL if { $::tcl_platform(os) == "Darwin" } { vcaps -core } source $env(CSF_OCCTSamplesPath)/tcl/materials.tcl diff --git a/tests/v3d/materials/phong1 b/tests/v3d/materials/phong1 index 5d4900f76a..b84b183f14 100644 --- a/tests/v3d/materials/phong1 +++ b/tests/v3d/materials/phong1 @@ -6,3 +6,4 @@ puts "" source $env(CSF_OCCTSamplesPath)/tcl/materials.tcl vrenderparams -shadingModel PHONG -msaa 0 +vdump $imagedir/${casename}.png diff --git a/tests/v3d/materials/raytrace1 b/tests/v3d/materials/raytrace1 index c3939d81f5..a4dec71e32 100644 --- a/tests/v3d/materials/raytrace1 +++ b/tests/v3d/materials/raytrace1 @@ -6,7 +6,9 @@ puts "" # Ray-Tracing doesn't work with Compatible Profile on macOS pload VISUALIZATION +pload OPENGL if { $::tcl_platform(os) == "Darwin" } { vcaps -core } source $env(CSF_OCCTSamplesPath)/tcl/materials.tcl vrenderparams -raytrace -msaa 0 +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug172 b/tests/v3d/memory/bug172 old mode 100755 new mode 100644 similarity index 64% rename from tests/bugs/vis/bug172 rename to tests/v3d/memory/bug172 index e386eae4c1..dacd99c8de --- a/tests/bugs/vis/bug172 +++ b/tests/v3d/memory/bug172 @@ -2,7 +2,7 @@ puts "========" puts "OCC172" puts "========" -pload XDE VISUALIZATION +pload XDE VISUALIZATION QAcommands # disable VBO to avoid false memory leaks reported on NVIDIA graphics, see issue #29996 pload OPENGL @@ -15,11 +15,11 @@ vdisplay s set listmem {} set i_max 10 for {set i 1} {${i} <= ${i_max}} {incr i} { - # select shape - OCC172 - # deselect shape - OCC172 + # select shape + OCC172 + # deselect shape + OCC172 - lappend listmem [meminfo h] - checktrend $listmem 0 1 "Memory leak detected" + lappend listmem [meminfo h] + checktrend $listmem 0 1 "Memory leak detected" } diff --git a/tests/v3d/memory/bug26538 b/tests/v3d/memory/bug26538 new file mode 100644 index 0000000000..93d5109e65 --- /dev/null +++ b/tests/v3d/memory/bug26538 @@ -0,0 +1,25 @@ +puts "============" +puts "OCC26538: Visualization - Infinite growth of maxtrix stack in OpenGl_Structure::Render" +puts "============" +puts "" + +pload MODELING VISUALIZATION +box b1 1 1 1 +box b2 1 1 1 + +vinit View1 +vdisplay b1 +vdisplay b2 +vsetlocation b2 10 10 10 +vfit + +set listmem {} + +set i_max 3 +for {set i 1} {${i} <= ${i_max}} {incr i} { + vfps 1000 + lappend listmem [meminfo h] + checktrend $listmem 0 1 "Memory leak detected" +} + +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug29412 b/tests/v3d/memory/bug29412 similarity index 95% rename from tests/bugs/vis/bug29412 rename to tests/v3d/memory/bug29412 index b2d58222b3..b82d855ab7 100644 --- a/tests/bugs/vis/bug29412 +++ b/tests/v3d/memory/bug29412 @@ -3,7 +3,7 @@ puts "# 0029412: Huge Memory leak since I upgraded to OC 6.9.0" puts "# ===================================================================" puts "" -pload VISUALIZATION +pload VISUALIZATION QAcommands pload OPENGL vcaps -vsync 0 vinit View1 diff --git a/tests/bugs/vis/bug5682 b/tests/v3d/memory/bug5682 old mode 100755 new mode 100644 similarity index 76% rename from tests/bugs/vis/bug5682 rename to tests/v3d/memory/bug5682 index c152e77b54..1695d6d260 --- a/tests/bugs/vis/bug5682 +++ b/tests/v3d/memory/bug5682 @@ -1,12 +1,9 @@ puts "============" -puts "OCC5682" +puts "OCC5682: AIS_InteractiveContext::Remove does not remove the object from memory" puts "============" puts "" -###################################################### -# AIS_InteractiveContext::Remove does not remove the object from memory -###################################################### -set BugNumber OCC5682 +pload MODELING VISUALIZATION set aNbBoxes 10 set aBoxes {} diff --git a/tests/bugs/vis/bug79 b/tests/v3d/memory/bug79 similarity index 74% rename from tests/bugs/vis/bug79 rename to tests/v3d/memory/bug79 index b4ef25aa90..5ef3e74e42 100644 --- a/tests/bugs/vis/bug79 +++ b/tests/v3d/memory/bug79 @@ -15,9 +15,9 @@ vdisplay s set listmem {} set i_max 10 for {set i 1} {${i} <= ${i_max}} {incr i} { - verase s - vdisplay s + verase s + vdisplay s - lappend listmem [meminfo h] - checktrend $listmem 0 1 "Memory leak detected" + lappend listmem [meminfo h] + checktrend $listmem 0 1 "Memory leak detected" } diff --git a/tests/v3d/mesh/C1 b/tests/v3d/mesh/C1 index 6e285accfb..a25998fd88 100644 --- a/tests/v3d/mesh/C1 +++ b/tests/v3d/mesh/C1 @@ -11,4 +11,4 @@ vselbvhbuild 1 -nbThreads 1 vselmode s FACE 1 vselbvhbuild -wait vselect 0 0 512 512 -vdump $imagedir/${test_image}.png \ No newline at end of file +vdump $imagedir/${casename}.png diff --git a/tests/v3d/mesh/begin b/tests/v3d/mesh/begin index a7d7cb8003..2d57bea52a 100644 --- a/tests/v3d/mesh/begin +++ b/tests/v3d/mesh/begin @@ -1,3 +1,2 @@ -set subgroup "mesh" -pload XSDRAW -vinit \ No newline at end of file +pload MODELING VISUALIZATION XSDRAW +vinit View1 diff --git a/tests/v3d/mesh/bug10781 b/tests/v3d/mesh/bug10781 new file mode 100644 index 0000000000..25cd2ba351 --- /dev/null +++ b/tests/v3d/mesh/bug10781 @@ -0,0 +1,26 @@ +puts "============" +puts "OCC10781: MeshVS is not sensitive to width of edges" +puts "============" +puts "" + +pload XDE VISUALIZATION + +vinit View1 +vclear +vaxo + +meshfromstl m [locate_data_file OMF6391_box.stl] + +set aCoordX 206 +set aCoordY 280 + +vmoveto $aCoordX $aCoordY + +set aColor1px [vreadpixel $aCoordX $aCoordY rgb name] +if { "$aColor1px" != "BLACK" } { puts "Error: BLACK color is expected at pixel ${aCoordX}x${aCoordY}" } + +mesh_edge_width m 6 +set aColor5px [vreadpixel $aCoordX $aCoordY rgb name] +if { "$aColor5px" == "BLACK" } { puts "Error: YELLOW color is expected at pixel ${aCoordX}x${aCoordY}" } + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/mesh/bug11095 b/tests/v3d/mesh/bug11095 new file mode 100644 index 0000000000..979ba8f5b3 --- /dev/null +++ b/tests/v3d/mesh/bug11095 @@ -0,0 +1,20 @@ +puts "============" +puts "OCC11095: MeshVS: Borders of faces are not visible in shrink mode" +puts "============" +puts "" + +set BugNumber OCC11095 + +pload XDE VISUALIZATION + +vinit View1 +meshfromstl m [locate_data_file OMF6391_box.stl] +vmoveto 157 280 + +vsetdispmode m 3 +puts "\nSet shrinked display mode\n" + +checkcolor 137 277 0 0 0 +if { ${stat} != 1 } { puts "Error : Borders of faces are not visible in shrink mode" } + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug26028 b/tests/v3d/mesh/bug26028 similarity index 98% rename from tests/bugs/vis/bug26028 rename to tests/v3d/mesh/bug26028 index 072cee8308..3179aa908e 100644 --- a/tests/bugs/vis/bug26028 +++ b/tests/v3d/mesh/bug26028 @@ -3,7 +3,7 @@ puts "Drawing mesh as closed object." puts "=============" puts "" -pload XDE +pload XDE VISUALIZATION set aMeshFile [locate_data_file sh1.stl] diff --git a/tests/v3d/parse.rules b/tests/v3d/parse.rules index 4546f28fdf..d2d2452862 100644 --- a/tests/v3d/parse.rules +++ b/tests/v3d/parse.rules @@ -1,3 +1 @@ FAILED /\bFaulty\b/ error -SKIPPED /OCCT was compiled without OpenCL support!/ -SKIPPED /OpenCL device info is unavailable!/ diff --git a/tests/v3d/point_cloud/sensitivebox b/tests/v3d/point_cloud/sensitivebox index d0ee3f5429..f91e404135 100644 --- a/tests/v3d/point_cloud/sensitivebox +++ b/tests/v3d/point_cloud/sensitivebox @@ -2,6 +2,8 @@ puts "========" puts "Sensitive box selection" puts "========" +pload MODELING VISUALIZATION + # create sphere sphere ss 10 mkface s ss @@ -57,4 +59,5 @@ vaxo vfit vclipplane pl1 -delete vclipplane pl2 -delete -vmoveto 200 200 \ No newline at end of file +vmoveto 200 200 +vdump $imagedir/${casename}.png diff --git a/tests/v3d/point_cloud/sphere b/tests/v3d/point_cloud/sphere index bcd3d98ded..d62fb79ba9 100644 --- a/tests/v3d/point_cloud/sphere +++ b/tests/v3d/point_cloud/sphere @@ -2,6 +2,8 @@ puts "========" puts "Point cloud object from triangulated sphere" puts "========" +pload MODELING VISUALIZATION + # create sphere sphere ss 10 mkface s ss @@ -38,3 +40,4 @@ vsetmaterial p COPPER vdump $::imagedir/${::casename}_copper.png vmoveto 200 200 +vdump $imagedir/${casename}.png diff --git a/tests/v3d/quadric/begin b/tests/v3d/quadric/begin deleted file mode 100644 index 8c0dd45577..0000000000 --- a/tests/v3d/quadric/begin +++ /dev/null @@ -1,2 +0,0 @@ -vinit View1 -set subgroup "quadric" diff --git a/tests/v3d/quadric/cylinder b/tests/v3d/quadric/cylinder index 2877d25b60..18dbe35db7 100644 --- a/tests/v3d/quadric/cylinder +++ b/tests/v3d/quadric/cylinder @@ -2,6 +2,10 @@ puts "====================================" puts "Prs3d_ToolCylinder - create cylinder" puts "====================================" +pload MODELING VISUALIZATION +vclear +vinit View1 + # cylinder vcylinder c1 8 8 20 vlocation c1 -translate 0 0 20 diff --git a/tests/v3d/quadric/sphere b/tests/v3d/quadric/sphere index c6ff540504..4aa0a77588 100644 --- a/tests/v3d/quadric/sphere +++ b/tests/v3d/quadric/sphere @@ -2,9 +2,12 @@ puts "================================" puts "Prs3d_ToolSphere - create sphere" puts "================================" +pload MODELING VISUALIZATION +vclear +vinit View1 + # complete sphere vsphere s 10 - vfit vdump $imagedir/${casename}.png diff --git a/tests/v3d/quadric/torus b/tests/v3d/quadric/torus index eebfb28b86..fad1f483dc 100644 --- a/tests/v3d/quadric/torus +++ b/tests/v3d/quadric/torus @@ -2,6 +2,10 @@ puts "==============================" puts "Prs3d_ToolTorus - create torus" puts "==============================" +pload MODELING VISUALIZATION +vclear +vinit View1 + # complete torus vtorus t1 10 5 vlocation t1 -translate 0 0 20 @@ -15,5 +19,4 @@ vtorus t3 10 5 180 360 vlocation t3 -translate 20 20 -20 vfit - vdump $imagedir/${casename}.png diff --git a/tests/v3d/raytrace/begin b/tests/v3d/raytrace/begin deleted file mode 100644 index 415dbe5fa0..0000000000 --- a/tests/v3d/raytrace/begin +++ /dev/null @@ -1,6 +0,0 @@ -set subgroup "raytrace" - -# Ray-Tracing doesn't work with Compatible Profile on macOS -if { $::tcl_platform(os) == "Darwin" } { vcaps -core } - -vinit View1 diff --git a/tests/v3d/transparency/begin b/tests/v3d/transparency/begin deleted file mode 100644 index a79f0fcb22..0000000000 --- a/tests/v3d/transparency/begin +++ /dev/null @@ -1,2 +0,0 @@ -set subgroup "transparency" -vinit View1 \ No newline at end of file diff --git a/tests/bugs/vis/buc60814 b/tests/v3d/trihedron/buc60814 old mode 100755 new mode 100644 similarity index 50% rename from tests/bugs/vis/buc60814 rename to tests/v3d/trihedron/buc60814 index 28d22941c1..de53a8e6a1 --- a/tests/bugs/vis/buc60814 +++ b/tests/v3d/trihedron/buc60814 @@ -3,28 +3,15 @@ puts "BUC60814" puts "========" puts "" -vinit +pload VISUALIZATION QAcommands +vinit View1 BUC60814 vfit -set x_coord 131 -set y_coord 352 +checkcolor 131 352 0 0 1 +if {$stat != 1} { puts "Error : Circle has NOT blue color." } -checkcolor $x_coord $y_coord 0 0 1 +checkcolor 170 319 0 0 1 +if {$stat != 1} { puts "Error : Trihedron has NOT blue color." } -#AKI.111002.Against **Exception..-it's on lin.Changed coord of trihedron. - -if {$stat != 1} { - puts "Error : Circle has NOT blue color." -} - -set x_coord 170 -set y_coord 319 - -checkcolor $x_coord $y_coord 0 0 1 - -if {$stat != 1} { - puts "Error : Trihedron has NOT blue color." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug10 b/tests/v3d/trihedron/bug10 similarity index 64% rename from tests/bugs/vis/bug10 rename to tests/v3d/trihedron/bug10 index b50032fd6a..f208046a73 100644 --- a/tests/bugs/vis/bug10 +++ b/tests/v3d/trihedron/bug10 @@ -3,7 +3,8 @@ puts "OCC10" puts "================" puts "" -vinit +pload MODELING VISUALIZATION QAcommands +vinit View1 box b 10 10 10 explode b f vdisplay b_1 @@ -13,4 +14,4 @@ set ll 5 OCC10 trihedron1 b_1 ${ll} -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug218 b/tests/v3d/trihedron/bug218 old mode 100755 new mode 100644 similarity index 83% rename from tests/bugs/vis/bug218 rename to tests/v3d/trihedron/bug218 index 1129c45a5d..9fccbca296 --- a/tests/bugs/vis/bug218 +++ b/tests/v3d/trihedron/bug218 @@ -3,7 +3,8 @@ puts "OCC218" puts "================" puts "" -vinit +pload MODELING VISUALIZATION QAcommands +vinit View1 box b 10 10 10 explode b f vdisplay b_1 @@ -32,11 +33,6 @@ checkcolor $x_coord $y_coord 0 0 0 OCC218 trihedron1 b_1 my___axis___1 my___axis2 checkcolor $x_coord $y_coord 0.85 0.85 0 +if { $stat != 1 } { puts "There is no messages near axes" } -if { $stat != 1 } { - puts "There is no messages near axes" -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - - +vdump $imagedir/${casename}.png diff --git a/tests/v3d/trihedron/bug22368 b/tests/v3d/trihedron/bug22368 new file mode 100644 index 0000000000..afa7305d36 --- /dev/null +++ b/tests/v3d/trihedron/bug22368 @@ -0,0 +1,27 @@ +puts "========================" +puts "OCC22368: AIS_Trihedron's highlight presentation isn't updated on trihedron relocation" +puts "========================" +puts "" + +pload VISUALIZATION QAcommands +vclear +vinit View1 +vtrihedron trihedron +OCC74_set trihedron 3 + +set x1 200 +set x2 220 +set x3 210 + +set y 190 + +vselect ${x3} ${y} + +vsetlocation trihedron 100 100 100 + +set status 0 +for {set i ${x1} } {$i <= ${x2} } {incr i} { + checkcolor ${i} ${y} 0 0 0 +} + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/trihedron/bug22483 b/tests/v3d/trihedron/bug22483 new file mode 100644 index 0000000000..0a342eb19c --- /dev/null +++ b/tests/v3d/trihedron/bug22483 @@ -0,0 +1,18 @@ +puts "============" +puts "OCC22483: ZBufferTrihedron loses user-defined color" +puts "============" +puts "" + +pload VISUALIZATION +vinit View1 +vzbufftrihedron +vdump $imagedir/${casename}_1.png + +vzbufftrihedron -position left_lower -scale 0.1 -type zbuffer -colorLabels WHITE +vdump $imagedir/${casename}_2.png + +vzbufftrihedron -position right_upper -scale 0.2 -type zbuffer -colorLabels 0.78 0.20 1.0 +vdump $imagedir/${casename}_3.png + +vzbufftrihedron -position center -scale 0.1 -type wireframe -colorLabels 0.0 0.59 1.0 +vdump $imagedir/${casename}_4.png diff --git a/tests/v3d/trihedron/bug23422 b/tests/v3d/trihedron/bug23422 new file mode 100644 index 0000000000..3036922725 --- /dev/null +++ b/tests/v3d/trihedron/bug23422 @@ -0,0 +1,17 @@ +puts "============" +puts "CR23422: Selection problems when using SetLocation" +puts "============" +puts "" + +pload MODELING VISUALIZATION +box b 50 50 50 +vinit View1 +vsetdispmode 1 +vdisplay b +vtrihedron t + +vsetlocation b 30 30 130 + +vmoveto 240 150 + +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/trihedron/bug23484_1 b/tests/v3d/trihedron/bug23484_1 new file mode 100644 index 0000000000..d0d6321ea3 --- /dev/null +++ b/tests/v3d/trihedron/bug23484_1 @@ -0,0 +1,16 @@ +puts "============" +puts "OCC23484: Visualization, TKOpenGl - primitive arrays to become the only way to render geometry" +puts "Tests wireframe trihedron rendering with primitive arrays" +puts "============" +puts "" + +pload VISUALIZATION +vinit View1 +vfit +vaxo + +vzbufftrihedron -scale 0.1 -type wireframe -position left_lower +vdump $imagedir/${casename}_1.png + +vzbufftrihedron -scale 0.1 -type wireframe -position center +vdump $imagedir/${casename}_2.png diff --git a/tests/bugs/vis/bug24396 b/tests/v3d/trihedron/bug24396 similarity index 70% rename from tests/bugs/vis/bug24396 rename to tests/v3d/trihedron/bug24396 index 5280c29acd..65ef71b101 100644 --- a/tests/bugs/vis/bug24396 +++ b/tests/v3d/trihedron/bug24396 @@ -1,10 +1,7 @@ puts "============" -puts "CR24396" +puts "CR24396: vselmode - disable auto loading of objects into Local Context" puts "============" puts "" -####################################################################### -# "vselmode" - disable auto loading of objects into Local Context -####################################################################### set trihedron_axis_pick_x 29 set trihedron_axis_pick_y 56 @@ -18,6 +15,7 @@ set trihedron_point_pick_y 305 set trihedron_point_check_x 24 set trihedron_point_check_y 305 +pload MODELING VISUALIZATION vinit View1 vclear vaxo @@ -30,14 +28,9 @@ vfit # --------------------------------------------------- # # check that there is no selection of trihedron axis # # --------------------------------------------------- # - vmoveto $trihedron_axis_pick_x $trihedron_axis_pick_y - checkcolor $trihedron_axis_pick_x $trihedron_axis_pick_y 0 0 0 - -if { $stat != 1 } { - puts "Error : The trihedron should not be highlighted." -} +if { $stat != 1 } { puts "Error : The trihedron should not be highlighted." } vselmode b 0 0 vselmode 0 0 @@ -47,25 +40,15 @@ vselmode 1 1 # ----------------------------------------------- # # check that selection of trihedron point is ok # # ----------------------------------------------- # - vmoveto $trihedron_point_pick_x $trihedron_point_pick_y - checkcolor $trihedron_point_check_x $trihedron_point_check_y 0 1 1 - -if { $stat != 1 } { - puts "Error : The trihedron point highlight is incorrect." -} +if { $stat != 1 } { puts "Error : The trihedron point highlight is incorrect." } # --------------------------------------------------------- # # check that there is still no selection of trihedron axis # # --------------------------------------------------------- # - vmoveto $trihedron_axis_pick_x $trihedron_axis_pick_y - checkcolor $trihedron_axis_pick_x $trihedron_axis_pick_y 0 0 0 +if { $stat != 1 } { puts "Error : The trihedron should not be highlighted." } -if { $stat != 1 } { - puts "Error : The trihedron should not be highlighted." -} - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/trihedron/bug24989 b/tests/v3d/trihedron/bug24989 new file mode 100644 index 0000000000..9595cc5987 --- /dev/null +++ b/tests/v3d/trihedron/bug24989 @@ -0,0 +1,9 @@ +puts "============" +puts "OCC24989: Visualization - workaround vc12 32-bit compiler optimizer bug resulted in crash in AIS_Axis" +puts "============" +puts "" + +pload VISUALIZATION +vinit View1 +vtrihedron vtr +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25340 b/tests/v3d/trihedron/bug25340 similarity index 90% rename from tests/bugs/vis/bug25340 rename to tests/v3d/trihedron/bug25340 index 4c1a14443d..1b2f6ba914 100644 --- a/tests/bugs/vis/bug25340 +++ b/tests/v3d/trihedron/bug25340 @@ -3,7 +3,7 @@ puts "0025340: Visualization, AIS_InteractiveContext - properly apply selection puts "========" puts "" -pload QAcommands +pload MODELING VISUALIZATION QAcommands vinit View1 @@ -30,4 +30,4 @@ if {$color_2 != "LIGHTSTEELBLUE4"} { puts " current color is: $color_2" } -vdump ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/v3d/trihedron/bug25611_1 b/tests/v3d/trihedron/bug25611_1 new file mode 100644 index 0000000000..0e1ce893be --- /dev/null +++ b/tests/v3d/trihedron/bug25611_1 @@ -0,0 +1,16 @@ +puts "========" +puts "OCC25611: Displaying zbufftrihedron interferes with vgraduatedtrihedron" +puts "========" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +psphere s 10 +vdisplay s +vaxo +vfit +vsetdispmode s 1 +vgraduatedtrihedron -on +vzbufftrihedron + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug25611_2 b/tests/v3d/trihedron/bug25611_2 similarity index 74% rename from tests/bugs/vis/bug25611_2 rename to tests/v3d/trihedron/bug25611_2 index ceb6a95f41..1702d86065 100644 --- a/tests/bugs/vis/bug25611_2 +++ b/tests/v3d/trihedron/bug25611_2 @@ -1,12 +1,10 @@ puts "========" -puts "OCC25611" +puts "OCC25611: Displaying \'zbufftrihedron\' interferes with \'vgraduatedtrihedron\'" +puts "Test graduated trihedron parameters" puts "========" puts "" -############################################################################ -puts "Displaying \'zbufftrihedron\' interferes with \'vgraduatedtrihedron\'" -puts "Test graduated trihedron parameters" -############################################################################ +pload MODELING VISUALIZATION vinit View1 psphere s 10 vdisplay s diff --git a/tests/v3d/trihedron/bug26754 b/tests/v3d/trihedron/bug26754 new file mode 100644 index 0000000000..cb710499d6 --- /dev/null +++ b/tests/v3d/trihedron/bug26754 @@ -0,0 +1,19 @@ +puts "================================================================" +puts "CR26754: Visualization - provide API to display AIS_Trihedron presentation without axes labels" +puts "================================================================" +puts "" + +pload VISUALIZATION +vinit View1 +vclear +vaxo +vtrihedron t -hidelabels on +vzoom 4 +vdump $imagedir/${casename}_1.png + +vselect 204 100 +vdump $imagedir/${casename}_2.png + +vselmode 2 1 +vselect 204 100 +vdump $imagedir/${casename}_3.png diff --git a/tests/bugs/vis/bug27958 b/tests/v3d/trihedron/bug27958 similarity index 100% rename from tests/bugs/vis/bug27958 rename to tests/v3d/trihedron/bug27958 diff --git a/tests/v3d/trihedron/bug5988 b/tests/v3d/trihedron/bug5988 new file mode 100644 index 0000000000..8066b1f80a --- /dev/null +++ b/tests/v3d/trihedron/bug5988 @@ -0,0 +1,34 @@ +puts "============" +puts "OCC5988: A textured shape (AIS_TextureShape) becomes black if we display an AIS_PlaneTrihedron with it" +puts "============" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +vclear +box box 100 100 100 +vdisplay box +vfit +puts "display box" + +set x 200 +set y 200 +checkcolor $x $y 0 0 0 + +puts "display trihedron" +vtrihedron vtr + +puts "display textured box" +vtexture box [locate_data_file OCC5988_2d_floor.rgb] + +set x 200 +set y 200 +if { "[vreadpixel $x $y rgb name]" != "BLACK" } { + puts "box is not black - OK" + puts "OK OCC5988" +} else { + puts "box is black - Faulty" + puts "Faulty OCC5988" +} + +vdump $imagedir/${casename}.png diff --git a/tests/v3d/trsf/bug23120 b/tests/v3d/trsf/bug23120 new file mode 100644 index 0000000000..fb7ff5bc91 --- /dev/null +++ b/tests/v3d/trsf/bug23120 @@ -0,0 +1,23 @@ +puts "============" +puts "OCC23120: Transform persistence is not restored" +puts "============" +puts "" + +pload MODELING VISUALIZATION + +box b1 10 20 30 +box b2 10 20 30 +ttranslate b2 50 50 0 + +vinit View1 +vdisplay b1 -trihedron center +vdisplay b2 +vfit +vsetdispmode 1 +vzoom 0.5 +vpan 100 0 + +checkcolor 300 130 0.78 0.55 0.9 +if { $stat != 1 } { puts "Error : Transform persistence is not restored" } + +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug23652 b/tests/v3d/trsf/bug23652 old mode 100755 new mode 100644 similarity index 50% rename from tests/bugs/vis/bug23652 rename to tests/v3d/trsf/bug23652 index d6d5aa23b2..3fc23def13 --- a/tests/bugs/vis/bug23652 +++ b/tests/v3d/trsf/bug23652 @@ -1,34 +1,23 @@ puts "========" -puts "OCC23652" +puts "OCC23652: Non zoomable text with alignment slides away when zooming view" puts "========" -############################################################################### -# Non zoomable text with alignment slides away when zooming view -############################################################################### - +pload MODELING VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont -vinit +vinit View1 vtrihedron tri vdrawtext text0 Default -pos 0.0 0.0 0.0 -color WHITE -halign left -valign bottom -angle 0 -zoom 1 -height 20 -aspect regular -font SansFont vdrawtext text1 Right_Align -pos 0.0 0.0 0.0 -color WHITE -halign right -valign bottom -angle 0 -zoom 1 -height 20 -aspect regular -font SansFont -set scale 3.1783114563761763 set proj_X 0.57735025882720947 set proj_Y -0.57735025882720947 set proj_Z 0.57735025882720947 set up_X -0.40824827551841736 set up_Y 0.40824827551841736 set up_Z 0.81649655103683472 -set at_X 0 -set at_Y 0 -set at_Z 0 +vviewparams -scale 3.1783114563761763 -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at 0 0 0 -vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} +checkcolor 210 204 0.6 0.6 0.6 -set x_coord 210 -set y_coord 204 - -checkcolor $x_coord $y_coord 0.6 0.6 0.6 - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/trsf/bug24358 b/tests/v3d/trsf/bug24358 new file mode 100644 index 0000000000..97e8c14bb7 --- /dev/null +++ b/tests/v3d/trsf/bug24358 @@ -0,0 +1,21 @@ +puts "===========" +puts "0024358: TKV3d - connected structures are not re-computed on device lost" +puts "===========" +puts "" + +pload MODELING VISUALIZATION +box b1 0 0 0 1 2 3 +box b2 3 0 0 3 2 1 +vinit View1 +vclear +vaxo +vsetdispmode 1 +vconnect b1c -3 0 0 b1 b2 +vfit +vdump $imagedir/${casename}_1.png + +vclose View1 1 +vinit View1 +vdisplay b1c +vfit +vdump $imagedir/${casename}_2.png diff --git a/tests/bugs/vis/bug24623_3 b/tests/v3d/trsf/bug24623_3 similarity index 70% rename from tests/bugs/vis/bug24623_3 rename to tests/v3d/trsf/bug24623_3 index f74eef4cae..46dd910329 100644 --- a/tests/bugs/vis/bug24623_3 +++ b/tests/v3d/trsf/bug24623_3 @@ -1,15 +1,10 @@ puts "============" -puts "OCC24623_3" +puts "OCC24623_3: Visualization - improve selection mechanism" +puts "Tests memory leaks in creation of selection primitives for connected interactive objects:" +puts "checks that there is no 'dead links' in removing Select3D_BVHPrimitiveContent" puts "============" puts "" -####################################################################### -puts "Visualization - improve selection mechanism" -# tests memory leaks in creation of selection primitives for connected -# interactive objects: checks that there is no "dead links" in removing -# Select3D_BVHPrimitiveContent -####################################################################### -puts "" pload MODELING VISUALIZATION psphere s 0.5 tclean s @@ -17,7 +12,6 @@ incmesh s 0.001 trinfo s set aMemInit [meminfo h] - set aNb 1000 # display as copies @@ -46,6 +40,5 @@ puts "Clearing (connected) : [expr $aMemClear2 / (1024 * 1024)] MiB" set aRatio [expr $aMemClear2 / double($aMemClear1)] # check if the memory difference is greater than 10% -if {[expr $aRatio > 1.1]} { - puts "Error : TEST FAILED" -} +if {[expr $aRatio > 1.1]} { puts "Error : TEST FAILED" } +vdump $imagedir/${casename}.png diff --git a/tests/v3d/trsf/bug24623_4 b/tests/v3d/trsf/bug24623_4 new file mode 100644 index 0000000000..997603f3ce --- /dev/null +++ b/tests/v3d/trsf/bug24623_4 @@ -0,0 +1,37 @@ +puts "============" +puts "OCC24623_4: Visualization - improve selection mechanism" +puts "Tests memory leaks in creation of selection primitives for connected interactive objects:" +puts "checks that there is no 'dead links' to reference interactives after its clearing" +puts "============" +puts "" + +pload MODELING VISUALIZATION +psphere s 0.5 +tclean s +incmesh s 0.001 +trinfo s +vinit +vclear + +set aMemInit [meminfo h] +set anIterNb 100 + +for {set anIterCount 0} {$anIterCount < $anIterNb} {incr anIterCount} { + set aNb 11 + + vconnectto i_1 0 0 0 s -nodisplay + vloadselection i_1 + for {set i 2} {$i < $aNb} {incr i} { vconnectto i_${i} ${i} 0 0 i_1 -nodisplay; vloadselection i_${i} } + vclear +} + +set aMemClear [meminfo h] + +puts "Initial memory : [expr $aMemInit / (1024 * 1024)] MiB" +puts "Clearing : [expr $aMemClear / (1024 * 1024)] MiB" + +set aRatio [expr $aMemClear / double($aMemInit)] + +# check if the memory difference is greater than 20% +if {[expr $aRatio > 1.2]} { puts "Error : TEST FAILED" } +vdump $imagedir/${casename}.png diff --git a/tests/v3d/trsf/bug24756 b/tests/v3d/trsf/bug24756 new file mode 100644 index 0000000000..03fc16f540 --- /dev/null +++ b/tests/v3d/trsf/bug24756 @@ -0,0 +1,16 @@ +puts "============" +puts "CR24756: AIS_ConnectedInteractive does not support nested AIS_ConnectedInteractive" +puts "============" +puts "" + +pload MODELING VISUALIZATION + +vinit View1 +box b 1 1 1 +vdisplay b +vconnectto b1 2 0 0 b +vconnectto b2 2 0 0 b1 +vsetlocation b1 2 1 0 +vfit + +vdump ${imagedir}/${casename}.png diff --git a/tests/v3d/trsf/bug24837_1 b/tests/v3d/trsf/bug24837_1 new file mode 100644 index 0000000000..92a1e1c299 --- /dev/null +++ b/tests/v3d/trsf/bug24837_1 @@ -0,0 +1,34 @@ +puts "============" +puts "CR24837_1: Visualization - revise design and implementation of connected Interactive Objects" +puts "============" +puts "" + +pload MODELING VISUALIZATION +vinit View1 +box b 1 1 1 +psphere s 0.5 +vdisplay b s +vsetlocation s 0 2.5 0 +box d 0.5 0.5 3 +box d2 0.5 3 0.5 +vdisplay d d2 +vconnectto b1 -2 0 0 b +vconnect z 2 0 0 b s +vconnect z2 4 0 0 d d2 +vconnect z3 6 0 0 z z2 +vconnect z4 10 0 0 z3 z2 +vfit +vdump ${imagedir}/${casename}_1_1.png + +vaddconnected z4 0 4 0 s +vdisconnect z4 1 +vfit +vdump ${imagedir}/${casename}_1_2.png + +vhlr on +vdump ${imagedir}/${casename}_1_3.png + +vhlr off +vsetdispmode 1 +vmoveto 320 330 +vdump ${imagedir}/${casename}_1_4.png diff --git a/tests/bugs/vis/bug24837_2 b/tests/v3d/trsf/bug24837_2 similarity index 83% rename from tests/bugs/vis/bug24837_2 rename to tests/v3d/trsf/bug24837_2 index 50a8d6b040..4d98bdfc88 100644 --- a/tests/bugs/vis/bug24837_2 +++ b/tests/v3d/trsf/bug24837_2 @@ -1,14 +1,11 @@ puts "============" -puts "CR24837_2" +puts "CR24837_2: Visualization - revise design and implementation of connected Interactive Objects" puts "============" puts "" -####################################################################### -# Visualization - revise design and implementation of connected Interactive Objects -####################################################################### - -vfont add [locate_data_file DejaVuSans.ttf] SansFont pload MODELING VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + box o1 -10 -10 -5 1 1 10 box o2 10 10 -5 1 1 10 box b1 0 0 0 1 2 3 diff --git a/tests/bugs/vis/bug25276 b/tests/v3d/trsf/bug25276 similarity index 98% rename from tests/bugs/vis/bug25276 rename to tests/v3d/trsf/bug25276 index 45b4cd71cd..2eb0af5173 100644 --- a/tests/bugs/vis/bug25276 +++ b/tests/v3d/trsf/bug25276 @@ -4,7 +4,7 @@ puts "============" puts "" pload MODELING VISUALIZATION -vinit +vinit View1 box b1 1 6 1 vsetdispmode 1 vdisplay b1 diff --git a/tests/bugs/vis/bug25532 b/tests/v3d/trsf/bug25532 similarity index 77% rename from tests/bugs/vis/bug25532 rename to tests/v3d/trsf/bug25532 index df49d66ad8..4f24614136 100644 --- a/tests/bugs/vis/bug25532 +++ b/tests/v3d/trsf/bug25532 @@ -1,11 +1,7 @@ puts "============" -puts "OCC25532" +puts "OCC25532: Visualization - fix cross-references between AIS_ConnectedInteractive and connected presentation" puts "============" puts "" -####################################################################### -# Visualization - fix cross-references between AIS_ConnectedInteractive -# and connected presentation -####################################################################### pload MODELING VISUALIZATION pload OPENGL @@ -21,8 +17,8 @@ vcaps -vbo 0 vsetdispmode 1 vdefaults -absDefl 1.0 vselprops -autoactivate 0 -set aMemInit [meminfo h] +set aMemInit [meminfo h] set aNb 1000 # display as copies @@ -50,7 +46,5 @@ puts "Clearing (connected): [expr $aMemClear2 / (1024 * 1024)] MiB" set aRatio [expr $aMemClear2 / double($aMemClear1)] # check if the memory difference is greater than 20% -if [expr $aRatio > 1.2] { - puts "Error : TEST FAILED" -} - +if [expr $aRatio > 1.2] { puts "Error : TEST FAILED" } +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug26029 b/tests/v3d/trsf/bug26029 similarity index 86% rename from tests/bugs/vis/bug26029 rename to tests/v3d/trsf/bug26029 index d61a6857cb..9b309539e8 100644 --- a/tests/bugs/vis/bug26029 +++ b/tests/v3d/trsf/bug26029 @@ -1,11 +1,9 @@ puts "============" puts "0026029: Visualization - Poor performance of connected objects" +puts "Time spent on computation of large number of connected objects" +puts "should grow linearly with the number of objects" puts "============" puts "" -########################################################### -# Time spent on computation of large number of connected objects -# should grow linearly with the number of objects -########################################################### pload MODELING VISUALIZATION psphere s 0.5 diff --git a/tests/bugs/vis/bug26199 b/tests/v3d/trsf/bug26199 similarity index 86% rename from tests/bugs/vis/bug26199 rename to tests/v3d/trsf/bug26199 index 54eab94495..ba1ddca3e8 100644 --- a/tests/bugs/vis/bug26199 +++ b/tests/v3d/trsf/bug26199 @@ -1,10 +1,9 @@ puts "==========" -puts "OCC26199" +puts "OCC26199: Visualization - use NCollection_IndexedMap instead of NCollection_Sequence in OpenGl_BVHClipPrimitiveSet to improve performance" puts "==========" puts "" -############################################################ -# Visualization - use NCollection_IndexedMap instead of NCollection_Sequence in OpenGl_BVHClipPrimitiveSet to improve performance -############################################################ + +pload MODELING VISUALIZATION psphere s 0.5 tclean s diff --git a/tests/bugs/vis/bug26344 b/tests/v3d/trsf/bug26344 similarity index 97% rename from tests/bugs/vis/bug26344 rename to tests/v3d/trsf/bug26344 index e9fa334120..dd056d2f8a 100644 --- a/tests/bugs/vis/bug26344 +++ b/tests/v3d/trsf/bug26344 @@ -3,6 +3,8 @@ puts "0026344: Visualization - provide a support of zoom persistent selection" puts "============" puts "" +pload MODELING VISUALIZATION + vclear vclose ALL vinit View1 w=409 h=409 @@ -69,4 +71,4 @@ if { [vreadpixel 132 300 rgb name] != "GRAY73" } { puts "Error selecting trihedr vselect 50 410 410 50 vstate -entities -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug26719_2 b/tests/v3d/trsf/bug26719_2 similarity index 85% rename from tests/bugs/vis/bug26719_2 rename to tests/v3d/trsf/bug26719_2 index b4fa9ef8be..7e3616f8ec 100644 --- a/tests/bugs/vis/bug26719_2 +++ b/tests/v3d/trsf/bug26719_2 @@ -1,12 +1,8 @@ puts "============" -puts "CR26719" +puts "CR26719: Visualization - cannot pick zoom persistent object" puts "============" puts "" -########################################################################################## -puts "Visualization - cannot pick zoom persistent object" -########################################################################################## - proc compareDepth {theInfo} { set aInfoList [split $theInfo "\n"] set aEntNb [llength $aInfoList] @@ -75,5 +71,3 @@ vmoveto 276 110 set anInfo [vstate -entities] compareDepth $anInfo vdump ${imagedir}/${casename}_2.png - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug27285 b/tests/v3d/trsf/bug27285 similarity index 60% rename from tests/bugs/vis/bug27285 rename to tests/v3d/trsf/bug27285 index 6e4477ff10..2dea43673f 100644 --- a/tests/bugs/vis/bug27285 +++ b/tests/v3d/trsf/bug27285 @@ -1,14 +1,11 @@ puts "========" -puts "OCC27285" +puts "OCC27285: Visualization - selection of AIS_MultipleConnectedInteractive is broken" puts "========" puts "" -################################################################## -puts "Visualization - selection of AIS_MultipleConnectedInteractive is broken" -################################################################## pload VISUALIZATION MODELING -vinit +vinit View1 vsetdispmode 1 box b 100 100 100 @@ -29,4 +26,4 @@ if {[string match *Selected* [vstate bc]] != "1"} { puts "ERROR: multiple connected interactive object is not selected" } -set only_screen 1 +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug27359 b/tests/v3d/trsf/bug27359 similarity index 58% rename from tests/bugs/vis/bug27359 rename to tests/v3d/trsf/bug27359 index 033d3252f8..f3302cfcd3 100644 --- a/tests/bugs/vis/bug27359 +++ b/tests/v3d/trsf/bug27359 @@ -1,20 +1,15 @@ puts "========" -puts "OCC27359" +puts "OCC27359: Visualization - add support of flipping for textured text" puts "========" puts "" -################################################################## -puts "Visualization - add support of flipping for textured text" -################################################################## -set anImage1 $imagedir/${casename}_1.png -set anImage2 $imagedir/${casename}_2.png -set anImage3 $imagedir/${casename}_3.png set m_pi 3,14 set m_pi2 1,57 +pload MODELING VISUALIZATION vfont add [locate_data_file DejaVuSans.ttf] SansFont -vinit +vinit View1 vclear vright @@ -31,13 +26,13 @@ vdrawtext t2 "center text" -pos 0 $y/2 $z/2 -color red -height 30 -plane 1 0 0 0 vfit vright -vdump $anImage1 +vdump $imagedir/${casename}_1.png vrotate $m_pi 0 0 vfit -vdump $anImage2 +vdump $imagedir/${casename}_2.png vright vrotate 0 $m_pi 0 vfit -vdump $anImage3 \ No newline at end of file +vdump $imagedir/${casename}_3.png diff --git a/tests/bugs/vis/bug27739 b/tests/v3d/trsf/bug27739 similarity index 89% rename from tests/bugs/vis/bug27739 rename to tests/v3d/trsf/bug27739 index 7e3e34e68a..35d63da9b6 100644 --- a/tests/bugs/vis/bug27739 +++ b/tests/v3d/trsf/bug27739 @@ -1,10 +1,9 @@ puts "========" -puts "OCC27739" +puts "OCC27739: Visualization, TKV3d - implement individual acceleration data structure for selection of 2D persistent objects" puts "========" puts "" -################################################################## -puts "Visualization, TKV3d - implement individual acceleration data structure for selection of 2D persistent objects" -################################################################## + +pload MODELING VISUALIZATION # Create view set win_width 409 diff --git a/tests/bugs/vis/bug27793 b/tests/v3d/trsf/bug27793 similarity index 100% rename from tests/bugs/vis/bug27793 rename to tests/v3d/trsf/bug27793 diff --git a/tests/bugs/vis/bug27817 b/tests/v3d/trsf/bug27817 similarity index 100% rename from tests/bugs/vis/bug27817 rename to tests/v3d/trsf/bug27817 diff --git a/tests/bugs/vis/bug27869 b/tests/v3d/trsf/bug27869 similarity index 93% rename from tests/bugs/vis/bug27869 rename to tests/v3d/trsf/bug27869 index df557764de..4c9ba80789 100644 --- a/tests/bugs/vis/bug27869 +++ b/tests/v3d/trsf/bug27869 @@ -3,6 +3,7 @@ puts "0027869: Visualization - AIS_ConnectedInteractive does not support exact H puts "================" puts "" +pload VISUALIZATION restore [locate_data_file CrankArm.brep] obj vclear vinit View1 diff --git a/tests/v3d/vertex/begin b/tests/v3d/vertex/begin deleted file mode 100644 index 5225a65bcd..0000000000 --- a/tests/v3d/vertex/begin +++ /dev/null @@ -1,2 +0,0 @@ -vinit View1 -set subgroup "vertex" diff --git a/tests/v3d/vertex_edge/begin b/tests/v3d/vertex_edge/begin deleted file mode 100644 index 9d2b7c2c61..0000000000 --- a/tests/v3d/vertex_edge/begin +++ /dev/null @@ -1,2 +0,0 @@ -vinit View1 -set subgroup "vertex_edge" diff --git a/tests/v3d/vertex_face/begin b/tests/v3d/vertex_face/begin deleted file mode 100644 index 64ad201149..0000000000 --- a/tests/v3d/vertex_face/begin +++ /dev/null @@ -1,2 +0,0 @@ -vinit View1 -set subgroup "vertex_face" diff --git a/tests/v3d/vertex_solid/begin b/tests/v3d/vertex_solid/begin deleted file mode 100644 index d0a29e936e..0000000000 --- a/tests/v3d/vertex_solid/begin +++ /dev/null @@ -1,3 +0,0 @@ -vinit View1 -set subgroup "vertex_solid" - diff --git a/tests/v3d/vertex_wire/begin b/tests/v3d/vertex_wire/begin deleted file mode 100644 index 16acd7f6f8..0000000000 --- a/tests/v3d/vertex_wire/begin +++ /dev/null @@ -1,2 +0,0 @@ -vinit View1 -set subgroup "vertex_wire" diff --git a/tests/v3d/viewcube/default b/tests/v3d/viewcube/default index 0b3f08f8df..cc506d5737 100644 --- a/tests/v3d/viewcube/default +++ b/tests/v3d/viewcube/default @@ -3,6 +3,7 @@ puts "0028954: Visualization - implement interactive object AIS_ViewCube for cam puts "Display and erase with default settings" puts "==================================" +pload MODELING VISUALIZATION vclear vinit View1 diff --git a/tests/v3d/viewcube/style b/tests/v3d/viewcube/style index c205c6f07c..9d3a9d3c1b 100644 --- a/tests/v3d/viewcube/style +++ b/tests/v3d/viewcube/style @@ -3,6 +3,7 @@ puts "0028954: Visualization - implement interactive object AIS_ViewCube for cam puts "Display custom styled View Cube" puts "==================================" +pload MODELING VISUALIZATION vclear vinit View1 vrenderparams -rendScale 1 diff --git a/tests/v3d/viewcube/view b/tests/v3d/viewcube/view index 2a84e9903b..75d410ffdd 100644 --- a/tests/v3d/viewcube/view +++ b/tests/v3d/viewcube/view @@ -3,6 +3,7 @@ puts "0028954: Visualization - implement interactive object AIS_ViewCube for cam puts "Check view affinity" puts "==================================" +pload MODELING VISUALIZATION vclear vclose ALL vinit View1 diff --git a/tests/v3d/wire/begin b/tests/v3d/wire/begin deleted file mode 100644 index ce5b265b76..0000000000 --- a/tests/v3d/wire/begin +++ /dev/null @@ -1,2 +0,0 @@ -vinit View1 -set subgroup "wire" diff --git a/tests/v3d/wire_solid/begin b/tests/v3d/wire_solid/begin deleted file mode 100644 index f8926ada89..0000000000 --- a/tests/v3d/wire_solid/begin +++ /dev/null @@ -1,2 +0,0 @@ -vinit View1 -set subgroup "wire_solid" diff --git a/tests/vselect/begin b/tests/vselect/begin new file mode 100644 index 0000000000..6ec5060e31 --- /dev/null +++ b/tests/vselect/begin @@ -0,0 +1,5 @@ +cpulimit 300 + +pload VISUALIZATION TOPTEST + +if { [info exists imagedir] == 0 } { set imagedir . } diff --git a/tests/bugs/vis/buc60587 b/tests/vselect/bugs/buc60587 old mode 100755 new mode 100644 similarity index 90% rename from tests/bugs/vis/buc60587 rename to tests/vselect/bugs/buc60587 index 9d3f42b365..e0c80104e6 --- a/tests/bugs/vis/buc60587 +++ b/tests/vselect/bugs/buc60587 @@ -26,4 +26,4 @@ if { $stat != 1 } { puts "Error : Model has NOT CYAN colour." } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/buc60688 b/tests/vselect/bugs/buc60688 old mode 100755 new mode 100644 similarity index 91% rename from tests/bugs/vis/buc60688 rename to tests/vselect/bugs/buc60688 index 4976af2325..06932aa33f --- a/tests/bugs/vis/buc60688 +++ b/tests/vselect/bugs/buc60688 @@ -31,4 +31,4 @@ if {"[vreadpixel $x_coord $y_coord rgb name]" != "GRAY80"} { puts "Error : The rectangular is NOT highlighted." } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/buc60876 b/tests/vselect/bugs/buc60876 old mode 100755 new mode 100644 similarity index 87% rename from tests/bugs/vis/buc60876 rename to tests/vselect/bugs/buc60876 index 6120b5fab3..be3f2fc2d3 --- a/tests/bugs/vis/buc60876 +++ b/tests/vselect/bugs/buc60876 @@ -3,8 +3,10 @@ puts "BUC60876" puts "========" puts "" +pload MODELING VISUALIZATION QAcommands + pcylinder c 100 300 -vinit +vinit View1 BUC60876 c vfit vmoveto 200 200 @@ -14,5 +16,4 @@ set y_coord 200 checkcolor $x_coord $y_coord 0 1 1 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug10702 b/tests/vselect/bugs/bug10702 old mode 100755 new mode 100644 similarity index 59% rename from tests/bugs/vis/bug10702 rename to tests/vselect/bugs/bug10702 index f1575bbe16..b3b3c8228d --- a/tests/bugs/vis/bug10702 +++ b/tests/vselect/bugs/bug10702 @@ -1,16 +1,13 @@ puts "============" -puts "OCC10702" +puts "OCC10702: MeshVS_NodalColorPrsBuilder does not take into account visibility of mesh elements" puts "============" puts "" -####################################################################### -# MeshVS_NodalColorPrsBuilder does not take into account visibility of mesh elements -####################################################################### set BugNumber OCC10702 -pload XDE +pload MODELING VISUALIZATION XDE -vinit +vinit View1 meshfromstl m [locate_data_file OMF6391_box.stl] @@ -35,8 +32,6 @@ checkcolor $x_coord $y_coord 0 0 0.36 meshcolors m nodal 0 puts "\nDisplay nodal color presentation" -#checkcolor $x_coord $y_coord 0.46 0.12 0.37 checkcolor $x_coord $y_coord 0.72 0.72 0.70 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png - +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug113 b/tests/vselect/bugs/bug113 old mode 100755 new mode 100644 similarity index 94% rename from tests/bugs/vis/bug113 rename to tests/vselect/bugs/bug113 index 8e2b352889..5221f3c437 --- a/tests/bugs/vis/bug113 +++ b/tests/vselect/bugs/bug113 @@ -57,4 +57,4 @@ checkcolor ${X_02} ${Y_02} 0 1 1 # Rotation vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug12121 b/tests/vselect/bugs/bug12121 old mode 100755 new mode 100644 similarity index 90% rename from tests/bugs/vis/bug12121 rename to tests/vselect/bugs/bug12121 index 3751b9e1c9..8aa8c9cd33 --- a/tests/bugs/vis/bug12121 +++ b/tests/vselect/bugs/bug12121 @@ -1,10 +1,7 @@ puts "================" -puts "OCC12121" +puts "OCC12121: Optimization of existing selection classes" puts "================" puts "" -####################################################################################### -# Optimization of existing selection classes -###################################################################################### set BugNumber OCC12121 set x1 226 @@ -128,4 +125,4 @@ if { ${status_vconnect} == 1 } { puts "Faulty ${BugNumber}" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug129_1 b/tests/vselect/bugs/bug129_1 old mode 100755 new mode 100644 similarity index 100% rename from tests/bugs/vis/bug129_1 rename to tests/vselect/bugs/bug129_1 diff --git a/tests/bugs/vis/bug129_2 b/tests/vselect/bugs/bug129_2 old mode 100755 new mode 100644 similarity index 100% rename from tests/bugs/vis/bug129_2 rename to tests/vselect/bugs/bug129_2 diff --git a/tests/bugs/vis/bug22016 b/tests/vselect/bugs/bug22016 similarity index 65% rename from tests/bugs/vis/bug22016 rename to tests/vselect/bugs/bug22016 index 3e350d2ac6..5cd29d92f7 100644 --- a/tests/bugs/vis/bug22016 +++ b/tests/vselect/bugs/bug22016 @@ -1,10 +1,7 @@ puts "========" -puts "OCC22016" +puts "OCC22016: Incorrect selection color after displaying a selected object" puts "========" puts "" -######################################################################################### -# Incorrect selection color after displaying a selected object -######################################################################################### pload MODELING VISUALIZATION box b1 0 0 0 1 2 3 diff --git a/tests/bugs/vis/bug22018 b/tests/vselect/bugs/bug22018 old mode 100755 new mode 100644 similarity index 78% rename from tests/bugs/vis/bug22018 rename to tests/vselect/bugs/bug22018 index 2b92a3f8a5..934124b411 --- a/tests/bugs/vis/bug22018 +++ b/tests/vselect/bugs/bug22018 @@ -1,14 +1,11 @@ puts "============" -puts "OCC22018" +puts "OCC22018: Select3D_SensitiveCircle::Matches(): DMin parameter left uninitialized" puts "============" puts "" -####################################################################### -# Select3D_SensitiveCircle::Matches(): DMin parameter left uninitialized -####################################################################### set BugNumber OCC22018 -vinit +vinit View1 vpoint p1 -5 0 0 vpoint p2 0 5 0 @@ -66,4 +63,4 @@ if { [vreadpixel $x2 $y rgb name] != "WHITE" } { puts "Error: unexpected color of selected object" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug22048 b/tests/vselect/bugs/bug22048 similarity index 100% rename from tests/bugs/vis/bug22048 rename to tests/vselect/bugs/bug22048 diff --git a/tests/bugs/vis/bug23012 b/tests/vselect/bugs/bug23012 old mode 100755 new mode 100644 similarity index 65% rename from tests/bugs/vis/bug23012 rename to tests/vselect/bugs/bug23012 index b46ef469f0..de98fe644f --- a/tests/bugs/vis/bug23012 +++ b/tests/vselect/bugs/bug23012 @@ -1,10 +1,7 @@ puts "================" -puts "OCC23012" +puts "OCC23012: Detection gives incorrect results" puts "================" puts "" -####################################################################################### -# Detection gives incorrect results -###################################################################################### set BugNumber OCC23012 @@ -36,4 +33,4 @@ if { "$ColorBefore" == "$ColorAfter" } { } vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug23539_1 b/tests/vselect/bugs/bug23539_1 similarity index 66% rename from tests/bugs/vis/bug23539_1 rename to tests/vselect/bugs/bug23539_1 index 4d9ea83555..449fd44a61 100644 --- a/tests/bugs/vis/bug23539_1 +++ b/tests/vselect/bugs/bug23539_1 @@ -1,13 +1,10 @@ puts "============" -puts "CR23539" +puts "CR23539: Test case for polygonal selection" puts "============" puts "" -###################################################### -# Test case for polygonal selection -###################################################### box b 10 10 10 -vinit +vinit View1 vdisplay b vfit vselmode 2 1 @@ -25,4 +22,4 @@ if { ${NbSelected2} != 0 } { puts "Error : Bad number of selected edges after polyginal selection of empty space" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/vselect/bugs/bug23539_2 b/tests/vselect/bugs/bug23539_2 new file mode 100644 index 0000000000..05659b71b5 --- /dev/null +++ b/tests/vselect/bugs/bug23539_2 @@ -0,0 +1,24 @@ +puts "============" +puts "CR23539: Test case for polygonal shift selection" +puts "============" +puts "" + +box a 10 10 10 +box b 50 50 50 10 10 10 +vinit +vdisplay a b +vfit +vselmode 2 1 +vselect 0 0 +vselect 58 300 +vselect 300 200 300 60 400 60 407 150 -xor + +set NbSelected1 [vnbselected] +if { ${NbSelected1} != 13 } { puts "Error : Polygonal shift selection doesn't work properly" } + +vselect 350 120 -xor + +set NbSelected1 [vnbselected] +if { ${NbSelected1} != 12 } { puts "Error : (case 2)" } + +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug23649_1 b/tests/vselect/bugs/bug23649_1 similarity index 61% rename from tests/bugs/vis/bug23649_1 rename to tests/vselect/bugs/bug23649_1 index 112f7bea32..d8e65c4644 100644 --- a/tests/bugs/vis/bug23649_1 +++ b/tests/vselect/bugs/bug23649_1 @@ -1,14 +1,10 @@ puts "============" -puts "CR23649" +puts "0023649: Different behaviour of highlighting after shift selection." +puts "It tests default functionality of highlighting" +puts "during shift selection of sub-shapes (local context)." puts "============" puts "" -####################################################################### -# 0023649: Different behaviour of highlighting after shift selection. -# It tests default functionality of highlighting -# during shift selection of sub-shapes (local context). -####################################################################### - set anImage1 $imagedir/${casename}_Selection.png set anImage2 $imagedir/${casename}_HighlightFirst.png set anImage3 $imagedir/${casename}_HighlightSecond.png @@ -31,4 +27,4 @@ vdump ${anImage2} #highlight the second edge - it should NOT be highlightable by default vmoveto 165 278 -vdump ${anImage3} \ No newline at end of file +vdump ${anImage3} diff --git a/tests/bugs/vis/bug23649_2 b/tests/vselect/bugs/bug23649_2 similarity index 61% rename from tests/bugs/vis/bug23649_2 rename to tests/vselect/bugs/bug23649_2 index 8ad4f04fdd..15dad4064f 100644 --- a/tests/bugs/vis/bug23649_2 +++ b/tests/vselect/bugs/bug23649_2 @@ -1,14 +1,10 @@ puts "============" -puts "CR23649" +puts "0023649: Different behaviour of highlighting after shift selection" +puts "It tests highlighting of selected sub-shapes." +puts "This mode is option of interactive context." puts "============" puts "" -####################################################################### -# 0023649: Different behaviour of highlighting after shift selection -# It tests highlighting of selected sub-shapes. -# This mode is option of interactive context. -####################################################################### - set anImage1 $imagedir/${casename}_HighlightFirst.png set anImage2 $imagedir/${casename}_HighlightSecond.png @@ -32,4 +28,4 @@ vdump ${anImage1} #highlight the second edge - it should be highlightable by default vmoveto 165 278 -vdump ${anImage2} \ No newline at end of file +vdump ${anImage2} diff --git a/tests/bugs/vis/bug23649_3 b/tests/vselect/bugs/bug23649_3 similarity index 63% rename from tests/bugs/vis/bug23649_3 rename to tests/vselect/bugs/bug23649_3 index bf4faa64dd..699edd8fdd 100644 --- a/tests/bugs/vis/bug23649_3 +++ b/tests/vselect/bugs/bug23649_3 @@ -1,14 +1,10 @@ puts "============" -puts "CR23649" +puts "0023649: Different behaviour of highlighting after shift selection." +puts "It tests default functionality of highlighting" +puts "during shift selection of shapes (neutral point)." puts "============" puts "" -####################################################################### -# 0023649: Different behaviour of highlighting after shift selection. -# It tests default functionality of highlighting -# during shift selection of shapes (neutral point). -####################################################################### - set anImage1 $imagedir/${casename}_Selection.png set anImage2 $imagedir/${casename}_HighlightFirst.png set anImage3 $imagedir/${casename}_HighlightSecond.png diff --git a/tests/bugs/vis/bug23649_4 b/tests/vselect/bugs/bug23649_4 similarity index 63% rename from tests/bugs/vis/bug23649_4 rename to tests/vselect/bugs/bug23649_4 index 4d03d81bbb..eb7050c1e9 100644 --- a/tests/bugs/vis/bug23649_4 +++ b/tests/vselect/bugs/bug23649_4 @@ -1,14 +1,10 @@ puts "============" -puts "CR23649" +puts "0023649: Different behaviour of highlighting after shift selection" +puts "It tests highlighting of selected shapes (neutral point)." +puts "This mode is option of interactive context." puts "============" puts "" -####################################################################### -# 0023649: Different behaviour of highlighting after shift selection -# It tests highlighting of selected shapes (neutral point). -# This mode is option of interactive context. -####################################################################### - set anImage1 $imagedir/${casename}_HighlightFirst.png set anImage2 $imagedir/${casename}_HighlightSecond.png diff --git a/tests/bugs/vis/bug24420 b/tests/vselect/bugs/bug24420 similarity index 96% rename from tests/bugs/vis/bug24420 rename to tests/vselect/bugs/bug24420 index 3331c52482..226de0aaa4 100644 --- a/tests/bugs/vis/bug24420 +++ b/tests/vselect/bugs/bug24420 @@ -44,3 +44,4 @@ checkcolor 395 200 0 1 1 if { $stat != 1 } { puts "Error : Select3D_SensitiveFace does not work properly with type of sensitivity Select3D_TOS_BOUNDARY!" } +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug24564 b/tests/vselect/bugs/bug24564 similarity index 75% rename from tests/bugs/vis/bug24564 rename to tests/vselect/bugs/bug24564 index a612eceb97..ad717a89c3 100644 --- a/tests/bugs/vis/bug24564 +++ b/tests/vselect/bugs/bug24564 @@ -1,12 +1,8 @@ puts "============" -puts "CR24564" +puts "CR24564: Test for sensitivity of box located over AIS_Plane" puts "============" puts "" -####################################################################### -# Test for sensitivity of box located over AIS_Plane -####################################################################### - set aV "Driver1/Viewer1/View1" vinit name=$aV l=32 t=32 w=400 h=400 vactivate $aV @@ -37,3 +33,4 @@ vmoveto 200 200 if { "[vreadpixel 199 200 rgb name]" != "CYAN" } { puts "Error : The box is not selectable!" } +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug24569 b/tests/vselect/bugs/bug24569 similarity index 72% rename from tests/bugs/vis/bug24569 rename to tests/vselect/bugs/bug24569 index 18b37fe5bf..b0a73f9ba9 100644 --- a/tests/bugs/vis/bug24569 +++ b/tests/vselect/bugs/bug24569 @@ -1,12 +1,8 @@ puts "============" -puts "CR24569" +puts "CR24569: Test for conversion of sensitives by AIS_InteractiveContext::Update" puts "============" puts "" -####################################################################### -# Test for conversion of sensitives by AIS_InteractiveContext::Update -####################################################################### - set aV "Driver1/Viewer1/View1" vinit name=$aV l=32 t=32 w=400 h=400 vactivate $aV @@ -45,4 +41,4 @@ if { $stat != 1 } { puts "Error : Sensitive entity of AIS_Plane is incorrect after update!" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug25098 b/tests/vselect/bugs/bug25098 similarity index 99% rename from tests/bugs/vis/bug25098 rename to tests/vselect/bugs/bug25098 index c434bc741d..7bbc39c9fa 100644 --- a/tests/bugs/vis/bug25098 +++ b/tests/vselect/bugs/bug25098 @@ -133,3 +133,4 @@ if {[string equal $aWireChildSensitiveType "Detected Child: Select3D_SensitiveSe puts "Must be: Detected Child: Select3D_SensitiveSegment" puts "ERROR" } +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug25103 b/tests/vselect/bugs/bug25103 similarity index 77% rename from tests/bugs/vis/bug25103 rename to tests/vselect/bugs/bug25103 index 3a8a5cc32a..bb33ad6762 100644 --- a/tests/bugs/vis/bug25103 +++ b/tests/vselect/bugs/bug25103 @@ -1,12 +1,9 @@ puts "============" -puts "CR25103" +puts "CR25103: Visualization - Regression in interactive detection" puts "============" puts "" -####################################################################### -# Visualization - Regression in interactive detection -####################################################################### -vinit +vinit View1 vsetdispmode 1 box wall1 1 8 8 diff --git a/tests/bugs/vis/bug25230 b/tests/vselect/bugs/bug25230 similarity index 69% rename from tests/bugs/vis/bug25230 rename to tests/vselect/bugs/bug25230 index 68d6707e17..be4636eb1c 100644 --- a/tests/bugs/vis/bug25230 +++ b/tests/vselect/bugs/bug25230 @@ -1,13 +1,11 @@ puts "============" -puts "OCC25230" +puts "OCC25230: Visualization - Test case for selection in perspective views" +puts "Test is made using comparison of selected points with expected to be selected points." +puts "In case of mismatching test will report about an e r r o r of certain type:" +puts "point selection, rectangle selection or polygon selection is broken." puts "============" puts "" -#################################################################################### -# Visualization - Test case for selection in perspective views -# Test is made using comparison of selected points with expected to be selected points. -# In case of mismatching test will report about an error of certain type: -# point selection, rectangle selection or polygon selection is broken. -#################################################################################### + vinit View1 vsetdispmode 1 #draw grid of points 7x7 @@ -82,12 +80,7 @@ for {set i 0} {$i < [llength $refsorted]} {incr i} { } } -if {$stat == 1} { - puts "Error : Perspective selection by rectangle is broken." -} -if {$stat1 == 1} { - puts "Error : Perspective selection by point is broken." -} -if {$stat2 == 1} { - puts "Error : Perspective selection by polygon is broken." -} +if {$stat == 1} { puts "Error : Perspective selection by rectangle is broken." } +if {$stat1 == 1} { puts "Error : Perspective selection by point is broken." } +if {$stat2 == 1} { puts "Error : Perspective selection by polygon is broken." } +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug25265 b/tests/vselect/bugs/bug25265 similarity index 73% rename from tests/bugs/vis/bug25265 rename to tests/vselect/bugs/bug25265 index d16e7cd8cd..f078c83f5f 100644 --- a/tests/bugs/vis/bug25265 +++ b/tests/vselect/bugs/bug25265 @@ -1,12 +1,9 @@ puts "============" -puts "OCC25265" +puts "OCC25265: Perspective projection - selecting front point of two." +puts "When trying to select front point of two (lying on Z-coordinate) in a perspective" +puts "view, the back one is snapped and selected." puts "============" puts "" -#################################################################################### -# Perspective projection - selecting front point of two. -# When trying to select front point of two (lying on Z-coordinate) in a perspective -# view, the back one is snapped and selected. -#################################################################################### set select_x 204 set select_y 204 @@ -70,5 +67,4 @@ set eye_y 10.98 set eye_z 24.59 vviewparams -scale $scale -up $up_x $up_y $up_z -at $at_x $at_y $at_z -eye $eye_x $eye_y $eye_z - -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/vselect/bugs/bug25335 b/tests/vselect/bugs/bug25335 new file mode 100644 index 0000000000..1705d256c5 --- /dev/null +++ b/tests/vselect/bugs/bug25335 @@ -0,0 +1,21 @@ +puts "================" +puts "OCC25335: Visualization - method ::SelectedShape() in AIS_LocalContext and AIS_InteractiveContext overrides shape transformation" +puts "================" +puts "" + +vinit View1 + +box b 1 1 1 +vdisplay b +btranslate b 1 0 0 +vselmode 2 1 +vfit +vselect 299 352 +vpickselected +vsetlocation b 0 1 0 +vzfit +vselect 233 188 +vpickselected +vsetlocation b -2 2 0 +vfit +vdump ${imagedir}/${casename}.png diff --git a/tests/vselect/bugs/bug25492 b/tests/vselect/bugs/bug25492 new file mode 100644 index 0000000000..624da41ea7 --- /dev/null +++ b/tests/vselect/bugs/bug25492 @@ -0,0 +1,26 @@ +puts "============" +puts "CR25492: The selected subshape does not have topological relationship with original shape in OCC680" +puts "============" +puts "" + +pload MODELING VISUALIZATION + +set isEqual 0 +vinit +box aShape 5 5 5 3 3 3 +vdisplay aShape +vfit +vselmode 4 1 +vselect 100 200 +vpickselected aSub +explode aShape F + +for {set i 1} {$i <= 6 } {incr i} { + set aRes [compare aShape_$i aSub]; + if { [lsearch $aRes equal] != -1} { + set isEqual 1 + } +} + +if {$isEqual == 0} { puts "Error: No selected sub-shape was found in exploded sub-shapes" } +vdump ${imagedir}/${casename}.png diff --git a/tests/vselect/bugs/bug25507 b/tests/vselect/bugs/bug25507 new file mode 100644 index 0000000000..d4b4402068 --- /dev/null +++ b/tests/vselect/bugs/bug25507 @@ -0,0 +1,22 @@ +puts "============" +puts "CR25507: Visualization - the method V3d_View::Place() is incorrect" +puts "============" +puts "" + +vinit View1 +vsetdispmode 1 + +box b1 2 1 1 +vdisplay b1 +box b2 1 1 1 +vdisplay b2 +vsetlocation b2 5 0 0 +vfit + +vselect 80 140 +vplace 80 140 + +vmoveto 200 180 +checkcolor 200 180 0.78 0.55 0.09 + +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug25624 b/tests/vselect/bugs/bug25624 similarity index 57% rename from tests/bugs/vis/bug25624 rename to tests/vselect/bugs/bug25624 index 35e8efd125..3235f21122 100644 --- a/tests/bugs/vis/bug25624 +++ b/tests/vselect/bugs/bug25624 @@ -1,10 +1,7 @@ puts "========" -puts "OCC25624" +puts "OCC25624: Visualization - selection is incorrect in perspective mode in a specific case" puts "========" puts "" -############################################################################ -puts "Visualization - selection is incorrect in perspective mode in a specific case" -############################################################################ pload MODELING VISUALIZATION box a 0.0 0.0 0.0 0.1 0.1 0.1 @@ -28,4 +25,4 @@ checkcolor 170 10 0.8 0.8 0.8 # without any highlighting checkcolor 210 184 1 1 0 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug25627 b/tests/vselect/bugs/bug25627 similarity index 76% rename from tests/bugs/vis/bug25627 rename to tests/vselect/bugs/bug25627 index 56d43002a8..bd32adf220 100644 --- a/tests/bugs/vis/bug25627 +++ b/tests/vselect/bugs/bug25627 @@ -1,14 +1,11 @@ puts "============" -puts "CR25627" +puts "CR25627: SelectedShape() and HasSelectedShape() of AIS_InteractiveContext class do not work as expected." puts "============" puts "" -####################################################################### -# SelectedShape() and HasSelectedShape() of AIS_InteractiveContext -# class do not work as expected. -####################################################################### -pload ALL -vinit +pload MODELING VISUALIZATION + +vinit View1 box aBox 5 5 5 vdisplay aBox vfit @@ -46,4 +43,4 @@ if { [lsearch $aCompRes not] != -1 } { puts "ERROR: Selected box and selected solid are not equal!" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug26031 b/tests/vselect/bugs/bug26031 similarity index 60% rename from tests/bugs/vis/bug26031 rename to tests/vselect/bugs/bug26031 index ae1ab438de..68f74d5a85 100644 --- a/tests/bugs/vis/bug26031 +++ b/tests/vselect/bugs/bug26031 @@ -1,12 +1,8 @@ puts "============" -puts "CR26031" +puts "CR26031: Visualization - fix out-of-range within Select3D_InteriorSensitivePointSet::GetPoints()" puts "============" puts "" -########################################################################################## -# Visualization - fix out-of-range within Select3D_InteriorSensitivePointSet::GetPoints() -########################################################################################## - pload VISUALIZATION XDE testreadiges [locate_data_file bug25747_pencil.igs] aPencil diff --git a/tests/bugs/vis/bug26146 b/tests/vselect/bugs/bug26146 similarity index 100% rename from tests/bugs/vis/bug26146 rename to tests/vselect/bugs/bug26146 diff --git a/tests/bugs/vis/bug26147 b/tests/vselect/bugs/bug26147 similarity index 80% rename from tests/bugs/vis/bug26147 rename to tests/vselect/bugs/bug26147 index 2788fb4329..96cae5f0e4 100644 --- a/tests/bugs/vis/bug26147 +++ b/tests/vselect/bugs/bug26147 @@ -1,12 +1,8 @@ puts "============" -puts "CR26147" +puts "CR26147: Visualization - restore the ability to pick only fully included objects in rectangular selection" puts "============" puts "" -########################################################################################## -puts "Visualization - restore the ability to pick only fully included objects in rectangular selection" -########################################################################################## - pload VISUALIZATION MODELING box b1 0 0 0 1 1 1 diff --git a/tests/bugs/vis/bug26159 b/tests/vselect/bugs/bug26159 similarity index 100% rename from tests/bugs/vis/bug26159 rename to tests/vselect/bugs/bug26159 diff --git a/tests/bugs/vis/bug26209 b/tests/vselect/bugs/bug26209 similarity index 58% rename from tests/bugs/vis/bug26209 rename to tests/vselect/bugs/bug26209 index 08550c4efd..df0bc89039 100644 --- a/tests/bugs/vis/bug26209 +++ b/tests/vselect/bugs/bug26209 @@ -1,12 +1,8 @@ puts "============" -puts "CR26209" +puts "CR26209: Visualization - provide a method to fit view to the specific bounding box" puts "============" puts "" -########################################################################################## -puts "Visualization - provide a method to fit view to the specific bounding box" -########################################################################################## - pload VISUALIZATION MODELING box b 1 1 1 diff --git a/tests/bugs/vis/bug26217 b/tests/vselect/bugs/bug26217 similarity index 65% rename from tests/bugs/vis/bug26217 rename to tests/vselect/bugs/bug26217 index 4d265c3324..b020f7f043 100644 --- a/tests/bugs/vis/bug26217 +++ b/tests/vselect/bugs/bug26217 @@ -1,12 +1,8 @@ puts "============" -puts "CR26217" +puts "CR26217: Visualization, Select3D_SensitiveCircle - fix compilation with CLang for iOS" puts "============" puts "" -########################################################################################## -puts "Visualization, Select3D_SensitiveCircle - fix compilation with CLang for iOS" -########################################################################################## - pload VISUALIZATION vinit View1 diff --git a/tests/vselect/bugs/bug26284 b/tests/vselect/bugs/bug26284 new file mode 100644 index 0000000000..8173005ad2 --- /dev/null +++ b/tests/vselect/bugs/bug26284 @@ -0,0 +1,12 @@ +puts "========" +puts "OCC26284: Visualization - eliminate recursion in SelectMgr_SelectionManager" +puts "========" +puts "" + +pload QAcommands VISUALIZATION + +vinit View1 +OCC26284 + +vfit +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug26304 b/tests/vselect/bugs/bug26304 similarity index 83% rename from tests/bugs/vis/bug26304 rename to tests/vselect/bugs/bug26304 index 132df257b6..758bf451fa 100644 --- a/tests/bugs/vis/bug26304 +++ b/tests/vselect/bugs/bug26304 @@ -10,12 +10,12 @@ proc findPoint {theInfoString} { for {set aIdx 0} {$aIdx < $aSize} {incr aIdx} { set aItem [lindex $theInfoString $aIdx] if {[string compare $aItem "Point:"] == 0} { - set aX [string trim [lindex $theInfoString [expr $aIdx + 1]]] - set aY [string trim [lindex $theInfoString [expr $aIdx + 2]]] - set aZ [string trim [lindex $theInfoString [expr $aIdx + 3]]] - return [list $aX $aY $aZ] - } + set aX [string trim [lindex $theInfoString [expr $aIdx + 1]]] + set aY [string trim [lindex $theInfoString [expr $aIdx + 2]]] + set aZ [string trim [lindex $theInfoString [expr $aIdx + 3]]] + return [list $aX $aY $aZ] } + } } pload VISUALIZATION MODELING diff --git a/tests/bugs/vis/bug26413 b/tests/vselect/bugs/bug26413 similarity index 86% rename from tests/bugs/vis/bug26413 rename to tests/vselect/bugs/bug26413 index afbc550269..a94016c628 100644 --- a/tests/bugs/vis/bug26413 +++ b/tests/vselect/bugs/bug26413 @@ -1,10 +1,7 @@ puts "============" -puts "CR26413" +puts "CR26413: Visualization, SelectMgr_ViewerSelector - Pixel tolerance is overridden by selection sensitivity" puts "============" puts "" -################################################################################### -puts "Visualization, SelectMgr_ViewerSelector - Pixel tolerance is overridden by selection sensitivity" -################################################################################### pload VISUALIZATION MODELING diff --git a/tests/bugs/vis/bug26430 b/tests/vselect/bugs/bug26430 similarity index 73% rename from tests/bugs/vis/bug26430 rename to tests/vselect/bugs/bug26430 index 07f875e116..cdea8a13c9 100644 --- a/tests/bugs/vis/bug26430 +++ b/tests/vselect/bugs/bug26430 @@ -1,12 +1,8 @@ puts "============" -puts "CR26430" +puts "CR26430: Visualization - segmentation fault in opened local context" puts "============" puts "" -########################################################################################## -puts "Visualization - segmentation fault in opened local context" -########################################################################################## - pload MODELING VISUALIZATION restore [locate_data_file bug26430.brep] aShape diff --git a/tests/bugs/vis/bug26462_1 b/tests/vselect/bugs/bug26462_1 similarity index 69% rename from tests/bugs/vis/bug26462_1 rename to tests/vselect/bugs/bug26462_1 index d185319b96..cf02e0aedf 100644 --- a/tests/bugs/vis/bug26462_1 +++ b/tests/vselect/bugs/bug26462_1 @@ -1,15 +1,11 @@ puts "============" -puts "CR26462" +puts "CR26462: Visualization - selection does not adapt to line width change" puts "============" puts "" -########################################################################################## -puts "Visualization - selection does not adapt to line width change" -########################################################################################## - pload VISUALIZATION MODELING -vinit +vinit View1 box b1 10 10 10 box b2 10 10 10 @@ -47,8 +43,6 @@ vselect 103 322 -xor # check that increase of tolerance for b1 doesn't influence # on b2 set aNbSelected [vnbselected] -if {$aNbSelected != "1"} { - puts "ERROR: b2 is selected after b1's tolerance increased" -} +if {$aNbSelected != "1"} { puts "ERROR: b2 is selected after b1's tolerance increased" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/vselect/bugs/bug26462_2 b/tests/vselect/bugs/bug26462_2 new file mode 100644 index 0000000000..1a42b54153 --- /dev/null +++ b/tests/vselect/bugs/bug26462_2 @@ -0,0 +1,11 @@ +puts "============" +puts "CR26462: Visualization - selection does not adapt to line width change" +puts "============" +puts "" + +pload VISUALIZATION QAcommands + +vinit View1 +OCC26462 + +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug26566 b/tests/vselect/bugs/bug26566 similarity index 68% rename from tests/bugs/vis/bug26566 rename to tests/vselect/bugs/bug26566 index e6efdd4baf..982bd157b6 100644 --- a/tests/bugs/vis/bug26566 +++ b/tests/vselect/bugs/bug26566 @@ -1,13 +1,10 @@ puts "========" -puts "OCC26566" +puts "OCC26566: Visualization - incorrect highlight after selection of owners with auto-highlight disabled" puts "========" puts "" -################################################################## -puts "Visualization - incorrect highlight after selection of owners with auto-highlight disabled" -################################################################## pload VISUALIZATION MODELING XSDRAW -vinit +vinit View1 # create an object with auto-highlight disabled meshfromstl m [locate_data_file b.stl] @@ -35,4 +32,4 @@ checkcolor 321 128 0.8 0.8 0.8 # check that mesh is drawn without selection checkcolor 316 321 0 0 0 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug26596 b/tests/vselect/bugs/bug26596 similarity index 51% rename from tests/bugs/vis/bug26596 rename to tests/vselect/bugs/bug26596 index f0ce765ac8..c450fc3faa 100644 --- a/tests/bugs/vis/bug26596 +++ b/tests/vselect/bugs/bug26596 @@ -1,12 +1,8 @@ puts "============" -puts "CR26596" +puts "CR26596: Visualization - hidden twice times structure should not be selectabl" puts "============" puts "" -########################################################################################## -puts "Visualization - hidden twice times structure should not be selectable" -########################################################################################## - pload MODELING VISUALIZATION box b 1 2 3 @@ -28,4 +24,4 @@ if {$aResColor == "0 1 1 1"} { puts "ERROR: Zero selection mode was not deactivated at second AIS_InteractiveContext::Erase call" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/vselect/bugs/bug26641 b/tests/vselect/bugs/bug26641 new file mode 100644 index 0000000000..fe6778ec5a --- /dev/null +++ b/tests/vselect/bugs/bug26641 @@ -0,0 +1,26 @@ +puts "============" +puts "0026641: Visualization, TKOpenGl - handle correctly transformation persistence within perspective projection" +puts "============" +puts "" + +vinit View1 +vclear + +box b0 30 0 0 10 10 10 +box b1 -30 -30 30 10 30 20 +vdisplay b0 +vdisplay b1 +vfit +vdump ${imagedir}/${casename}_none_pers_ortho.png + +vdisplay b1 -trsfPers zoom -trsfPersPos -30 -30 30 +vfit +vdump ${imagedir}/${casename}_zoom_pers_ortho.png + +vcamera -persp +vfit +vdump ${imagedir}/${casename}_zoom_pers_persp.png + +vselect 30 70 +if {[vnbselected] != 1} { puts "ERROR: Transform persistence object is not selected!" } +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug26680 b/tests/vselect/bugs/bug26680 similarity index 95% rename from tests/bugs/vis/bug26680 rename to tests/vselect/bugs/bug26680 index 15a6c05dac..42f5d10975 100644 --- a/tests/bugs/vis/bug26680 +++ b/tests/vselect/bugs/bug26680 @@ -21,4 +21,4 @@ if {[vreadpixel 197 257 rgb name] != "GRAY86"} { puts "ERROR: presentation for s vselect 0 0 if {[vreadpixel 197 257 rgb name] != "BLUE"} { puts "ERROR: the object is not unhighlighted after selection highlight!" } -vdump ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug26719_1 b/tests/vselect/bugs/bug26719_1 similarity index 100% rename from tests/bugs/vis/bug26719_1 rename to tests/vselect/bugs/bug26719_1 diff --git a/tests/bugs/vis/bug26721 b/tests/vselect/bugs/bug26721 similarity index 65% rename from tests/bugs/vis/bug26721 rename to tests/vselect/bugs/bug26721 index d0081fab19..7bf067e65f 100644 --- a/tests/bugs/vis/bug26721 +++ b/tests/vselect/bugs/bug26721 @@ -1,16 +1,12 @@ puts "============" -puts "CR26721" +puts "CR26721: Visualization - selection highlight of selected face is broken" puts "============" puts "" -########################################################################################## -puts "Visualization - selection highlight of selected face is broken" -########################################################################################## - pload VISUALIZATION MODELING box b 1 1 1 -vinit +vinit View1 vdisplay b vfit @@ -31,4 +27,4 @@ if {[vreadpixel 204 301 name] != "GRAY80 1"} { puts "ERROR: the face selected is not highlighted with selection color!" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug26726 b/tests/vselect/bugs/bug26726 similarity index 98% rename from tests/bugs/vis/bug26726 rename to tests/vselect/bugs/bug26726 index 2580e4d5ce..32660e1ec4 100644 --- a/tests/bugs/vis/bug26726 +++ b/tests/vselect/bugs/bug26726 @@ -4,10 +4,9 @@ puts "============" puts "" pload VISUALIZATION - vclear vclose all -vinit +vinit View1 vsetdispmode 1 box b0 5 0 0 1 1 1 diff --git a/tests/bugs/vis/bug26779 b/tests/vselect/bugs/bug26779 similarity index 81% rename from tests/bugs/vis/bug26779 rename to tests/vselect/bugs/bug26779 index 8c31cf2402..54f0827ee3 100644 --- a/tests/bugs/vis/bug26779 +++ b/tests/vselect/bugs/bug26779 @@ -1,12 +1,8 @@ puts "============" -puts "CR26779" +puts "CR26779: Draw Harness, ViewerTest - vstate output is incorrect for sub-shapes selection without opening local context" puts "============" puts "" -########################################################################################## -puts "Draw Harness, ViewerTest - vstate output is incorrect for sub-shapes selection without opening local context" -########################################################################################## - pload MODELING VISUALIZATION box b1 1 2 3 @@ -57,4 +53,4 @@ if {[string compare $aItem3 "Face #2"] != 0} { puts "ERROR: vstate output for selected face in test part 2 is incorrect" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug26870 b/tests/vselect/bugs/bug26870 similarity index 63% rename from tests/bugs/vis/bug26870 rename to tests/vselect/bugs/bug26870 index 91ade09d0d..9a037f5176 100644 --- a/tests/bugs/vis/bug26870 +++ b/tests/vselect/bugs/bug26870 @@ -1,15 +1,11 @@ puts "============" -puts "CR26870" +puts "CR26870: Visualization - deactivated selections are not updated after object's re-computation" puts "============" puts "" -########################################################################################## -puts "Visualization - deactivated selections are not updated after object's re-computation" -########################################################################################## - pload VISUALIZATION MODELING -vinit +vinit View1 box b 1 1 1 vdisplay b vfit @@ -34,4 +30,4 @@ if {[vreadpixel 29 216 name] == "YELLOW 1"} { puts "ERROR: the box's face is not highlighted! Selection mode 4 was not updated after redisplaying the box." } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug26959 b/tests/vselect/bugs/bug26959 similarity index 79% rename from tests/bugs/vis/bug26959 rename to tests/vselect/bugs/bug26959 index 26d4aab60f..3960465065 100644 --- a/tests/bugs/vis/bug26959 +++ b/tests/vselect/bugs/bug26959 @@ -1,6 +1,5 @@ puts "============" -puts "CR26959" -puts "Visualization - cannot select edge of the shape" +puts "CR26959: Visualization - cannot select edge of the shape" puts "============" puts "" @@ -28,4 +27,4 @@ if {[vreadpixel 142 127 name] == "CYAN 1"} { puts "ERROR: the shape was not displayed correctly!" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug26960 b/tests/vselect/bugs/bug26960 similarity index 100% rename from tests/bugs/vis/bug26960 rename to tests/vselect/bugs/bug26960 diff --git a/tests/bugs/vis/bug27008 b/tests/vselect/bugs/bug27008 similarity index 68% rename from tests/bugs/vis/bug27008 rename to tests/vselect/bugs/bug27008 index 6a326d51f7..53d6e299ef 100644 --- a/tests/bugs/vis/bug27008 +++ b/tests/vselect/bugs/bug27008 @@ -1,10 +1,7 @@ puts "===========" -puts "OCC27008" +puts "OCC27008: Visualization - polygonal selection algorithm does not work with MeshVS_Mesh" puts "===========" puts "" -########################################################################## -# Visualization - polygonal selection algorithm does not work with MeshVS_Mesh -########################################################################## pload VISUALIZATION XDE diff --git a/tests/bugs/vis/bug27318 b/tests/vselect/bugs/bug27318 similarity index 74% rename from tests/bugs/vis/bug27318 rename to tests/vselect/bugs/bug27318 index d16d06216e..ec682f0958 100644 --- a/tests/bugs/vis/bug27318 +++ b/tests/vselect/bugs/bug27318 @@ -1,12 +1,9 @@ puts "TODO OCC27318 MacOS: Error : TEST FAILED" puts "========" -puts "OCC27318" +puts "OCC27318: Memory is not released in Select3D_SensitiveSet when destroying AIS_InteractiveContext without removing objects" puts "========" puts "" -################################################################## -puts "Memory is not released in Select3D_SensitiveSet when destroying AIS_InteractiveContext without removing objects" -################################################################## pload VISUALIZATION QAcommands @@ -33,5 +30,5 @@ set aRatio [expr $aMemAfter / double($aMemInit)] # check if the memory difference is greater than 5% if [expr $aRatio > 1.05] { - puts "Error : TEST FAILED" + puts "Error : TEST FAILED" } diff --git a/tests/bugs/vis/bug27477 b/tests/vselect/bugs/bug27477 similarity index 73% rename from tests/bugs/vis/bug27477 rename to tests/vselect/bugs/bug27477 index fead5ea00a..7ce18aef2a 100644 --- a/tests/bugs/vis/bug27477 +++ b/tests/vselect/bugs/bug27477 @@ -1,10 +1,7 @@ puts "============" -puts "OCC27477" +puts "OCC27477: Visualization - Select3D_SensitiveCircle always return infinite depth value in boundary mode" puts "============" puts "" -#################################################################################### -# Visualization - Select3D_SensitiveCircle always return infinite depth value in boundary mode -#################################################################################### proc check_output {theInfo} { set aSize [llength $theInfo] @@ -42,4 +39,4 @@ if {$aResult == 1} { puts $aResult } -set only_screen 1 +vdump ${imagedir}/${casename}.png diff --git a/tests/vselect/bugs/bug27523 b/tests/vselect/bugs/bug27523 new file mode 100644 index 0000000000..710ac51dd5 --- /dev/null +++ b/tests/vselect/bugs/bug27523 @@ -0,0 +1,11 @@ +puts "============" +puts "OCC27523: Visualization - selection owner contains obsolete shape" +puts "============" +puts "" + +pload QAcommands VISUALIZATION + +vinit View1 +OCC27523 + +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug27530 b/tests/vselect/bugs/bug27530 similarity index 87% rename from tests/bugs/vis/bug27530 rename to tests/vselect/bugs/bug27530 index 42695959e2..9807dadcfe 100644 --- a/tests/bugs/vis/bug27530 +++ b/tests/vselect/bugs/bug27530 @@ -1,10 +1,7 @@ puts "===========" -puts "OCC27530" +puts "OCC27530: Visualization - AIS_InteractiveContext::HilightNextDetected() doesn't work in Neutral Point" puts "===========" puts "" -########################################################################## -# Visualization - AIS_InteractiveContext::HilightNextDetected() doesn't work in Neutral Point -########################################################################## proc check_highlighting { theHiBoxIdx theCoords } { set aNext [expr ($theHiBoxIdx + 1) % 3] @@ -37,7 +34,7 @@ lappend coords 333 lappend coords 177 lappend coords 2 -vinit +vinit View1 vclear vdisplay b0 b1 b2 vleft @@ -77,3 +74,4 @@ vselprev if { ![check_highlighting 0 $coords] } { puts "ERROR: incorrect highlighting of box b0 after vselprev call" } +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug27618 b/tests/vselect/bugs/bug27618 similarity index 100% rename from tests/bugs/vis/bug27618 rename to tests/vselect/bugs/bug27618 diff --git a/tests/vselect/bugs/bug27621_1 b/tests/vselect/bugs/bug27621_1 new file mode 100644 index 0000000000..ca57c8a8c6 --- /dev/null +++ b/tests/vselect/bugs/bug27621_1 @@ -0,0 +1,18 @@ +puts "========" +puts "CR27621_1: Highlighting with color remains visible when shape is erased" +puts "========" +puts "" + +vclear +vinit View1 + +box b 1 2 3 +vdisplay b -dispmode 1 +vfit +vmoveto 250 250 + +vdump $imagedir/${casename}_highlighted.png + +verase b + +vdump $imagedir/${casename}_erased.png diff --git a/tests/vselect/bugs/bug27621_2 b/tests/vselect/bugs/bug27621_2 new file mode 100644 index 0000000000..4995421746 --- /dev/null +++ b/tests/vselect/bugs/bug27621_2 @@ -0,0 +1,18 @@ +puts "========" +puts "CR27621_2: Highlighting with color remains visible when shape is erased" +puts "========" +puts "" + +vclear +vinit View1 + +box b 1 2 3 +vdisplay b -dispmode 1 +vfit +vmoveto 250 250 + +vdump $imagedir/${casename}_highlighted.png + +vclear + +vdump $imagedir/${casename}_erased.png diff --git a/tests/bugs/vis/bug27757 b/tests/vselect/bugs/bug27757 similarity index 89% rename from tests/bugs/vis/bug27757 rename to tests/vselect/bugs/bug27757 index 23ce0946cb..b0fd1916c0 100644 --- a/tests/bugs/vis/bug27757 +++ b/tests/vselect/bugs/bug27757 @@ -6,7 +6,7 @@ puts "" pload VISUALIZATION QAcommands -vinit +vinit View1 # create box object that has sphere as a child object OCC27757 @@ -23,4 +23,4 @@ if {[vreadpixel 145 285 name] != "GRAY80 1"} { puts "Error: the sphere is not highlighted with selection color!" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug27796 b/tests/vselect/bugs/bug27796 similarity index 98% rename from tests/bugs/vis/bug27796 rename to tests/vselect/bugs/bug27796 index d21bd49e53..b3af40d9dd 100644 --- a/tests/bugs/vis/bug27796 +++ b/tests/vselect/bugs/bug27796 @@ -102,3 +102,4 @@ vmoveto 110 385 vselect 110 385 set aColor [vreadpixel 110 385 rgb name] if { $aColor != "GRAY89" } { puts "Error: wrong object is highlighted" } +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug27797 b/tests/vselect/bugs/bug27797 similarity index 100% rename from tests/bugs/vis/bug27797 rename to tests/vselect/bugs/bug27797 diff --git a/tests/bugs/vis/bug27805 b/tests/vselect/bugs/bug27805 similarity index 100% rename from tests/bugs/vis/bug27805 rename to tests/vselect/bugs/bug27805 diff --git a/tests/bugs/vis/bug27893 b/tests/vselect/bugs/bug27893 similarity index 52% rename from tests/bugs/vis/bug27893 rename to tests/vselect/bugs/bug27893 index 3a129889b9..19045d29a8 100644 --- a/tests/bugs/vis/bug27893 +++ b/tests/vselect/bugs/bug27893 @@ -1,17 +1,15 @@ puts "===========" -puts "OCC27893" +puts "OCC27893: Visualization - AIS_InteractiveContext::SetSelected does not work" puts "===========" puts "" -########################################################################## -# Visualization - AIS_InteractiveContext::SetSelected does not work -########################################################################## pload VISUALIZATION QAcommands -vinit +vinit View1 OCC27893 vfit if {[vnbselected] != "1" || [vreadpixel 204 254 name] != "GRAY80 1"} { puts "ERROR: The box is not selected, AIS_InteractiveContext::SetSelected works incorrect" } +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug27986_1 b/tests/vselect/bugs/bug27986_1 similarity index 100% rename from tests/bugs/vis/bug27986_1 rename to tests/vselect/bugs/bug27986_1 diff --git a/tests/bugs/vis/bug27986_2 b/tests/vselect/bugs/bug27986_2 similarity index 100% rename from tests/bugs/vis/bug27986_2 rename to tests/vselect/bugs/bug27986_2 diff --git a/tests/bugs/vis/bug28205_1 b/tests/vselect/bugs/bug28205_1 similarity index 100% rename from tests/bugs/vis/bug28205_1 rename to tests/vselect/bugs/bug28205_1 diff --git a/tests/bugs/vis/bug28205_2 b/tests/vselect/bugs/bug28205_2 similarity index 100% rename from tests/bugs/vis/bug28205_2 rename to tests/vselect/bugs/bug28205_2 diff --git a/tests/vselect/bugs/bug28310 b/tests/vselect/bugs/bug28310 new file mode 100644 index 0000000000..0f220baa3b --- /dev/null +++ b/tests/vselect/bugs/bug28310 @@ -0,0 +1,12 @@ +puts "===========" +puts "OCC28310: Visualization - crash on iteration through detected interactive objects" +puts "===========" +puts "" + +pload VISUALIZATION QAcommands + +vinit View1 + +# Sequence of C++ commands crashes the application +OCC28310 +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug28365 b/tests/vselect/bugs/bug28365 similarity index 92% rename from tests/bugs/vis/bug28365 rename to tests/vselect/bugs/bug28365 index e343db202a..40761dc780 100644 --- a/tests/bugs/vis/bug28365 +++ b/tests/vselect/bugs/bug28365 @@ -15,3 +15,4 @@ vchangeselected b set aNbSelected [vnbselected] if { $aNbSelected != 0 } { puts "Error: Vertex filter was not applied" } +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug28527 b/tests/vselect/bugs/bug28527 similarity index 100% rename from tests/bugs/vis/bug28527 rename to tests/vselect/bugs/bug28527 diff --git a/tests/bugs/vis/bug28988 b/tests/vselect/bugs/bug28988 similarity index 94% rename from tests/bugs/vis/bug28988 rename to tests/vselect/bugs/bug28988 index 637e73fd9b..c96aca6eac 100644 --- a/tests/bugs/vis/bug28988 +++ b/tests/vselect/bugs/bug28988 @@ -20,3 +20,4 @@ vlocation b -reset vmoveto 110 110 vreadpixel 110 110 rgb name if { "[vreadpixel 110 110 rgb name]" != "CYAN2" } { puts "Error: reset shape is not selected!" } +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug29938 b/tests/vselect/bugs/bug29938 similarity index 97% rename from tests/bugs/vis/bug29938 rename to tests/vselect/bugs/bug29938 index 8a4a8dd1ae..10f0d505e8 100644 --- a/tests/bugs/vis/bug29938 +++ b/tests/vselect/bugs/bug29938 @@ -49,3 +49,4 @@ foreach {_ x y z} $match { if {$pnt != "$x $y $z"} { puts "Error: Calculate point ($x $y $z) is not equal to target ($pnt)" } } +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug30218 b/tests/vselect/bugs/bug30218 similarity index 100% rename from tests/bugs/vis/bug30218 rename to tests/vselect/bugs/bug30218 diff --git a/tests/bugs/vis/bug30672 b/tests/vselect/bugs/bug30672 similarity index 100% rename from tests/bugs/vis/bug30672 rename to tests/vselect/bugs/bug30672 diff --git a/tests/bugs/vis/bug30717 b/tests/vselect/bugs/bug30717 similarity index 92% rename from tests/bugs/vis/bug30717 rename to tests/vselect/bugs/bug30717 index 416aecd7fe..1d29f8577c 100644 --- a/tests/bugs/vis/bug30717 +++ b/tests/vselect/bugs/bug30717 @@ -14,3 +14,4 @@ vmoveto 250 250 vselect 250 250 verase b if { [vreadpixel 300 300 rgb name] != "BLACK" } { puts "Error: hidden face is highlighted" } +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug30824 b/tests/vselect/bugs/bug30824 similarity index 90% rename from tests/bugs/vis/bug30824 rename to tests/vselect/bugs/bug30824 index 4d959bf089..0b18cfcd73 100644 --- a/tests/bugs/vis/bug30824 +++ b/tests/vselect/bugs/bug30824 @@ -22,4 +22,4 @@ vchild parent -ignoreParentTrsf -add child2 vfit vselect 0 0 200 200 -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug31221 b/tests/vselect/bugs/bug31221 similarity index 95% rename from tests/bugs/vis/bug31221 rename to tests/vselect/bugs/bug31221 index e5db4a3eab..a623cfc13d 100644 --- a/tests/bugs/vis/bug31221 +++ b/tests/vselect/bugs/bug31221 @@ -49,4 +49,5 @@ if { $aNbSelected != 1 } { puts "Error: combined OR filter was not applied" } vchangeselected v set aNbSelected [vnbselected] -if { $aNbSelected != 2 } { puts "Error: combined OR filter was not applied" } \ No newline at end of file +if { $aNbSelected != 2 } { puts "Error: combined OR filter was not applied" } +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug31412 b/tests/vselect/bugs/bug31412 similarity index 96% rename from tests/bugs/vis/bug31412 rename to tests/vselect/bugs/bug31412 index f581d900bd..cdff3ab4f9 100644 --- a/tests/bugs/vis/bug31412 +++ b/tests/vselect/bugs/bug31412 @@ -33,3 +33,4 @@ if { [vreadpixel 50 58 rgb name] == "CYAN" } { puts "ERROR: back box is misdetec vpoint p3 -2d -nosel 200 58 vdump $imagedir/${casename}_proj_X.png vremove p3 +vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug31425 b/tests/vselect/bugs/bug31425 similarity index 100% rename from tests/bugs/vis/bug31425 rename to tests/vselect/bugs/bug31425 diff --git a/tests/bugs/vis/bug31440 b/tests/vselect/bugs/bug31440 similarity index 100% rename from tests/bugs/vis/bug31440 rename to tests/vselect/bugs/bug31440 diff --git a/tests/vselect/bugs/bug544 b/tests/vselect/bugs/bug544 new file mode 100644 index 0000000000..9591792088 --- /dev/null +++ b/tests/vselect/bugs/bug544 @@ -0,0 +1,22 @@ +puts "========" +puts "OCC544: Problems with the results of MakePipeShell" +puts "========" +puts "" + +pload MODELING VISUALIZATION QAcommands + +vinit View1 +vsetdispmode 1 +OCC544 +vdisplay result +vsetmaterial result PLASTIC +vsetcolor result MATRABLUE +vsettransparency result 0.5 +vsetdispmode 1 +vfit +vviewparams -scale 2.05374 -proj 0.135192 -0.978297 -0.157031 -up -0.399854 -0.198875 0.894743 -at 415.781529476262 349.647084890243 417.026634136105 + +vmoveto 300 70 +checkcolor 220 110 0.04 0.04 0.5 + +vdump $imagedir/${casename}.png diff --git a/tests/vselect/bugs/bug6652 b/tests/vselect/bugs/bug6652 new file mode 100644 index 0000000000..6b862b4e6b --- /dev/null +++ b/tests/vselect/bugs/bug6652 @@ -0,0 +1,20 @@ +puts "============" +puts "OCC6652: Problem of mesh selection" +puts "============" +puts "" + +pload XDE +set BugNumber OCC6652 + +vinit View1 + +meshfromstl result [locate_data_file OCC6652.stl] + +vsetdispmode result 3 +vselmode result 8 1 + +vselect 5 5 400 400 + +if {[vnbselected] != 26966} { puts "Faulty ${BugNumber}" } + +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug7186 b/tests/vselect/bugs/bug7186 old mode 100755 new mode 100644 similarity index 74% rename from tests/bugs/vis/bug7186 rename to tests/vselect/bugs/bug7186 index c7540d341c..f2edc683b3 --- a/tests/bugs/vis/bug7186 +++ b/tests/vselect/bugs/bug7186 @@ -1,11 +1,8 @@ puts "============" -puts "OCC7186" +puts "OCC7186: Selecting an empty space with rectangle doesn't clear" +puts "the current selection, when there is an opened local context" puts "============" puts "" -###################################################### -# Selecting an empty space with rectangle doesn't clear -# the current selection, when there is an opened local context -###################################################### set BugNumber OCC7186 @@ -51,4 +48,4 @@ if { ${mistake} == 1 } { puts "${BugNumber}: OK" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug727 b/tests/vselect/bugs/bug727 old mode 100755 new mode 100644 similarity index 89% rename from tests/bugs/vis/bug727 rename to tests/vselect/bugs/bug727 index cea74d4483..9ef34034cb --- a/tests/bugs/vis/bug727 +++ b/tests/vselect/bugs/bug727 @@ -35,4 +35,4 @@ if { ${NbSelected1} != 1 } { puts "Error : (case 2)" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug74 b/tests/vselect/bugs/bug74 old mode 100755 new mode 100644 similarity index 97% rename from tests/bugs/vis/bug74 rename to tests/vselect/bugs/bug74 index 1a2aab2169..1e08fa17ae --- a/tests/bugs/vis/bug74 +++ b/tests/vselect/bugs/bug74 @@ -1,10 +1,11 @@ - puts "================" puts "OCC74" puts "BUC61051" puts "================" puts "" +pload MODELING VISUALIZATION QAcommands + # Data set Shape_X 100 set Shape_Y 346 @@ -28,7 +29,7 @@ set Solid_X ${Shape_X} set Solid_Y ${Shape_Y} # Display box -vinit +vinit View1 box b 10 10 10 vdisplay b vfit @@ -163,4 +164,4 @@ if { [vreadpixel ${Vertex_X} ${Vertex_Y} rgb name] != "YELLOW" } { puts "Error : vertex color is not yellow" } -checkview -screenshot -3d -path ${imagedir}/${test_image}.png +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug26973 b/tests/vselect/clipping/bug26973 similarity index 85% rename from tests/bugs/vis/bug26973 rename to tests/vselect/clipping/bug26973 index 3a1682ab8a..b069cfdeba 100644 --- a/tests/bugs/vis/bug26973 +++ b/tests/vselect/clipping/bug26973 @@ -1,12 +1,8 @@ puts "============" -puts "CR26973" +puts "CR26973: Visualization - selection of entities hidden by clipping planes is broken" puts "============" puts "" -########################################################################################## -puts "Visualization - selection of entities hidden by clipping planes is broken" -########################################################################################## - pload MODELING VISUALIZATION vinit View1 diff --git a/tests/bugs/vis/bug29791 b/tests/vselect/clipping/bug29791 similarity index 100% rename from tests/bugs/vis/bug29791 rename to tests/vselect/clipping/bug29791 diff --git a/tests/bugs/vis/bug29947 b/tests/vselect/clipping/bug29947 similarity index 100% rename from tests/bugs/vis/bug29947 rename to tests/vselect/clipping/bug29947 diff --git a/tests/bugs/vis/bug30695 b/tests/vselect/clipping/bug30695 similarity index 92% rename from tests/bugs/vis/bug30695 rename to tests/vselect/clipping/bug30695 index 366ccef3cb..d0164922d7 100644 --- a/tests/bugs/vis/bug30695 +++ b/tests/vselect/clipping/bug30695 @@ -2,24 +2,16 @@ puts "=============" puts "0030695: Visualization - selection by box should use clipping planes set for viewer" puts "=============" -pload ALL -vinit View1 +pload MODELING VISUALIZATION box b 10 10 10 -vdisplay b - box b1 -5 0 0 2 2 2 -vdisplay b1 - box b2 13 0 0 2 2 2 -vdisplay b2 - box b3 16 0 0 2 2 2 -vdisplay b3 - -vsetdispmode 1 +vinit View1 vtop +vdisplay -dispMode 1 b b1 b2 b3 vfit vzoom 0.5 @@ -45,3 +37,4 @@ vselect 40 100 370 300 -allowoverlap 1 if {[vnbselected] != 2} { puts "ERROR: Bad number of selected objects after clippling plane set on view with allow overlap selection!" } +vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug30777 b/tests/vselect/clipping/bug30777 similarity index 100% rename from tests/bugs/vis/bug30777 rename to tests/vselect/clipping/bug30777 diff --git a/tests/bugs/vis/bug30906 b/tests/vselect/clipping/bug30906 similarity index 100% rename from tests/bugs/vis/bug30906 rename to tests/vselect/clipping/bug30906 diff --git a/tests/bugs/vis/bug31650 b/tests/vselect/clipping/bug31650 similarity index 100% rename from tests/bugs/vis/bug31650 rename to tests/vselect/clipping/bug31650 diff --git a/tests/v3d/edge/A1 b/tests/vselect/edge/A1 similarity index 100% rename from tests/v3d/edge/A1 rename to tests/vselect/edge/A1 diff --git a/tests/v3d/edge/A10 b/tests/vselect/edge/A10 similarity index 100% rename from tests/v3d/edge/A10 rename to tests/vselect/edge/A10 diff --git a/tests/v3d/edge/A2 b/tests/vselect/edge/A2 similarity index 100% rename from tests/v3d/edge/A2 rename to tests/vselect/edge/A2 diff --git a/tests/v3d/edge/A3 b/tests/vselect/edge/A3 similarity index 100% rename from tests/v3d/edge/A3 rename to tests/vselect/edge/A3 diff --git a/tests/v3d/edge/A4 b/tests/vselect/edge/A4 similarity index 100% rename from tests/v3d/edge/A4 rename to tests/vselect/edge/A4 diff --git a/tests/v3d/edge/A5 b/tests/vselect/edge/A5 similarity index 100% rename from tests/v3d/edge/A5 rename to tests/vselect/edge/A5 diff --git a/tests/v3d/edge/A6 b/tests/vselect/edge/A6 similarity index 100% rename from tests/v3d/edge/A6 rename to tests/vselect/edge/A6 diff --git a/tests/v3d/edge/A7 b/tests/vselect/edge/A7 similarity index 100% rename from tests/v3d/edge/A7 rename to tests/vselect/edge/A7 diff --git a/tests/v3d/edge/A8 b/tests/vselect/edge/A8 similarity index 100% rename from tests/v3d/edge/A8 rename to tests/vselect/edge/A8 diff --git a/tests/v3d/edge/A9 b/tests/vselect/edge/A9 similarity index 100% rename from tests/v3d/edge/A9 rename to tests/vselect/edge/A9 diff --git a/tests/v3d/edge/B1 b/tests/vselect/edge/B1 similarity index 100% rename from tests/v3d/edge/B1 rename to tests/vselect/edge/B1 diff --git a/tests/v3d/edge/B2 b/tests/vselect/edge/B2 similarity index 100% rename from tests/v3d/edge/B2 rename to tests/vselect/edge/B2 diff --git a/tests/v3d/edge/B3 b/tests/vselect/edge/B3 similarity index 100% rename from tests/v3d/edge/B3 rename to tests/vselect/edge/B3 diff --git a/tests/v3d/edge/B4 b/tests/vselect/edge/B4 similarity index 100% rename from tests/v3d/edge/B4 rename to tests/vselect/edge/B4 diff --git a/tests/v3d/edge/B5 b/tests/vselect/edge/B5 similarity index 100% rename from tests/v3d/edge/B5 rename to tests/vselect/edge/B5 diff --git a/tests/v3d/edge/B6 b/tests/vselect/edge/B6 similarity index 100% rename from tests/v3d/edge/B6 rename to tests/vselect/edge/B6 diff --git a/tests/v3d/edge/B7 b/tests/vselect/edge/B7 similarity index 100% rename from tests/v3d/edge/B7 rename to tests/vselect/edge/B7 diff --git a/tests/v3d/edge/B8 b/tests/vselect/edge/B8 similarity index 100% rename from tests/v3d/edge/B8 rename to tests/vselect/edge/B8 diff --git a/tests/v3d/edge/B9 b/tests/vselect/edge/B9 similarity index 100% rename from tests/v3d/edge/B9 rename to tests/vselect/edge/B9 diff --git a/tests/v3d/edge/C1 b/tests/vselect/edge/C1 similarity index 100% rename from tests/v3d/edge/C1 rename to tests/vselect/edge/C1 diff --git a/tests/v3d/edge/C2 b/tests/vselect/edge/C2 similarity index 100% rename from tests/v3d/edge/C2 rename to tests/vselect/edge/C2 diff --git a/tests/v3d/edge/C3 b/tests/vselect/edge/C3 similarity index 100% rename from tests/v3d/edge/C3 rename to tests/vselect/edge/C3 diff --git a/tests/v3d/edge/C4 b/tests/vselect/edge/C4 similarity index 100% rename from tests/v3d/edge/C4 rename to tests/vselect/edge/C4 diff --git a/tests/v3d/edge/C5 b/tests/vselect/edge/C5 similarity index 100% rename from tests/v3d/edge/C5 rename to tests/vselect/edge/C5 diff --git a/tests/v3d/edge/C6 b/tests/vselect/edge/C6 similarity index 100% rename from tests/v3d/edge/C6 rename to tests/vselect/edge/C6 diff --git a/tests/v3d/edge/C7 b/tests/vselect/edge/C7 similarity index 100% rename from tests/v3d/edge/C7 rename to tests/vselect/edge/C7 diff --git a/tests/v3d/edge/C8 b/tests/vselect/edge/C8 similarity index 100% rename from tests/v3d/edge/C8 rename to tests/vselect/edge/C8 diff --git a/tests/v3d/edge/C9 b/tests/vselect/edge/C9 similarity index 100% rename from tests/v3d/edge/C9 rename to tests/vselect/edge/C9 diff --git a/tests/v3d/edge/D1 b/tests/vselect/edge/D1 similarity index 100% rename from tests/v3d/edge/D1 rename to tests/vselect/edge/D1 diff --git a/tests/v3d/edge/D2 b/tests/vselect/edge/D2 similarity index 100% rename from tests/v3d/edge/D2 rename to tests/vselect/edge/D2 diff --git a/tests/v3d/edge/D3 b/tests/vselect/edge/D3 similarity index 100% rename from tests/v3d/edge/D3 rename to tests/vselect/edge/D3 diff --git a/tests/v3d/edge/D4 b/tests/vselect/edge/D4 similarity index 100% rename from tests/v3d/edge/D4 rename to tests/vselect/edge/D4 diff --git a/tests/v3d/edge/D5 b/tests/vselect/edge/D5 similarity index 100% rename from tests/v3d/edge/D5 rename to tests/vselect/edge/D5 diff --git a/tests/v3d/edge/D6 b/tests/vselect/edge/D6 similarity index 100% rename from tests/v3d/edge/D6 rename to tests/vselect/edge/D6 diff --git a/tests/v3d/edge/D7 b/tests/vselect/edge/D7 similarity index 100% rename from tests/v3d/edge/D7 rename to tests/vselect/edge/D7 diff --git a/tests/v3d/edge/D8 b/tests/vselect/edge/D8 similarity index 100% rename from tests/v3d/edge/D8 rename to tests/vselect/edge/D8 diff --git a/tests/v3d/edge/D9 b/tests/vselect/edge/D9 similarity index 100% rename from tests/v3d/edge/D9 rename to tests/vselect/edge/D9 diff --git a/tests/v3d/edge/E1 b/tests/vselect/edge/E1 similarity index 100% rename from tests/v3d/edge/E1 rename to tests/vselect/edge/E1 diff --git a/tests/v3d/edge/E2 b/tests/vselect/edge/E2 similarity index 100% rename from tests/v3d/edge/E2 rename to tests/vselect/edge/E2 diff --git a/tests/v3d/edge/E3 b/tests/vselect/edge/E3 similarity index 100% rename from tests/v3d/edge/E3 rename to tests/vselect/edge/E3 diff --git a/tests/v3d/edge/E4 b/tests/vselect/edge/E4 similarity index 100% rename from tests/v3d/edge/E4 rename to tests/vselect/edge/E4 diff --git a/tests/v3d/edge/E5 b/tests/vselect/edge/E5 similarity index 100% rename from tests/v3d/edge/E5 rename to tests/vselect/edge/E5 diff --git a/tests/v3d/edge/E6 b/tests/vselect/edge/E6 similarity index 100% rename from tests/v3d/edge/E6 rename to tests/vselect/edge/E6 diff --git a/tests/v3d/edge/E7 b/tests/vselect/edge/E7 similarity index 100% rename from tests/v3d/edge/E7 rename to tests/vselect/edge/E7 diff --git a/tests/v3d/edge/E8 b/tests/vselect/edge/E8 similarity index 100% rename from tests/v3d/edge/E8 rename to tests/vselect/edge/E8 diff --git a/tests/v3d/edge/E9 b/tests/vselect/edge/E9 similarity index 100% rename from tests/v3d/edge/E9 rename to tests/vselect/edge/E9 diff --git a/tests/v3d/edge/F1 b/tests/vselect/edge/F1 similarity index 100% rename from tests/v3d/edge/F1 rename to tests/vselect/edge/F1 diff --git a/tests/v3d/edge/F2 b/tests/vselect/edge/F2 similarity index 100% rename from tests/v3d/edge/F2 rename to tests/vselect/edge/F2 diff --git a/tests/vselect/edge/begin b/tests/vselect/edge/begin new file mode 100644 index 0000000000..93ea333926 --- /dev/null +++ b/tests/vselect/edge/begin @@ -0,0 +1 @@ +vinit View1 diff --git a/tests/vselect/edge/end b/tests/vselect/edge/end new file mode 100644 index 0000000000..3d3cd7e7c3 --- /dev/null +++ b/tests/vselect/edge/end @@ -0,0 +1 @@ +vdump $imagedir/${casename}.png diff --git a/tests/v3d/edge_face/A1 b/tests/vselect/edge_face/A1 similarity index 100% rename from tests/v3d/edge_face/A1 rename to tests/vselect/edge_face/A1 diff --git a/tests/v3d/edge_face/A2 b/tests/vselect/edge_face/A2 similarity index 100% rename from tests/v3d/edge_face/A2 rename to tests/vselect/edge_face/A2 diff --git a/tests/v3d/edge_face/A3 b/tests/vselect/edge_face/A3 similarity index 100% rename from tests/v3d/edge_face/A3 rename to tests/vselect/edge_face/A3 diff --git a/tests/v3d/edge_face/A4 b/tests/vselect/edge_face/A4 similarity index 100% rename from tests/v3d/edge_face/A4 rename to tests/vselect/edge_face/A4 diff --git a/tests/v3d/edge_face/A5 b/tests/vselect/edge_face/A5 similarity index 100% rename from tests/v3d/edge_face/A5 rename to tests/vselect/edge_face/A5 diff --git a/tests/v3d/edge_face/A6 b/tests/vselect/edge_face/A6 similarity index 100% rename from tests/v3d/edge_face/A6 rename to tests/vselect/edge_face/A6 diff --git a/tests/v3d/edge_face/A7 b/tests/vselect/edge_face/A7 similarity index 100% rename from tests/v3d/edge_face/A7 rename to tests/vselect/edge_face/A7 diff --git a/tests/v3d/edge_face/A8 b/tests/vselect/edge_face/A8 similarity index 100% rename from tests/v3d/edge_face/A8 rename to tests/vselect/edge_face/A8 diff --git a/tests/v3d/edge_face/A9 b/tests/vselect/edge_face/A9 similarity index 100% rename from tests/v3d/edge_face/A9 rename to tests/vselect/edge_face/A9 diff --git a/tests/v3d/edge_face/B1 b/tests/vselect/edge_face/B1 similarity index 100% rename from tests/v3d/edge_face/B1 rename to tests/vselect/edge_face/B1 diff --git a/tests/v3d/edge_face/B2 b/tests/vselect/edge_face/B2 similarity index 100% rename from tests/v3d/edge_face/B2 rename to tests/vselect/edge_face/B2 diff --git a/tests/v3d/edge_face/B3 b/tests/vselect/edge_face/B3 similarity index 100% rename from tests/v3d/edge_face/B3 rename to tests/vselect/edge_face/B3 diff --git a/tests/v3d/edge_face/B4 b/tests/vselect/edge_face/B4 similarity index 100% rename from tests/v3d/edge_face/B4 rename to tests/vselect/edge_face/B4 diff --git a/tests/v3d/edge_face/B5 b/tests/vselect/edge_face/B5 similarity index 100% rename from tests/v3d/edge_face/B5 rename to tests/vselect/edge_face/B5 diff --git a/tests/v3d/edge_face/B6 b/tests/vselect/edge_face/B6 similarity index 100% rename from tests/v3d/edge_face/B6 rename to tests/vselect/edge_face/B6 diff --git a/tests/v3d/edge_face/B7 b/tests/vselect/edge_face/B7 similarity index 100% rename from tests/v3d/edge_face/B7 rename to tests/vselect/edge_face/B7 diff --git a/tests/v3d/edge_face/B8 b/tests/vselect/edge_face/B8 similarity index 100% rename from tests/v3d/edge_face/B8 rename to tests/vselect/edge_face/B8 diff --git a/tests/v3d/edge_face/B9 b/tests/vselect/edge_face/B9 similarity index 100% rename from tests/v3d/edge_face/B9 rename to tests/vselect/edge_face/B9 diff --git a/tests/v3d/edge_face/C1 b/tests/vselect/edge_face/C1 similarity index 100% rename from tests/v3d/edge_face/C1 rename to tests/vselect/edge_face/C1 diff --git a/tests/v3d/edge_face/C2 b/tests/vselect/edge_face/C2 similarity index 100% rename from tests/v3d/edge_face/C2 rename to tests/vselect/edge_face/C2 diff --git a/tests/v3d/edge_face/C3 b/tests/vselect/edge_face/C3 similarity index 100% rename from tests/v3d/edge_face/C3 rename to tests/vselect/edge_face/C3 diff --git a/tests/v3d/edge_face/C4 b/tests/vselect/edge_face/C4 similarity index 100% rename from tests/v3d/edge_face/C4 rename to tests/vselect/edge_face/C4 diff --git a/tests/v3d/edge_face/C5 b/tests/vselect/edge_face/C5 similarity index 100% rename from tests/v3d/edge_face/C5 rename to tests/vselect/edge_face/C5 diff --git a/tests/v3d/edge_face/C6 b/tests/vselect/edge_face/C6 similarity index 100% rename from tests/v3d/edge_face/C6 rename to tests/vselect/edge_face/C6 diff --git a/tests/v3d/edge_face/C7 b/tests/vselect/edge_face/C7 similarity index 100% rename from tests/v3d/edge_face/C7 rename to tests/vselect/edge_face/C7 diff --git a/tests/v3d/edge_face/C8 b/tests/vselect/edge_face/C8 similarity index 100% rename from tests/v3d/edge_face/C8 rename to tests/vselect/edge_face/C8 diff --git a/tests/v3d/edge_face/C9 b/tests/vselect/edge_face/C9 similarity index 100% rename from tests/v3d/edge_face/C9 rename to tests/vselect/edge_face/C9 diff --git a/tests/v3d/edge_face/D1 b/tests/vselect/edge_face/D1 similarity index 100% rename from tests/v3d/edge_face/D1 rename to tests/vselect/edge_face/D1 diff --git a/tests/v3d/edge_face/D2 b/tests/vselect/edge_face/D2 similarity index 100% rename from tests/v3d/edge_face/D2 rename to tests/vselect/edge_face/D2 diff --git a/tests/v3d/edge_face/D3 b/tests/vselect/edge_face/D3 similarity index 100% rename from tests/v3d/edge_face/D3 rename to tests/vselect/edge_face/D3 diff --git a/tests/v3d/edge_face/D4 b/tests/vselect/edge_face/D4 similarity index 100% rename from tests/v3d/edge_face/D4 rename to tests/vselect/edge_face/D4 diff --git a/tests/v3d/edge_face/D5 b/tests/vselect/edge_face/D5 similarity index 100% rename from tests/v3d/edge_face/D5 rename to tests/vselect/edge_face/D5 diff --git a/tests/v3d/edge_face/D6 b/tests/vselect/edge_face/D6 similarity index 100% rename from tests/v3d/edge_face/D6 rename to tests/vselect/edge_face/D6 diff --git a/tests/v3d/edge_face/D7 b/tests/vselect/edge_face/D7 similarity index 100% rename from tests/v3d/edge_face/D7 rename to tests/vselect/edge_face/D7 diff --git a/tests/v3d/edge_face/D8 b/tests/vselect/edge_face/D8 similarity index 100% rename from tests/v3d/edge_face/D8 rename to tests/vselect/edge_face/D8 diff --git a/tests/v3d/edge_face/D9 b/tests/vselect/edge_face/D9 similarity index 100% rename from tests/v3d/edge_face/D9 rename to tests/vselect/edge_face/D9 diff --git a/tests/v3d/edge_face/E1 b/tests/vselect/edge_face/E1 similarity index 100% rename from tests/v3d/edge_face/E1 rename to tests/vselect/edge_face/E1 diff --git a/tests/v3d/edge_face/E2 b/tests/vselect/edge_face/E2 similarity index 100% rename from tests/v3d/edge_face/E2 rename to tests/vselect/edge_face/E2 diff --git a/tests/v3d/edge_face/E3 b/tests/vselect/edge_face/E3 similarity index 100% rename from tests/v3d/edge_face/E3 rename to tests/vselect/edge_face/E3 diff --git a/tests/v3d/edge_face/E4 b/tests/vselect/edge_face/E4 similarity index 100% rename from tests/v3d/edge_face/E4 rename to tests/vselect/edge_face/E4 diff --git a/tests/v3d/edge_face/E5 b/tests/vselect/edge_face/E5 similarity index 100% rename from tests/v3d/edge_face/E5 rename to tests/vselect/edge_face/E5 diff --git a/tests/v3d/edge_face/E6 b/tests/vselect/edge_face/E6 similarity index 100% rename from tests/v3d/edge_face/E6 rename to tests/vselect/edge_face/E6 diff --git a/tests/v3d/edge_face/E7 b/tests/vselect/edge_face/E7 similarity index 100% rename from tests/v3d/edge_face/E7 rename to tests/vselect/edge_face/E7 diff --git a/tests/v3d/edge_face/E8 b/tests/vselect/edge_face/E8 similarity index 100% rename from tests/v3d/edge_face/E8 rename to tests/vselect/edge_face/E8 diff --git a/tests/v3d/edge_face/E9 b/tests/vselect/edge_face/E9 similarity index 100% rename from tests/v3d/edge_face/E9 rename to tests/vselect/edge_face/E9 diff --git a/tests/v3d/edge_face/F1 b/tests/vselect/edge_face/F1 similarity index 100% rename from tests/v3d/edge_face/F1 rename to tests/vselect/edge_face/F1 diff --git a/tests/v3d/edge_face/F2 b/tests/vselect/edge_face/F2 similarity index 100% rename from tests/v3d/edge_face/F2 rename to tests/vselect/edge_face/F2 diff --git a/tests/v3d/edge_face/F3 b/tests/vselect/edge_face/F3 similarity index 100% rename from tests/v3d/edge_face/F3 rename to tests/vselect/edge_face/F3 diff --git a/tests/v3d/edge_face/F4 b/tests/vselect/edge_face/F4 similarity index 100% rename from tests/v3d/edge_face/F4 rename to tests/vselect/edge_face/F4 diff --git a/tests/v3d/edge_face/F5 b/tests/vselect/edge_face/F5 similarity index 100% rename from tests/v3d/edge_face/F5 rename to tests/vselect/edge_face/F5 diff --git a/tests/v3d/edge_face/F6 b/tests/vselect/edge_face/F6 similarity index 100% rename from tests/v3d/edge_face/F6 rename to tests/vselect/edge_face/F6 diff --git a/tests/v3d/edge_face/F7 b/tests/vselect/edge_face/F7 similarity index 100% rename from tests/v3d/edge_face/F7 rename to tests/vselect/edge_face/F7 diff --git a/tests/v3d/edge_face/F8 b/tests/vselect/edge_face/F8 similarity index 100% rename from tests/v3d/edge_face/F8 rename to tests/vselect/edge_face/F8 diff --git a/tests/v3d/edge_face/F9 b/tests/vselect/edge_face/F9 similarity index 100% rename from tests/v3d/edge_face/F9 rename to tests/vselect/edge_face/F9 diff --git a/tests/v3d/edge_face/G1 b/tests/vselect/edge_face/G1 similarity index 100% rename from tests/v3d/edge_face/G1 rename to tests/vselect/edge_face/G1 diff --git a/tests/v3d/edge_face/G2 b/tests/vselect/edge_face/G2 similarity index 100% rename from tests/v3d/edge_face/G2 rename to tests/vselect/edge_face/G2 diff --git a/tests/v3d/edge_face/G3 b/tests/vselect/edge_face/G3 similarity index 100% rename from tests/v3d/edge_face/G3 rename to tests/vselect/edge_face/G3 diff --git a/tests/v3d/edge_face/G4 b/tests/vselect/edge_face/G4 similarity index 100% rename from tests/v3d/edge_face/G4 rename to tests/vselect/edge_face/G4 diff --git a/tests/v3d/edge_face/G5 b/tests/vselect/edge_face/G5 similarity index 100% rename from tests/v3d/edge_face/G5 rename to tests/vselect/edge_face/G5 diff --git a/tests/v3d/edge_face/G6 b/tests/vselect/edge_face/G6 similarity index 100% rename from tests/v3d/edge_face/G6 rename to tests/vselect/edge_face/G6 diff --git a/tests/v3d/edge_face/G7 b/tests/vselect/edge_face/G7 similarity index 100% rename from tests/v3d/edge_face/G7 rename to tests/vselect/edge_face/G7 diff --git a/tests/v3d/edge_face/G8 b/tests/vselect/edge_face/G8 similarity index 100% rename from tests/v3d/edge_face/G8 rename to tests/vselect/edge_face/G8 diff --git a/tests/v3d/edge_face/G9 b/tests/vselect/edge_face/G9 similarity index 100% rename from tests/v3d/edge_face/G9 rename to tests/vselect/edge_face/G9 diff --git a/tests/v3d/edge_face/H1 b/tests/vselect/edge_face/H1 similarity index 100% rename from tests/v3d/edge_face/H1 rename to tests/vselect/edge_face/H1 diff --git a/tests/v3d/edge_face/H2 b/tests/vselect/edge_face/H2 similarity index 100% rename from tests/v3d/edge_face/H2 rename to tests/vselect/edge_face/H2 diff --git a/tests/v3d/edge_face/H3 b/tests/vselect/edge_face/H3 similarity index 100% rename from tests/v3d/edge_face/H3 rename to tests/vselect/edge_face/H3 diff --git a/tests/v3d/edge_face/H4 b/tests/vselect/edge_face/H4 similarity index 100% rename from tests/v3d/edge_face/H4 rename to tests/vselect/edge_face/H4 diff --git a/tests/v3d/edge_face/H5 b/tests/vselect/edge_face/H5 similarity index 100% rename from tests/v3d/edge_face/H5 rename to tests/vselect/edge_face/H5 diff --git a/tests/v3d/edge_face/H6 b/tests/vselect/edge_face/H6 similarity index 100% rename from tests/v3d/edge_face/H6 rename to tests/vselect/edge_face/H6 diff --git a/tests/v3d/edge_face/H7 b/tests/vselect/edge_face/H7 similarity index 100% rename from tests/v3d/edge_face/H7 rename to tests/vselect/edge_face/H7 diff --git a/tests/v3d/edge_face/H8 b/tests/vselect/edge_face/H8 similarity index 100% rename from tests/v3d/edge_face/H8 rename to tests/vselect/edge_face/H8 diff --git a/tests/v3d/edge_face/H9 b/tests/vselect/edge_face/H9 similarity index 100% rename from tests/v3d/edge_face/H9 rename to tests/vselect/edge_face/H9 diff --git a/tests/v3d/edge_face/I1 b/tests/vselect/edge_face/I1 similarity index 100% rename from tests/v3d/edge_face/I1 rename to tests/vselect/edge_face/I1 diff --git a/tests/v3d/edge_face/I2 b/tests/vselect/edge_face/I2 similarity index 100% rename from tests/v3d/edge_face/I2 rename to tests/vselect/edge_face/I2 diff --git a/tests/v3d/edge_face/I3 b/tests/vselect/edge_face/I3 similarity index 100% rename from tests/v3d/edge_face/I3 rename to tests/vselect/edge_face/I3 diff --git a/tests/v3d/edge_face/I4 b/tests/vselect/edge_face/I4 similarity index 100% rename from tests/v3d/edge_face/I4 rename to tests/vselect/edge_face/I4 diff --git a/tests/v3d/edge_face/I5 b/tests/vselect/edge_face/I5 similarity index 100% rename from tests/v3d/edge_face/I5 rename to tests/vselect/edge_face/I5 diff --git a/tests/v3d/edge_face/I6 b/tests/vselect/edge_face/I6 similarity index 100% rename from tests/v3d/edge_face/I6 rename to tests/vselect/edge_face/I6 diff --git a/tests/v3d/edge_face/I7 b/tests/vselect/edge_face/I7 similarity index 100% rename from tests/v3d/edge_face/I7 rename to tests/vselect/edge_face/I7 diff --git a/tests/v3d/edge_face/I8 b/tests/vselect/edge_face/I8 similarity index 100% rename from tests/v3d/edge_face/I8 rename to tests/vselect/edge_face/I8 diff --git a/tests/v3d/edge_face/I9 b/tests/vselect/edge_face/I9 similarity index 100% rename from tests/v3d/edge_face/I9 rename to tests/vselect/edge_face/I9 diff --git a/tests/v3d/edge_face/J1 b/tests/vselect/edge_face/J1 similarity index 100% rename from tests/v3d/edge_face/J1 rename to tests/vselect/edge_face/J1 diff --git a/tests/v3d/edge_face/J2 b/tests/vselect/edge_face/J2 similarity index 100% rename from tests/v3d/edge_face/J2 rename to tests/vselect/edge_face/J2 diff --git a/tests/v3d/edge_face/J3 b/tests/vselect/edge_face/J3 similarity index 100% rename from tests/v3d/edge_face/J3 rename to tests/vselect/edge_face/J3 diff --git a/tests/v3d/edge_face/J4 b/tests/vselect/edge_face/J4 similarity index 100% rename from tests/v3d/edge_face/J4 rename to tests/vselect/edge_face/J4 diff --git a/tests/v3d/edge_face/J5 b/tests/vselect/edge_face/J5 similarity index 100% rename from tests/v3d/edge_face/J5 rename to tests/vselect/edge_face/J5 diff --git a/tests/v3d/edge_face/J6 b/tests/vselect/edge_face/J6 similarity index 100% rename from tests/v3d/edge_face/J6 rename to tests/vselect/edge_face/J6 diff --git a/tests/v3d/edge_face/J7 b/tests/vselect/edge_face/J7 similarity index 100% rename from tests/v3d/edge_face/J7 rename to tests/vselect/edge_face/J7 diff --git a/tests/v3d/edge_face/J8 b/tests/vselect/edge_face/J8 similarity index 100% rename from tests/v3d/edge_face/J8 rename to tests/vselect/edge_face/J8 diff --git a/tests/v3d/edge_face/J9 b/tests/vselect/edge_face/J9 similarity index 100% rename from tests/v3d/edge_face/J9 rename to tests/vselect/edge_face/J9 diff --git a/tests/v3d/edge_face/K1 b/tests/vselect/edge_face/K1 similarity index 100% rename from tests/v3d/edge_face/K1 rename to tests/vselect/edge_face/K1 diff --git a/tests/v3d/edge_face/K2 b/tests/vselect/edge_face/K2 similarity index 100% rename from tests/v3d/edge_face/K2 rename to tests/vselect/edge_face/K2 diff --git a/tests/v3d/edge_face/K3 b/tests/vselect/edge_face/K3 similarity index 100% rename from tests/v3d/edge_face/K3 rename to tests/vselect/edge_face/K3 diff --git a/tests/v3d/edge_face/K4 b/tests/vselect/edge_face/K4 similarity index 100% rename from tests/v3d/edge_face/K4 rename to tests/vselect/edge_face/K4 diff --git a/tests/v3d/edge_face/K5 b/tests/vselect/edge_face/K5 similarity index 100% rename from tests/v3d/edge_face/K5 rename to tests/vselect/edge_face/K5 diff --git a/tests/v3d/edge_face/K6 b/tests/vselect/edge_face/K6 similarity index 100% rename from tests/v3d/edge_face/K6 rename to tests/vselect/edge_face/K6 diff --git a/tests/v3d/edge_face/K7 b/tests/vselect/edge_face/K7 similarity index 100% rename from tests/v3d/edge_face/K7 rename to tests/vselect/edge_face/K7 diff --git a/tests/v3d/edge_face/K8 b/tests/vselect/edge_face/K8 similarity index 100% rename from tests/v3d/edge_face/K8 rename to tests/vselect/edge_face/K8 diff --git a/tests/v3d/edge_face/K9 b/tests/vselect/edge_face/K9 similarity index 100% rename from tests/v3d/edge_face/K9 rename to tests/vselect/edge_face/K9 diff --git a/tests/v3d/edge_face/L1 b/tests/vselect/edge_face/L1 similarity index 100% rename from tests/v3d/edge_face/L1 rename to tests/vselect/edge_face/L1 diff --git a/tests/v3d/edge_face/L2 b/tests/vselect/edge_face/L2 similarity index 100% rename from tests/v3d/edge_face/L2 rename to tests/vselect/edge_face/L2 diff --git a/tests/v3d/edge_face/L3 b/tests/vselect/edge_face/L3 similarity index 100% rename from tests/v3d/edge_face/L3 rename to tests/vselect/edge_face/L3 diff --git a/tests/v3d/edge_face/L4 b/tests/vselect/edge_face/L4 similarity index 100% rename from tests/v3d/edge_face/L4 rename to tests/vselect/edge_face/L4 diff --git a/tests/v3d/edge_face/L5 b/tests/vselect/edge_face/L5 similarity index 100% rename from tests/v3d/edge_face/L5 rename to tests/vselect/edge_face/L5 diff --git a/tests/v3d/edge_face/L6 b/tests/vselect/edge_face/L6 similarity index 100% rename from tests/v3d/edge_face/L6 rename to tests/vselect/edge_face/L6 diff --git a/tests/v3d/edge_face/L7 b/tests/vselect/edge_face/L7 similarity index 100% rename from tests/v3d/edge_face/L7 rename to tests/vselect/edge_face/L7 diff --git a/tests/v3d/edge_face/L8 b/tests/vselect/edge_face/L8 similarity index 100% rename from tests/v3d/edge_face/L8 rename to tests/vselect/edge_face/L8 diff --git a/tests/v3d/edge_face/L9 b/tests/vselect/edge_face/L9 similarity index 100% rename from tests/v3d/edge_face/L9 rename to tests/vselect/edge_face/L9 diff --git a/tests/v3d/edge_face/M1 b/tests/vselect/edge_face/M1 similarity index 100% rename from tests/v3d/edge_face/M1 rename to tests/vselect/edge_face/M1 diff --git a/tests/v3d/edge_face/M2 b/tests/vselect/edge_face/M2 similarity index 100% rename from tests/v3d/edge_face/M2 rename to tests/vselect/edge_face/M2 diff --git a/tests/v3d/edge_face/M3 b/tests/vselect/edge_face/M3 similarity index 100% rename from tests/v3d/edge_face/M3 rename to tests/vselect/edge_face/M3 diff --git a/tests/v3d/edge_face/M4 b/tests/vselect/edge_face/M4 similarity index 100% rename from tests/v3d/edge_face/M4 rename to tests/vselect/edge_face/M4 diff --git a/tests/v3d/edge_face/M5 b/tests/vselect/edge_face/M5 similarity index 100% rename from tests/v3d/edge_face/M5 rename to tests/vselect/edge_face/M5 diff --git a/tests/v3d/edge_face/M6 b/tests/vselect/edge_face/M6 similarity index 100% rename from tests/v3d/edge_face/M6 rename to tests/vselect/edge_face/M6 diff --git a/tests/v3d/edge_face/M7 b/tests/vselect/edge_face/M7 similarity index 100% rename from tests/v3d/edge_face/M7 rename to tests/vselect/edge_face/M7 diff --git a/tests/v3d/edge_face/M8 b/tests/vselect/edge_face/M8 similarity index 100% rename from tests/v3d/edge_face/M8 rename to tests/vselect/edge_face/M8 diff --git a/tests/v3d/edge_face/M9 b/tests/vselect/edge_face/M9 similarity index 100% rename from tests/v3d/edge_face/M9 rename to tests/vselect/edge_face/M9 diff --git a/tests/v3d/edge_face/N1 b/tests/vselect/edge_face/N1 similarity index 100% rename from tests/v3d/edge_face/N1 rename to tests/vselect/edge_face/N1 diff --git a/tests/v3d/edge_face/N2 b/tests/vselect/edge_face/N2 similarity index 100% rename from tests/v3d/edge_face/N2 rename to tests/vselect/edge_face/N2 diff --git a/tests/v3d/edge_face/N3 b/tests/vselect/edge_face/N3 similarity index 100% rename from tests/v3d/edge_face/N3 rename to tests/vselect/edge_face/N3 diff --git a/tests/v3d/edge_face/N4 b/tests/vselect/edge_face/N4 similarity index 100% rename from tests/v3d/edge_face/N4 rename to tests/vselect/edge_face/N4 diff --git a/tests/v3d/edge_face/N5 b/tests/vselect/edge_face/N5 similarity index 100% rename from tests/v3d/edge_face/N5 rename to tests/vselect/edge_face/N5 diff --git a/tests/v3d/edge_face/N6 b/tests/vselect/edge_face/N6 similarity index 100% rename from tests/v3d/edge_face/N6 rename to tests/vselect/edge_face/N6 diff --git a/tests/v3d/edge_face/N7 b/tests/vselect/edge_face/N7 similarity index 100% rename from tests/v3d/edge_face/N7 rename to tests/vselect/edge_face/N7 diff --git a/tests/v3d/edge_face/N8 b/tests/vselect/edge_face/N8 similarity index 100% rename from tests/v3d/edge_face/N8 rename to tests/vselect/edge_face/N8 diff --git a/tests/v3d/edge_face/N9 b/tests/vselect/edge_face/N9 similarity index 100% rename from tests/v3d/edge_face/N9 rename to tests/vselect/edge_face/N9 diff --git a/tests/v3d/edge_face/O1 b/tests/vselect/edge_face/O1 similarity index 100% rename from tests/v3d/edge_face/O1 rename to tests/vselect/edge_face/O1 diff --git a/tests/v3d/edge_face/O2 b/tests/vselect/edge_face/O2 similarity index 100% rename from tests/v3d/edge_face/O2 rename to tests/vselect/edge_face/O2 diff --git a/tests/v3d/edge_face/O3 b/tests/vselect/edge_face/O3 similarity index 100% rename from tests/v3d/edge_face/O3 rename to tests/vselect/edge_face/O3 diff --git a/tests/v3d/edge_face/O4 b/tests/vselect/edge_face/O4 similarity index 100% rename from tests/v3d/edge_face/O4 rename to tests/vselect/edge_face/O4 diff --git a/tests/v3d/edge_face/O5 b/tests/vselect/edge_face/O5 similarity index 100% rename from tests/v3d/edge_face/O5 rename to tests/vselect/edge_face/O5 diff --git a/tests/v3d/edge_face/O6 b/tests/vselect/edge_face/O6 similarity index 100% rename from tests/v3d/edge_face/O6 rename to tests/vselect/edge_face/O6 diff --git a/tests/v3d/edge_face/O7 b/tests/vselect/edge_face/O7 similarity index 100% rename from tests/v3d/edge_face/O7 rename to tests/vselect/edge_face/O7 diff --git a/tests/v3d/edge_face/O8 b/tests/vselect/edge_face/O8 similarity index 100% rename from tests/v3d/edge_face/O8 rename to tests/vselect/edge_face/O8 diff --git a/tests/v3d/edge_face/O9 b/tests/vselect/edge_face/O9 similarity index 100% rename from tests/v3d/edge_face/O9 rename to tests/vselect/edge_face/O9 diff --git a/tests/v3d/edge_face/P1 b/tests/vselect/edge_face/P1 similarity index 100% rename from tests/v3d/edge_face/P1 rename to tests/vselect/edge_face/P1 diff --git a/tests/v3d/edge_face/P2 b/tests/vselect/edge_face/P2 similarity index 100% rename from tests/v3d/edge_face/P2 rename to tests/vselect/edge_face/P2 diff --git a/tests/v3d/edge_face/P3 b/tests/vselect/edge_face/P3 similarity index 100% rename from tests/v3d/edge_face/P3 rename to tests/vselect/edge_face/P3 diff --git a/tests/v3d/edge_face/P4 b/tests/vselect/edge_face/P4 similarity index 100% rename from tests/v3d/edge_face/P4 rename to tests/vselect/edge_face/P4 diff --git a/tests/v3d/edge_face/P5 b/tests/vselect/edge_face/P5 similarity index 100% rename from tests/v3d/edge_face/P5 rename to tests/vselect/edge_face/P5 diff --git a/tests/v3d/edge_face/P6 b/tests/vselect/edge_face/P6 similarity index 100% rename from tests/v3d/edge_face/P6 rename to tests/vselect/edge_face/P6 diff --git a/tests/vselect/edge_face/begin b/tests/vselect/edge_face/begin new file mode 100644 index 0000000000..93ea333926 --- /dev/null +++ b/tests/vselect/edge_face/begin @@ -0,0 +1 @@ +vinit View1 diff --git a/tests/vselect/edge_face/end b/tests/vselect/edge_face/end new file mode 100644 index 0000000000..3d3cd7e7c3 --- /dev/null +++ b/tests/vselect/edge_face/end @@ -0,0 +1 @@ +vdump $imagedir/${casename}.png diff --git a/tests/v3d/edge_solid/A1 b/tests/vselect/edge_solid/A1 similarity index 100% rename from tests/v3d/edge_solid/A1 rename to tests/vselect/edge_solid/A1 diff --git a/tests/v3d/edge_solid/A2 b/tests/vselect/edge_solid/A2 similarity index 100% rename from tests/v3d/edge_solid/A2 rename to tests/vselect/edge_solid/A2 diff --git a/tests/v3d/edge_solid/A3 b/tests/vselect/edge_solid/A3 similarity index 100% rename from tests/v3d/edge_solid/A3 rename to tests/vselect/edge_solid/A3 diff --git a/tests/v3d/edge_solid/A4 b/tests/vselect/edge_solid/A4 similarity index 100% rename from tests/v3d/edge_solid/A4 rename to tests/vselect/edge_solid/A4 diff --git a/tests/v3d/edge_solid/A5 b/tests/vselect/edge_solid/A5 similarity index 100% rename from tests/v3d/edge_solid/A5 rename to tests/vselect/edge_solid/A5 diff --git a/tests/v3d/edge_solid/A6 b/tests/vselect/edge_solid/A6 similarity index 100% rename from tests/v3d/edge_solid/A6 rename to tests/vselect/edge_solid/A6 diff --git a/tests/v3d/edge_solid/A7 b/tests/vselect/edge_solid/A7 similarity index 100% rename from tests/v3d/edge_solid/A7 rename to tests/vselect/edge_solid/A7 diff --git a/tests/v3d/edge_solid/A8 b/tests/vselect/edge_solid/A8 similarity index 100% rename from tests/v3d/edge_solid/A8 rename to tests/vselect/edge_solid/A8 diff --git a/tests/v3d/edge_solid/A9 b/tests/vselect/edge_solid/A9 similarity index 100% rename from tests/v3d/edge_solid/A9 rename to tests/vselect/edge_solid/A9 diff --git a/tests/v3d/edge_solid/B1 b/tests/vselect/edge_solid/B1 similarity index 100% rename from tests/v3d/edge_solid/B1 rename to tests/vselect/edge_solid/B1 diff --git a/tests/v3d/edge_solid/B2 b/tests/vselect/edge_solid/B2 similarity index 100% rename from tests/v3d/edge_solid/B2 rename to tests/vselect/edge_solid/B2 diff --git a/tests/v3d/edge_solid/B3 b/tests/vselect/edge_solid/B3 similarity index 100% rename from tests/v3d/edge_solid/B3 rename to tests/vselect/edge_solid/B3 diff --git a/tests/v3d/edge_solid/B4 b/tests/vselect/edge_solid/B4 similarity index 100% rename from tests/v3d/edge_solid/B4 rename to tests/vselect/edge_solid/B4 diff --git a/tests/v3d/edge_solid/B5 b/tests/vselect/edge_solid/B5 similarity index 100% rename from tests/v3d/edge_solid/B5 rename to tests/vselect/edge_solid/B5 diff --git a/tests/v3d/edge_solid/B6 b/tests/vselect/edge_solid/B6 similarity index 100% rename from tests/v3d/edge_solid/B6 rename to tests/vselect/edge_solid/B6 diff --git a/tests/v3d/edge_solid/B7 b/tests/vselect/edge_solid/B7 similarity index 100% rename from tests/v3d/edge_solid/B7 rename to tests/vselect/edge_solid/B7 diff --git a/tests/v3d/edge_solid/B8 b/tests/vselect/edge_solid/B8 similarity index 100% rename from tests/v3d/edge_solid/B8 rename to tests/vselect/edge_solid/B8 diff --git a/tests/v3d/edge_solid/B9 b/tests/vselect/edge_solid/B9 similarity index 100% rename from tests/v3d/edge_solid/B9 rename to tests/vselect/edge_solid/B9 diff --git a/tests/v3d/edge_solid/C1 b/tests/vselect/edge_solid/C1 similarity index 100% rename from tests/v3d/edge_solid/C1 rename to tests/vselect/edge_solid/C1 diff --git a/tests/v3d/edge_solid/C2 b/tests/vselect/edge_solid/C2 similarity index 100% rename from tests/v3d/edge_solid/C2 rename to tests/vselect/edge_solid/C2 diff --git a/tests/v3d/edge_solid/C3 b/tests/vselect/edge_solid/C3 similarity index 100% rename from tests/v3d/edge_solid/C3 rename to tests/vselect/edge_solid/C3 diff --git a/tests/v3d/edge_solid/C4 b/tests/vselect/edge_solid/C4 similarity index 100% rename from tests/v3d/edge_solid/C4 rename to tests/vselect/edge_solid/C4 diff --git a/tests/v3d/edge_solid/C5 b/tests/vselect/edge_solid/C5 similarity index 100% rename from tests/v3d/edge_solid/C5 rename to tests/vselect/edge_solid/C5 diff --git a/tests/v3d/edge_solid/C6 b/tests/vselect/edge_solid/C6 similarity index 100% rename from tests/v3d/edge_solid/C6 rename to tests/vselect/edge_solid/C6 diff --git a/tests/v3d/edge_solid/C7 b/tests/vselect/edge_solid/C7 similarity index 100% rename from tests/v3d/edge_solid/C7 rename to tests/vselect/edge_solid/C7 diff --git a/tests/v3d/edge_solid/C8 b/tests/vselect/edge_solid/C8 similarity index 100% rename from tests/v3d/edge_solid/C8 rename to tests/vselect/edge_solid/C8 diff --git a/tests/v3d/edge_solid/C9 b/tests/vselect/edge_solid/C9 similarity index 100% rename from tests/v3d/edge_solid/C9 rename to tests/vselect/edge_solid/C9 diff --git a/tests/v3d/edge_solid/D1 b/tests/vselect/edge_solid/D1 similarity index 100% rename from tests/v3d/edge_solid/D1 rename to tests/vselect/edge_solid/D1 diff --git a/tests/v3d/edge_solid/D2 b/tests/vselect/edge_solid/D2 similarity index 100% rename from tests/v3d/edge_solid/D2 rename to tests/vselect/edge_solid/D2 diff --git a/tests/v3d/edge_solid/D3 b/tests/vselect/edge_solid/D3 similarity index 100% rename from tests/v3d/edge_solid/D3 rename to tests/vselect/edge_solid/D3 diff --git a/tests/v3d/edge_solid/D4 b/tests/vselect/edge_solid/D4 similarity index 100% rename from tests/v3d/edge_solid/D4 rename to tests/vselect/edge_solid/D4 diff --git a/tests/v3d/edge_solid/D5 b/tests/vselect/edge_solid/D5 similarity index 100% rename from tests/v3d/edge_solid/D5 rename to tests/vselect/edge_solid/D5 diff --git a/tests/v3d/edge_solid/D6 b/tests/vselect/edge_solid/D6 similarity index 100% rename from tests/v3d/edge_solid/D6 rename to tests/vselect/edge_solid/D6 diff --git a/tests/v3d/edge_solid/D7 b/tests/vselect/edge_solid/D7 similarity index 100% rename from tests/v3d/edge_solid/D7 rename to tests/vselect/edge_solid/D7 diff --git a/tests/v3d/edge_solid/D8 b/tests/vselect/edge_solid/D8 similarity index 100% rename from tests/v3d/edge_solid/D8 rename to tests/vselect/edge_solid/D8 diff --git a/tests/v3d/edge_solid/D9 b/tests/vselect/edge_solid/D9 similarity index 100% rename from tests/v3d/edge_solid/D9 rename to tests/vselect/edge_solid/D9 diff --git a/tests/v3d/edge_solid/E1 b/tests/vselect/edge_solid/E1 similarity index 100% rename from tests/v3d/edge_solid/E1 rename to tests/vselect/edge_solid/E1 diff --git a/tests/v3d/edge_solid/E2 b/tests/vselect/edge_solid/E2 similarity index 100% rename from tests/v3d/edge_solid/E2 rename to tests/vselect/edge_solid/E2 diff --git a/tests/v3d/edge_solid/E3 b/tests/vselect/edge_solid/E3 similarity index 100% rename from tests/v3d/edge_solid/E3 rename to tests/vselect/edge_solid/E3 diff --git a/tests/v3d/edge_solid/E4 b/tests/vselect/edge_solid/E4 similarity index 100% rename from tests/v3d/edge_solid/E4 rename to tests/vselect/edge_solid/E4 diff --git a/tests/v3d/edge_solid/E5 b/tests/vselect/edge_solid/E5 similarity index 100% rename from tests/v3d/edge_solid/E5 rename to tests/vselect/edge_solid/E5 diff --git a/tests/v3d/edge_solid/E6 b/tests/vselect/edge_solid/E6 similarity index 100% rename from tests/v3d/edge_solid/E6 rename to tests/vselect/edge_solid/E6 diff --git a/tests/v3d/edge_solid/E7 b/tests/vselect/edge_solid/E7 similarity index 100% rename from tests/v3d/edge_solid/E7 rename to tests/vselect/edge_solid/E7 diff --git a/tests/v3d/edge_solid/E8 b/tests/vselect/edge_solid/E8 similarity index 100% rename from tests/v3d/edge_solid/E8 rename to tests/vselect/edge_solid/E8 diff --git a/tests/v3d/edge_solid/E9 b/tests/vselect/edge_solid/E9 similarity index 100% rename from tests/v3d/edge_solid/E9 rename to tests/vselect/edge_solid/E9 diff --git a/tests/v3d/edge_solid/F1 b/tests/vselect/edge_solid/F1 similarity index 100% rename from tests/v3d/edge_solid/F1 rename to tests/vselect/edge_solid/F1 diff --git a/tests/v3d/edge_solid/F2 b/tests/vselect/edge_solid/F2 similarity index 100% rename from tests/v3d/edge_solid/F2 rename to tests/vselect/edge_solid/F2 diff --git a/tests/v3d/edge_solid/F3 b/tests/vselect/edge_solid/F3 similarity index 100% rename from tests/v3d/edge_solid/F3 rename to tests/vselect/edge_solid/F3 diff --git a/tests/v3d/edge_solid/F4 b/tests/vselect/edge_solid/F4 similarity index 100% rename from tests/v3d/edge_solid/F4 rename to tests/vselect/edge_solid/F4 diff --git a/tests/v3d/edge_solid/F5 b/tests/vselect/edge_solid/F5 similarity index 100% rename from tests/v3d/edge_solid/F5 rename to tests/vselect/edge_solid/F5 diff --git a/tests/v3d/edge_solid/F6 b/tests/vselect/edge_solid/F6 similarity index 100% rename from tests/v3d/edge_solid/F6 rename to tests/vselect/edge_solid/F6 diff --git a/tests/v3d/edge_solid/F7 b/tests/vselect/edge_solid/F7 similarity index 100% rename from tests/v3d/edge_solid/F7 rename to tests/vselect/edge_solid/F7 diff --git a/tests/v3d/edge_solid/F8 b/tests/vselect/edge_solid/F8 similarity index 100% rename from tests/v3d/edge_solid/F8 rename to tests/vselect/edge_solid/F8 diff --git a/tests/v3d/edge_solid/F9 b/tests/vselect/edge_solid/F9 similarity index 100% rename from tests/v3d/edge_solid/F9 rename to tests/vselect/edge_solid/F9 diff --git a/tests/v3d/edge_solid/G1 b/tests/vselect/edge_solid/G1 similarity index 100% rename from tests/v3d/edge_solid/G1 rename to tests/vselect/edge_solid/G1 diff --git a/tests/v3d/edge_solid/G2 b/tests/vselect/edge_solid/G2 similarity index 100% rename from tests/v3d/edge_solid/G2 rename to tests/vselect/edge_solid/G2 diff --git a/tests/v3d/edge_solid/G3 b/tests/vselect/edge_solid/G3 similarity index 100% rename from tests/v3d/edge_solid/G3 rename to tests/vselect/edge_solid/G3 diff --git a/tests/v3d/edge_solid/G4 b/tests/vselect/edge_solid/G4 similarity index 100% rename from tests/v3d/edge_solid/G4 rename to tests/vselect/edge_solid/G4 diff --git a/tests/v3d/edge_solid/G5 b/tests/vselect/edge_solid/G5 similarity index 100% rename from tests/v3d/edge_solid/G5 rename to tests/vselect/edge_solid/G5 diff --git a/tests/v3d/edge_solid/G6 b/tests/vselect/edge_solid/G6 similarity index 100% rename from tests/v3d/edge_solid/G6 rename to tests/vselect/edge_solid/G6 diff --git a/tests/v3d/edge_solid/G7 b/tests/vselect/edge_solid/G7 similarity index 100% rename from tests/v3d/edge_solid/G7 rename to tests/vselect/edge_solid/G7 diff --git a/tests/v3d/edge_solid/G8 b/tests/vselect/edge_solid/G8 similarity index 100% rename from tests/v3d/edge_solid/G8 rename to tests/vselect/edge_solid/G8 diff --git a/tests/v3d/edge_solid/G9 b/tests/vselect/edge_solid/G9 similarity index 100% rename from tests/v3d/edge_solid/G9 rename to tests/vselect/edge_solid/G9 diff --git a/tests/v3d/edge_solid/H1 b/tests/vselect/edge_solid/H1 similarity index 100% rename from tests/v3d/edge_solid/H1 rename to tests/vselect/edge_solid/H1 diff --git a/tests/v3d/edge_solid/H2 b/tests/vselect/edge_solid/H2 similarity index 100% rename from tests/v3d/edge_solid/H2 rename to tests/vselect/edge_solid/H2 diff --git a/tests/v3d/edge_solid/H3 b/tests/vselect/edge_solid/H3 similarity index 100% rename from tests/v3d/edge_solid/H3 rename to tests/vselect/edge_solid/H3 diff --git a/tests/v3d/edge_solid/H4 b/tests/vselect/edge_solid/H4 similarity index 100% rename from tests/v3d/edge_solid/H4 rename to tests/vselect/edge_solid/H4 diff --git a/tests/v3d/edge_solid/H5 b/tests/vselect/edge_solid/H5 similarity index 100% rename from tests/v3d/edge_solid/H5 rename to tests/vselect/edge_solid/H5 diff --git a/tests/v3d/edge_solid/H6 b/tests/vselect/edge_solid/H6 similarity index 100% rename from tests/v3d/edge_solid/H6 rename to tests/vselect/edge_solid/H6 diff --git a/tests/v3d/edge_solid/H7 b/tests/vselect/edge_solid/H7 similarity index 100% rename from tests/v3d/edge_solid/H7 rename to tests/vselect/edge_solid/H7 diff --git a/tests/v3d/edge_solid/H8 b/tests/vselect/edge_solid/H8 similarity index 100% rename from tests/v3d/edge_solid/H8 rename to tests/vselect/edge_solid/H8 diff --git a/tests/v3d/edge_solid/H9 b/tests/vselect/edge_solid/H9 similarity index 100% rename from tests/v3d/edge_solid/H9 rename to tests/vselect/edge_solid/H9 diff --git a/tests/v3d/edge_solid/I1 b/tests/vselect/edge_solid/I1 similarity index 100% rename from tests/v3d/edge_solid/I1 rename to tests/vselect/edge_solid/I1 diff --git a/tests/v3d/edge_solid/I2 b/tests/vselect/edge_solid/I2 similarity index 100% rename from tests/v3d/edge_solid/I2 rename to tests/vselect/edge_solid/I2 diff --git a/tests/v3d/edge_solid/I3 b/tests/vselect/edge_solid/I3 similarity index 100% rename from tests/v3d/edge_solid/I3 rename to tests/vselect/edge_solid/I3 diff --git a/tests/v3d/edge_solid/I4 b/tests/vselect/edge_solid/I4 similarity index 100% rename from tests/v3d/edge_solid/I4 rename to tests/vselect/edge_solid/I4 diff --git a/tests/v3d/edge_solid/I5 b/tests/vselect/edge_solid/I5 similarity index 100% rename from tests/v3d/edge_solid/I5 rename to tests/vselect/edge_solid/I5 diff --git a/tests/v3d/edge_solid/I6 b/tests/vselect/edge_solid/I6 similarity index 100% rename from tests/v3d/edge_solid/I6 rename to tests/vselect/edge_solid/I6 diff --git a/tests/v3d/edge_solid/I7 b/tests/vselect/edge_solid/I7 similarity index 100% rename from tests/v3d/edge_solid/I7 rename to tests/vselect/edge_solid/I7 diff --git a/tests/v3d/edge_solid/I8 b/tests/vselect/edge_solid/I8 similarity index 100% rename from tests/v3d/edge_solid/I8 rename to tests/vselect/edge_solid/I8 diff --git a/tests/v3d/edge_solid/I9 b/tests/vselect/edge_solid/I9 similarity index 100% rename from tests/v3d/edge_solid/I9 rename to tests/vselect/edge_solid/I9 diff --git a/tests/v3d/edge_solid/J1 b/tests/vselect/edge_solid/J1 similarity index 100% rename from tests/v3d/edge_solid/J1 rename to tests/vselect/edge_solid/J1 diff --git a/tests/v3d/edge_solid/J2 b/tests/vselect/edge_solid/J2 similarity index 100% rename from tests/v3d/edge_solid/J2 rename to tests/vselect/edge_solid/J2 diff --git a/tests/v3d/edge_solid/J3 b/tests/vselect/edge_solid/J3 similarity index 100% rename from tests/v3d/edge_solid/J3 rename to tests/vselect/edge_solid/J3 diff --git a/tests/v3d/edge_solid/J4 b/tests/vselect/edge_solid/J4 similarity index 100% rename from tests/v3d/edge_solid/J4 rename to tests/vselect/edge_solid/J4 diff --git a/tests/v3d/edge_solid/J5 b/tests/vselect/edge_solid/J5 similarity index 100% rename from tests/v3d/edge_solid/J5 rename to tests/vselect/edge_solid/J5 diff --git a/tests/v3d/edge_solid/J6 b/tests/vselect/edge_solid/J6 similarity index 100% rename from tests/v3d/edge_solid/J6 rename to tests/vselect/edge_solid/J6 diff --git a/tests/v3d/edge_solid/J7 b/tests/vselect/edge_solid/J7 similarity index 100% rename from tests/v3d/edge_solid/J7 rename to tests/vselect/edge_solid/J7 diff --git a/tests/v3d/edge_solid/J8 b/tests/vselect/edge_solid/J8 similarity index 100% rename from tests/v3d/edge_solid/J8 rename to tests/vselect/edge_solid/J8 diff --git a/tests/v3d/edge_solid/J9 b/tests/vselect/edge_solid/J9 similarity index 100% rename from tests/v3d/edge_solid/J9 rename to tests/vselect/edge_solid/J9 diff --git a/tests/v3d/edge_solid/K1 b/tests/vselect/edge_solid/K1 similarity index 100% rename from tests/v3d/edge_solid/K1 rename to tests/vselect/edge_solid/K1 diff --git a/tests/v3d/edge_solid/K2 b/tests/vselect/edge_solid/K2 similarity index 100% rename from tests/v3d/edge_solid/K2 rename to tests/vselect/edge_solid/K2 diff --git a/tests/v3d/edge_solid/K3 b/tests/vselect/edge_solid/K3 similarity index 100% rename from tests/v3d/edge_solid/K3 rename to tests/vselect/edge_solid/K3 diff --git a/tests/v3d/edge_solid/K4 b/tests/vselect/edge_solid/K4 similarity index 100% rename from tests/v3d/edge_solid/K4 rename to tests/vselect/edge_solid/K4 diff --git a/tests/v3d/edge_solid/K5 b/tests/vselect/edge_solid/K5 similarity index 100% rename from tests/v3d/edge_solid/K5 rename to tests/vselect/edge_solid/K5 diff --git a/tests/v3d/edge_solid/K6 b/tests/vselect/edge_solid/K6 similarity index 100% rename from tests/v3d/edge_solid/K6 rename to tests/vselect/edge_solid/K6 diff --git a/tests/v3d/edge_solid/K7 b/tests/vselect/edge_solid/K7 similarity index 100% rename from tests/v3d/edge_solid/K7 rename to tests/vselect/edge_solid/K7 diff --git a/tests/v3d/edge_solid/K8 b/tests/vselect/edge_solid/K8 similarity index 100% rename from tests/v3d/edge_solid/K8 rename to tests/vselect/edge_solid/K8 diff --git a/tests/v3d/edge_solid/K9 b/tests/vselect/edge_solid/K9 similarity index 100% rename from tests/v3d/edge_solid/K9 rename to tests/vselect/edge_solid/K9 diff --git a/tests/v3d/edge_solid/L1 b/tests/vselect/edge_solid/L1 similarity index 100% rename from tests/v3d/edge_solid/L1 rename to tests/vselect/edge_solid/L1 diff --git a/tests/v3d/edge_solid/L2 b/tests/vselect/edge_solid/L2 similarity index 100% rename from tests/v3d/edge_solid/L2 rename to tests/vselect/edge_solid/L2 diff --git a/tests/v3d/edge_solid/L3 b/tests/vselect/edge_solid/L3 similarity index 100% rename from tests/v3d/edge_solid/L3 rename to tests/vselect/edge_solid/L3 diff --git a/tests/v3d/edge_solid/L4 b/tests/vselect/edge_solid/L4 similarity index 100% rename from tests/v3d/edge_solid/L4 rename to tests/vselect/edge_solid/L4 diff --git a/tests/v3d/edge_solid/L5 b/tests/vselect/edge_solid/L5 similarity index 100% rename from tests/v3d/edge_solid/L5 rename to tests/vselect/edge_solid/L5 diff --git a/tests/v3d/edge_solid/L6 b/tests/vselect/edge_solid/L6 similarity index 100% rename from tests/v3d/edge_solid/L6 rename to tests/vselect/edge_solid/L6 diff --git a/tests/v3d/edge_solid/L7 b/tests/vselect/edge_solid/L7 similarity index 100% rename from tests/v3d/edge_solid/L7 rename to tests/vselect/edge_solid/L7 diff --git a/tests/v3d/edge_solid/L8 b/tests/vselect/edge_solid/L8 similarity index 100% rename from tests/v3d/edge_solid/L8 rename to tests/vselect/edge_solid/L8 diff --git a/tests/v3d/edge_solid/L9 b/tests/vselect/edge_solid/L9 similarity index 100% rename from tests/v3d/edge_solid/L9 rename to tests/vselect/edge_solid/L9 diff --git a/tests/v3d/edge_solid/M1 b/tests/vselect/edge_solid/M1 similarity index 100% rename from tests/v3d/edge_solid/M1 rename to tests/vselect/edge_solid/M1 diff --git a/tests/v3d/edge_solid/M2 b/tests/vselect/edge_solid/M2 similarity index 100% rename from tests/v3d/edge_solid/M2 rename to tests/vselect/edge_solid/M2 diff --git a/tests/v3d/edge_solid/M3 b/tests/vselect/edge_solid/M3 similarity index 100% rename from tests/v3d/edge_solid/M3 rename to tests/vselect/edge_solid/M3 diff --git a/tests/v3d/edge_solid/M4 b/tests/vselect/edge_solid/M4 similarity index 100% rename from tests/v3d/edge_solid/M4 rename to tests/vselect/edge_solid/M4 diff --git a/tests/v3d/edge_solid/M5 b/tests/vselect/edge_solid/M5 similarity index 100% rename from tests/v3d/edge_solid/M5 rename to tests/vselect/edge_solid/M5 diff --git a/tests/v3d/edge_solid/M6 b/tests/vselect/edge_solid/M6 similarity index 100% rename from tests/v3d/edge_solid/M6 rename to tests/vselect/edge_solid/M6 diff --git a/tests/v3d/edge_solid/M7 b/tests/vselect/edge_solid/M7 similarity index 100% rename from tests/v3d/edge_solid/M7 rename to tests/vselect/edge_solid/M7 diff --git a/tests/v3d/edge_solid/M8 b/tests/vselect/edge_solid/M8 similarity index 100% rename from tests/v3d/edge_solid/M8 rename to tests/vselect/edge_solid/M8 diff --git a/tests/v3d/edge_solid/M9 b/tests/vselect/edge_solid/M9 similarity index 100% rename from tests/v3d/edge_solid/M9 rename to tests/vselect/edge_solid/M9 diff --git a/tests/v3d/edge_solid/N1 b/tests/vselect/edge_solid/N1 similarity index 100% rename from tests/v3d/edge_solid/N1 rename to tests/vselect/edge_solid/N1 diff --git a/tests/v3d/edge_solid/N2 b/tests/vselect/edge_solid/N2 similarity index 100% rename from tests/v3d/edge_solid/N2 rename to tests/vselect/edge_solid/N2 diff --git a/tests/v3d/edge_solid/N3 b/tests/vselect/edge_solid/N3 similarity index 100% rename from tests/v3d/edge_solid/N3 rename to tests/vselect/edge_solid/N3 diff --git a/tests/v3d/edge_solid/N4 b/tests/vselect/edge_solid/N4 similarity index 100% rename from tests/v3d/edge_solid/N4 rename to tests/vselect/edge_solid/N4 diff --git a/tests/v3d/edge_solid/N5 b/tests/vselect/edge_solid/N5 similarity index 100% rename from tests/v3d/edge_solid/N5 rename to tests/vselect/edge_solid/N5 diff --git a/tests/v3d/edge_solid/N6 b/tests/vselect/edge_solid/N6 similarity index 100% rename from tests/v3d/edge_solid/N6 rename to tests/vselect/edge_solid/N6 diff --git a/tests/v3d/edge_solid/N7 b/tests/vselect/edge_solid/N7 similarity index 100% rename from tests/v3d/edge_solid/N7 rename to tests/vselect/edge_solid/N7 diff --git a/tests/v3d/edge_solid/N8 b/tests/vselect/edge_solid/N8 similarity index 100% rename from tests/v3d/edge_solid/N8 rename to tests/vselect/edge_solid/N8 diff --git a/tests/v3d/edge_solid/N9 b/tests/vselect/edge_solid/N9 similarity index 100% rename from tests/v3d/edge_solid/N9 rename to tests/vselect/edge_solid/N9 diff --git a/tests/v3d/edge_solid/O1 b/tests/vselect/edge_solid/O1 similarity index 100% rename from tests/v3d/edge_solid/O1 rename to tests/vselect/edge_solid/O1 diff --git a/tests/v3d/edge_solid/O2 b/tests/vselect/edge_solid/O2 similarity index 100% rename from tests/v3d/edge_solid/O2 rename to tests/vselect/edge_solid/O2 diff --git a/tests/v3d/edge_solid/O3 b/tests/vselect/edge_solid/O3 similarity index 100% rename from tests/v3d/edge_solid/O3 rename to tests/vselect/edge_solid/O3 diff --git a/tests/v3d/edge_solid/O4 b/tests/vselect/edge_solid/O4 similarity index 100% rename from tests/v3d/edge_solid/O4 rename to tests/vselect/edge_solid/O4 diff --git a/tests/v3d/edge_solid/O5 b/tests/vselect/edge_solid/O5 similarity index 100% rename from tests/v3d/edge_solid/O5 rename to tests/vselect/edge_solid/O5 diff --git a/tests/v3d/edge_solid/O6 b/tests/vselect/edge_solid/O6 similarity index 100% rename from tests/v3d/edge_solid/O6 rename to tests/vselect/edge_solid/O6 diff --git a/tests/v3d/edge_solid/O7 b/tests/vselect/edge_solid/O7 similarity index 100% rename from tests/v3d/edge_solid/O7 rename to tests/vselect/edge_solid/O7 diff --git a/tests/v3d/edge_solid/O8 b/tests/vselect/edge_solid/O8 similarity index 100% rename from tests/v3d/edge_solid/O8 rename to tests/vselect/edge_solid/O8 diff --git a/tests/v3d/edge_solid/O9 b/tests/vselect/edge_solid/O9 similarity index 100% rename from tests/v3d/edge_solid/O9 rename to tests/vselect/edge_solid/O9 diff --git a/tests/v3d/edge_solid/P1 b/tests/vselect/edge_solid/P1 similarity index 100% rename from tests/v3d/edge_solid/P1 rename to tests/vselect/edge_solid/P1 diff --git a/tests/v3d/edge_solid/P2 b/tests/vselect/edge_solid/P2 similarity index 100% rename from tests/v3d/edge_solid/P2 rename to tests/vselect/edge_solid/P2 diff --git a/tests/v3d/edge_solid/P3 b/tests/vselect/edge_solid/P3 similarity index 100% rename from tests/v3d/edge_solid/P3 rename to tests/vselect/edge_solid/P3 diff --git a/tests/v3d/edge_solid/P4 b/tests/vselect/edge_solid/P4 similarity index 100% rename from tests/v3d/edge_solid/P4 rename to tests/vselect/edge_solid/P4 diff --git a/tests/v3d/edge_solid/P5 b/tests/vselect/edge_solid/P5 similarity index 100% rename from tests/v3d/edge_solid/P5 rename to tests/vselect/edge_solid/P5 diff --git a/tests/v3d/edge_solid/P6 b/tests/vselect/edge_solid/P6 similarity index 100% rename from tests/v3d/edge_solid/P6 rename to tests/vselect/edge_solid/P6 diff --git a/tests/vselect/edge_solid/begin b/tests/vselect/edge_solid/begin new file mode 100644 index 0000000000..93ea333926 --- /dev/null +++ b/tests/vselect/edge_solid/begin @@ -0,0 +1 @@ +vinit View1 diff --git a/tests/vselect/edge_solid/end b/tests/vselect/edge_solid/end new file mode 100644 index 0000000000..3d3cd7e7c3 --- /dev/null +++ b/tests/vselect/edge_solid/end @@ -0,0 +1 @@ +vdump $imagedir/${casename}.png diff --git a/tests/vselect/end b/tests/vselect/end new file mode 100644 index 0000000000..73b3acd4ea --- /dev/null +++ b/tests/vselect/end @@ -0,0 +1 @@ +puts "TEST COMPLETED" diff --git a/tests/v3d/face/A1 b/tests/vselect/face/A1 similarity index 100% rename from tests/v3d/face/A1 rename to tests/vselect/face/A1 diff --git a/tests/v3d/face/A2 b/tests/vselect/face/A2 similarity index 100% rename from tests/v3d/face/A2 rename to tests/vselect/face/A2 diff --git a/tests/v3d/face/A3 b/tests/vselect/face/A3 similarity index 100% rename from tests/v3d/face/A3 rename to tests/vselect/face/A3 diff --git a/tests/v3d/face/A4 b/tests/vselect/face/A4 similarity index 100% rename from tests/v3d/face/A4 rename to tests/vselect/face/A4 diff --git a/tests/v3d/face/A5 b/tests/vselect/face/A5 similarity index 100% rename from tests/v3d/face/A5 rename to tests/vselect/face/A5 diff --git a/tests/v3d/face/A6 b/tests/vselect/face/A6 similarity index 100% rename from tests/v3d/face/A6 rename to tests/vselect/face/A6 diff --git a/tests/v3d/face/A7 b/tests/vselect/face/A7 similarity index 100% rename from tests/v3d/face/A7 rename to tests/vselect/face/A7 diff --git a/tests/v3d/face/A8 b/tests/vselect/face/A8 similarity index 100% rename from tests/v3d/face/A8 rename to tests/vselect/face/A8 diff --git a/tests/v3d/face/A9 b/tests/vselect/face/A9 similarity index 100% rename from tests/v3d/face/A9 rename to tests/vselect/face/A9 diff --git a/tests/v3d/face/B1 b/tests/vselect/face/B1 similarity index 100% rename from tests/v3d/face/B1 rename to tests/vselect/face/B1 diff --git a/tests/v3d/face/B2 b/tests/vselect/face/B2 similarity index 100% rename from tests/v3d/face/B2 rename to tests/vselect/face/B2 diff --git a/tests/v3d/face/B3 b/tests/vselect/face/B3 similarity index 100% rename from tests/v3d/face/B3 rename to tests/vselect/face/B3 diff --git a/tests/v3d/face/B4 b/tests/vselect/face/B4 similarity index 100% rename from tests/v3d/face/B4 rename to tests/vselect/face/B4 diff --git a/tests/v3d/face/B5 b/tests/vselect/face/B5 similarity index 100% rename from tests/v3d/face/B5 rename to tests/vselect/face/B5 diff --git a/tests/v3d/face/B6 b/tests/vselect/face/B6 similarity index 100% rename from tests/v3d/face/B6 rename to tests/vselect/face/B6 diff --git a/tests/v3d/face/B7 b/tests/vselect/face/B7 similarity index 100% rename from tests/v3d/face/B7 rename to tests/vselect/face/B7 diff --git a/tests/v3d/face/B8 b/tests/vselect/face/B8 similarity index 100% rename from tests/v3d/face/B8 rename to tests/vselect/face/B8 diff --git a/tests/v3d/face/B9 b/tests/vselect/face/B9 similarity index 100% rename from tests/v3d/face/B9 rename to tests/vselect/face/B9 diff --git a/tests/v3d/face/C1 b/tests/vselect/face/C1 similarity index 100% rename from tests/v3d/face/C1 rename to tests/vselect/face/C1 diff --git a/tests/v3d/face/C2 b/tests/vselect/face/C2 similarity index 100% rename from tests/v3d/face/C2 rename to tests/vselect/face/C2 diff --git a/tests/v3d/face/C3 b/tests/vselect/face/C3 similarity index 100% rename from tests/v3d/face/C3 rename to tests/vselect/face/C3 diff --git a/tests/v3d/face/C4 b/tests/vselect/face/C4 similarity index 100% rename from tests/v3d/face/C4 rename to tests/vselect/face/C4 diff --git a/tests/v3d/face/C5 b/tests/vselect/face/C5 similarity index 100% rename from tests/v3d/face/C5 rename to tests/vselect/face/C5 diff --git a/tests/v3d/face/C6 b/tests/vselect/face/C6 similarity index 100% rename from tests/v3d/face/C6 rename to tests/vselect/face/C6 diff --git a/tests/v3d/face/C7 b/tests/vselect/face/C7 similarity index 100% rename from tests/v3d/face/C7 rename to tests/vselect/face/C7 diff --git a/tests/v3d/face/C8 b/tests/vselect/face/C8 similarity index 100% rename from tests/v3d/face/C8 rename to tests/vselect/face/C8 diff --git a/tests/v3d/face/C9 b/tests/vselect/face/C9 similarity index 100% rename from tests/v3d/face/C9 rename to tests/vselect/face/C9 diff --git a/tests/v3d/face/D1 b/tests/vselect/face/D1 similarity index 100% rename from tests/v3d/face/D1 rename to tests/vselect/face/D1 diff --git a/tests/v3d/face/D2 b/tests/vselect/face/D2 similarity index 100% rename from tests/v3d/face/D2 rename to tests/vselect/face/D2 diff --git a/tests/v3d/face/D3 b/tests/vselect/face/D3 similarity index 100% rename from tests/v3d/face/D3 rename to tests/vselect/face/D3 diff --git a/tests/v3d/face/D4 b/tests/vselect/face/D4 similarity index 100% rename from tests/v3d/face/D4 rename to tests/vselect/face/D4 diff --git a/tests/v3d/face/D5 b/tests/vselect/face/D5 similarity index 100% rename from tests/v3d/face/D5 rename to tests/vselect/face/D5 diff --git a/tests/v3d/face/D6 b/tests/vselect/face/D6 similarity index 100% rename from tests/v3d/face/D6 rename to tests/vselect/face/D6 diff --git a/tests/v3d/face/D7 b/tests/vselect/face/D7 similarity index 100% rename from tests/v3d/face/D7 rename to tests/vselect/face/D7 diff --git a/tests/v3d/face/D8 b/tests/vselect/face/D8 similarity index 100% rename from tests/v3d/face/D8 rename to tests/vselect/face/D8 diff --git a/tests/v3d/face/D9 b/tests/vselect/face/D9 similarity index 100% rename from tests/v3d/face/D9 rename to tests/vselect/face/D9 diff --git a/tests/v3d/face/E1 b/tests/vselect/face/E1 similarity index 100% rename from tests/v3d/face/E1 rename to tests/vselect/face/E1 diff --git a/tests/v3d/face/E2 b/tests/vselect/face/E2 similarity index 100% rename from tests/v3d/face/E2 rename to tests/vselect/face/E2 diff --git a/tests/v3d/face/E3 b/tests/vselect/face/E3 similarity index 100% rename from tests/v3d/face/E3 rename to tests/vselect/face/E3 diff --git a/tests/v3d/face/E4 b/tests/vselect/face/E4 similarity index 100% rename from tests/v3d/face/E4 rename to tests/vselect/face/E4 diff --git a/tests/v3d/face/E5 b/tests/vselect/face/E5 similarity index 100% rename from tests/v3d/face/E5 rename to tests/vselect/face/E5 diff --git a/tests/v3d/face/E6 b/tests/vselect/face/E6 similarity index 100% rename from tests/v3d/face/E6 rename to tests/vselect/face/E6 diff --git a/tests/v3d/face/E7 b/tests/vselect/face/E7 similarity index 100% rename from tests/v3d/face/E7 rename to tests/vselect/face/E7 diff --git a/tests/v3d/face/E8 b/tests/vselect/face/E8 similarity index 100% rename from tests/v3d/face/E8 rename to tests/vselect/face/E8 diff --git a/tests/v3d/face/E9 b/tests/vselect/face/E9 similarity index 100% rename from tests/v3d/face/E9 rename to tests/vselect/face/E9 diff --git a/tests/v3d/face/F1 b/tests/vselect/face/F1 similarity index 100% rename from tests/v3d/face/F1 rename to tests/vselect/face/F1 diff --git a/tests/v3d/face/F2 b/tests/vselect/face/F2 similarity index 100% rename from tests/v3d/face/F2 rename to tests/vselect/face/F2 diff --git a/tests/v3d/face/F3 b/tests/vselect/face/F3 similarity index 100% rename from tests/v3d/face/F3 rename to tests/vselect/face/F3 diff --git a/tests/v3d/face/G1 b/tests/vselect/face/G1 similarity index 100% rename from tests/v3d/face/G1 rename to tests/vselect/face/G1 diff --git a/tests/v3d/face/G2 b/tests/vselect/face/G2 similarity index 100% rename from tests/v3d/face/G2 rename to tests/vselect/face/G2 diff --git a/tests/v3d/face/G3 b/tests/vselect/face/G3 similarity index 100% rename from tests/v3d/face/G3 rename to tests/vselect/face/G3 diff --git a/tests/v3d/face/G4 b/tests/vselect/face/G4 similarity index 100% rename from tests/v3d/face/G4 rename to tests/vselect/face/G4 diff --git a/tests/vselect/face/begin b/tests/vselect/face/begin new file mode 100644 index 0000000000..93ea333926 --- /dev/null +++ b/tests/vselect/face/begin @@ -0,0 +1 @@ +vinit View1 diff --git a/tests/vselect/face/end b/tests/vselect/face/end new file mode 100644 index 0000000000..3d3cd7e7c3 --- /dev/null +++ b/tests/vselect/face/end @@ -0,0 +1 @@ +vdump $imagedir/${casename}.png diff --git a/tests/vselect/grids.list b/tests/vselect/grids.list new file mode 100644 index 0000000000..31a9dfa0e2 --- /dev/null +++ b/tests/vselect/grids.list @@ -0,0 +1,13 @@ +001 bugs +002 clipping +003 edge +004 edge_face +005 edge_solid +006 face +007 vertex +008 vertex_edge +009 vertex_face +010 vertex_solid +011 vertex_wire +012 wire +013 wire_solid diff --git a/tests/vselect/parse.rules b/tests/vselect/parse.rules new file mode 100644 index 0000000000..d2d2452862 --- /dev/null +++ b/tests/vselect/parse.rules @@ -0,0 +1 @@ +FAILED /\bFaulty\b/ error diff --git a/tests/v3d/vertex/A1 b/tests/vselect/vertex/A1 similarity index 100% rename from tests/v3d/vertex/A1 rename to tests/vselect/vertex/A1 diff --git a/tests/v3d/vertex/A2 b/tests/vselect/vertex/A2 similarity index 100% rename from tests/v3d/vertex/A2 rename to tests/vselect/vertex/A2 diff --git a/tests/v3d/vertex/A3 b/tests/vselect/vertex/A3 similarity index 100% rename from tests/v3d/vertex/A3 rename to tests/vselect/vertex/A3 diff --git a/tests/v3d/vertex/A4 b/tests/vselect/vertex/A4 similarity index 100% rename from tests/v3d/vertex/A4 rename to tests/vselect/vertex/A4 diff --git a/tests/v3d/vertex/A5 b/tests/vselect/vertex/A5 similarity index 100% rename from tests/v3d/vertex/A5 rename to tests/vselect/vertex/A5 diff --git a/tests/v3d/vertex/A6 b/tests/vselect/vertex/A6 similarity index 100% rename from tests/v3d/vertex/A6 rename to tests/vselect/vertex/A6 diff --git a/tests/v3d/vertex/A7 b/tests/vselect/vertex/A7 similarity index 100% rename from tests/v3d/vertex/A7 rename to tests/vselect/vertex/A7 diff --git a/tests/v3d/vertex/A8 b/tests/vselect/vertex/A8 similarity index 100% rename from tests/v3d/vertex/A8 rename to tests/vselect/vertex/A8 diff --git a/tests/v3d/vertex/A9 b/tests/vselect/vertex/A9 similarity index 100% rename from tests/v3d/vertex/A9 rename to tests/vselect/vertex/A9 diff --git a/tests/v3d/vertex/B1 b/tests/vselect/vertex/B1 similarity index 100% rename from tests/v3d/vertex/B1 rename to tests/vselect/vertex/B1 diff --git a/tests/v3d/vertex/B2 b/tests/vselect/vertex/B2 similarity index 100% rename from tests/v3d/vertex/B2 rename to tests/vselect/vertex/B2 diff --git a/tests/v3d/vertex/B3 b/tests/vselect/vertex/B3 similarity index 100% rename from tests/v3d/vertex/B3 rename to tests/vselect/vertex/B3 diff --git a/tests/v3d/vertex/B4 b/tests/vselect/vertex/B4 similarity index 100% rename from tests/v3d/vertex/B4 rename to tests/vselect/vertex/B4 diff --git a/tests/v3d/vertex/B5 b/tests/vselect/vertex/B5 similarity index 100% rename from tests/v3d/vertex/B5 rename to tests/vselect/vertex/B5 diff --git a/tests/v3d/vertex/B6 b/tests/vselect/vertex/B6 similarity index 100% rename from tests/v3d/vertex/B6 rename to tests/vselect/vertex/B6 diff --git a/tests/v3d/vertex/B7 b/tests/vselect/vertex/B7 similarity index 100% rename from tests/v3d/vertex/B7 rename to tests/vselect/vertex/B7 diff --git a/tests/v3d/vertex/B8 b/tests/vselect/vertex/B8 similarity index 100% rename from tests/v3d/vertex/B8 rename to tests/vselect/vertex/B8 diff --git a/tests/v3d/vertex/B9 b/tests/vselect/vertex/B9 similarity index 100% rename from tests/v3d/vertex/B9 rename to tests/vselect/vertex/B9 diff --git a/tests/v3d/vertex/C1 b/tests/vselect/vertex/C1 similarity index 100% rename from tests/v3d/vertex/C1 rename to tests/vselect/vertex/C1 diff --git a/tests/v3d/vertex/C2 b/tests/vselect/vertex/C2 similarity index 100% rename from tests/v3d/vertex/C2 rename to tests/vselect/vertex/C2 diff --git a/tests/v3d/vertex/C3 b/tests/vselect/vertex/C3 similarity index 100% rename from tests/v3d/vertex/C3 rename to tests/vselect/vertex/C3 diff --git a/tests/v3d/vertex/C4 b/tests/vselect/vertex/C4 similarity index 100% rename from tests/v3d/vertex/C4 rename to tests/vselect/vertex/C4 diff --git a/tests/v3d/vertex/C5 b/tests/vselect/vertex/C5 similarity index 100% rename from tests/v3d/vertex/C5 rename to tests/vselect/vertex/C5 diff --git a/tests/v3d/vertex/C6 b/tests/vselect/vertex/C6 similarity index 100% rename from tests/v3d/vertex/C6 rename to tests/vselect/vertex/C6 diff --git a/tests/v3d/vertex/C7 b/tests/vselect/vertex/C7 similarity index 100% rename from tests/v3d/vertex/C7 rename to tests/vselect/vertex/C7 diff --git a/tests/v3d/vertex/C8 b/tests/vselect/vertex/C8 similarity index 100% rename from tests/v3d/vertex/C8 rename to tests/vselect/vertex/C8 diff --git a/tests/v3d/vertex/C9 b/tests/vselect/vertex/C9 similarity index 100% rename from tests/v3d/vertex/C9 rename to tests/vselect/vertex/C9 diff --git a/tests/v3d/vertex/D1 b/tests/vselect/vertex/D1 similarity index 100% rename from tests/v3d/vertex/D1 rename to tests/vselect/vertex/D1 diff --git a/tests/v3d/vertex/D2 b/tests/vselect/vertex/D2 similarity index 100% rename from tests/v3d/vertex/D2 rename to tests/vselect/vertex/D2 diff --git a/tests/v3d/vertex/D3 b/tests/vselect/vertex/D3 similarity index 100% rename from tests/v3d/vertex/D3 rename to tests/vselect/vertex/D3 diff --git a/tests/v3d/vertex/D4 b/tests/vselect/vertex/D4 similarity index 100% rename from tests/v3d/vertex/D4 rename to tests/vselect/vertex/D4 diff --git a/tests/v3d/vertex/D5 b/tests/vselect/vertex/D5 similarity index 100% rename from tests/v3d/vertex/D5 rename to tests/vselect/vertex/D5 diff --git a/tests/v3d/vertex/D6 b/tests/vselect/vertex/D6 similarity index 100% rename from tests/v3d/vertex/D6 rename to tests/vselect/vertex/D6 diff --git a/tests/v3d/vertex/D7 b/tests/vselect/vertex/D7 similarity index 100% rename from tests/v3d/vertex/D7 rename to tests/vselect/vertex/D7 diff --git a/tests/v3d/vertex/D8 b/tests/vselect/vertex/D8 similarity index 100% rename from tests/v3d/vertex/D8 rename to tests/vselect/vertex/D8 diff --git a/tests/v3d/vertex/D9 b/tests/vselect/vertex/D9 similarity index 100% rename from tests/v3d/vertex/D9 rename to tests/vselect/vertex/D9 diff --git a/tests/v3d/vertex/E1 b/tests/vselect/vertex/E1 similarity index 100% rename from tests/v3d/vertex/E1 rename to tests/vselect/vertex/E1 diff --git a/tests/v3d/vertex/E2 b/tests/vselect/vertex/E2 similarity index 100% rename from tests/v3d/vertex/E2 rename to tests/vselect/vertex/E2 diff --git a/tests/v3d/vertex/E3 b/tests/vselect/vertex/E3 similarity index 100% rename from tests/v3d/vertex/E3 rename to tests/vselect/vertex/E3 diff --git a/tests/v3d/vertex/E4 b/tests/vselect/vertex/E4 similarity index 100% rename from tests/v3d/vertex/E4 rename to tests/vselect/vertex/E4 diff --git a/tests/v3d/vertex/E5 b/tests/vselect/vertex/E5 similarity index 100% rename from tests/v3d/vertex/E5 rename to tests/vselect/vertex/E5 diff --git a/tests/v3d/vertex/E6 b/tests/vselect/vertex/E6 similarity index 100% rename from tests/v3d/vertex/E6 rename to tests/vselect/vertex/E6 diff --git a/tests/v3d/vertex/E7 b/tests/vselect/vertex/E7 similarity index 100% rename from tests/v3d/vertex/E7 rename to tests/vselect/vertex/E7 diff --git a/tests/v3d/vertex/E8 b/tests/vselect/vertex/E8 similarity index 100% rename from tests/v3d/vertex/E8 rename to tests/vselect/vertex/E8 diff --git a/tests/v3d/vertex/E9 b/tests/vselect/vertex/E9 similarity index 100% rename from tests/v3d/vertex/E9 rename to tests/vselect/vertex/E9 diff --git a/tests/v3d/vertex/F1 b/tests/vselect/vertex/F1 similarity index 100% rename from tests/v3d/vertex/F1 rename to tests/vselect/vertex/F1 diff --git a/tests/v3d/vertex/F2 b/tests/vselect/vertex/F2 similarity index 100% rename from tests/v3d/vertex/F2 rename to tests/vselect/vertex/F2 diff --git a/tests/vselect/vertex/begin b/tests/vselect/vertex/begin new file mode 100644 index 0000000000..93ea333926 --- /dev/null +++ b/tests/vselect/vertex/begin @@ -0,0 +1 @@ +vinit View1 diff --git a/tests/vselect/vertex/end b/tests/vselect/vertex/end new file mode 100644 index 0000000000..3d3cd7e7c3 --- /dev/null +++ b/tests/vselect/vertex/end @@ -0,0 +1 @@ +vdump $imagedir/${casename}.png diff --git a/tests/v3d/vertex_edge/A1 b/tests/vselect/vertex_edge/A1 similarity index 100% rename from tests/v3d/vertex_edge/A1 rename to tests/vselect/vertex_edge/A1 diff --git a/tests/v3d/vertex_edge/A2 b/tests/vselect/vertex_edge/A2 similarity index 100% rename from tests/v3d/vertex_edge/A2 rename to tests/vselect/vertex_edge/A2 diff --git a/tests/v3d/vertex_edge/A3 b/tests/vselect/vertex_edge/A3 similarity index 100% rename from tests/v3d/vertex_edge/A3 rename to tests/vselect/vertex_edge/A3 diff --git a/tests/v3d/vertex_edge/A4 b/tests/vselect/vertex_edge/A4 similarity index 100% rename from tests/v3d/vertex_edge/A4 rename to tests/vselect/vertex_edge/A4 diff --git a/tests/v3d/vertex_edge/A5 b/tests/vselect/vertex_edge/A5 similarity index 100% rename from tests/v3d/vertex_edge/A5 rename to tests/vselect/vertex_edge/A5 diff --git a/tests/v3d/vertex_edge/A6 b/tests/vselect/vertex_edge/A6 similarity index 100% rename from tests/v3d/vertex_edge/A6 rename to tests/vselect/vertex_edge/A6 diff --git a/tests/v3d/vertex_edge/A7 b/tests/vselect/vertex_edge/A7 similarity index 100% rename from tests/v3d/vertex_edge/A7 rename to tests/vselect/vertex_edge/A7 diff --git a/tests/v3d/vertex_edge/A8 b/tests/vselect/vertex_edge/A8 similarity index 100% rename from tests/v3d/vertex_edge/A8 rename to tests/vselect/vertex_edge/A8 diff --git a/tests/v3d/vertex_edge/A9 b/tests/vselect/vertex_edge/A9 similarity index 100% rename from tests/v3d/vertex_edge/A9 rename to tests/vselect/vertex_edge/A9 diff --git a/tests/v3d/vertex_edge/B1 b/tests/vselect/vertex_edge/B1 similarity index 100% rename from tests/v3d/vertex_edge/B1 rename to tests/vselect/vertex_edge/B1 diff --git a/tests/v3d/vertex_edge/B2 b/tests/vselect/vertex_edge/B2 similarity index 100% rename from tests/v3d/vertex_edge/B2 rename to tests/vselect/vertex_edge/B2 diff --git a/tests/v3d/vertex_edge/B3 b/tests/vselect/vertex_edge/B3 similarity index 100% rename from tests/v3d/vertex_edge/B3 rename to tests/vselect/vertex_edge/B3 diff --git a/tests/v3d/vertex_edge/B4 b/tests/vselect/vertex_edge/B4 similarity index 100% rename from tests/v3d/vertex_edge/B4 rename to tests/vselect/vertex_edge/B4 diff --git a/tests/v3d/vertex_edge/B5 b/tests/vselect/vertex_edge/B5 similarity index 100% rename from tests/v3d/vertex_edge/B5 rename to tests/vselect/vertex_edge/B5 diff --git a/tests/v3d/vertex_edge/B6 b/tests/vselect/vertex_edge/B6 similarity index 100% rename from tests/v3d/vertex_edge/B6 rename to tests/vselect/vertex_edge/B6 diff --git a/tests/v3d/vertex_edge/B7 b/tests/vselect/vertex_edge/B7 similarity index 100% rename from tests/v3d/vertex_edge/B7 rename to tests/vselect/vertex_edge/B7 diff --git a/tests/v3d/vertex_edge/B8 b/tests/vselect/vertex_edge/B8 similarity index 100% rename from tests/v3d/vertex_edge/B8 rename to tests/vselect/vertex_edge/B8 diff --git a/tests/v3d/vertex_edge/B9 b/tests/vselect/vertex_edge/B9 similarity index 100% rename from tests/v3d/vertex_edge/B9 rename to tests/vselect/vertex_edge/B9 diff --git a/tests/v3d/vertex_edge/C1 b/tests/vselect/vertex_edge/C1 similarity index 100% rename from tests/v3d/vertex_edge/C1 rename to tests/vselect/vertex_edge/C1 diff --git a/tests/v3d/vertex_edge/C2 b/tests/vselect/vertex_edge/C2 similarity index 100% rename from tests/v3d/vertex_edge/C2 rename to tests/vselect/vertex_edge/C2 diff --git a/tests/v3d/vertex_edge/C3 b/tests/vselect/vertex_edge/C3 similarity index 100% rename from tests/v3d/vertex_edge/C3 rename to tests/vselect/vertex_edge/C3 diff --git a/tests/v3d/vertex_edge/C4 b/tests/vselect/vertex_edge/C4 similarity index 100% rename from tests/v3d/vertex_edge/C4 rename to tests/vselect/vertex_edge/C4 diff --git a/tests/v3d/vertex_edge/C5 b/tests/vselect/vertex_edge/C5 similarity index 100% rename from tests/v3d/vertex_edge/C5 rename to tests/vselect/vertex_edge/C5 diff --git a/tests/v3d/vertex_edge/C6 b/tests/vselect/vertex_edge/C6 similarity index 100% rename from tests/v3d/vertex_edge/C6 rename to tests/vselect/vertex_edge/C6 diff --git a/tests/v3d/vertex_edge/C7 b/tests/vselect/vertex_edge/C7 similarity index 100% rename from tests/v3d/vertex_edge/C7 rename to tests/vselect/vertex_edge/C7 diff --git a/tests/v3d/vertex_edge/C8 b/tests/vselect/vertex_edge/C8 similarity index 100% rename from tests/v3d/vertex_edge/C8 rename to tests/vselect/vertex_edge/C8 diff --git a/tests/v3d/vertex_edge/C9 b/tests/vselect/vertex_edge/C9 similarity index 100% rename from tests/v3d/vertex_edge/C9 rename to tests/vselect/vertex_edge/C9 diff --git a/tests/v3d/vertex_edge/D1 b/tests/vselect/vertex_edge/D1 similarity index 100% rename from tests/v3d/vertex_edge/D1 rename to tests/vselect/vertex_edge/D1 diff --git a/tests/v3d/vertex_edge/D2 b/tests/vselect/vertex_edge/D2 similarity index 100% rename from tests/v3d/vertex_edge/D2 rename to tests/vselect/vertex_edge/D2 diff --git a/tests/v3d/vertex_edge/D3 b/tests/vselect/vertex_edge/D3 similarity index 100% rename from tests/v3d/vertex_edge/D3 rename to tests/vselect/vertex_edge/D3 diff --git a/tests/v3d/vertex_edge/D4 b/tests/vselect/vertex_edge/D4 similarity index 100% rename from tests/v3d/vertex_edge/D4 rename to tests/vselect/vertex_edge/D4 diff --git a/tests/v3d/vertex_edge/D5 b/tests/vselect/vertex_edge/D5 similarity index 100% rename from tests/v3d/vertex_edge/D5 rename to tests/vselect/vertex_edge/D5 diff --git a/tests/v3d/vertex_edge/D6 b/tests/vselect/vertex_edge/D6 similarity index 100% rename from tests/v3d/vertex_edge/D6 rename to tests/vselect/vertex_edge/D6 diff --git a/tests/v3d/vertex_edge/D7 b/tests/vselect/vertex_edge/D7 similarity index 100% rename from tests/v3d/vertex_edge/D7 rename to tests/vselect/vertex_edge/D7 diff --git a/tests/v3d/vertex_edge/D8 b/tests/vselect/vertex_edge/D8 similarity index 100% rename from tests/v3d/vertex_edge/D8 rename to tests/vselect/vertex_edge/D8 diff --git a/tests/v3d/vertex_edge/D9 b/tests/vselect/vertex_edge/D9 similarity index 100% rename from tests/v3d/vertex_edge/D9 rename to tests/vselect/vertex_edge/D9 diff --git a/tests/v3d/vertex_edge/E1 b/tests/vselect/vertex_edge/E1 similarity index 100% rename from tests/v3d/vertex_edge/E1 rename to tests/vselect/vertex_edge/E1 diff --git a/tests/v3d/vertex_edge/E2 b/tests/vselect/vertex_edge/E2 similarity index 100% rename from tests/v3d/vertex_edge/E2 rename to tests/vselect/vertex_edge/E2 diff --git a/tests/v3d/vertex_edge/E3 b/tests/vselect/vertex_edge/E3 similarity index 100% rename from tests/v3d/vertex_edge/E3 rename to tests/vselect/vertex_edge/E3 diff --git a/tests/v3d/vertex_edge/E4 b/tests/vselect/vertex_edge/E4 similarity index 100% rename from tests/v3d/vertex_edge/E4 rename to tests/vselect/vertex_edge/E4 diff --git a/tests/v3d/vertex_edge/E5 b/tests/vselect/vertex_edge/E5 similarity index 100% rename from tests/v3d/vertex_edge/E5 rename to tests/vselect/vertex_edge/E5 diff --git a/tests/v3d/vertex_edge/E6 b/tests/vselect/vertex_edge/E6 similarity index 100% rename from tests/v3d/vertex_edge/E6 rename to tests/vselect/vertex_edge/E6 diff --git a/tests/v3d/vertex_edge/E7 b/tests/vselect/vertex_edge/E7 similarity index 100% rename from tests/v3d/vertex_edge/E7 rename to tests/vselect/vertex_edge/E7 diff --git a/tests/v3d/vertex_edge/E8 b/tests/vselect/vertex_edge/E8 similarity index 100% rename from tests/v3d/vertex_edge/E8 rename to tests/vselect/vertex_edge/E8 diff --git a/tests/v3d/vertex_edge/E9 b/tests/vselect/vertex_edge/E9 similarity index 100% rename from tests/v3d/vertex_edge/E9 rename to tests/vselect/vertex_edge/E9 diff --git a/tests/v3d/vertex_edge/F1 b/tests/vselect/vertex_edge/F1 similarity index 100% rename from tests/v3d/vertex_edge/F1 rename to tests/vselect/vertex_edge/F1 diff --git a/tests/v3d/vertex_edge/F2 b/tests/vselect/vertex_edge/F2 similarity index 100% rename from tests/v3d/vertex_edge/F2 rename to tests/vselect/vertex_edge/F2 diff --git a/tests/v3d/vertex_edge/F3 b/tests/vselect/vertex_edge/F3 similarity index 100% rename from tests/v3d/vertex_edge/F3 rename to tests/vselect/vertex_edge/F3 diff --git a/tests/v3d/vertex_edge/F4 b/tests/vselect/vertex_edge/F4 similarity index 100% rename from tests/v3d/vertex_edge/F4 rename to tests/vselect/vertex_edge/F4 diff --git a/tests/v3d/vertex_edge/F5 b/tests/vselect/vertex_edge/F5 similarity index 100% rename from tests/v3d/vertex_edge/F5 rename to tests/vselect/vertex_edge/F5 diff --git a/tests/v3d/vertex_edge/F6 b/tests/vselect/vertex_edge/F6 similarity index 100% rename from tests/v3d/vertex_edge/F6 rename to tests/vselect/vertex_edge/F6 diff --git a/tests/v3d/vertex_edge/F7 b/tests/vselect/vertex_edge/F7 similarity index 100% rename from tests/v3d/vertex_edge/F7 rename to tests/vselect/vertex_edge/F7 diff --git a/tests/v3d/vertex_edge/F8 b/tests/vselect/vertex_edge/F8 similarity index 100% rename from tests/v3d/vertex_edge/F8 rename to tests/vselect/vertex_edge/F8 diff --git a/tests/v3d/vertex_edge/F9 b/tests/vselect/vertex_edge/F9 similarity index 100% rename from tests/v3d/vertex_edge/F9 rename to tests/vselect/vertex_edge/F9 diff --git a/tests/v3d/vertex_edge/G1 b/tests/vselect/vertex_edge/G1 similarity index 100% rename from tests/v3d/vertex_edge/G1 rename to tests/vselect/vertex_edge/G1 diff --git a/tests/v3d/vertex_edge/G2 b/tests/vselect/vertex_edge/G2 similarity index 100% rename from tests/v3d/vertex_edge/G2 rename to tests/vselect/vertex_edge/G2 diff --git a/tests/v3d/vertex_edge/G3 b/tests/vselect/vertex_edge/G3 similarity index 100% rename from tests/v3d/vertex_edge/G3 rename to tests/vselect/vertex_edge/G3 diff --git a/tests/v3d/vertex_edge/G4 b/tests/vselect/vertex_edge/G4 similarity index 100% rename from tests/v3d/vertex_edge/G4 rename to tests/vselect/vertex_edge/G4 diff --git a/tests/v3d/vertex_edge/G5 b/tests/vselect/vertex_edge/G5 similarity index 100% rename from tests/v3d/vertex_edge/G5 rename to tests/vselect/vertex_edge/G5 diff --git a/tests/v3d/vertex_edge/G6 b/tests/vselect/vertex_edge/G6 similarity index 100% rename from tests/v3d/vertex_edge/G6 rename to tests/vselect/vertex_edge/G6 diff --git a/tests/v3d/vertex_edge/G7 b/tests/vselect/vertex_edge/G7 similarity index 100% rename from tests/v3d/vertex_edge/G7 rename to tests/vselect/vertex_edge/G7 diff --git a/tests/v3d/vertex_edge/G8 b/tests/vselect/vertex_edge/G8 similarity index 100% rename from tests/v3d/vertex_edge/G8 rename to tests/vselect/vertex_edge/G8 diff --git a/tests/v3d/vertex_edge/G9 b/tests/vselect/vertex_edge/G9 similarity index 100% rename from tests/v3d/vertex_edge/G9 rename to tests/vselect/vertex_edge/G9 diff --git a/tests/v3d/vertex_edge/H1 b/tests/vselect/vertex_edge/H1 similarity index 100% rename from tests/v3d/vertex_edge/H1 rename to tests/vselect/vertex_edge/H1 diff --git a/tests/v3d/vertex_edge/H2 b/tests/vselect/vertex_edge/H2 similarity index 100% rename from tests/v3d/vertex_edge/H2 rename to tests/vselect/vertex_edge/H2 diff --git a/tests/v3d/vertex_edge/H3 b/tests/vselect/vertex_edge/H3 similarity index 100% rename from tests/v3d/vertex_edge/H3 rename to tests/vselect/vertex_edge/H3 diff --git a/tests/v3d/vertex_edge/H4 b/tests/vselect/vertex_edge/H4 similarity index 100% rename from tests/v3d/vertex_edge/H4 rename to tests/vselect/vertex_edge/H4 diff --git a/tests/v3d/vertex_edge/H5 b/tests/vselect/vertex_edge/H5 similarity index 100% rename from tests/v3d/vertex_edge/H5 rename to tests/vselect/vertex_edge/H5 diff --git a/tests/v3d/vertex_edge/H6 b/tests/vselect/vertex_edge/H6 similarity index 100% rename from tests/v3d/vertex_edge/H6 rename to tests/vselect/vertex_edge/H6 diff --git a/tests/v3d/vertex_edge/H7 b/tests/vselect/vertex_edge/H7 similarity index 100% rename from tests/v3d/vertex_edge/H7 rename to tests/vselect/vertex_edge/H7 diff --git a/tests/v3d/vertex_edge/H8 b/tests/vselect/vertex_edge/H8 similarity index 100% rename from tests/v3d/vertex_edge/H8 rename to tests/vselect/vertex_edge/H8 diff --git a/tests/v3d/vertex_edge/H9 b/tests/vselect/vertex_edge/H9 similarity index 100% rename from tests/v3d/vertex_edge/H9 rename to tests/vselect/vertex_edge/H9 diff --git a/tests/v3d/vertex_edge/I1 b/tests/vselect/vertex_edge/I1 similarity index 100% rename from tests/v3d/vertex_edge/I1 rename to tests/vselect/vertex_edge/I1 diff --git a/tests/v3d/vertex_edge/I2 b/tests/vselect/vertex_edge/I2 similarity index 100% rename from tests/v3d/vertex_edge/I2 rename to tests/vselect/vertex_edge/I2 diff --git a/tests/v3d/vertex_edge/I3 b/tests/vselect/vertex_edge/I3 similarity index 100% rename from tests/v3d/vertex_edge/I3 rename to tests/vselect/vertex_edge/I3 diff --git a/tests/v3d/vertex_edge/I4 b/tests/vselect/vertex_edge/I4 similarity index 100% rename from tests/v3d/vertex_edge/I4 rename to tests/vselect/vertex_edge/I4 diff --git a/tests/v3d/vertex_edge/I5 b/tests/vselect/vertex_edge/I5 similarity index 100% rename from tests/v3d/vertex_edge/I5 rename to tests/vselect/vertex_edge/I5 diff --git a/tests/v3d/vertex_edge/I6 b/tests/vselect/vertex_edge/I6 similarity index 100% rename from tests/v3d/vertex_edge/I6 rename to tests/vselect/vertex_edge/I6 diff --git a/tests/v3d/vertex_edge/I7 b/tests/vselect/vertex_edge/I7 similarity index 100% rename from tests/v3d/vertex_edge/I7 rename to tests/vselect/vertex_edge/I7 diff --git a/tests/v3d/vertex_edge/I8 b/tests/vselect/vertex_edge/I8 similarity index 100% rename from tests/v3d/vertex_edge/I8 rename to tests/vselect/vertex_edge/I8 diff --git a/tests/v3d/vertex_edge/I9 b/tests/vselect/vertex_edge/I9 similarity index 100% rename from tests/v3d/vertex_edge/I9 rename to tests/vselect/vertex_edge/I9 diff --git a/tests/v3d/vertex_edge/J1 b/tests/vselect/vertex_edge/J1 similarity index 100% rename from tests/v3d/vertex_edge/J1 rename to tests/vselect/vertex_edge/J1 diff --git a/tests/v3d/vertex_edge/J2 b/tests/vselect/vertex_edge/J2 similarity index 100% rename from tests/v3d/vertex_edge/J2 rename to tests/vselect/vertex_edge/J2 diff --git a/tests/v3d/vertex_edge/J3 b/tests/vselect/vertex_edge/J3 similarity index 100% rename from tests/v3d/vertex_edge/J3 rename to tests/vselect/vertex_edge/J3 diff --git a/tests/v3d/vertex_edge/J4 b/tests/vselect/vertex_edge/J4 similarity index 100% rename from tests/v3d/vertex_edge/J4 rename to tests/vselect/vertex_edge/J4 diff --git a/tests/v3d/vertex_edge/J5 b/tests/vselect/vertex_edge/J5 similarity index 100% rename from tests/v3d/vertex_edge/J5 rename to tests/vselect/vertex_edge/J5 diff --git a/tests/v3d/vertex_edge/J6 b/tests/vselect/vertex_edge/J6 similarity index 100% rename from tests/v3d/vertex_edge/J6 rename to tests/vselect/vertex_edge/J6 diff --git a/tests/v3d/vertex_edge/J7 b/tests/vselect/vertex_edge/J7 similarity index 100% rename from tests/v3d/vertex_edge/J7 rename to tests/vselect/vertex_edge/J7 diff --git a/tests/v3d/vertex_edge/J8 b/tests/vselect/vertex_edge/J8 similarity index 100% rename from tests/v3d/vertex_edge/J8 rename to tests/vselect/vertex_edge/J8 diff --git a/tests/v3d/vertex_edge/J9 b/tests/vselect/vertex_edge/J9 similarity index 100% rename from tests/v3d/vertex_edge/J9 rename to tests/vselect/vertex_edge/J9 diff --git a/tests/v3d/vertex_edge/K1 b/tests/vselect/vertex_edge/K1 similarity index 100% rename from tests/v3d/vertex_edge/K1 rename to tests/vselect/vertex_edge/K1 diff --git a/tests/v3d/vertex_edge/K2 b/tests/vselect/vertex_edge/K2 similarity index 100% rename from tests/v3d/vertex_edge/K2 rename to tests/vselect/vertex_edge/K2 diff --git a/tests/v3d/vertex_edge/K3 b/tests/vselect/vertex_edge/K3 similarity index 100% rename from tests/v3d/vertex_edge/K3 rename to tests/vselect/vertex_edge/K3 diff --git a/tests/v3d/vertex_edge/K4 b/tests/vselect/vertex_edge/K4 similarity index 100% rename from tests/v3d/vertex_edge/K4 rename to tests/vselect/vertex_edge/K4 diff --git a/tests/vselect/vertex_edge/begin b/tests/vselect/vertex_edge/begin new file mode 100644 index 0000000000..93ea333926 --- /dev/null +++ b/tests/vselect/vertex_edge/begin @@ -0,0 +1 @@ +vinit View1 diff --git a/tests/vselect/vertex_edge/end b/tests/vselect/vertex_edge/end new file mode 100644 index 0000000000..3d3cd7e7c3 --- /dev/null +++ b/tests/vselect/vertex_edge/end @@ -0,0 +1 @@ +vdump $imagedir/${casename}.png diff --git a/tests/v3d/vertex_face/A1 b/tests/vselect/vertex_face/A1 similarity index 100% rename from tests/v3d/vertex_face/A1 rename to tests/vselect/vertex_face/A1 diff --git a/tests/v3d/vertex_face/A2 b/tests/vselect/vertex_face/A2 similarity index 100% rename from tests/v3d/vertex_face/A2 rename to tests/vselect/vertex_face/A2 diff --git a/tests/v3d/vertex_face/A3 b/tests/vselect/vertex_face/A3 similarity index 100% rename from tests/v3d/vertex_face/A3 rename to tests/vselect/vertex_face/A3 diff --git a/tests/v3d/vertex_face/A4 b/tests/vselect/vertex_face/A4 similarity index 100% rename from tests/v3d/vertex_face/A4 rename to tests/vselect/vertex_face/A4 diff --git a/tests/v3d/vertex_face/A5 b/tests/vselect/vertex_face/A5 similarity index 100% rename from tests/v3d/vertex_face/A5 rename to tests/vselect/vertex_face/A5 diff --git a/tests/v3d/vertex_face/A6 b/tests/vselect/vertex_face/A6 similarity index 100% rename from tests/v3d/vertex_face/A6 rename to tests/vselect/vertex_face/A6 diff --git a/tests/v3d/vertex_face/A7 b/tests/vselect/vertex_face/A7 similarity index 100% rename from tests/v3d/vertex_face/A7 rename to tests/vselect/vertex_face/A7 diff --git a/tests/v3d/vertex_face/A8 b/tests/vselect/vertex_face/A8 similarity index 100% rename from tests/v3d/vertex_face/A8 rename to tests/vselect/vertex_face/A8 diff --git a/tests/v3d/vertex_face/A9 b/tests/vselect/vertex_face/A9 similarity index 100% rename from tests/v3d/vertex_face/A9 rename to tests/vselect/vertex_face/A9 diff --git a/tests/v3d/vertex_face/B1 b/tests/vselect/vertex_face/B1 similarity index 100% rename from tests/v3d/vertex_face/B1 rename to tests/vselect/vertex_face/B1 diff --git a/tests/v3d/vertex_face/B2 b/tests/vselect/vertex_face/B2 similarity index 100% rename from tests/v3d/vertex_face/B2 rename to tests/vselect/vertex_face/B2 diff --git a/tests/v3d/vertex_face/B3 b/tests/vselect/vertex_face/B3 similarity index 100% rename from tests/v3d/vertex_face/B3 rename to tests/vselect/vertex_face/B3 diff --git a/tests/v3d/vertex_face/B4 b/tests/vselect/vertex_face/B4 similarity index 100% rename from tests/v3d/vertex_face/B4 rename to tests/vselect/vertex_face/B4 diff --git a/tests/v3d/vertex_face/B5 b/tests/vselect/vertex_face/B5 similarity index 100% rename from tests/v3d/vertex_face/B5 rename to tests/vselect/vertex_face/B5 diff --git a/tests/v3d/vertex_face/B6 b/tests/vselect/vertex_face/B6 similarity index 100% rename from tests/v3d/vertex_face/B6 rename to tests/vselect/vertex_face/B6 diff --git a/tests/v3d/vertex_face/B7 b/tests/vselect/vertex_face/B7 similarity index 100% rename from tests/v3d/vertex_face/B7 rename to tests/vselect/vertex_face/B7 diff --git a/tests/v3d/vertex_face/B8 b/tests/vselect/vertex_face/B8 similarity index 100% rename from tests/v3d/vertex_face/B8 rename to tests/vselect/vertex_face/B8 diff --git a/tests/v3d/vertex_face/B9 b/tests/vselect/vertex_face/B9 similarity index 100% rename from tests/v3d/vertex_face/B9 rename to tests/vselect/vertex_face/B9 diff --git a/tests/v3d/vertex_face/C1 b/tests/vselect/vertex_face/C1 similarity index 100% rename from tests/v3d/vertex_face/C1 rename to tests/vselect/vertex_face/C1 diff --git a/tests/v3d/vertex_face/C2 b/tests/vselect/vertex_face/C2 similarity index 100% rename from tests/v3d/vertex_face/C2 rename to tests/vselect/vertex_face/C2 diff --git a/tests/v3d/vertex_face/C3 b/tests/vselect/vertex_face/C3 similarity index 100% rename from tests/v3d/vertex_face/C3 rename to tests/vselect/vertex_face/C3 diff --git a/tests/v3d/vertex_face/C4 b/tests/vselect/vertex_face/C4 similarity index 100% rename from tests/v3d/vertex_face/C4 rename to tests/vselect/vertex_face/C4 diff --git a/tests/v3d/vertex_face/C5 b/tests/vselect/vertex_face/C5 similarity index 100% rename from tests/v3d/vertex_face/C5 rename to tests/vselect/vertex_face/C5 diff --git a/tests/v3d/vertex_face/C6 b/tests/vselect/vertex_face/C6 similarity index 100% rename from tests/v3d/vertex_face/C6 rename to tests/vselect/vertex_face/C6 diff --git a/tests/v3d/vertex_face/C7 b/tests/vselect/vertex_face/C7 similarity index 100% rename from tests/v3d/vertex_face/C7 rename to tests/vselect/vertex_face/C7 diff --git a/tests/v3d/vertex_face/C8 b/tests/vselect/vertex_face/C8 similarity index 100% rename from tests/v3d/vertex_face/C8 rename to tests/vselect/vertex_face/C8 diff --git a/tests/v3d/vertex_face/C9 b/tests/vselect/vertex_face/C9 similarity index 100% rename from tests/v3d/vertex_face/C9 rename to tests/vselect/vertex_face/C9 diff --git a/tests/v3d/vertex_face/D1 b/tests/vselect/vertex_face/D1 similarity index 100% rename from tests/v3d/vertex_face/D1 rename to tests/vselect/vertex_face/D1 diff --git a/tests/v3d/vertex_face/D2 b/tests/vselect/vertex_face/D2 similarity index 100% rename from tests/v3d/vertex_face/D2 rename to tests/vselect/vertex_face/D2 diff --git a/tests/v3d/vertex_face/D3 b/tests/vselect/vertex_face/D3 similarity index 100% rename from tests/v3d/vertex_face/D3 rename to tests/vselect/vertex_face/D3 diff --git a/tests/v3d/vertex_face/D4 b/tests/vselect/vertex_face/D4 similarity index 100% rename from tests/v3d/vertex_face/D4 rename to tests/vselect/vertex_face/D4 diff --git a/tests/v3d/vertex_face/D5 b/tests/vselect/vertex_face/D5 similarity index 100% rename from tests/v3d/vertex_face/D5 rename to tests/vselect/vertex_face/D5 diff --git a/tests/v3d/vertex_face/D6 b/tests/vselect/vertex_face/D6 similarity index 100% rename from tests/v3d/vertex_face/D6 rename to tests/vselect/vertex_face/D6 diff --git a/tests/v3d/vertex_face/D7 b/tests/vselect/vertex_face/D7 similarity index 100% rename from tests/v3d/vertex_face/D7 rename to tests/vselect/vertex_face/D7 diff --git a/tests/v3d/vertex_face/D8 b/tests/vselect/vertex_face/D8 similarity index 100% rename from tests/v3d/vertex_face/D8 rename to tests/vselect/vertex_face/D8 diff --git a/tests/v3d/vertex_face/D9 b/tests/vselect/vertex_face/D9 similarity index 100% rename from tests/v3d/vertex_face/D9 rename to tests/vselect/vertex_face/D9 diff --git a/tests/v3d/vertex_face/E1 b/tests/vselect/vertex_face/E1 similarity index 100% rename from tests/v3d/vertex_face/E1 rename to tests/vselect/vertex_face/E1 diff --git a/tests/v3d/vertex_face/E2 b/tests/vselect/vertex_face/E2 similarity index 100% rename from tests/v3d/vertex_face/E2 rename to tests/vselect/vertex_face/E2 diff --git a/tests/v3d/vertex_face/E3 b/tests/vselect/vertex_face/E3 similarity index 100% rename from tests/v3d/vertex_face/E3 rename to tests/vselect/vertex_face/E3 diff --git a/tests/v3d/vertex_face/E4 b/tests/vselect/vertex_face/E4 similarity index 100% rename from tests/v3d/vertex_face/E4 rename to tests/vselect/vertex_face/E4 diff --git a/tests/v3d/vertex_face/E5 b/tests/vselect/vertex_face/E5 similarity index 100% rename from tests/v3d/vertex_face/E5 rename to tests/vselect/vertex_face/E5 diff --git a/tests/v3d/vertex_face/E6 b/tests/vselect/vertex_face/E6 similarity index 100% rename from tests/v3d/vertex_face/E6 rename to tests/vselect/vertex_face/E6 diff --git a/tests/v3d/vertex_face/E7 b/tests/vselect/vertex_face/E7 similarity index 100% rename from tests/v3d/vertex_face/E7 rename to tests/vselect/vertex_face/E7 diff --git a/tests/v3d/vertex_face/E8 b/tests/vselect/vertex_face/E8 similarity index 100% rename from tests/v3d/vertex_face/E8 rename to tests/vselect/vertex_face/E8 diff --git a/tests/v3d/vertex_face/E9 b/tests/vselect/vertex_face/E9 similarity index 100% rename from tests/v3d/vertex_face/E9 rename to tests/vselect/vertex_face/E9 diff --git a/tests/v3d/vertex_face/F1 b/tests/vselect/vertex_face/F1 similarity index 100% rename from tests/v3d/vertex_face/F1 rename to tests/vselect/vertex_face/F1 diff --git a/tests/v3d/vertex_face/F2 b/tests/vselect/vertex_face/F2 similarity index 100% rename from tests/v3d/vertex_face/F2 rename to tests/vselect/vertex_face/F2 diff --git a/tests/v3d/vertex_face/F3 b/tests/vselect/vertex_face/F3 similarity index 100% rename from tests/v3d/vertex_face/F3 rename to tests/vselect/vertex_face/F3 diff --git a/tests/v3d/vertex_face/F4 b/tests/vselect/vertex_face/F4 similarity index 100% rename from tests/v3d/vertex_face/F4 rename to tests/vselect/vertex_face/F4 diff --git a/tests/v3d/vertex_face/F5 b/tests/vselect/vertex_face/F5 similarity index 100% rename from tests/v3d/vertex_face/F5 rename to tests/vselect/vertex_face/F5 diff --git a/tests/v3d/vertex_face/F6 b/tests/vselect/vertex_face/F6 similarity index 100% rename from tests/v3d/vertex_face/F6 rename to tests/vselect/vertex_face/F6 diff --git a/tests/v3d/vertex_face/F7 b/tests/vselect/vertex_face/F7 similarity index 100% rename from tests/v3d/vertex_face/F7 rename to tests/vselect/vertex_face/F7 diff --git a/tests/v3d/vertex_face/F8 b/tests/vselect/vertex_face/F8 similarity index 100% rename from tests/v3d/vertex_face/F8 rename to tests/vselect/vertex_face/F8 diff --git a/tests/v3d/vertex_face/F9 b/tests/vselect/vertex_face/F9 similarity index 100% rename from tests/v3d/vertex_face/F9 rename to tests/vselect/vertex_face/F9 diff --git a/tests/v3d/vertex_face/G1 b/tests/vselect/vertex_face/G1 similarity index 100% rename from tests/v3d/vertex_face/G1 rename to tests/vselect/vertex_face/G1 diff --git a/tests/v3d/vertex_face/G2 b/tests/vselect/vertex_face/G2 similarity index 100% rename from tests/v3d/vertex_face/G2 rename to tests/vselect/vertex_face/G2 diff --git a/tests/v3d/vertex_face/G3 b/tests/vselect/vertex_face/G3 similarity index 100% rename from tests/v3d/vertex_face/G3 rename to tests/vselect/vertex_face/G3 diff --git a/tests/v3d/vertex_face/G4 b/tests/vselect/vertex_face/G4 similarity index 100% rename from tests/v3d/vertex_face/G4 rename to tests/vselect/vertex_face/G4 diff --git a/tests/v3d/vertex_face/G5 b/tests/vselect/vertex_face/G5 similarity index 100% rename from tests/v3d/vertex_face/G5 rename to tests/vselect/vertex_face/G5 diff --git a/tests/v3d/vertex_face/G6 b/tests/vselect/vertex_face/G6 similarity index 100% rename from tests/v3d/vertex_face/G6 rename to tests/vselect/vertex_face/G6 diff --git a/tests/v3d/vertex_face/G7 b/tests/vselect/vertex_face/G7 similarity index 100% rename from tests/v3d/vertex_face/G7 rename to tests/vselect/vertex_face/G7 diff --git a/tests/v3d/vertex_face/G8 b/tests/vselect/vertex_face/G8 similarity index 100% rename from tests/v3d/vertex_face/G8 rename to tests/vselect/vertex_face/G8 diff --git a/tests/v3d/vertex_face/G9 b/tests/vselect/vertex_face/G9 similarity index 100% rename from tests/v3d/vertex_face/G9 rename to tests/vselect/vertex_face/G9 diff --git a/tests/v3d/vertex_face/H1 b/tests/vselect/vertex_face/H1 similarity index 100% rename from tests/v3d/vertex_face/H1 rename to tests/vselect/vertex_face/H1 diff --git a/tests/v3d/vertex_face/H2 b/tests/vselect/vertex_face/H2 similarity index 100% rename from tests/v3d/vertex_face/H2 rename to tests/vselect/vertex_face/H2 diff --git a/tests/v3d/vertex_face/H3 b/tests/vselect/vertex_face/H3 similarity index 100% rename from tests/v3d/vertex_face/H3 rename to tests/vselect/vertex_face/H3 diff --git a/tests/v3d/vertex_face/H4 b/tests/vselect/vertex_face/H4 similarity index 100% rename from tests/v3d/vertex_face/H4 rename to tests/vselect/vertex_face/H4 diff --git a/tests/v3d/vertex_face/H5 b/tests/vselect/vertex_face/H5 similarity index 100% rename from tests/v3d/vertex_face/H5 rename to tests/vselect/vertex_face/H5 diff --git a/tests/v3d/vertex_face/H6 b/tests/vselect/vertex_face/H6 similarity index 100% rename from tests/v3d/vertex_face/H6 rename to tests/vselect/vertex_face/H6 diff --git a/tests/v3d/vertex_face/H7 b/tests/vselect/vertex_face/H7 similarity index 100% rename from tests/v3d/vertex_face/H7 rename to tests/vselect/vertex_face/H7 diff --git a/tests/v3d/vertex_face/H8 b/tests/vselect/vertex_face/H8 similarity index 100% rename from tests/v3d/vertex_face/H8 rename to tests/vselect/vertex_face/H8 diff --git a/tests/v3d/vertex_face/H9 b/tests/vselect/vertex_face/H9 similarity index 100% rename from tests/v3d/vertex_face/H9 rename to tests/vselect/vertex_face/H9 diff --git a/tests/v3d/vertex_face/I1 b/tests/vselect/vertex_face/I1 similarity index 100% rename from tests/v3d/vertex_face/I1 rename to tests/vselect/vertex_face/I1 diff --git a/tests/v3d/vertex_face/I2 b/tests/vselect/vertex_face/I2 similarity index 100% rename from tests/v3d/vertex_face/I2 rename to tests/vselect/vertex_face/I2 diff --git a/tests/v3d/vertex_face/I3 b/tests/vselect/vertex_face/I3 similarity index 100% rename from tests/v3d/vertex_face/I3 rename to tests/vselect/vertex_face/I3 diff --git a/tests/v3d/vertex_face/I4 b/tests/vselect/vertex_face/I4 similarity index 100% rename from tests/v3d/vertex_face/I4 rename to tests/vselect/vertex_face/I4 diff --git a/tests/v3d/vertex_face/I5 b/tests/vselect/vertex_face/I5 similarity index 100% rename from tests/v3d/vertex_face/I5 rename to tests/vselect/vertex_face/I5 diff --git a/tests/v3d/vertex_face/I6 b/tests/vselect/vertex_face/I6 similarity index 100% rename from tests/v3d/vertex_face/I6 rename to tests/vselect/vertex_face/I6 diff --git a/tests/v3d/vertex_face/I7 b/tests/vselect/vertex_face/I7 similarity index 100% rename from tests/v3d/vertex_face/I7 rename to tests/vselect/vertex_face/I7 diff --git a/tests/v3d/vertex_face/I8 b/tests/vselect/vertex_face/I8 similarity index 100% rename from tests/v3d/vertex_face/I8 rename to tests/vselect/vertex_face/I8 diff --git a/tests/v3d/vertex_face/I9 b/tests/vselect/vertex_face/I9 similarity index 100% rename from tests/v3d/vertex_face/I9 rename to tests/vselect/vertex_face/I9 diff --git a/tests/v3d/vertex_face/J1 b/tests/vselect/vertex_face/J1 similarity index 100% rename from tests/v3d/vertex_face/J1 rename to tests/vselect/vertex_face/J1 diff --git a/tests/v3d/vertex_face/J2 b/tests/vselect/vertex_face/J2 similarity index 100% rename from tests/v3d/vertex_face/J2 rename to tests/vselect/vertex_face/J2 diff --git a/tests/v3d/vertex_face/J3 b/tests/vselect/vertex_face/J3 similarity index 100% rename from tests/v3d/vertex_face/J3 rename to tests/vselect/vertex_face/J3 diff --git a/tests/v3d/vertex_face/J4 b/tests/vselect/vertex_face/J4 similarity index 100% rename from tests/v3d/vertex_face/J4 rename to tests/vselect/vertex_face/J4 diff --git a/tests/v3d/vertex_face/J5 b/tests/vselect/vertex_face/J5 similarity index 100% rename from tests/v3d/vertex_face/J5 rename to tests/vselect/vertex_face/J5 diff --git a/tests/v3d/vertex_face/J6 b/tests/vselect/vertex_face/J6 similarity index 100% rename from tests/v3d/vertex_face/J6 rename to tests/vselect/vertex_face/J6 diff --git a/tests/v3d/vertex_face/J7 b/tests/vselect/vertex_face/J7 similarity index 100% rename from tests/v3d/vertex_face/J7 rename to tests/vselect/vertex_face/J7 diff --git a/tests/v3d/vertex_face/J8 b/tests/vselect/vertex_face/J8 similarity index 100% rename from tests/v3d/vertex_face/J8 rename to tests/vselect/vertex_face/J8 diff --git a/tests/v3d/vertex_face/J9 b/tests/vselect/vertex_face/J9 similarity index 100% rename from tests/v3d/vertex_face/J9 rename to tests/vselect/vertex_face/J9 diff --git a/tests/v3d/vertex_face/K1 b/tests/vselect/vertex_face/K1 similarity index 100% rename from tests/v3d/vertex_face/K1 rename to tests/vselect/vertex_face/K1 diff --git a/tests/v3d/vertex_face/K2 b/tests/vselect/vertex_face/K2 similarity index 100% rename from tests/v3d/vertex_face/K2 rename to tests/vselect/vertex_face/K2 diff --git a/tests/v3d/vertex_face/K3 b/tests/vselect/vertex_face/K3 similarity index 100% rename from tests/v3d/vertex_face/K3 rename to tests/vselect/vertex_face/K3 diff --git a/tests/v3d/vertex_face/K4 b/tests/vselect/vertex_face/K4 similarity index 100% rename from tests/v3d/vertex_face/K4 rename to tests/vselect/vertex_face/K4 diff --git a/tests/vselect/vertex_face/begin b/tests/vselect/vertex_face/begin new file mode 100644 index 0000000000..93ea333926 --- /dev/null +++ b/tests/vselect/vertex_face/begin @@ -0,0 +1 @@ +vinit View1 diff --git a/tests/vselect/vertex_face/end b/tests/vselect/vertex_face/end new file mode 100644 index 0000000000..3d3cd7e7c3 --- /dev/null +++ b/tests/vselect/vertex_face/end @@ -0,0 +1 @@ +vdump $imagedir/${casename}.png diff --git a/tests/v3d/vertex_solid/A1 b/tests/vselect/vertex_solid/A1 similarity index 100% rename from tests/v3d/vertex_solid/A1 rename to tests/vselect/vertex_solid/A1 diff --git a/tests/v3d/vertex_solid/A2 b/tests/vselect/vertex_solid/A2 similarity index 100% rename from tests/v3d/vertex_solid/A2 rename to tests/vselect/vertex_solid/A2 diff --git a/tests/v3d/vertex_solid/A3 b/tests/vselect/vertex_solid/A3 similarity index 100% rename from tests/v3d/vertex_solid/A3 rename to tests/vselect/vertex_solid/A3 diff --git a/tests/v3d/vertex_solid/A4 b/tests/vselect/vertex_solid/A4 similarity index 100% rename from tests/v3d/vertex_solid/A4 rename to tests/vselect/vertex_solid/A4 diff --git a/tests/v3d/vertex_solid/A5 b/tests/vselect/vertex_solid/A5 similarity index 100% rename from tests/v3d/vertex_solid/A5 rename to tests/vselect/vertex_solid/A5 diff --git a/tests/v3d/vertex_solid/A6 b/tests/vselect/vertex_solid/A6 similarity index 100% rename from tests/v3d/vertex_solid/A6 rename to tests/vselect/vertex_solid/A6 diff --git a/tests/v3d/vertex_solid/A7 b/tests/vselect/vertex_solid/A7 similarity index 100% rename from tests/v3d/vertex_solid/A7 rename to tests/vselect/vertex_solid/A7 diff --git a/tests/v3d/vertex_solid/A8 b/tests/vselect/vertex_solid/A8 similarity index 100% rename from tests/v3d/vertex_solid/A8 rename to tests/vselect/vertex_solid/A8 diff --git a/tests/v3d/vertex_solid/A9 b/tests/vselect/vertex_solid/A9 similarity index 100% rename from tests/v3d/vertex_solid/A9 rename to tests/vselect/vertex_solid/A9 diff --git a/tests/v3d/vertex_solid/B1 b/tests/vselect/vertex_solid/B1 similarity index 100% rename from tests/v3d/vertex_solid/B1 rename to tests/vselect/vertex_solid/B1 diff --git a/tests/v3d/vertex_solid/B2 b/tests/vselect/vertex_solid/B2 similarity index 100% rename from tests/v3d/vertex_solid/B2 rename to tests/vselect/vertex_solid/B2 diff --git a/tests/v3d/vertex_solid/B3 b/tests/vselect/vertex_solid/B3 similarity index 100% rename from tests/v3d/vertex_solid/B3 rename to tests/vselect/vertex_solid/B3 diff --git a/tests/v3d/vertex_solid/B4 b/tests/vselect/vertex_solid/B4 similarity index 100% rename from tests/v3d/vertex_solid/B4 rename to tests/vselect/vertex_solid/B4 diff --git a/tests/v3d/vertex_solid/B5 b/tests/vselect/vertex_solid/B5 similarity index 100% rename from tests/v3d/vertex_solid/B5 rename to tests/vselect/vertex_solid/B5 diff --git a/tests/v3d/vertex_solid/B6 b/tests/vselect/vertex_solid/B6 similarity index 100% rename from tests/v3d/vertex_solid/B6 rename to tests/vselect/vertex_solid/B6 diff --git a/tests/v3d/vertex_solid/B7 b/tests/vselect/vertex_solid/B7 similarity index 100% rename from tests/v3d/vertex_solid/B7 rename to tests/vselect/vertex_solid/B7 diff --git a/tests/v3d/vertex_solid/B8 b/tests/vselect/vertex_solid/B8 similarity index 100% rename from tests/v3d/vertex_solid/B8 rename to tests/vselect/vertex_solid/B8 diff --git a/tests/v3d/vertex_solid/B9 b/tests/vselect/vertex_solid/B9 similarity index 100% rename from tests/v3d/vertex_solid/B9 rename to tests/vselect/vertex_solid/B9 diff --git a/tests/v3d/vertex_solid/C1 b/tests/vselect/vertex_solid/C1 similarity index 100% rename from tests/v3d/vertex_solid/C1 rename to tests/vselect/vertex_solid/C1 diff --git a/tests/v3d/vertex_solid/C2 b/tests/vselect/vertex_solid/C2 similarity index 100% rename from tests/v3d/vertex_solid/C2 rename to tests/vselect/vertex_solid/C2 diff --git a/tests/v3d/vertex_solid/C3 b/tests/vselect/vertex_solid/C3 similarity index 100% rename from tests/v3d/vertex_solid/C3 rename to tests/vselect/vertex_solid/C3 diff --git a/tests/v3d/vertex_solid/C4 b/tests/vselect/vertex_solid/C4 similarity index 100% rename from tests/v3d/vertex_solid/C4 rename to tests/vselect/vertex_solid/C4 diff --git a/tests/v3d/vertex_solid/C5 b/tests/vselect/vertex_solid/C5 similarity index 100% rename from tests/v3d/vertex_solid/C5 rename to tests/vselect/vertex_solid/C5 diff --git a/tests/v3d/vertex_solid/C6 b/tests/vselect/vertex_solid/C6 similarity index 100% rename from tests/v3d/vertex_solid/C6 rename to tests/vselect/vertex_solid/C6 diff --git a/tests/v3d/vertex_solid/C7 b/tests/vselect/vertex_solid/C7 similarity index 100% rename from tests/v3d/vertex_solid/C7 rename to tests/vselect/vertex_solid/C7 diff --git a/tests/v3d/vertex_solid/C8 b/tests/vselect/vertex_solid/C8 similarity index 100% rename from tests/v3d/vertex_solid/C8 rename to tests/vselect/vertex_solid/C8 diff --git a/tests/v3d/vertex_solid/C9 b/tests/vselect/vertex_solid/C9 similarity index 100% rename from tests/v3d/vertex_solid/C9 rename to tests/vselect/vertex_solid/C9 diff --git a/tests/v3d/vertex_solid/D1 b/tests/vselect/vertex_solid/D1 similarity index 100% rename from tests/v3d/vertex_solid/D1 rename to tests/vselect/vertex_solid/D1 diff --git a/tests/v3d/vertex_solid/D2 b/tests/vselect/vertex_solid/D2 similarity index 100% rename from tests/v3d/vertex_solid/D2 rename to tests/vselect/vertex_solid/D2 diff --git a/tests/v3d/vertex_solid/D3 b/tests/vselect/vertex_solid/D3 similarity index 100% rename from tests/v3d/vertex_solid/D3 rename to tests/vselect/vertex_solid/D3 diff --git a/tests/v3d/vertex_solid/D4 b/tests/vselect/vertex_solid/D4 similarity index 100% rename from tests/v3d/vertex_solid/D4 rename to tests/vselect/vertex_solid/D4 diff --git a/tests/v3d/vertex_solid/D5 b/tests/vselect/vertex_solid/D5 similarity index 100% rename from tests/v3d/vertex_solid/D5 rename to tests/vselect/vertex_solid/D5 diff --git a/tests/v3d/vertex_solid/D6 b/tests/vselect/vertex_solid/D6 similarity index 100% rename from tests/v3d/vertex_solid/D6 rename to tests/vselect/vertex_solid/D6 diff --git a/tests/v3d/vertex_solid/D7 b/tests/vselect/vertex_solid/D7 similarity index 100% rename from tests/v3d/vertex_solid/D7 rename to tests/vselect/vertex_solid/D7 diff --git a/tests/v3d/vertex_solid/D8 b/tests/vselect/vertex_solid/D8 similarity index 100% rename from tests/v3d/vertex_solid/D8 rename to tests/vselect/vertex_solid/D8 diff --git a/tests/v3d/vertex_solid/D9 b/tests/vselect/vertex_solid/D9 similarity index 100% rename from tests/v3d/vertex_solid/D9 rename to tests/vselect/vertex_solid/D9 diff --git a/tests/v3d/vertex_solid/E1 b/tests/vselect/vertex_solid/E1 similarity index 100% rename from tests/v3d/vertex_solid/E1 rename to tests/vselect/vertex_solid/E1 diff --git a/tests/v3d/vertex_solid/E2 b/tests/vselect/vertex_solid/E2 similarity index 100% rename from tests/v3d/vertex_solid/E2 rename to tests/vselect/vertex_solid/E2 diff --git a/tests/v3d/vertex_solid/E3 b/tests/vselect/vertex_solid/E3 similarity index 100% rename from tests/v3d/vertex_solid/E3 rename to tests/vselect/vertex_solid/E3 diff --git a/tests/v3d/vertex_solid/E4 b/tests/vselect/vertex_solid/E4 similarity index 100% rename from tests/v3d/vertex_solid/E4 rename to tests/vselect/vertex_solid/E4 diff --git a/tests/v3d/vertex_solid/E5 b/tests/vselect/vertex_solid/E5 similarity index 100% rename from tests/v3d/vertex_solid/E5 rename to tests/vselect/vertex_solid/E5 diff --git a/tests/v3d/vertex_solid/E6 b/tests/vselect/vertex_solid/E6 similarity index 100% rename from tests/v3d/vertex_solid/E6 rename to tests/vselect/vertex_solid/E6 diff --git a/tests/v3d/vertex_solid/E7 b/tests/vselect/vertex_solid/E7 similarity index 100% rename from tests/v3d/vertex_solid/E7 rename to tests/vselect/vertex_solid/E7 diff --git a/tests/v3d/vertex_solid/E8 b/tests/vselect/vertex_solid/E8 similarity index 100% rename from tests/v3d/vertex_solid/E8 rename to tests/vselect/vertex_solid/E8 diff --git a/tests/v3d/vertex_solid/E9 b/tests/vselect/vertex_solid/E9 similarity index 100% rename from tests/v3d/vertex_solid/E9 rename to tests/vselect/vertex_solid/E9 diff --git a/tests/v3d/vertex_solid/F1 b/tests/vselect/vertex_solid/F1 similarity index 100% rename from tests/v3d/vertex_solid/F1 rename to tests/vselect/vertex_solid/F1 diff --git a/tests/v3d/vertex_solid/F2 b/tests/vselect/vertex_solid/F2 similarity index 100% rename from tests/v3d/vertex_solid/F2 rename to tests/vselect/vertex_solid/F2 diff --git a/tests/v3d/vertex_solid/F3 b/tests/vselect/vertex_solid/F3 similarity index 100% rename from tests/v3d/vertex_solid/F3 rename to tests/vselect/vertex_solid/F3 diff --git a/tests/v3d/vertex_solid/F4 b/tests/vselect/vertex_solid/F4 similarity index 100% rename from tests/v3d/vertex_solid/F4 rename to tests/vselect/vertex_solid/F4 diff --git a/tests/v3d/vertex_solid/F5 b/tests/vselect/vertex_solid/F5 similarity index 100% rename from tests/v3d/vertex_solid/F5 rename to tests/vselect/vertex_solid/F5 diff --git a/tests/v3d/vertex_solid/F6 b/tests/vselect/vertex_solid/F6 similarity index 100% rename from tests/v3d/vertex_solid/F6 rename to tests/vselect/vertex_solid/F6 diff --git a/tests/v3d/vertex_solid/F7 b/tests/vselect/vertex_solid/F7 similarity index 100% rename from tests/v3d/vertex_solid/F7 rename to tests/vselect/vertex_solid/F7 diff --git a/tests/v3d/vertex_solid/F8 b/tests/vselect/vertex_solid/F8 similarity index 100% rename from tests/v3d/vertex_solid/F8 rename to tests/vselect/vertex_solid/F8 diff --git a/tests/v3d/vertex_solid/F9 b/tests/vselect/vertex_solid/F9 similarity index 100% rename from tests/v3d/vertex_solid/F9 rename to tests/vselect/vertex_solid/F9 diff --git a/tests/v3d/vertex_solid/G1 b/tests/vselect/vertex_solid/G1 similarity index 100% rename from tests/v3d/vertex_solid/G1 rename to tests/vselect/vertex_solid/G1 diff --git a/tests/v3d/vertex_solid/G2 b/tests/vselect/vertex_solid/G2 similarity index 100% rename from tests/v3d/vertex_solid/G2 rename to tests/vselect/vertex_solid/G2 diff --git a/tests/v3d/vertex_solid/G3 b/tests/vselect/vertex_solid/G3 similarity index 100% rename from tests/v3d/vertex_solid/G3 rename to tests/vselect/vertex_solid/G3 diff --git a/tests/v3d/vertex_solid/G4 b/tests/vselect/vertex_solid/G4 similarity index 100% rename from tests/v3d/vertex_solid/G4 rename to tests/vselect/vertex_solid/G4 diff --git a/tests/v3d/vertex_solid/G5 b/tests/vselect/vertex_solid/G5 similarity index 100% rename from tests/v3d/vertex_solid/G5 rename to tests/vselect/vertex_solid/G5 diff --git a/tests/v3d/vertex_solid/G6 b/tests/vselect/vertex_solid/G6 similarity index 100% rename from tests/v3d/vertex_solid/G6 rename to tests/vselect/vertex_solid/G6 diff --git a/tests/v3d/vertex_solid/G7 b/tests/vselect/vertex_solid/G7 similarity index 100% rename from tests/v3d/vertex_solid/G7 rename to tests/vselect/vertex_solid/G7 diff --git a/tests/v3d/vertex_solid/G8 b/tests/vselect/vertex_solid/G8 similarity index 100% rename from tests/v3d/vertex_solid/G8 rename to tests/vselect/vertex_solid/G8 diff --git a/tests/v3d/vertex_solid/G9 b/tests/vselect/vertex_solid/G9 similarity index 100% rename from tests/v3d/vertex_solid/G9 rename to tests/vselect/vertex_solid/G9 diff --git a/tests/v3d/vertex_solid/H1 b/tests/vselect/vertex_solid/H1 similarity index 100% rename from tests/v3d/vertex_solid/H1 rename to tests/vselect/vertex_solid/H1 diff --git a/tests/v3d/vertex_solid/H2 b/tests/vselect/vertex_solid/H2 similarity index 100% rename from tests/v3d/vertex_solid/H2 rename to tests/vselect/vertex_solid/H2 diff --git a/tests/v3d/vertex_solid/H3 b/tests/vselect/vertex_solid/H3 similarity index 100% rename from tests/v3d/vertex_solid/H3 rename to tests/vselect/vertex_solid/H3 diff --git a/tests/v3d/vertex_solid/H4 b/tests/vselect/vertex_solid/H4 similarity index 100% rename from tests/v3d/vertex_solid/H4 rename to tests/vselect/vertex_solid/H4 diff --git a/tests/v3d/vertex_solid/H5 b/tests/vselect/vertex_solid/H5 similarity index 100% rename from tests/v3d/vertex_solid/H5 rename to tests/vselect/vertex_solid/H5 diff --git a/tests/v3d/vertex_solid/H6 b/tests/vselect/vertex_solid/H6 similarity index 100% rename from tests/v3d/vertex_solid/H6 rename to tests/vselect/vertex_solid/H6 diff --git a/tests/v3d/vertex_solid/H7 b/tests/vselect/vertex_solid/H7 similarity index 100% rename from tests/v3d/vertex_solid/H7 rename to tests/vselect/vertex_solid/H7 diff --git a/tests/v3d/vertex_solid/H8 b/tests/vselect/vertex_solid/H8 similarity index 100% rename from tests/v3d/vertex_solid/H8 rename to tests/vselect/vertex_solid/H8 diff --git a/tests/v3d/vertex_solid/H9 b/tests/vselect/vertex_solid/H9 similarity index 100% rename from tests/v3d/vertex_solid/H9 rename to tests/vselect/vertex_solid/H9 diff --git a/tests/v3d/vertex_solid/I1 b/tests/vselect/vertex_solid/I1 similarity index 100% rename from tests/v3d/vertex_solid/I1 rename to tests/vselect/vertex_solid/I1 diff --git a/tests/v3d/vertex_solid/I2 b/tests/vselect/vertex_solid/I2 similarity index 100% rename from tests/v3d/vertex_solid/I2 rename to tests/vselect/vertex_solid/I2 diff --git a/tests/v3d/vertex_solid/I3 b/tests/vselect/vertex_solid/I3 similarity index 100% rename from tests/v3d/vertex_solid/I3 rename to tests/vselect/vertex_solid/I3 diff --git a/tests/v3d/vertex_solid/I4 b/tests/vselect/vertex_solid/I4 similarity index 100% rename from tests/v3d/vertex_solid/I4 rename to tests/vselect/vertex_solid/I4 diff --git a/tests/v3d/vertex_solid/I5 b/tests/vselect/vertex_solid/I5 similarity index 100% rename from tests/v3d/vertex_solid/I5 rename to tests/vselect/vertex_solid/I5 diff --git a/tests/v3d/vertex_solid/I6 b/tests/vselect/vertex_solid/I6 similarity index 100% rename from tests/v3d/vertex_solid/I6 rename to tests/vselect/vertex_solid/I6 diff --git a/tests/v3d/vertex_solid/I7 b/tests/vselect/vertex_solid/I7 similarity index 100% rename from tests/v3d/vertex_solid/I7 rename to tests/vselect/vertex_solid/I7 diff --git a/tests/v3d/vertex_solid/I8 b/tests/vselect/vertex_solid/I8 similarity index 100% rename from tests/v3d/vertex_solid/I8 rename to tests/vselect/vertex_solid/I8 diff --git a/tests/v3d/vertex_solid/I9 b/tests/vselect/vertex_solid/I9 similarity index 100% rename from tests/v3d/vertex_solid/I9 rename to tests/vselect/vertex_solid/I9 diff --git a/tests/v3d/vertex_solid/J1 b/tests/vselect/vertex_solid/J1 similarity index 100% rename from tests/v3d/vertex_solid/J1 rename to tests/vselect/vertex_solid/J1 diff --git a/tests/v3d/vertex_solid/J2 b/tests/vselect/vertex_solid/J2 similarity index 100% rename from tests/v3d/vertex_solid/J2 rename to tests/vselect/vertex_solid/J2 diff --git a/tests/v3d/vertex_solid/J3 b/tests/vselect/vertex_solid/J3 similarity index 100% rename from tests/v3d/vertex_solid/J3 rename to tests/vselect/vertex_solid/J3 diff --git a/tests/v3d/vertex_solid/J4 b/tests/vselect/vertex_solid/J4 similarity index 100% rename from tests/v3d/vertex_solid/J4 rename to tests/vselect/vertex_solid/J4 diff --git a/tests/v3d/vertex_solid/J5 b/tests/vselect/vertex_solid/J5 similarity index 100% rename from tests/v3d/vertex_solid/J5 rename to tests/vselect/vertex_solid/J5 diff --git a/tests/v3d/vertex_solid/J6 b/tests/vselect/vertex_solid/J6 similarity index 100% rename from tests/v3d/vertex_solid/J6 rename to tests/vselect/vertex_solid/J6 diff --git a/tests/v3d/vertex_solid/J7 b/tests/vselect/vertex_solid/J7 similarity index 100% rename from tests/v3d/vertex_solid/J7 rename to tests/vselect/vertex_solid/J7 diff --git a/tests/v3d/vertex_solid/J8 b/tests/vselect/vertex_solid/J8 similarity index 100% rename from tests/v3d/vertex_solid/J8 rename to tests/vselect/vertex_solid/J8 diff --git a/tests/v3d/vertex_solid/J9 b/tests/vselect/vertex_solid/J9 similarity index 100% rename from tests/v3d/vertex_solid/J9 rename to tests/vselect/vertex_solid/J9 diff --git a/tests/v3d/vertex_solid/K1 b/tests/vselect/vertex_solid/K1 similarity index 100% rename from tests/v3d/vertex_solid/K1 rename to tests/vselect/vertex_solid/K1 diff --git a/tests/v3d/vertex_solid/K2 b/tests/vselect/vertex_solid/K2 similarity index 100% rename from tests/v3d/vertex_solid/K2 rename to tests/vselect/vertex_solid/K2 diff --git a/tests/v3d/vertex_solid/K3 b/tests/vselect/vertex_solid/K3 similarity index 100% rename from tests/v3d/vertex_solid/K3 rename to tests/vselect/vertex_solid/K3 diff --git a/tests/v3d/vertex_solid/K4 b/tests/vselect/vertex_solid/K4 similarity index 100% rename from tests/v3d/vertex_solid/K4 rename to tests/vselect/vertex_solid/K4 diff --git a/tests/vselect/vertex_solid/begin b/tests/vselect/vertex_solid/begin new file mode 100644 index 0000000000..93ea333926 --- /dev/null +++ b/tests/vselect/vertex_solid/begin @@ -0,0 +1 @@ +vinit View1 diff --git a/tests/vselect/vertex_solid/end b/tests/vselect/vertex_solid/end new file mode 100644 index 0000000000..3d3cd7e7c3 --- /dev/null +++ b/tests/vselect/vertex_solid/end @@ -0,0 +1 @@ +vdump $imagedir/${casename}.png diff --git a/tests/v3d/vertex_wire/A1 b/tests/vselect/vertex_wire/A1 similarity index 100% rename from tests/v3d/vertex_wire/A1 rename to tests/vselect/vertex_wire/A1 diff --git a/tests/v3d/vertex_wire/A2 b/tests/vselect/vertex_wire/A2 similarity index 100% rename from tests/v3d/vertex_wire/A2 rename to tests/vselect/vertex_wire/A2 diff --git a/tests/v3d/vertex_wire/A3 b/tests/vselect/vertex_wire/A3 similarity index 100% rename from tests/v3d/vertex_wire/A3 rename to tests/vselect/vertex_wire/A3 diff --git a/tests/v3d/vertex_wire/A4 b/tests/vselect/vertex_wire/A4 similarity index 100% rename from tests/v3d/vertex_wire/A4 rename to tests/vselect/vertex_wire/A4 diff --git a/tests/v3d/vertex_wire/A5 b/tests/vselect/vertex_wire/A5 similarity index 100% rename from tests/v3d/vertex_wire/A5 rename to tests/vselect/vertex_wire/A5 diff --git a/tests/v3d/vertex_wire/A6 b/tests/vselect/vertex_wire/A6 similarity index 100% rename from tests/v3d/vertex_wire/A6 rename to tests/vselect/vertex_wire/A6 diff --git a/tests/v3d/vertex_wire/A7 b/tests/vselect/vertex_wire/A7 similarity index 100% rename from tests/v3d/vertex_wire/A7 rename to tests/vselect/vertex_wire/A7 diff --git a/tests/v3d/vertex_wire/A8 b/tests/vselect/vertex_wire/A8 similarity index 100% rename from tests/v3d/vertex_wire/A8 rename to tests/vselect/vertex_wire/A8 diff --git a/tests/v3d/vertex_wire/A9 b/tests/vselect/vertex_wire/A9 similarity index 100% rename from tests/v3d/vertex_wire/A9 rename to tests/vselect/vertex_wire/A9 diff --git a/tests/v3d/vertex_wire/B1 b/tests/vselect/vertex_wire/B1 similarity index 100% rename from tests/v3d/vertex_wire/B1 rename to tests/vselect/vertex_wire/B1 diff --git a/tests/v3d/vertex_wire/B2 b/tests/vselect/vertex_wire/B2 similarity index 100% rename from tests/v3d/vertex_wire/B2 rename to tests/vselect/vertex_wire/B2 diff --git a/tests/v3d/vertex_wire/B3 b/tests/vselect/vertex_wire/B3 similarity index 100% rename from tests/v3d/vertex_wire/B3 rename to tests/vselect/vertex_wire/B3 diff --git a/tests/v3d/vertex_wire/B4 b/tests/vselect/vertex_wire/B4 similarity index 100% rename from tests/v3d/vertex_wire/B4 rename to tests/vselect/vertex_wire/B4 diff --git a/tests/v3d/vertex_wire/B5 b/tests/vselect/vertex_wire/B5 similarity index 100% rename from tests/v3d/vertex_wire/B5 rename to tests/vselect/vertex_wire/B5 diff --git a/tests/v3d/vertex_wire/B6 b/tests/vselect/vertex_wire/B6 similarity index 100% rename from tests/v3d/vertex_wire/B6 rename to tests/vselect/vertex_wire/B6 diff --git a/tests/v3d/vertex_wire/B7 b/tests/vselect/vertex_wire/B7 similarity index 100% rename from tests/v3d/vertex_wire/B7 rename to tests/vselect/vertex_wire/B7 diff --git a/tests/v3d/vertex_wire/B8 b/tests/vselect/vertex_wire/B8 similarity index 100% rename from tests/v3d/vertex_wire/B8 rename to tests/vselect/vertex_wire/B8 diff --git a/tests/v3d/vertex_wire/B9 b/tests/vselect/vertex_wire/B9 similarity index 100% rename from tests/v3d/vertex_wire/B9 rename to tests/vselect/vertex_wire/B9 diff --git a/tests/v3d/vertex_wire/C1 b/tests/vselect/vertex_wire/C1 similarity index 100% rename from tests/v3d/vertex_wire/C1 rename to tests/vselect/vertex_wire/C1 diff --git a/tests/v3d/vertex_wire/C2 b/tests/vselect/vertex_wire/C2 similarity index 100% rename from tests/v3d/vertex_wire/C2 rename to tests/vselect/vertex_wire/C2 diff --git a/tests/v3d/vertex_wire/C3 b/tests/vselect/vertex_wire/C3 similarity index 100% rename from tests/v3d/vertex_wire/C3 rename to tests/vselect/vertex_wire/C3 diff --git a/tests/v3d/vertex_wire/C4 b/tests/vselect/vertex_wire/C4 similarity index 100% rename from tests/v3d/vertex_wire/C4 rename to tests/vselect/vertex_wire/C4 diff --git a/tests/v3d/vertex_wire/C5 b/tests/vselect/vertex_wire/C5 similarity index 100% rename from tests/v3d/vertex_wire/C5 rename to tests/vselect/vertex_wire/C5 diff --git a/tests/v3d/vertex_wire/C6 b/tests/vselect/vertex_wire/C6 similarity index 100% rename from tests/v3d/vertex_wire/C6 rename to tests/vselect/vertex_wire/C6 diff --git a/tests/v3d/vertex_wire/C7 b/tests/vselect/vertex_wire/C7 similarity index 100% rename from tests/v3d/vertex_wire/C7 rename to tests/vselect/vertex_wire/C7 diff --git a/tests/v3d/vertex_wire/C8 b/tests/vselect/vertex_wire/C8 similarity index 100% rename from tests/v3d/vertex_wire/C8 rename to tests/vselect/vertex_wire/C8 diff --git a/tests/v3d/vertex_wire/C9 b/tests/vselect/vertex_wire/C9 similarity index 100% rename from tests/v3d/vertex_wire/C9 rename to tests/vselect/vertex_wire/C9 diff --git a/tests/v3d/vertex_wire/D1 b/tests/vselect/vertex_wire/D1 similarity index 100% rename from tests/v3d/vertex_wire/D1 rename to tests/vselect/vertex_wire/D1 diff --git a/tests/v3d/vertex_wire/D2 b/tests/vselect/vertex_wire/D2 similarity index 100% rename from tests/v3d/vertex_wire/D2 rename to tests/vselect/vertex_wire/D2 diff --git a/tests/v3d/vertex_wire/D3 b/tests/vselect/vertex_wire/D3 similarity index 100% rename from tests/v3d/vertex_wire/D3 rename to tests/vselect/vertex_wire/D3 diff --git a/tests/v3d/vertex_wire/D4 b/tests/vselect/vertex_wire/D4 similarity index 100% rename from tests/v3d/vertex_wire/D4 rename to tests/vselect/vertex_wire/D4 diff --git a/tests/v3d/vertex_wire/D5 b/tests/vselect/vertex_wire/D5 similarity index 100% rename from tests/v3d/vertex_wire/D5 rename to tests/vselect/vertex_wire/D5 diff --git a/tests/v3d/vertex_wire/D6 b/tests/vselect/vertex_wire/D6 similarity index 100% rename from tests/v3d/vertex_wire/D6 rename to tests/vselect/vertex_wire/D6 diff --git a/tests/v3d/vertex_wire/D7 b/tests/vselect/vertex_wire/D7 similarity index 100% rename from tests/v3d/vertex_wire/D7 rename to tests/vselect/vertex_wire/D7 diff --git a/tests/v3d/vertex_wire/D8 b/tests/vselect/vertex_wire/D8 similarity index 100% rename from tests/v3d/vertex_wire/D8 rename to tests/vselect/vertex_wire/D8 diff --git a/tests/v3d/vertex_wire/D9 b/tests/vselect/vertex_wire/D9 similarity index 100% rename from tests/v3d/vertex_wire/D9 rename to tests/vselect/vertex_wire/D9 diff --git a/tests/v3d/vertex_wire/E1 b/tests/vselect/vertex_wire/E1 similarity index 100% rename from tests/v3d/vertex_wire/E1 rename to tests/vselect/vertex_wire/E1 diff --git a/tests/v3d/vertex_wire/E2 b/tests/vselect/vertex_wire/E2 similarity index 100% rename from tests/v3d/vertex_wire/E2 rename to tests/vselect/vertex_wire/E2 diff --git a/tests/v3d/vertex_wire/E3 b/tests/vselect/vertex_wire/E3 similarity index 100% rename from tests/v3d/vertex_wire/E3 rename to tests/vselect/vertex_wire/E3 diff --git a/tests/v3d/vertex_wire/E4 b/tests/vselect/vertex_wire/E4 similarity index 100% rename from tests/v3d/vertex_wire/E4 rename to tests/vselect/vertex_wire/E4 diff --git a/tests/v3d/vertex_wire/E5 b/tests/vselect/vertex_wire/E5 similarity index 100% rename from tests/v3d/vertex_wire/E5 rename to tests/vselect/vertex_wire/E5 diff --git a/tests/v3d/vertex_wire/E6 b/tests/vselect/vertex_wire/E6 similarity index 100% rename from tests/v3d/vertex_wire/E6 rename to tests/vselect/vertex_wire/E6 diff --git a/tests/v3d/vertex_wire/E7 b/tests/vselect/vertex_wire/E7 similarity index 100% rename from tests/v3d/vertex_wire/E7 rename to tests/vselect/vertex_wire/E7 diff --git a/tests/v3d/vertex_wire/E8 b/tests/vselect/vertex_wire/E8 similarity index 100% rename from tests/v3d/vertex_wire/E8 rename to tests/vselect/vertex_wire/E8 diff --git a/tests/v3d/vertex_wire/E9 b/tests/vselect/vertex_wire/E9 similarity index 100% rename from tests/v3d/vertex_wire/E9 rename to tests/vselect/vertex_wire/E9 diff --git a/tests/v3d/vertex_wire/F1 b/tests/vselect/vertex_wire/F1 similarity index 100% rename from tests/v3d/vertex_wire/F1 rename to tests/vselect/vertex_wire/F1 diff --git a/tests/v3d/vertex_wire/F2 b/tests/vselect/vertex_wire/F2 similarity index 100% rename from tests/v3d/vertex_wire/F2 rename to tests/vselect/vertex_wire/F2 diff --git a/tests/v3d/vertex_wire/F3 b/tests/vselect/vertex_wire/F3 similarity index 100% rename from tests/v3d/vertex_wire/F3 rename to tests/vselect/vertex_wire/F3 diff --git a/tests/v3d/vertex_wire/F4 b/tests/vselect/vertex_wire/F4 similarity index 100% rename from tests/v3d/vertex_wire/F4 rename to tests/vselect/vertex_wire/F4 diff --git a/tests/v3d/vertex_wire/F5 b/tests/vselect/vertex_wire/F5 similarity index 100% rename from tests/v3d/vertex_wire/F5 rename to tests/vselect/vertex_wire/F5 diff --git a/tests/v3d/vertex_wire/F6 b/tests/vselect/vertex_wire/F6 similarity index 100% rename from tests/v3d/vertex_wire/F6 rename to tests/vselect/vertex_wire/F6 diff --git a/tests/v3d/vertex_wire/F7 b/tests/vselect/vertex_wire/F7 similarity index 100% rename from tests/v3d/vertex_wire/F7 rename to tests/vselect/vertex_wire/F7 diff --git a/tests/v3d/vertex_wire/F8 b/tests/vselect/vertex_wire/F8 similarity index 100% rename from tests/v3d/vertex_wire/F8 rename to tests/vselect/vertex_wire/F8 diff --git a/tests/v3d/vertex_wire/F9 b/tests/vselect/vertex_wire/F9 similarity index 100% rename from tests/v3d/vertex_wire/F9 rename to tests/vselect/vertex_wire/F9 diff --git a/tests/v3d/vertex_wire/G1 b/tests/vselect/vertex_wire/G1 similarity index 100% rename from tests/v3d/vertex_wire/G1 rename to tests/vselect/vertex_wire/G1 diff --git a/tests/v3d/vertex_wire/G2 b/tests/vselect/vertex_wire/G2 similarity index 100% rename from tests/v3d/vertex_wire/G2 rename to tests/vselect/vertex_wire/G2 diff --git a/tests/v3d/vertex_wire/G3 b/tests/vselect/vertex_wire/G3 similarity index 100% rename from tests/v3d/vertex_wire/G3 rename to tests/vselect/vertex_wire/G3 diff --git a/tests/v3d/vertex_wire/G4 b/tests/vselect/vertex_wire/G4 similarity index 100% rename from tests/v3d/vertex_wire/G4 rename to tests/vselect/vertex_wire/G4 diff --git a/tests/v3d/vertex_wire/G5 b/tests/vselect/vertex_wire/G5 similarity index 100% rename from tests/v3d/vertex_wire/G5 rename to tests/vselect/vertex_wire/G5 diff --git a/tests/v3d/vertex_wire/G6 b/tests/vselect/vertex_wire/G6 similarity index 100% rename from tests/v3d/vertex_wire/G6 rename to tests/vselect/vertex_wire/G6 diff --git a/tests/v3d/vertex_wire/G7 b/tests/vselect/vertex_wire/G7 similarity index 100% rename from tests/v3d/vertex_wire/G7 rename to tests/vselect/vertex_wire/G7 diff --git a/tests/v3d/vertex_wire/G8 b/tests/vselect/vertex_wire/G8 similarity index 100% rename from tests/v3d/vertex_wire/G8 rename to tests/vselect/vertex_wire/G8 diff --git a/tests/v3d/vertex_wire/G9 b/tests/vselect/vertex_wire/G9 similarity index 100% rename from tests/v3d/vertex_wire/G9 rename to tests/vselect/vertex_wire/G9 diff --git a/tests/v3d/vertex_wire/H1 b/tests/vselect/vertex_wire/H1 similarity index 100% rename from tests/v3d/vertex_wire/H1 rename to tests/vselect/vertex_wire/H1 diff --git a/tests/v3d/vertex_wire/H2 b/tests/vselect/vertex_wire/H2 similarity index 100% rename from tests/v3d/vertex_wire/H2 rename to tests/vselect/vertex_wire/H2 diff --git a/tests/v3d/vertex_wire/H3 b/tests/vselect/vertex_wire/H3 similarity index 100% rename from tests/v3d/vertex_wire/H3 rename to tests/vselect/vertex_wire/H3 diff --git a/tests/v3d/vertex_wire/H4 b/tests/vselect/vertex_wire/H4 similarity index 100% rename from tests/v3d/vertex_wire/H4 rename to tests/vselect/vertex_wire/H4 diff --git a/tests/v3d/vertex_wire/H5 b/tests/vselect/vertex_wire/H5 similarity index 100% rename from tests/v3d/vertex_wire/H5 rename to tests/vselect/vertex_wire/H5 diff --git a/tests/v3d/vertex_wire/H6 b/tests/vselect/vertex_wire/H6 similarity index 100% rename from tests/v3d/vertex_wire/H6 rename to tests/vselect/vertex_wire/H6 diff --git a/tests/v3d/vertex_wire/H7 b/tests/vselect/vertex_wire/H7 similarity index 100% rename from tests/v3d/vertex_wire/H7 rename to tests/vselect/vertex_wire/H7 diff --git a/tests/v3d/vertex_wire/H8 b/tests/vselect/vertex_wire/H8 similarity index 100% rename from tests/v3d/vertex_wire/H8 rename to tests/vselect/vertex_wire/H8 diff --git a/tests/v3d/vertex_wire/H9 b/tests/vselect/vertex_wire/H9 similarity index 100% rename from tests/v3d/vertex_wire/H9 rename to tests/vselect/vertex_wire/H9 diff --git a/tests/v3d/vertex_wire/I1 b/tests/vselect/vertex_wire/I1 similarity index 100% rename from tests/v3d/vertex_wire/I1 rename to tests/vselect/vertex_wire/I1 diff --git a/tests/v3d/vertex_wire/I2 b/tests/vselect/vertex_wire/I2 similarity index 100% rename from tests/v3d/vertex_wire/I2 rename to tests/vselect/vertex_wire/I2 diff --git a/tests/v3d/vertex_wire/I3 b/tests/vselect/vertex_wire/I3 similarity index 100% rename from tests/v3d/vertex_wire/I3 rename to tests/vselect/vertex_wire/I3 diff --git a/tests/v3d/vertex_wire/I4 b/tests/vselect/vertex_wire/I4 similarity index 100% rename from tests/v3d/vertex_wire/I4 rename to tests/vselect/vertex_wire/I4 diff --git a/tests/v3d/vertex_wire/I5 b/tests/vselect/vertex_wire/I5 similarity index 100% rename from tests/v3d/vertex_wire/I5 rename to tests/vselect/vertex_wire/I5 diff --git a/tests/v3d/vertex_wire/I6 b/tests/vselect/vertex_wire/I6 similarity index 100% rename from tests/v3d/vertex_wire/I6 rename to tests/vselect/vertex_wire/I6 diff --git a/tests/v3d/vertex_wire/I7 b/tests/vselect/vertex_wire/I7 similarity index 100% rename from tests/v3d/vertex_wire/I7 rename to tests/vselect/vertex_wire/I7 diff --git a/tests/v3d/vertex_wire/I8 b/tests/vselect/vertex_wire/I8 similarity index 100% rename from tests/v3d/vertex_wire/I8 rename to tests/vselect/vertex_wire/I8 diff --git a/tests/v3d/vertex_wire/I9 b/tests/vselect/vertex_wire/I9 similarity index 100% rename from tests/v3d/vertex_wire/I9 rename to tests/vselect/vertex_wire/I9 diff --git a/tests/v3d/vertex_wire/J1 b/tests/vselect/vertex_wire/J1 similarity index 100% rename from tests/v3d/vertex_wire/J1 rename to tests/vselect/vertex_wire/J1 diff --git a/tests/v3d/vertex_wire/J2 b/tests/vselect/vertex_wire/J2 similarity index 100% rename from tests/v3d/vertex_wire/J2 rename to tests/vselect/vertex_wire/J2 diff --git a/tests/v3d/vertex_wire/J3 b/tests/vselect/vertex_wire/J3 similarity index 100% rename from tests/v3d/vertex_wire/J3 rename to tests/vselect/vertex_wire/J3 diff --git a/tests/v3d/vertex_wire/J4 b/tests/vselect/vertex_wire/J4 similarity index 100% rename from tests/v3d/vertex_wire/J4 rename to tests/vselect/vertex_wire/J4 diff --git a/tests/v3d/vertex_wire/J5 b/tests/vselect/vertex_wire/J5 similarity index 100% rename from tests/v3d/vertex_wire/J5 rename to tests/vselect/vertex_wire/J5 diff --git a/tests/v3d/vertex_wire/J6 b/tests/vselect/vertex_wire/J6 similarity index 100% rename from tests/v3d/vertex_wire/J6 rename to tests/vselect/vertex_wire/J6 diff --git a/tests/v3d/vertex_wire/J7 b/tests/vselect/vertex_wire/J7 similarity index 100% rename from tests/v3d/vertex_wire/J7 rename to tests/vselect/vertex_wire/J7 diff --git a/tests/v3d/vertex_wire/J8 b/tests/vselect/vertex_wire/J8 similarity index 100% rename from tests/v3d/vertex_wire/J8 rename to tests/vselect/vertex_wire/J8 diff --git a/tests/v3d/vertex_wire/J9 b/tests/vselect/vertex_wire/J9 similarity index 100% rename from tests/v3d/vertex_wire/J9 rename to tests/vselect/vertex_wire/J9 diff --git a/tests/v3d/vertex_wire/K1 b/tests/vselect/vertex_wire/K1 similarity index 100% rename from tests/v3d/vertex_wire/K1 rename to tests/vselect/vertex_wire/K1 diff --git a/tests/v3d/vertex_wire/K2 b/tests/vselect/vertex_wire/K2 similarity index 100% rename from tests/v3d/vertex_wire/K2 rename to tests/vselect/vertex_wire/K2 diff --git a/tests/v3d/vertex_wire/K3 b/tests/vselect/vertex_wire/K3 similarity index 100% rename from tests/v3d/vertex_wire/K3 rename to tests/vselect/vertex_wire/K3 diff --git a/tests/v3d/vertex_wire/K4 b/tests/vselect/vertex_wire/K4 similarity index 100% rename from tests/v3d/vertex_wire/K4 rename to tests/vselect/vertex_wire/K4 diff --git a/tests/vselect/vertex_wire/begin b/tests/vselect/vertex_wire/begin new file mode 100644 index 0000000000..93ea333926 --- /dev/null +++ b/tests/vselect/vertex_wire/begin @@ -0,0 +1 @@ +vinit View1 diff --git a/tests/vselect/vertex_wire/end b/tests/vselect/vertex_wire/end new file mode 100644 index 0000000000..3d3cd7e7c3 --- /dev/null +++ b/tests/vselect/vertex_wire/end @@ -0,0 +1 @@ +vdump $imagedir/${casename}.png diff --git a/tests/v3d/wire/A1 b/tests/vselect/wire/A1 similarity index 100% rename from tests/v3d/wire/A1 rename to tests/vselect/wire/A1 diff --git a/tests/v3d/wire/A2 b/tests/vselect/wire/A2 similarity index 100% rename from tests/v3d/wire/A2 rename to tests/vselect/wire/A2 diff --git a/tests/v3d/wire/A3 b/tests/vselect/wire/A3 similarity index 100% rename from tests/v3d/wire/A3 rename to tests/vselect/wire/A3 diff --git a/tests/v3d/wire/A4 b/tests/vselect/wire/A4 similarity index 100% rename from tests/v3d/wire/A4 rename to tests/vselect/wire/A4 diff --git a/tests/v3d/wire/A5 b/tests/vselect/wire/A5 similarity index 100% rename from tests/v3d/wire/A5 rename to tests/vselect/wire/A5 diff --git a/tests/v3d/wire/A6 b/tests/vselect/wire/A6 similarity index 100% rename from tests/v3d/wire/A6 rename to tests/vselect/wire/A6 diff --git a/tests/v3d/wire/A7 b/tests/vselect/wire/A7 similarity index 100% rename from tests/v3d/wire/A7 rename to tests/vselect/wire/A7 diff --git a/tests/v3d/wire/A8 b/tests/vselect/wire/A8 similarity index 100% rename from tests/v3d/wire/A8 rename to tests/vselect/wire/A8 diff --git a/tests/v3d/wire/A9 b/tests/vselect/wire/A9 similarity index 100% rename from tests/v3d/wire/A9 rename to tests/vselect/wire/A9 diff --git a/tests/v3d/wire/B1 b/tests/vselect/wire/B1 similarity index 100% rename from tests/v3d/wire/B1 rename to tests/vselect/wire/B1 diff --git a/tests/v3d/wire/B2 b/tests/vselect/wire/B2 similarity index 100% rename from tests/v3d/wire/B2 rename to tests/vselect/wire/B2 diff --git a/tests/v3d/wire/B3 b/tests/vselect/wire/B3 similarity index 100% rename from tests/v3d/wire/B3 rename to tests/vselect/wire/B3 diff --git a/tests/v3d/wire/B4 b/tests/vselect/wire/B4 similarity index 100% rename from tests/v3d/wire/B4 rename to tests/vselect/wire/B4 diff --git a/tests/v3d/wire/B5 b/tests/vselect/wire/B5 similarity index 100% rename from tests/v3d/wire/B5 rename to tests/vselect/wire/B5 diff --git a/tests/v3d/wire/B6 b/tests/vselect/wire/B6 similarity index 100% rename from tests/v3d/wire/B6 rename to tests/vselect/wire/B6 diff --git a/tests/v3d/wire/B7 b/tests/vselect/wire/B7 similarity index 100% rename from tests/v3d/wire/B7 rename to tests/vselect/wire/B7 diff --git a/tests/v3d/wire/B8 b/tests/vselect/wire/B8 similarity index 100% rename from tests/v3d/wire/B8 rename to tests/vselect/wire/B8 diff --git a/tests/v3d/wire/B9 b/tests/vselect/wire/B9 similarity index 100% rename from tests/v3d/wire/B9 rename to tests/vselect/wire/B9 diff --git a/tests/v3d/wire/C1 b/tests/vselect/wire/C1 similarity index 100% rename from tests/v3d/wire/C1 rename to tests/vselect/wire/C1 diff --git a/tests/v3d/wire/C2 b/tests/vselect/wire/C2 similarity index 100% rename from tests/v3d/wire/C2 rename to tests/vselect/wire/C2 diff --git a/tests/v3d/wire/C3 b/tests/vselect/wire/C3 similarity index 100% rename from tests/v3d/wire/C3 rename to tests/vselect/wire/C3 diff --git a/tests/v3d/wire/C4 b/tests/vselect/wire/C4 similarity index 100% rename from tests/v3d/wire/C4 rename to tests/vselect/wire/C4 diff --git a/tests/v3d/wire/C5 b/tests/vselect/wire/C5 similarity index 100% rename from tests/v3d/wire/C5 rename to tests/vselect/wire/C5 diff --git a/tests/v3d/wire/C6 b/tests/vselect/wire/C6 similarity index 100% rename from tests/v3d/wire/C6 rename to tests/vselect/wire/C6 diff --git a/tests/v3d/wire/C7 b/tests/vselect/wire/C7 similarity index 100% rename from tests/v3d/wire/C7 rename to tests/vselect/wire/C7 diff --git a/tests/v3d/wire/C8 b/tests/vselect/wire/C8 similarity index 100% rename from tests/v3d/wire/C8 rename to tests/vselect/wire/C8 diff --git a/tests/v3d/wire/C9 b/tests/vselect/wire/C9 similarity index 100% rename from tests/v3d/wire/C9 rename to tests/vselect/wire/C9 diff --git a/tests/v3d/wire/D1 b/tests/vselect/wire/D1 similarity index 100% rename from tests/v3d/wire/D1 rename to tests/vselect/wire/D1 diff --git a/tests/v3d/wire/D2 b/tests/vselect/wire/D2 similarity index 100% rename from tests/v3d/wire/D2 rename to tests/vselect/wire/D2 diff --git a/tests/v3d/wire/D3 b/tests/vselect/wire/D3 similarity index 100% rename from tests/v3d/wire/D3 rename to tests/vselect/wire/D3 diff --git a/tests/v3d/wire/D4 b/tests/vselect/wire/D4 similarity index 100% rename from tests/v3d/wire/D4 rename to tests/vselect/wire/D4 diff --git a/tests/v3d/wire/D5 b/tests/vselect/wire/D5 similarity index 100% rename from tests/v3d/wire/D5 rename to tests/vselect/wire/D5 diff --git a/tests/v3d/wire/D6 b/tests/vselect/wire/D6 similarity index 100% rename from tests/v3d/wire/D6 rename to tests/vselect/wire/D6 diff --git a/tests/v3d/wire/D7 b/tests/vselect/wire/D7 similarity index 100% rename from tests/v3d/wire/D7 rename to tests/vselect/wire/D7 diff --git a/tests/v3d/wire/D8 b/tests/vselect/wire/D8 similarity index 100% rename from tests/v3d/wire/D8 rename to tests/vselect/wire/D8 diff --git a/tests/v3d/wire/D9 b/tests/vselect/wire/D9 similarity index 100% rename from tests/v3d/wire/D9 rename to tests/vselect/wire/D9 diff --git a/tests/v3d/wire/E1 b/tests/vselect/wire/E1 similarity index 100% rename from tests/v3d/wire/E1 rename to tests/vselect/wire/E1 diff --git a/tests/v3d/wire/E2 b/tests/vselect/wire/E2 similarity index 100% rename from tests/v3d/wire/E2 rename to tests/vselect/wire/E2 diff --git a/tests/v3d/wire/E3 b/tests/vselect/wire/E3 similarity index 100% rename from tests/v3d/wire/E3 rename to tests/vselect/wire/E3 diff --git a/tests/v3d/wire/E4 b/tests/vselect/wire/E4 similarity index 100% rename from tests/v3d/wire/E4 rename to tests/vselect/wire/E4 diff --git a/tests/v3d/wire/E5 b/tests/vselect/wire/E5 similarity index 100% rename from tests/v3d/wire/E5 rename to tests/vselect/wire/E5 diff --git a/tests/v3d/wire/E6 b/tests/vselect/wire/E6 similarity index 100% rename from tests/v3d/wire/E6 rename to tests/vselect/wire/E6 diff --git a/tests/v3d/wire/E7 b/tests/vselect/wire/E7 similarity index 100% rename from tests/v3d/wire/E7 rename to tests/vselect/wire/E7 diff --git a/tests/v3d/wire/E8 b/tests/vselect/wire/E8 similarity index 100% rename from tests/v3d/wire/E8 rename to tests/vselect/wire/E8 diff --git a/tests/v3d/wire/E9 b/tests/vselect/wire/E9 similarity index 100% rename from tests/v3d/wire/E9 rename to tests/vselect/wire/E9 diff --git a/tests/v3d/wire/F1 b/tests/vselect/wire/F1 similarity index 100% rename from tests/v3d/wire/F1 rename to tests/vselect/wire/F1 diff --git a/tests/v3d/wire/F2 b/tests/vselect/wire/F2 similarity index 100% rename from tests/v3d/wire/F2 rename to tests/vselect/wire/F2 diff --git a/tests/vselect/wire/begin b/tests/vselect/wire/begin new file mode 100644 index 0000000000..93ea333926 --- /dev/null +++ b/tests/vselect/wire/begin @@ -0,0 +1 @@ +vinit View1 diff --git a/tests/vselect/wire/end b/tests/vselect/wire/end new file mode 100644 index 0000000000..3d3cd7e7c3 --- /dev/null +++ b/tests/vselect/wire/end @@ -0,0 +1 @@ +vdump $imagedir/${casename}.png diff --git a/tests/v3d/wire_solid/A1 b/tests/vselect/wire_solid/A1 similarity index 100% rename from tests/v3d/wire_solid/A1 rename to tests/vselect/wire_solid/A1 diff --git a/tests/v3d/wire_solid/A2 b/tests/vselect/wire_solid/A2 similarity index 100% rename from tests/v3d/wire_solid/A2 rename to tests/vselect/wire_solid/A2 diff --git a/tests/v3d/wire_solid/A3 b/tests/vselect/wire_solid/A3 similarity index 100% rename from tests/v3d/wire_solid/A3 rename to tests/vselect/wire_solid/A3 diff --git a/tests/v3d/wire_solid/A4 b/tests/vselect/wire_solid/A4 similarity index 100% rename from tests/v3d/wire_solid/A4 rename to tests/vselect/wire_solid/A4 diff --git a/tests/v3d/wire_solid/A5 b/tests/vselect/wire_solid/A5 similarity index 100% rename from tests/v3d/wire_solid/A5 rename to tests/vselect/wire_solid/A5 diff --git a/tests/v3d/wire_solid/A6 b/tests/vselect/wire_solid/A6 similarity index 100% rename from tests/v3d/wire_solid/A6 rename to tests/vselect/wire_solid/A6 diff --git a/tests/v3d/wire_solid/A7 b/tests/vselect/wire_solid/A7 similarity index 100% rename from tests/v3d/wire_solid/A7 rename to tests/vselect/wire_solid/A7 diff --git a/tests/v3d/wire_solid/A8 b/tests/vselect/wire_solid/A8 similarity index 100% rename from tests/v3d/wire_solid/A8 rename to tests/vselect/wire_solid/A8 diff --git a/tests/v3d/wire_solid/A9 b/tests/vselect/wire_solid/A9 similarity index 100% rename from tests/v3d/wire_solid/A9 rename to tests/vselect/wire_solid/A9 diff --git a/tests/v3d/wire_solid/B1 b/tests/vselect/wire_solid/B1 similarity index 100% rename from tests/v3d/wire_solid/B1 rename to tests/vselect/wire_solid/B1 diff --git a/tests/v3d/wire_solid/B2 b/tests/vselect/wire_solid/B2 similarity index 100% rename from tests/v3d/wire_solid/B2 rename to tests/vselect/wire_solid/B2 diff --git a/tests/v3d/wire_solid/B3 b/tests/vselect/wire_solid/B3 similarity index 100% rename from tests/v3d/wire_solid/B3 rename to tests/vselect/wire_solid/B3 diff --git a/tests/v3d/wire_solid/B4 b/tests/vselect/wire_solid/B4 similarity index 100% rename from tests/v3d/wire_solid/B4 rename to tests/vselect/wire_solid/B4 diff --git a/tests/v3d/wire_solid/B5 b/tests/vselect/wire_solid/B5 similarity index 100% rename from tests/v3d/wire_solid/B5 rename to tests/vselect/wire_solid/B5 diff --git a/tests/v3d/wire_solid/B6 b/tests/vselect/wire_solid/B6 similarity index 100% rename from tests/v3d/wire_solid/B6 rename to tests/vselect/wire_solid/B6 diff --git a/tests/v3d/wire_solid/B7 b/tests/vselect/wire_solid/B7 similarity index 100% rename from tests/v3d/wire_solid/B7 rename to tests/vselect/wire_solid/B7 diff --git a/tests/v3d/wire_solid/B8 b/tests/vselect/wire_solid/B8 similarity index 100% rename from tests/v3d/wire_solid/B8 rename to tests/vselect/wire_solid/B8 diff --git a/tests/v3d/wire_solid/B9 b/tests/vselect/wire_solid/B9 similarity index 100% rename from tests/v3d/wire_solid/B9 rename to tests/vselect/wire_solid/B9 diff --git a/tests/v3d/wire_solid/C1 b/tests/vselect/wire_solid/C1 similarity index 100% rename from tests/v3d/wire_solid/C1 rename to tests/vselect/wire_solid/C1 diff --git a/tests/v3d/wire_solid/C2 b/tests/vselect/wire_solid/C2 similarity index 100% rename from tests/v3d/wire_solid/C2 rename to tests/vselect/wire_solid/C2 diff --git a/tests/v3d/wire_solid/C3 b/tests/vselect/wire_solid/C3 similarity index 100% rename from tests/v3d/wire_solid/C3 rename to tests/vselect/wire_solid/C3 diff --git a/tests/v3d/wire_solid/C4 b/tests/vselect/wire_solid/C4 similarity index 100% rename from tests/v3d/wire_solid/C4 rename to tests/vselect/wire_solid/C4 diff --git a/tests/v3d/wire_solid/C5 b/tests/vselect/wire_solid/C5 similarity index 100% rename from tests/v3d/wire_solid/C5 rename to tests/vselect/wire_solid/C5 diff --git a/tests/v3d/wire_solid/C6 b/tests/vselect/wire_solid/C6 similarity index 100% rename from tests/v3d/wire_solid/C6 rename to tests/vselect/wire_solid/C6 diff --git a/tests/v3d/wire_solid/C7 b/tests/vselect/wire_solid/C7 similarity index 100% rename from tests/v3d/wire_solid/C7 rename to tests/vselect/wire_solid/C7 diff --git a/tests/v3d/wire_solid/C8 b/tests/vselect/wire_solid/C8 similarity index 100% rename from tests/v3d/wire_solid/C8 rename to tests/vselect/wire_solid/C8 diff --git a/tests/v3d/wire_solid/C9 b/tests/vselect/wire_solid/C9 similarity index 100% rename from tests/v3d/wire_solid/C9 rename to tests/vselect/wire_solid/C9 diff --git a/tests/v3d/wire_solid/D1 b/tests/vselect/wire_solid/D1 similarity index 100% rename from tests/v3d/wire_solid/D1 rename to tests/vselect/wire_solid/D1 diff --git a/tests/v3d/wire_solid/D2 b/tests/vselect/wire_solid/D2 similarity index 100% rename from tests/v3d/wire_solid/D2 rename to tests/vselect/wire_solid/D2 diff --git a/tests/v3d/wire_solid/D3 b/tests/vselect/wire_solid/D3 similarity index 100% rename from tests/v3d/wire_solid/D3 rename to tests/vselect/wire_solid/D3 diff --git a/tests/v3d/wire_solid/D4 b/tests/vselect/wire_solid/D4 similarity index 100% rename from tests/v3d/wire_solid/D4 rename to tests/vselect/wire_solid/D4 diff --git a/tests/v3d/wire_solid/D5 b/tests/vselect/wire_solid/D5 similarity index 100% rename from tests/v3d/wire_solid/D5 rename to tests/vselect/wire_solid/D5 diff --git a/tests/v3d/wire_solid/D6 b/tests/vselect/wire_solid/D6 similarity index 100% rename from tests/v3d/wire_solid/D6 rename to tests/vselect/wire_solid/D6 diff --git a/tests/v3d/wire_solid/D7 b/tests/vselect/wire_solid/D7 similarity index 100% rename from tests/v3d/wire_solid/D7 rename to tests/vselect/wire_solid/D7 diff --git a/tests/v3d/wire_solid/D8 b/tests/vselect/wire_solid/D8 similarity index 100% rename from tests/v3d/wire_solid/D8 rename to tests/vselect/wire_solid/D8 diff --git a/tests/v3d/wire_solid/D9 b/tests/vselect/wire_solid/D9 similarity index 100% rename from tests/v3d/wire_solid/D9 rename to tests/vselect/wire_solid/D9 diff --git a/tests/v3d/wire_solid/E1 b/tests/vselect/wire_solid/E1 similarity index 100% rename from tests/v3d/wire_solid/E1 rename to tests/vselect/wire_solid/E1 diff --git a/tests/v3d/wire_solid/E2 b/tests/vselect/wire_solid/E2 similarity index 100% rename from tests/v3d/wire_solid/E2 rename to tests/vselect/wire_solid/E2 diff --git a/tests/v3d/wire_solid/E3 b/tests/vselect/wire_solid/E3 similarity index 100% rename from tests/v3d/wire_solid/E3 rename to tests/vselect/wire_solid/E3 diff --git a/tests/v3d/wire_solid/E4 b/tests/vselect/wire_solid/E4 similarity index 100% rename from tests/v3d/wire_solid/E4 rename to tests/vselect/wire_solid/E4 diff --git a/tests/v3d/wire_solid/E5 b/tests/vselect/wire_solid/E5 similarity index 100% rename from tests/v3d/wire_solid/E5 rename to tests/vselect/wire_solid/E5 diff --git a/tests/v3d/wire_solid/E6 b/tests/vselect/wire_solid/E6 similarity index 100% rename from tests/v3d/wire_solid/E6 rename to tests/vselect/wire_solid/E6 diff --git a/tests/v3d/wire_solid/E7 b/tests/vselect/wire_solid/E7 similarity index 100% rename from tests/v3d/wire_solid/E7 rename to tests/vselect/wire_solid/E7 diff --git a/tests/v3d/wire_solid/E8 b/tests/vselect/wire_solid/E8 similarity index 100% rename from tests/v3d/wire_solid/E8 rename to tests/vselect/wire_solid/E8 diff --git a/tests/v3d/wire_solid/E9 b/tests/vselect/wire_solid/E9 similarity index 100% rename from tests/v3d/wire_solid/E9 rename to tests/vselect/wire_solid/E9 diff --git a/tests/v3d/wire_solid/F1 b/tests/vselect/wire_solid/F1 similarity index 100% rename from tests/v3d/wire_solid/F1 rename to tests/vselect/wire_solid/F1 diff --git a/tests/v3d/wire_solid/F2 b/tests/vselect/wire_solid/F2 similarity index 100% rename from tests/v3d/wire_solid/F2 rename to tests/vselect/wire_solid/F2 diff --git a/tests/v3d/wire_solid/F3 b/tests/vselect/wire_solid/F3 similarity index 100% rename from tests/v3d/wire_solid/F3 rename to tests/vselect/wire_solid/F3 diff --git a/tests/v3d/wire_solid/F4 b/tests/vselect/wire_solid/F4 similarity index 100% rename from tests/v3d/wire_solid/F4 rename to tests/vselect/wire_solid/F4 diff --git a/tests/v3d/wire_solid/F5 b/tests/vselect/wire_solid/F5 similarity index 100% rename from tests/v3d/wire_solid/F5 rename to tests/vselect/wire_solid/F5 diff --git a/tests/v3d/wire_solid/F6 b/tests/vselect/wire_solid/F6 similarity index 100% rename from tests/v3d/wire_solid/F6 rename to tests/vselect/wire_solid/F6 diff --git a/tests/v3d/wire_solid/F7 b/tests/vselect/wire_solid/F7 similarity index 100% rename from tests/v3d/wire_solid/F7 rename to tests/vselect/wire_solid/F7 diff --git a/tests/v3d/wire_solid/F8 b/tests/vselect/wire_solid/F8 similarity index 100% rename from tests/v3d/wire_solid/F8 rename to tests/vselect/wire_solid/F8 diff --git a/tests/v3d/wire_solid/F9 b/tests/vselect/wire_solid/F9 similarity index 100% rename from tests/v3d/wire_solid/F9 rename to tests/vselect/wire_solid/F9 diff --git a/tests/v3d/wire_solid/G1 b/tests/vselect/wire_solid/G1 similarity index 100% rename from tests/v3d/wire_solid/G1 rename to tests/vselect/wire_solid/G1 diff --git a/tests/v3d/wire_solid/G2 b/tests/vselect/wire_solid/G2 similarity index 100% rename from tests/v3d/wire_solid/G2 rename to tests/vselect/wire_solid/G2 diff --git a/tests/v3d/wire_solid/G3 b/tests/vselect/wire_solid/G3 similarity index 100% rename from tests/v3d/wire_solid/G3 rename to tests/vselect/wire_solid/G3 diff --git a/tests/v3d/wire_solid/G4 b/tests/vselect/wire_solid/G4 similarity index 100% rename from tests/v3d/wire_solid/G4 rename to tests/vselect/wire_solid/G4 diff --git a/tests/v3d/wire_solid/G5 b/tests/vselect/wire_solid/G5 similarity index 100% rename from tests/v3d/wire_solid/G5 rename to tests/vselect/wire_solid/G5 diff --git a/tests/v3d/wire_solid/G6 b/tests/vselect/wire_solid/G6 similarity index 100% rename from tests/v3d/wire_solid/G6 rename to tests/vselect/wire_solid/G6 diff --git a/tests/v3d/wire_solid/G7 b/tests/vselect/wire_solid/G7 similarity index 100% rename from tests/v3d/wire_solid/G7 rename to tests/vselect/wire_solid/G7 diff --git a/tests/v3d/wire_solid/G8 b/tests/vselect/wire_solid/G8 similarity index 100% rename from tests/v3d/wire_solid/G8 rename to tests/vselect/wire_solid/G8 diff --git a/tests/v3d/wire_solid/G9 b/tests/vselect/wire_solid/G9 similarity index 100% rename from tests/v3d/wire_solid/G9 rename to tests/vselect/wire_solid/G9 diff --git a/tests/v3d/wire_solid/H1 b/tests/vselect/wire_solid/H1 similarity index 100% rename from tests/v3d/wire_solid/H1 rename to tests/vselect/wire_solid/H1 diff --git a/tests/v3d/wire_solid/H2 b/tests/vselect/wire_solid/H2 similarity index 100% rename from tests/v3d/wire_solid/H2 rename to tests/vselect/wire_solid/H2 diff --git a/tests/v3d/wire_solid/H3 b/tests/vselect/wire_solid/H3 similarity index 100% rename from tests/v3d/wire_solid/H3 rename to tests/vselect/wire_solid/H3 diff --git a/tests/v3d/wire_solid/H4 b/tests/vselect/wire_solid/H4 similarity index 100% rename from tests/v3d/wire_solid/H4 rename to tests/vselect/wire_solid/H4 diff --git a/tests/v3d/wire_solid/H5 b/tests/vselect/wire_solid/H5 similarity index 100% rename from tests/v3d/wire_solid/H5 rename to tests/vselect/wire_solid/H5 diff --git a/tests/v3d/wire_solid/H6 b/tests/vselect/wire_solid/H6 similarity index 100% rename from tests/v3d/wire_solid/H6 rename to tests/vselect/wire_solid/H6 diff --git a/tests/v3d/wire_solid/H7 b/tests/vselect/wire_solid/H7 similarity index 100% rename from tests/v3d/wire_solid/H7 rename to tests/vselect/wire_solid/H7 diff --git a/tests/v3d/wire_solid/H8 b/tests/vselect/wire_solid/H8 similarity index 100% rename from tests/v3d/wire_solid/H8 rename to tests/vselect/wire_solid/H8 diff --git a/tests/v3d/wire_solid/H9 b/tests/vselect/wire_solid/H9 similarity index 100% rename from tests/v3d/wire_solid/H9 rename to tests/vselect/wire_solid/H9 diff --git a/tests/v3d/wire_solid/I1 b/tests/vselect/wire_solid/I1 similarity index 100% rename from tests/v3d/wire_solid/I1 rename to tests/vselect/wire_solid/I1 diff --git a/tests/v3d/wire_solid/I2 b/tests/vselect/wire_solid/I2 similarity index 100% rename from tests/v3d/wire_solid/I2 rename to tests/vselect/wire_solid/I2 diff --git a/tests/v3d/wire_solid/I3 b/tests/vselect/wire_solid/I3 similarity index 100% rename from tests/v3d/wire_solid/I3 rename to tests/vselect/wire_solid/I3 diff --git a/tests/v3d/wire_solid/I4 b/tests/vselect/wire_solid/I4 similarity index 100% rename from tests/v3d/wire_solid/I4 rename to tests/vselect/wire_solid/I4 diff --git a/tests/v3d/wire_solid/I5 b/tests/vselect/wire_solid/I5 similarity index 100% rename from tests/v3d/wire_solid/I5 rename to tests/vselect/wire_solid/I5 diff --git a/tests/v3d/wire_solid/I6 b/tests/vselect/wire_solid/I6 similarity index 100% rename from tests/v3d/wire_solid/I6 rename to tests/vselect/wire_solid/I6 diff --git a/tests/v3d/wire_solid/I7 b/tests/vselect/wire_solid/I7 similarity index 100% rename from tests/v3d/wire_solid/I7 rename to tests/vselect/wire_solid/I7 diff --git a/tests/v3d/wire_solid/I8 b/tests/vselect/wire_solid/I8 similarity index 100% rename from tests/v3d/wire_solid/I8 rename to tests/vselect/wire_solid/I8 diff --git a/tests/v3d/wire_solid/I9 b/tests/vselect/wire_solid/I9 similarity index 100% rename from tests/v3d/wire_solid/I9 rename to tests/vselect/wire_solid/I9 diff --git a/tests/v3d/wire_solid/J1 b/tests/vselect/wire_solid/J1 similarity index 100% rename from tests/v3d/wire_solid/J1 rename to tests/vselect/wire_solid/J1 diff --git a/tests/v3d/wire_solid/J2 b/tests/vselect/wire_solid/J2 similarity index 100% rename from tests/v3d/wire_solid/J2 rename to tests/vselect/wire_solid/J2 diff --git a/tests/v3d/wire_solid/J3 b/tests/vselect/wire_solid/J3 similarity index 100% rename from tests/v3d/wire_solid/J3 rename to tests/vselect/wire_solid/J3 diff --git a/tests/v3d/wire_solid/J4 b/tests/vselect/wire_solid/J4 similarity index 100% rename from tests/v3d/wire_solid/J4 rename to tests/vselect/wire_solid/J4 diff --git a/tests/v3d/wire_solid/J5 b/tests/vselect/wire_solid/J5 similarity index 100% rename from tests/v3d/wire_solid/J5 rename to tests/vselect/wire_solid/J5 diff --git a/tests/v3d/wire_solid/J6 b/tests/vselect/wire_solid/J6 similarity index 100% rename from tests/v3d/wire_solid/J6 rename to tests/vselect/wire_solid/J6 diff --git a/tests/v3d/wire_solid/J7 b/tests/vselect/wire_solid/J7 similarity index 100% rename from tests/v3d/wire_solid/J7 rename to tests/vselect/wire_solid/J7 diff --git a/tests/v3d/wire_solid/J8 b/tests/vselect/wire_solid/J8 similarity index 100% rename from tests/v3d/wire_solid/J8 rename to tests/vselect/wire_solid/J8 diff --git a/tests/v3d/wire_solid/J9 b/tests/vselect/wire_solid/J9 similarity index 100% rename from tests/v3d/wire_solid/J9 rename to tests/vselect/wire_solid/J9 diff --git a/tests/v3d/wire_solid/K1 b/tests/vselect/wire_solid/K1 similarity index 100% rename from tests/v3d/wire_solid/K1 rename to tests/vselect/wire_solid/K1 diff --git a/tests/v3d/wire_solid/K2 b/tests/vselect/wire_solid/K2 similarity index 100% rename from tests/v3d/wire_solid/K2 rename to tests/vselect/wire_solid/K2 diff --git a/tests/v3d/wire_solid/K3 b/tests/vselect/wire_solid/K3 similarity index 100% rename from tests/v3d/wire_solid/K3 rename to tests/vselect/wire_solid/K3 diff --git a/tests/v3d/wire_solid/K4 b/tests/vselect/wire_solid/K4 similarity index 100% rename from tests/v3d/wire_solid/K4 rename to tests/vselect/wire_solid/K4 diff --git a/tests/v3d/wire_solid/L1 b/tests/vselect/wire_solid/L1 similarity index 100% rename from tests/v3d/wire_solid/L1 rename to tests/vselect/wire_solid/L1 diff --git a/tests/vselect/wire_solid/begin b/tests/vselect/wire_solid/begin new file mode 100644 index 0000000000..93ea333926 --- /dev/null +++ b/tests/vselect/wire_solid/begin @@ -0,0 +1 @@ +vinit View1 diff --git a/tests/vselect/wire_solid/end b/tests/vselect/wire_solid/end new file mode 100644 index 0000000000..3d3cd7e7c3 --- /dev/null +++ b/tests/vselect/wire_solid/end @@ -0,0 +1 @@ +vdump $imagedir/${casename}.png diff --git a/tests/vtk/begin b/tests/vtk/begin new file mode 100644 index 0000000000..e192e00147 --- /dev/null +++ b/tests/vtk/begin @@ -0,0 +1,3 @@ +cpulimit 300 + +if { [info exists imagedir] == 0 } { set imagedir . } diff --git a/tests/vtk/end b/tests/vtk/end new file mode 100644 index 0000000000..73b3acd4ea --- /dev/null +++ b/tests/vtk/end @@ -0,0 +1 @@ +puts "TEST COMPLETED" diff --git a/tests/vtk/grids.list b/tests/vtk/grids.list new file mode 100644 index 0000000000..213a62d886 --- /dev/null +++ b/tests/vtk/grids.list @@ -0,0 +1 @@ +001 ivtk diff --git a/tests/v3d/ivtk/bgcolor b/tests/vtk/ivtk/bgcolor similarity index 96% rename from tests/v3d/ivtk/bgcolor rename to tests/vtk/ivtk/bgcolor index 6e5f834ffb..a030c69f2f 100644 --- a/tests/v3d/ivtk/bgcolor +++ b/tests/vtk/ivtk/bgcolor @@ -3,6 +3,7 @@ puts "bgcolor: Tests changing of background color in the IVtk view" puts "============" puts "" +pload VIS ivtkinit ivtkbgcolor 200 220 250 ivtkdump $imagedir/${casename}_1.png diff --git a/tests/v3d/ivtk/boundary_draw b/tests/vtk/ivtk/boundary_draw similarity index 93% rename from tests/v3d/ivtk/boundary_draw rename to tests/vtk/ivtk/boundary_draw index 90516a8de6..986bae04f1 100644 --- a/tests/v3d/ivtk/boundary_draw +++ b/tests/vtk/ivtk/boundary_draw @@ -3,6 +3,7 @@ puts "boundary_draw: Tests boundary draw changing in the IVtk view" puts "=============" puts "" +pload MODELING VIS box b 1 1 1 ivtkinit ivtkdisplay b diff --git a/tests/v3d/ivtk/bug26978 b/tests/vtk/ivtk/bug26978 similarity index 94% rename from tests/v3d/ivtk/bug26978 rename to tests/vtk/ivtk/bug26978 index bfcb36c873..99ca0847d4 100644 --- a/tests/v3d/ivtk/bug26978 +++ b/tests/vtk/ivtk/bug26978 @@ -3,6 +3,7 @@ puts "0026978: VIS - Interactive selection is insensitive to swept shell" puts "========" puts "" +pload MODELING VIS VISUALIZATION restore [locate_data_file bug26978_evol3.brep] s ivtkinit diff --git a/tests/v3d/ivtk/bug27567 b/tests/vtk/ivtk/bug27567 similarity index 98% rename from tests/v3d/ivtk/bug27567 rename to tests/vtk/ivtk/bug27567 index 5d110ad008..6acec5ab00 100644 --- a/tests/v3d/ivtk/bug27567 +++ b/tests/vtk/ivtk/bug27567 @@ -9,6 +9,7 @@ puts "" # in IVTK ####################################################################### +pload MODELING VIS ivtkinit dlog off diff --git a/tests/v3d/ivtk/detect b/tests/vtk/ivtk/detect similarity index 91% rename from tests/v3d/ivtk/detect rename to tests/vtk/ivtk/detect index f6445f963d..c551e580c9 100644 --- a/tests/v3d/ivtk/detect +++ b/tests/vtk/ivtk/detect @@ -3,6 +3,7 @@ puts "detect: Tests detection of shapes in the IVtk view" puts "============" puts "" +pload MODELING VIS box b 1 1 1 ivtkinit ivtkdisplay b diff --git a/tests/v3d/ivtk/display_mode b/tests/vtk/ivtk/display_mode similarity index 93% rename from tests/v3d/ivtk/display_mode rename to tests/vtk/ivtk/display_mode index 85e9aa573a..cf1d017223 100644 --- a/tests/v3d/ivtk/display_mode +++ b/tests/vtk/ivtk/display_mode @@ -3,6 +3,7 @@ puts "display_mode: Tests display modes changing in the IVtk view" puts "============" puts "" +pload MODELING VIS box b 1 1 1 ivtkinit ivtkdisplay b diff --git a/tests/v3d/ivtk/erase b/tests/vtk/ivtk/erase similarity index 94% rename from tests/v3d/ivtk/erase rename to tests/vtk/ivtk/erase index 3f3849b6d0..579b8920e3 100644 --- a/tests/v3d/ivtk/erase +++ b/tests/vtk/ivtk/erase @@ -3,6 +3,7 @@ puts "erase: Tests erasing of shapes in the IVtk view" puts "============" puts "" +pload MODELING VIS box b1 1 1 1 box b2 3 3 3 1 1 1 ivtkinit diff --git a/tests/v3d/ivtk/parse.rules b/tests/vtk/ivtk/parse.rules similarity index 100% rename from tests/v3d/ivtk/parse.rules rename to tests/vtk/ivtk/parse.rules diff --git a/tests/v3d/ivtk/seam_edges b/tests/vtk/ivtk/seam_edges similarity index 92% rename from tests/v3d/ivtk/seam_edges rename to tests/vtk/ivtk/seam_edges index b32b7b2bc6..dd6c9034aa 100644 --- a/tests/v3d/ivtk/seam_edges +++ b/tests/vtk/ivtk/seam_edges @@ -3,6 +3,7 @@ puts "seam_edges: Tests boundary edges draw without seam edges in the IVtk view" puts "==========" puts "" +pload MODELING VIS psphere s 10 15 80 ivtkinit ivtkdisplay s diff --git a/tests/v3d/ivtk/select b/tests/vtk/ivtk/select similarity index 91% rename from tests/v3d/ivtk/select rename to tests/vtk/ivtk/select index 9a75d62b42..432d9315f3 100644 --- a/tests/v3d/ivtk/select +++ b/tests/vtk/ivtk/select @@ -3,6 +3,7 @@ puts "select: Tests selection of shapes in the IVtk view" puts "============" puts "" +pload MODELING VIS box b 1 1 1 ivtkinit ivtkdisplay b diff --git a/tests/v3d/ivtk/selection_mode b/tests/vtk/ivtk/selection_mode similarity index 92% rename from tests/v3d/ivtk/selection_mode rename to tests/vtk/ivtk/selection_mode index c7856ed715..fea276ac46 100644 --- a/tests/v3d/ivtk/selection_mode +++ b/tests/vtk/ivtk/selection_mode @@ -3,6 +3,7 @@ puts "selection_mode: Tests selection modes changing in the IVtk view" puts "============" puts "" +pload MODELING VIS box b 1 1 1 ivtkinit ivtkdisplay b diff --git a/tests/vtk/parse.rules b/tests/vtk/parse.rules new file mode 100644 index 0000000000..d2d2452862 --- /dev/null +++ b/tests/vtk/parse.rules @@ -0,0 +1 @@ +FAILED /\bFaulty\b/ error