From 079b1a9760ee61f8a5f4a5a0e633da292f4a2e39 Mon Sep 17 00:00:00 2001 From: barry Date: Fri, 31 May 2019 16:05:13 -0700 Subject: [PATCH] Added tetrahedron shape use in docmentation images and logo: - added Catmark and Loop versions of the toroidal tetrahedron shape - update shapes/all.h with the additions --- regression/shapes/all.h | 2 + regression/shapes/catmark_toroidal_tet.h | 112 +++++++++++++ regression/shapes/loop_toroidal_tet.h | 196 +++++++++++++++++++++++ 3 files changed, 310 insertions(+) create mode 100644 regression/shapes/catmark_toroidal_tet.h create mode 100644 regression/shapes/loop_toroidal_tet.h diff --git a/regression/shapes/all.h b/regression/shapes/all.h index 55a29a1e..f9c3dd11 100644 --- a/regression/shapes/all.h +++ b/regression/shapes/all.h @@ -100,6 +100,7 @@ #include "catmark_tent_creases0.h" #include "catmark_tent_creases1.h" #include "catmark_tent.h" +#include "catmark_toroidal_tet.h" #include "catmark_torus.h" #include "catmark_torus_creases0.h" #include "catmark_torus_creases1.h" @@ -135,6 +136,7 @@ #include "loop_pole360.h" #include "loop_saddle_edgecorner.h" #include "loop_saddle_edgeonly.h" +#include "loop_toroidal_tet.h" #include "loop_triangle_edgecorner.h" #include "loop_triangle_edgeonly.h" #include "loop_xord_boundary.h" diff --git a/regression/shapes/catmark_toroidal_tet.h b/regression/shapes/catmark_toroidal_tet.h new file mode 100644 index 00000000..795e16f0 --- /dev/null +++ b/regression/shapes/catmark_toroidal_tet.h @@ -0,0 +1,112 @@ +// +// Copyright 2019 DreamWorks Animation LLC. +// +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is deleted and replaced with: +// +// 6. Trademarks. This License does not grant permission to use the trade +// names, trademarks, service marks, or product names of the Licensor +// and its affiliates, except as required to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. +// +// You may obtain a copy of the Apache License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. +// + +static const std::string catmark_toroidal_tet = +"#\n" +"# Toroidal tetrahedron oriented within an axially aligned cube:\n" +"#\n" +"v -1.0 1.0 -1.0\n" +"v -1.0 -1.0 1.0\n" +"v 1.0 -1.0 -1.0\n" +"v 1.0 1.0 1.0\n" +"v 0.2 -0.6 -0.6\n" +"v -0.6 0.2 -0.6\n" +"v -0.6 -0.6 0.2\n" +"v -0.6 0.6 -0.2\n" +"v -0.6 -0.2 0.6\n" +"v 0.2 0.6 0.6\n" +"v -0.2 -0.6 0.6\n" +"v 0.6 -0.6 -0.2\n" +"v 0.6 0.2 0.6\n" +"v 0.6 -0.2 -0.6\n" +"v -0.2 0.6 -0.6\n" +"v 0.6 0.6 0.2\n" +"v -0.4 0.4 -0.4\n" +"v -0.4 -0.4 0.4\n" +"v 0.4 -0.4 -0.4\n" +"v 0.4 0.4 0.4\n" +"\n" +"vt 0.250 0.410\n" +"vt 0.025 0.020\n" +"vt 0.475 0.020\n" +"vt 0.750 0.410\n" +"vt 0.525 0.020\n" +"vt 0.975 0.020\n" +"vt 0.250 0.910\n" +"vt 0.025 0.520\n" +"vt 0.475 0.520\n" +"vt 0.750 0.910\n" +"vt 0.525 0.520\n" +"vt 0.975 0.520\n" +"vt 0.250 0.254\n" +"vt 0.160 0.100\n" +"vt 0.340 0.100\n" +"vt 0.750 0.254\n" +"vt 0.660 0.100\n" +"vt 0.840 0.100\n" +"vt 0.250 0.754\n" +"vt 0.160 0.600\n" +"vt 0.340 0.600\n" +"vt 0.750 0.754\n" +"vt 0.660 0.600\n" +"vt 0.840 0.600\n" +"vt 0.250 0.175\n" +"vt 0.228 0.137\n" +"vt 0.273 0.137\n" +"vt 0.750 0.175\n" +"vt 0.728 0.137\n" +"vt 0.772 0.137\n" +"vt 0.250 0.675\n" +"vt 0.228 0.637\n" +"vt 0.273 0.637\n" +"vt 0.750 0.675\n" +"vt 0.728 0.637\n" +"vt 0.772 0.637\n" +"\n" +"f 1/1 3/2 5/14 6/13\n" +"f 3/2 2/3 7/15 5/14\n" +"f 2/3 1/1 6/13 7/15\n" +"f 2/4 4/5 10/17 9/16\n" +"f 4/5 1/6 8/18 10/17\n" +"f 1/6 2/4 9/16 8/18\n" +"f 3/7 4/8 13/20 12/19\n" +"f 4/8 2/9 11/21 13/20\n" +"f 2/9 3/7 12/19 11/21\n" +"f 4/10 3/11 14/23 16/22\n" +"f 3/11 1/12 15/24 14/23\n" +"f 1/12 4/10 16/22 15/24\n" +"f 6/13 5/14 19/26 17/25\n" +"f 5/14 7/15 18/27 19/26\n" +"f 7/15 6/13 17/25 18/27\n" +"f 9/16 10/17 20/29 18/28\n" +"f 10/17 8/18 17/30 20/29\n" +"f 8/18 9/16 18/28 17/30\n" +"f 12/19 13/20 20/32 19/31\n" +"f 13/20 11/21 18/33 20/32\n" +"f 11/21 12/19 19/31 18/33\n" +"f 14/23 15/24 17/36 19/35\n" +"f 15/24 16/22 20/34 17/36\n" +"f 16/22 14/23 19/35 20/34\n" +"\n" +; diff --git a/regression/shapes/loop_toroidal_tet.h b/regression/shapes/loop_toroidal_tet.h new file mode 100644 index 00000000..3acc8446 --- /dev/null +++ b/regression/shapes/loop_toroidal_tet.h @@ -0,0 +1,196 @@ +// +// Copyright 2019 DreamWorks Animation LLC. +// +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is deleted and replaced with: +// +// 6. Trademarks. This License does not grant permission to use the trade +// names, trademarks, service marks, or product names of the Licensor +// and its affiliates, except as required to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. +// +// You may obtain a copy of the Apache License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. +// + +static const std::string loop_toroidal_tet = +"#\n" +"# Toroidal tetrahedron oriented within an axially aligned cube:\n" +"#\n" +"v -1.0 1.0 -1.0\n" +"v -1.0 -1.0 1.0\n" +"v 1.0 -1.0 -1.0\n" +"v 1.0 1.0 1.0\n" +"v 0.2 -0.6 -0.6\n" +"v -0.6 0.2 -0.6\n" +"v -0.6 -0.6 0.2\n" +"v -0.6 0.6 -0.2\n" +"v -0.6 -0.2 0.6\n" +"v 0.2 0.6 0.6\n" +"v -0.2 -0.6 0.6\n" +"v 0.6 -0.6 -0.2\n" +"v 0.6 0.2 0.6\n" +"v 0.6 -0.2 -0.6\n" +"v -0.2 0.6 -0.6\n" +"v 0.6 0.6 0.2\n" +"v -0.4 0.4 -0.4\n" +"v -0.4 -0.4 0.4\n" +"v 0.4 -0.4 -0.4\n" +"v 0.4 0.4 0.4\n" +"v 0.0 0.0 -1.0\n" +"v 0.0 -1.0 0.0\n" +"v -1.0 0.0 0.0\n" +"v 0.0 0.0 1.0\n" +"v 0.0 1.0 0.0\n" +"v 1.0 0.0 0.0\n" +"v 0.0 0.0 -0.4\n" +"v 0.0 -0.4 0.0\n" +"v -0.4 0.0 0.0\n" +"v 0.0 0.0 0.4\n" +"v 0.0 0.4 0.0\n" +"v 0.4 0.0 0.0\n" +"\n" +"vt 0.250 0.410\n" +"vt 0.138 0.215\n" +"vt 0.250 0.254\n" +"vt 0.160 0.100\n" +"vt 0.025 0.020\n" +"vt 0.250 0.020\n" +"vt 0.340 0.100\n" +"vt 0.475 0.020\n" +"vt 0.363 0.215\n" +"vt 0.750 0.410\n" +"vt 0.637 0.215\n" +"vt 0.750 0.254\n" +"vt 0.660 0.100\n" +"vt 0.525 0.020\n" +"vt 0.750 0.020\n" +"vt 0.840 0.100\n" +"vt 0.975 0.020\n" +"vt 0.863 0.215\n" +"vt 0.250 0.910\n" +"vt 0.138 0.715\n" +"vt 0.250 0.754\n" +"vt 0.160 0.600\n" +"vt 0.025 0.520\n" +"vt 0.250 0.520\n" +"vt 0.340 0.600\n" +"vt 0.475 0.520\n" +"vt 0.363 0.715\n" +"vt 0.750 0.910\n" +"vt 0.637 0.715\n" +"vt 0.750 0.754\n" +"vt 0.660 0.600\n" +"vt 0.525 0.520\n" +"vt 0.750 0.520\n" +"vt 0.840 0.600\n" +"vt 0.975 0.520\n" +"vt 0.863 0.715\n" +"vt 0.239 0.156\n" +"vt 0.228 0.137\n" +"vt 0.250 0.175\n" +"vt 0.250 0.137\n" +"vt 0.273 0.137\n" +"vt 0.262 0.156\n" +"vt 0.739 0.156\n" +"vt 0.728 0.137\n" +"vt 0.750 0.175\n" +"vt 0.750 0.137\n" +"vt 0.772 0.137\n" +"vt 0.761 0.156\n" +"vt 0.239 0.656\n" +"vt 0.228 0.637\n" +"vt 0.250 0.675\n" +"vt 0.250 0.637\n" +"vt 0.273 0.637\n" +"vt 0.262 0.656\n" +"vt 0.750 0.637\n" +"vt 0.772 0.637\n" +"vt 0.728 0.637\n" +"vt 0.761 0.656\n" +"vt 0.750 0.675\n" +"vt 0.739 0.656\n" +"\n" +"f 1/1 21/2 6/3 \n" +"f 21/2 5/4 6/3 \n" +"f 21/2 3/5 5/4 \n" +"f 3/5 22/6 5/4 \n" +"f 22/6 7/7 5/4 \n" +"f 22/6 2/8 7/7 \n" +"f 2/8 23/9 7/7 \n" +"f 23/9 6/3 7/7 \n" +"f 23/9 1/1 6/3 \n" +"f 2/10 24/11 9/12\n" +"f 24/11 10/13 9/12\n" +"f 24/11 4/14 10/13\n" +"f 4/14 25/15 10/13\n" +"f 25/15 8/16 10/13\n" +"f 25/15 1/17 8/16\n" +"f 1/17 23/18 8/16\n" +"f 23/18 9/12 8/16\n" +"f 23/18 2/10 9/12\n" +"f 3/19 26/20 12/21\n" +"f 26/20 13/22 12/21\n" +"f 26/20 4/23 13/22\n" +"f 4/23 24/24 13/22\n" +"f 24/24 11/25 13/22\n" +"f 24/24 2/26 11/25\n" +"f 2/26 22/27 11/25\n" +"f 22/27 12/21 11/25\n" +"f 22/27 3/19 12/21\n" +"f 4/28 26/29 16/30\n" +"f 26/29 14/31 16/30\n" +"f 26/29 3/32 14/31\n" +"f 3/32 21/33 14/31\n" +"f 21/33 15/34 14/31\n" +"f 21/33 1/35 15/34\n" +"f 1/35 25/36 15/34\n" +"f 25/36 16/30 15/34\n" +"f 25/36 4/28 16/30\n" +"f 6/3 5/4 27/37\n" +"f 5/4 19/38 27/37\n" +"f 6/3 27/37 17/39\n" +"f 5/4 7/7 28/40\n" +"f 7/7 18/41 28/40\n" +"f 5/4 28/40 19/38\n" +"f 7/7 6/3 29/42\n" +"f 6/3 17/39 29/42\n" +"f 7/7 29/42 18/41\n" +"f 9/12 10/13 30/43\n" +"f 10/13 20/44 30/43\n" +"f 9/12 30/43 18/45\n" +"f 10/13 8/16 31/46\n" +"f 8/16 17/47 31/46\n" +"f 10/13 31/46 20/44\n" +"f 8/16 9/12 29/48\n" +"f 9/12 18/45 29/48\n" +"f 8/16 29/48 17/47\n" +"f 12/21 13/22 32/49\n" +"f 13/22 20/50 32/49\n" +"f 12/21 32/49 19/51\n" +"f 13/22 11/25 30/52\n" +"f 11/25 18/53 30/52\n" +"f 13/22 30/52 20/50\n" +"f 11/25 12/21 28/54\n" +"f 12/21 19/51 28/54\n" +"f 11/25 28/54 18/53\n" +"f 14/31 15/34 27/55\n" +"f 15/34 17/56 27/55\n" +"f 14/31 27/55 19/57\n" +"f 15/34 16/30 31/58\n" +"f 16/30 20/59 31/58\n" +"f 15/34 31/58 17/56\n" +"f 16/30 14/31 32/60\n" +"f 14/31 19/57 32/60\n" +"f 16/30 32/60 20/59\n" +"\n" +;