From 341523a2b259f2a2dadd10843089441cd529ccb4 Mon Sep 17 00:00:00 2001 From: erik pernod Date: Sun, 13 Nov 2022 16:54:06 +0100 Subject: [PATCH] [scenes] Fix and update all carving scenes with Geomagic (#7) * [scenes] Fix and update haptic carving scenes * Add carving against rigid cube * Add scene with Geomagic and burning --- examples/Cube_AdvCarvingTexcoords.scn | 6 +- examples/Geomagic-ACarving-tetra2triangle.scn | 76 ----------- examples/Geomagic-ACarving.scn | 65 ---------- examples/Geomagic-AdvCarving.scn | 118 ++++++++++++++++++ .../Geomagic-AdvCarving.scn.qglviewer.view | 2 + .../Geomagic-AdvCarvingWithRefinement.scn | 102 +++++++++++++++ examples/Geomagic-AdvCarvingWithTexCoords.scn | 118 ++++++++++++++++++ ...AdvCarvingWithTexCoords.scn.qglviewer.view | 2 + examples/Geomagic-SurfaceCarving.scn | 14 ++- examples/Geomagic_RigidCube_AdvCarving.scn | 102 +++++++++++++++ 10 files changed, 458 insertions(+), 147 deletions(-) delete mode 100644 examples/Geomagic-ACarving-tetra2triangle.scn delete mode 100644 examples/Geomagic-ACarving.scn create mode 100644 examples/Geomagic-AdvCarving.scn create mode 100644 examples/Geomagic-AdvCarving.scn.qglviewer.view create mode 100644 examples/Geomagic-AdvCarvingWithRefinement.scn create mode 100644 examples/Geomagic-AdvCarvingWithTexCoords.scn create mode 100644 examples/Geomagic-AdvCarvingWithTexCoords.scn.qglviewer.view create mode 100644 examples/Geomagic_RigidCube_AdvCarving.scn diff --git a/examples/Cube_AdvCarvingTexcoords.scn b/examples/Cube_AdvCarvingTexcoords.scn index 4386499..9cf06f3 100644 --- a/examples/Cube_AdvCarvingTexcoords.scn +++ b/examples/Cube_AdvCarvingTexcoords.scn @@ -37,11 +37,11 @@ - + - + diff --git a/examples/Geomagic-ACarving-tetra2triangle.scn b/examples/Geomagic-ACarving-tetra2triangle.scn deleted file mode 100644 index e9133db..0000000 --- a/examples/Geomagic-ACarving-tetra2triangle.scn +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/Geomagic-ACarving.scn b/examples/Geomagic-ACarving.scn deleted file mode 100644 index c228b91..0000000 --- a/examples/Geomagic-ACarving.scn +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/Geomagic-AdvCarving.scn b/examples/Geomagic-AdvCarving.scn new file mode 100644 index 0000000..726c883 --- /dev/null +++ b/examples/Geomagic-AdvCarving.scn @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/Geomagic-AdvCarving.scn.qglviewer.view b/examples/Geomagic-AdvCarving.scn.qglviewer.view new file mode 100644 index 0000000..4d2a0ed --- /dev/null +++ b/examples/Geomagic-AdvCarving.scn.qglviewer.view @@ -0,0 +1,2 @@ +-26.4817 33.5874 3.80545 +-0.239151 -0.629519 -0.295128 0.6778 diff --git a/examples/Geomagic-AdvCarvingWithRefinement.scn b/examples/Geomagic-AdvCarvingWithRefinement.scn new file mode 100644 index 0000000..fcd7162 --- /dev/null +++ b/examples/Geomagic-AdvCarvingWithRefinement.scn @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/Geomagic-AdvCarvingWithTexCoords.scn b/examples/Geomagic-AdvCarvingWithTexCoords.scn new file mode 100644 index 0000000..b037d8b --- /dev/null +++ b/examples/Geomagic-AdvCarvingWithTexCoords.scn @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/Geomagic-AdvCarvingWithTexCoords.scn.qglviewer.view b/examples/Geomagic-AdvCarvingWithTexCoords.scn.qglviewer.view new file mode 100644 index 0000000..b8a71c3 --- /dev/null +++ b/examples/Geomagic-AdvCarvingWithTexCoords.scn.qglviewer.view @@ -0,0 +1,2 @@ +-26.3841 20.9086 -1.82431 +-0.208029 -0.68016 -0.198852 0.674213 diff --git a/examples/Geomagic-SurfaceCarving.scn b/examples/Geomagic-SurfaceCarving.scn index 9fb2374..2d75b58 100644 --- a/examples/Geomagic-SurfaceCarving.scn +++ b/examples/Geomagic-SurfaceCarving.scn @@ -1,9 +1,17 @@ - - - + + + + + + + + + + + diff --git a/examples/Geomagic_RigidCube_AdvCarving.scn b/examples/Geomagic_RigidCube_AdvCarving.scn new file mode 100644 index 0000000..5357ccd --- /dev/null +++ b/examples/Geomagic_RigidCube_AdvCarving.scn @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +