From efcc228a0b8ced1abd1afdfa4ffdc59b39ce8ca9 Mon Sep 17 00:00:00 2001 From: Efi Fogel Date: Mon, 9 Nov 2020 12:30:03 +0200 Subject: [PATCH] Updated --- .../dcel_extension_io.cpp | 6 +- .../geodesic_arcs_on_sphere/test03.wrl | 59 +++++++++---------- .../geodesic_arcs_on_sphere/test04.wrl | 55 ++++++++--------- .../geodesic_arcs_on_sphere/test02.wrl | 4 +- .../geodesic_arcs_on_sphere/test03.wrl | 4 +- .../geodesic_arcs_on_sphere/test04.wrl | 4 +- .../geodesic_arcs_on_sphere/test05.wrl | 4 +- .../geodesic_arcs_on_sphere/test06.wrl | 4 +- .../geodesic_arcs_on_sphere/test07.wrl | 4 +- .../geodesic_arcs_on_sphere/test08.wrl | 4 +- .../geodesic_arcs_on_sphere/test01.wrl | 8 +-- .../geodesic_arcs_on_sphere/test02.wrl | 8 +-- .../geodesic_arcs_on_sphere/test03.wrl | 8 +-- .../geodesic_arcs_on_sphere/test04.wrl | 8 +-- .../geodesic_arcs_on_sphere/test05.wrl | 8 +-- .../geodesic_arcs_on_sphere/test06.wrl | 8 +-- .../geodesic_arcs_on_sphere/test07.wrl | 8 +-- .../geodesic_arcs_on_sphere/test08.wrl | 8 +-- .../geodesic_arcs_on_sphere/test09.wrl | 8 +-- .../geodesic_arcs_on_sphere/test10.wrl | 8 +-- .../data/test_spherical_merge/test01.wrl | 47 +++++++-------- .../data/test_spherical_remove/test01.wrl | 40 ++++++------- .../data/test_spherical_remove/test02.wrl | 48 +++++++-------- .../data/test_spherical_remove/test03.wrl | 52 ++++++++-------- .../data/test_spherical_remove/test04.wrl | 40 ++++++------- .../data/test_spherical_remove/test05.wrl | 37 +++++------- .../data/test_spherical_remove/test06.wrl | 36 +++++------ .../data/test_spherical_remove/test07.wrl | 32 +++++----- .../data/test_spherical_remove/test08.wrl | 46 +++++++-------- .../data/test_spherical_remove/test09.wrl | 32 +++++----- .../data/test_spherical_remove/test11.wrl | 52 ++++++++-------- .../data/test_spherical_remove/test12.wrl | 52 ++++++++-------- .../data/test_spherical_remove/test13.wrl | 32 +++++----- .../data/test_spherical_remove/test14.wrl | 34 +++++------ .../data/test_spherical_remove/test15.wrl | 32 +++++----- .../data/test_spherical_remove/test16.wrl | 34 +++++------ .../data/test_spherical_remove/test17.wrl | 32 +++++----- .../data/test_spherical_remove/test18.wrl | 34 +++++------ .../data/test_spherical_remove/test19.wrl | 50 ++++++++-------- 39 files changed, 423 insertions(+), 567 deletions(-) diff --git a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/dcel_extension_io.cpp b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/dcel_extension_io.cpp index 5c303465cb4..8ba9b0bde3d 100644 --- a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/dcel_extension_io.cpp +++ b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/dcel_extension_io.cpp @@ -76,10 +76,8 @@ int main() { boundary_size = 0; if (! fit->is_unbounded()) { auto curr = fit->outer_ccb(); - do { - ++boundary_size; - ++curr; - } while (curr != fit->outer_ccb()); + do ++boundary_size; + while (++curr != fit->outer_ccb()); } fit->set_data(boundary_size); } diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/batched_point_location/geodesic_arcs_on_sphere/test03.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/batched_point_location/geodesic_arcs_on_sphere/test03.wrl index 6cab93ee73a..254ef079782 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/batched_point_location/geodesic_arcs_on_sphere/test03.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/batched_point_location/geodesic_arcs_on_sphere/test03.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -98,23 +94,22 @@ Transform { # insertionStrategy "increment" aosMarkedEdgeIndex -1 aosMarkedVertexIndex 6 7 - coord DEF COORD ExactCoordinate { - ratPoint [ - -1 0 -1 - 0 -1 -1 - 1 0 -1 - 0 1 -1 - -1 0 1 - 0 -1 1 - 1 0 1 - 0 1 1 - # - 1 0 -2 - 1 0 -1 - 1 0 0 - 1 0 1 - 1 0 2 - ] + coord DEF COORD EpecCoordinate { + exactPoint [-1 0 -1 + 0 -1 -1 + 1 0 -1 + 0 1 -1 + -1 0 1 + 0 -1 1 + 1 0 1 + 0 1 1 + # + 1 0 -2 + 1 0 -1 + 1 0 0 + 1 0 1 + 1 0 2 + ] } pointIndex [8 9 10 11 12] curveIndex [0 1, 1 2, 2 3, 3 0, 4 5, 5 6, 6 7, 7 4] @@ -146,7 +141,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -214,14 +216,7 @@ Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/batched_point_location/geodesic_arcs_on_sphere/test04.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/batched_point_location/geodesic_arcs_on_sphere/test04.wrl index 1cfc96e65ce..aa951546f5d 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/batched_point_location/geodesic_arcs_on_sphere/test04.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/batched_point_location/geodesic_arcs_on_sphere/test04.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -98,21 +94,20 @@ Transform { # insertionStrategy "increment" aosMarkedEdgeIndex -1 aosMarkedVertexIndex 7 - coord DEF COORD ExactCoordinate { - ratPoint [ - -1 0 -1 - 0 -1 -1 - 1 0 -1 - 0 1 -1 - -1 0 1 - 0 -1 1 - 1 0 1 - 0 1 1 - 1 0 -1 1 0 0 1 0 1 - # - 0 -1 0 - 0 1 0 - ] + coord DEF COORD EpecCoordinate { + exactPoint [-1 0 -1 + 0 -1 -1 + 1 0 -1 + 0 1 -1 + -1 0 1 + 0 -1 1 + 1 0 1 + 0 1 1 + 1 0 -1 1 0 0 1 0 1 + # + 0 -1 0 + 0 1 0 + ] } pointIndex [11 12] curveIndex [0 1, 1 2, 2 3, 3 0, 4 5, 5 6, 6 7, 7 4, @@ -145,7 +140,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -213,14 +215,7 @@ Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test02.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test02.wrl index 8129823bbec..00055fad033 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test02.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test02.wrl @@ -7,9 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test03.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test03.wrl index cd6e82a854a..0a85f22e64c 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test03.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test03.wrl @@ -7,9 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test04.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test04.wrl index 9e8b79bbed1..9e76361e692 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test04.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test04.wrl @@ -7,9 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test05.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test05.wrl index a661c66d873..64e5eb53cb8 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test05.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test05.wrl @@ -7,9 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test06.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test06.wrl index ee37345c097..6c5dff4fa9b 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test06.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test06.wrl @@ -7,9 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test07.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test07.wrl index 45c720f39ef..0861dc378e5 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test07.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test07.wrl @@ -7,9 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test08.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test08.wrl index c37bd6f5552..8c97c97ae65 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test08.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_construction/geodesic_arcs_on_sphere/test08.wrl @@ -7,9 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test01.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test01.wrl index 987662dc6f2..8067f483648 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test01.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test01.wrl @@ -8,11 +8,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test02.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test02.wrl index 750b87ac600..0506550be4a 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test02.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test02.wrl @@ -8,11 +8,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -58,7 +54,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test03.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test03.wrl index 9b3315c42f9..10e756157bc 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test03.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test03.wrl @@ -8,11 +8,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -58,7 +54,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test04.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test04.wrl index 9d00423f0c2..e2aaedda5b3 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test04.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test04.wrl @@ -8,11 +8,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -58,7 +54,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test05.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test05.wrl index 409e5eb57d2..ff3d2731d03 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test05.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test05.wrl @@ -8,11 +8,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -58,7 +54,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test06.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test06.wrl index f7a30511718..df0c7f43f54 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test06.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test06.wrl @@ -8,11 +8,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -58,7 +54,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test07.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test07.wrl index 315b09eace8..3a82492b475 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test07.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test07.wrl @@ -8,11 +8,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test08.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test08.wrl index f1666558bde..976ffcca475 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test08.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test08.wrl @@ -8,11 +8,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test09.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test09.wrl index 67357e9b9ed..cf819a4ae1f 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test09.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test09.wrl @@ -8,11 +8,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test10.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test10.wrl index bd1f146f9e8..89f07f8bb1c 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test10.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_overlay/geodesic_arcs_on_sphere/test10.wrl @@ -8,11 +8,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_merge/test01.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_merge/test01.wrl index d4d518c5965..a6b0cd0fb32 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_merge/test01.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_merge/test01.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -97,16 +93,15 @@ Transform { aosIsolatedVertexStyle "disc" # insertionStrategy "increment" aosMarkedEdgeIndex 0 - coord DEF COORD ExactCoordinate { - ratPoint [ - -11 7 11, - -1 -1 1, - 0 -2 0, - 1 -1 1, - 1 1 1, - 0 2 0, - -1 1 1 - ] + coord DEF COORD EpecCoordinate { + exactPoint [-11 7 11, + -1 -1 1, + 0 -2 0, + 1 -1 1, + 1 1 1, + 0 2 0, + -1 1 1 + ] } # pointIndex [6 7] curveIndex [1 0, @@ -145,7 +140,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -207,20 +209,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test01.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test01.wrl index 5985dc91eb3..062c9de77e5 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test01.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test01.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -97,12 +93,12 @@ Transform { aosIsolatedVertexStyle "disc" # insertionStrategy "increment" aosMarkedEdgeIndex 0 - coord DEF COORD ExactCoordinate { - ratPoint [0 -1 -1, - 0 -1 0, - -1 -1 0, - -1 0 -1 - ] + coord DEF COORD EpecCoordinate { + exactPoint [0 -1 -1, + 0 -1 0, + -1 -1 0, + -1 0 -1 + ] } # pointIndex [6 7] curveIndex [0 1, 1 2, 3 0] @@ -134,7 +130,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -196,20 +199,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test02.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test02.wrl index 8c757df2402..b4f40ee50e4 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test02.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test02.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -97,16 +93,16 @@ Transform { aosIsolatedVertexStyle "disc" # insertionStrategy "increment" aosMarkedEdgeIndex 0 - coord DEF COORD ExactCoordinate { - ratPoint [-1 -1 1, - -2 -2 1, - -1 0 0, - -2 -1 0, - -1 -2 0, - 0 -1 0, - -2 -2 -1, - -1 -1 -1 - ] + coord DEF COORD EpecCoordinate { + exactPoint [-1 -1 1, + -2 -2 1, + -1 0 0, + -2 -1 0, + -1 -2 0, + 0 -1 0, + -2 -2 -1, + -1 -1 -1 + ] } # pointIndex [6 7] curveIndex [2 3, 0 2, 2 7, 7 5, 5 0, 1 3, 3 6, 6 4, 4 1] @@ -138,7 +134,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -200,20 +203,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test03.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test03.wrl index e4805198d07..1eb34c58e22 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test03.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test03.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -97,18 +93,18 @@ Transform { aosIsolatedVertexStyle "disc" # insertionStrategy "increment" aosMarkedEdgeIndex 1 - coord DEF COORD ExactCoordinate { - ratPoint [-2 1 0 - -2 0 -1 - -1 0 0 - -2 0 1 - -2 -1 -2 - -2 -1 -1 - -2 -1 1 - -2 -1 2 - -1 -1 0 - -1 -2 0 - ] + coord DEF COORD EpecCoordinate { + exactPoint [-2 1 0 + -2 0 -1 + -1 0 0 + -2 0 1 + -2 -1 -2 + -2 -1 -1 + -2 -1 1 + -2 -1 2 + -1 -1 0 + -1 -2 0 + ] } # pointIndex [6 7] curveIndex [0 2, 0 1, 0 3, 1 4, 2 5 @@ -141,7 +137,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -203,20 +206,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test04.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test04.wrl index 1d219fac618..f52bff0c2db 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test04.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test04.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -97,12 +93,12 @@ Transform { aosIsolatedVertexStyle "disc" # insertionStrategy "increment" aosMarkedEdgeIndex 1 - coord DEF COORD ExactCoordinate { - ratPoint [-1 0 1 - -1 -1 1 - -1 -1 -1 - -1 0 -1 - ] + coord DEF COORD EpecCoordinate { + exactPoint [-1 0 1 + -1 -1 1 + -1 -1 -1 + -1 0 -1 + ] } # pointIndex [6 7] curveIndex [1 2, 2 3, 0 1] @@ -134,7 +130,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -196,20 +199,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test05.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test05.wrl index e81f6079b49..e03e6b33336 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test05.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test05.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -97,11 +93,10 @@ Transform { aosIsolatedVertexStyle "disc" # insertionStrategy "increment" aosMarkedEdgeIndex 7 - coord DEF COORD ExactCoordinate { - ratPoint [ - -2 1 0, -2 0 -1, -2 -1 0, -2 0 1, - -1 1 0, -1 0 -1 - ] + coord DEF COORD EpecCoordinate { + exactPoint [-2 1 0, -2 0 -1, -2 -1 0, -2 0 1, + -1 1 0, -1 0 -1 + ] } # pointIndex [6 7] curveIndex [0 1, 1 2, 2 3, 3 0, 4 5] @@ -133,7 +128,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -195,20 +197,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test06.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test06.wrl index 4c9accf7aeb..e13c8350a2b 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test06.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test06.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -98,10 +94,10 @@ Transform { # insertionStrategy "increment" aosMarkedEdgeIndex 7 aosMarkedEdgeRadius 0.03 - coord DEF COORD ExactCoordinate { - ratPoint [-4 -1 -2, -2 -2 -1, -2 -4 0, - -2 -2 1, -2 0 1, -2 -4 2 - ] + coord DEF COORD EpecCoordinate { + exactPoint [-4 -1 -2, -2 -2 -1, -2 -4 0, + -2 -2 1, -2 0 1, -2 -4 2 + ] } #pointIndex [22] curveIndex [1 2, 2 3, 3 4, 3 5, 0 1] @@ -133,7 +129,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -195,20 +198,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test07.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test07.wrl index 33905d75bf4..c7274293c88 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test07.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test07.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -98,8 +94,8 @@ Transform { # insertionStrategy "increment" aosMarkedEdgeIndex 7 aosMarkedEdgeRadius 0.03 - coord DEF COORD ExactCoordinate { - ratPoint [-2 0 -1, -2 -2 -1, -2 -2 1, -2 0 1] + coord DEF COORD EpecCoordinate { + exactPoint [-2 0 -1, -2 -2 -1, -2 -2 1, -2 0 1] } #pointIndex [22] curveIndex [1 2, 2 3, 0 1] @@ -131,7 +127,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -193,20 +196,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test08.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test08.wrl index f617f1f70f6..15bf3ad8229 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test08.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test08.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -98,18 +94,18 @@ Transform { # insertionStrategy "increment" aosMarkedEdgeIndex 7 aosMarkedEdgeRadius 0.03 - coord DEF COORD ExactCoordinate { - ratPoint [-1 1 0 --1 0 0 -0 0 -1 --1 -1 -1 --1 -1 0] + coord DEF COORD EpecCoordinate { + exactPoint [-1 1 0 + -1 0 0 + 0 0 -1 + -1 -1 -1 + -1 -1 0] } #pointIndex [8] curveIndex [0 1 -1 3 -2 3 -3 4 + 1 3 + 2 3 + 3 4 ] } } @@ -139,7 +135,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -201,20 +204,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test09.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test09.wrl index 734eeea4ae6..38341e41a0b 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test09.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test09.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -98,8 +94,8 @@ Transform { # insertionStrategy "increment" aosMarkedEdgeIndex 0 aosMarkedEdgeRadius 0.03 - coord DEF COORD ExactCoordinate { - ratPoint [0 0 -1, -1 -1 -1, -1 -1 1, 1 1 -1] + coord DEF COORD EpecCoordinate { + exactPoint [0 0 -1, -1 -1 -1, -1 -1 1, 1 1 -1] } #pointIndex [8] curveIndex [1 0, 2 1, 3 0] @@ -131,7 +127,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -193,20 +196,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test11.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test11.wrl index c04674469f1..cb7863ad9ab 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test11.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test11.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -98,18 +94,18 @@ Transform { # insertionStrategy "increment" aosMarkedEdgeIndex 7 aosMarkedEdgeRadius 0.03 - coord DEF COORD ExactCoordinate { - ratPoint [0 -1 -1, - 0 1 -1, - 1 -1 0, - 1 1 0, - 0 -1 1, - 0 1 1, - -1 -1 0, - -1 1 0, - 0 0 1, - 0 0 -1, - -1 0 0] + coord DEF COORD EpecCoordinate { + exactPoint [0 -1 -1, + 0 1 -1, + 1 -1 0, + 1 1 0, + 0 -1 1, + 0 1 1, + -1 -1 0, + -1 1 0, + 0 0 1, + 0 0 -1, + -1 0 0] } #pointIndex [8] curveIndex [0 9, 9 1, 2 3, 4 8, 8 5, 6 10, 10 7, @@ -142,7 +138,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -204,20 +207,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test12.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test12.wrl index 1ed66fe2efc..443336b90fa 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test12.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test12.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -98,18 +94,18 @@ Transform { # insertionStrategy "increment" aosMarkedEdgeIndex 7 aosMarkedEdgeRadius 0.03 - coord DEF COORD ExactCoordinate { - ratPoint [0 -1 -1, - 0 1 -1, - 1 -1 0, - 1 1 0, - 0 -1 1, - 0 1 1, - -1 -1 0, - -1 1 0, - 0 0 1, - 0 0 -1, - -1 0 0] + coord DEF COORD EpecCoordinate { + exactPoint [0 -1 -1, + 0 1 -1, + 1 -1 0, + 1 1 0, + 0 -1 1, + 0 1 1, + -1 -1 0, + -1 1 0, + 0 0 1, + 0 0 -1, + -1 0 0] } #pointIndex [8] curveIndex [6 10, 0 2, 2 4, 4 6, 6 0] @@ -141,7 +137,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -203,20 +206,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test13.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test13.wrl index 9dd416e5850..3257d7ad1a4 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test13.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test13.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -98,8 +94,8 @@ Transform { # insertionStrategy "increment" aosMarkedEdgeIndex 1 aosMarkedEdgeRadius 0.03 - coord DEF COORD ExactCoordinate { - ratPoint [0 0 -1, 1 -1 0, -1 -1 0, 0 -1 -1] + coord DEF COORD EpecCoordinate { + exactPoint [0 0 -1, 1 -1 0, -1 -1 0, 0 -1 -1] } #pointIndex [8] curveIndex [1 0, 2 1, 0 3, 3 1, 2 0] @@ -131,7 +127,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -193,20 +196,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test14.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test14.wrl index 7fa570f8490..39b9bd67c72 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test14.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test14.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -98,9 +94,9 @@ Transform { # insertionStrategy "increment" aosMarkedEdgeIndex 7 aosMarkedEdgeRadius 0.03 - coord DEF COORD ExactCoordinate { - ratPoint [-2 -1 -2, 0 0 -1, 2 -1 -2, 0 -1 1, - 1 1 0, -1 1 0] + coord DEF COORD EpecCoordinate { + exactPoint [-2 -1 -2, 0 0 -1, 2 -1 -2, 0 -1 1, + 1 1 0, -1 1 0] } #pointIndex [8] curveIndex [0 1, 1 2, 2 3, 3 0, 2 4, 0 5, 4 5, 5 3, 4 3] @@ -132,7 +128,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -194,20 +197,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test15.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test15.wrl index 3cbaec1bf8e..4fd497412e5 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test15.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test15.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -98,8 +94,8 @@ Transform { # insertionStrategy "increment" aosMarkedEdgeIndex 2 aosMarkedEdgeRadius 0.03 - coord DEF COORD ExactCoordinate { - ratPoint [0 0 -1, 1 -1 0, -1 -1 0, 0 -1 -1] + coord DEF COORD EpecCoordinate { + exactPoint [0 0 -1, 1 -1 0, -1 -1 0, 0 -1 -1] } #pointIndex [8] curveIndex [0 1, 1 2, 2 3, 3 0] @@ -131,7 +127,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -193,20 +196,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test16.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test16.wrl index b0a2c0d12f6..247fa51c696 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test16.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test16.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -98,9 +94,9 @@ Transform { # insertionStrategy "increment" aosMarkedEdgeIndex 3 aosMarkedEdgeRadius 0.03 - coord DEF COORD ExactCoordinate { - ratPoint [-1 0 -1, -2 1 0, -1 0 0, -2 -1 0, - -1 -2 0, 0 -1 0, -1 0 1] + coord DEF COORD EpecCoordinate { + exactPoint [-1 0 -1, -2 1 0, -1 0 0, -2 -1 0, + -1 -2 0, 0 -1 0, -1 0 1] } #pointIndex [8] curveIndex [3 2, 4 3, 5 6, 0 5, 1 0, 1 2, 1 6] @@ -132,7 +128,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -194,20 +197,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test17.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test17.wrl index 59fdd66b1ec..d7e39f33d34 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test17.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test17.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -98,8 +94,8 @@ Transform { # insertionStrategy "increment" aosMarkedEdgeIndex 4 aosMarkedEdgeRadius 0.03 - coord DEF COORD ExactCoordinate { - ratPoint [-1 0 -1, -1 2 0, -2 1 0, -1 0 0, -2 -1 0, -1 0 1] + coord DEF COORD EpecCoordinate { + exactPoint [-1 0 -1, -1 2 0, -2 1 0, -1 0 0, -2 -1 0, -1 0 1] } #pointIndex [8] curveIndex [3 4, 0 1, 2 3, 4 5, 1 5, 0 4] @@ -131,7 +127,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -193,20 +196,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test18.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test18.wrl index fa8e741eede..a95f53b0885 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test18.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test18.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -100,9 +96,9 @@ Transform { aosMarkedVertexIndex 0,1 aosMarkedVertexStyle "none" aosMarkedEdgeRadius 0.03 - coord DEF COORD ExactCoordinate { - ratPoint [-1 0 1, 0 -1 1, 1 0 1, 0 1 1, - -1 0 -1, 0 -1 -1, 1 0 -1, 0 1 -1] + coord DEF COORD EpecCoordinate { + exactPoint [-1 0 1, 0 -1 1, 1 0 1, 0 1 1, + -1 0 -1, 0 -1 -1, 1 0 -1, 0 1 -1] } #pointIndex [8] curveIndex [0 1, 1 2, 2 3, 3 0, @@ -135,7 +131,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -197,20 +200,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform { diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test19.wrl b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test19.wrl index 655ba98f9dd..d6f9a644ea5 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test19.wrl +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/test_spherical_remove/test19.wrl @@ -7,11 +7,7 @@ ColorBackground { clearStencil TRUE } NavigationInfo { type [ "EXAMINE" "ANY" ] } -Viewpoint { - type "ORTHOGONAL" - fieldOfView 2.96 - # radiusScale 0.7 -} +Viewpoint { type "ORTHOGONAL" } DEF TRANSFORMER_NAV NavigationInfo { type [ "TRANSFORM" ] } @@ -57,7 +53,7 @@ DEF SNAP Snapshot { Transform { rotation 1 0 0 -1.5708 bboxCenter 0 0 0 - bboxSize 1.5 1.5 1.5 + bboxSize 2 2 2 children [ Switch { whichChoice 0 @@ -100,17 +96,17 @@ Transform { aosMarkedVertexIndex 100 aosMarkedVertexStyle "none" aosMarkedEdgeRadius 0.03 - coord DEF COORD ExactCoordinate { - ratPoint [-1 0 -1 - -1 -1 -1 - 0 -1 -1 - -1 0 0 - -2 -2 -1 - 0 -1 0 - -2 -2 1 - -1 0 -3 - 1 -1 -3 - ] + coord DEF COORD EpecCoordinate { + exactPoint [-1 0 -1 + -1 -1 -1 + 0 -1 -1 + -1 0 0 + -2 -2 -1 + 0 -1 0 + -2 -2 1 + -1 0 -3 + 1 -1 -3 + ] } #pointIndex [8] curveIndex [ @@ -150,7 +146,14 @@ Transform { } } Shape { - appearance USE AXES_APP + appearance DEF AXES_APP Appearance { + material Material { + # ambientIntensity 1 + diffuseColor 0.4 0.4 0.4 + # specularColor 0.3 0.3 0.3 + # transparency 0.0001 + } + } geometry Sphere { center 0 0 -1 radius 0.05 @@ -212,20 +215,13 @@ Transform { } ] } - + # The axes: DEF AXES Transform { scale 0.1 0.1 0.1 children [ Shape { - appearance DEF AXES_APP Appearance { - material Material { - # ambientIntensity 1 - diffuseColor 0.4 0.4 0.4 - # specularColor 0.3 0.3 0.3 - # transparency 0.0001 - } - } + appearance USE AXES_APP geometry Sphere { radius 0.1 } } DEF CS_AXIS Transform {