AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-12-23 16:30:07 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1124 from barfowl/examples_loop_tet

Browse Source 
Added simple tetrahedron to set of Loop test shapes
This commit is contained in:
David G Yu 2019-06-14 17:37:32 -07:00 committed by GitHub
commit db9c01e7e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/dxViewer/init_shapes.h
View File

@ -72,6 +72,7 @@ static void initShapes() {
g_defaultShapes.push_back(ShapeDesc("catmark_car", catmark_car, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_car", catmark_car, kCatmark));
g_defaultShapes.push_back(ShapeDesc("loop_toroidal_tet", loop_toroidal_tet, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_toroidal_tet", loop_toroidal_tet, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_tetrahedron", loop_tetrahedron, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_cube", loop_cube, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_cube", loop_cube, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_cubes_semisharp", loop_cubes_semisharp, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_cubes_semisharp", loop_cubes_semisharp, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_cubes_infsharp", loop_cubes_infsharp, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_cubes_infsharp", loop_cubes_infsharp, kLoop));

1
examples/glFVarViewer/init_shapes.h
View File

@ -60,6 +60,7 @@ static void initShapes() {
g_defaultShapes.push_back(ShapeDesc("catmark_hole_test2", catmark_hole_test2, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_hole_test2", catmark_hole_test2, kCatmark));
g_defaultShapes.push_back(ShapeDesc("loop_toroidal_tet", loop_toroidal_tet, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_toroidal_tet", loop_toroidal_tet, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_tetrahedron", loop_tetrahedron, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_cube", loop_cube, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_cube", loop_cube, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_cubes_semisharp", loop_cubes_semisharp, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_cubes_semisharp", loop_cubes_semisharp, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_cubes_infsharp", loop_cubes_infsharp, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_cubes_infsharp", loop_cubes_infsharp, kLoop));

1
examples/glViewer/init_shapes.h
View File

@ -72,6 +72,7 @@ static void initShapes() {
g_defaultShapes.push_back(ShapeDesc("catmark_car", catmark_car, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_car", catmark_car, kCatmark));
g_defaultShapes.push_back(ShapeDesc("loop_toroidal_tet", loop_toroidal_tet, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_toroidal_tet", loop_toroidal_tet, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_tetrahedron", loop_tetrahedron, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_cube", loop_cube, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_cube", loop_cube, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_cubes_semisharp", loop_cubes_semisharp, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_cubes_semisharp", loop_cubes_semisharp, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_cubes_infsharp", loop_cubes_infsharp, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_cubes_infsharp", loop_cubes_infsharp, kLoop));

1
examples/mtlViewer/init_shapes.h
View File

@ -72,6 +72,7 @@ static void initShapes() {
g_defaultShapes.push_back(ShapeDesc("catmark_car", catmark_car, kCatmark)); g_defaultShapes.push_back(ShapeDesc("catmark_car", catmark_car, kCatmark));
g_defaultShapes.push_back(ShapeDesc("loop_toroidal_tet", loop_toroidal_tet, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_toroidal_tet", loop_toroidal_tet, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_tetrahedron", loop_tetrahedron, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_cube", loop_cube, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_cube", loop_cube, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_cubes_semisharp", loop_cubes_semisharp, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_cubes_semisharp", loop_cubes_semisharp, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_cubes_infsharp", loop_cubes_infsharp, kLoop)); g_defaultShapes.push_back(ShapeDesc("loop_cubes_infsharp", loop_cubes_infsharp, kLoop));

1
regression/shapes/all.h
View File

@ -136,6 +136,7 @@
#include "loop_pole360.h" #include "loop_pole360.h"
#include "loop_saddle_edgecorner.h" #include "loop_saddle_edgecorner.h"
#include "loop_saddle_edgeonly.h" #include "loop_saddle_edgeonly.h"
#include "loop_tetrahedron.h"
#include "loop_toroidal_tet.h" #include "loop_toroidal_tet.h"
#include "loop_triangle_edgecorner.h" #include "loop_triangle_edgecorner.h"
#include "loop_triangle_edgeonly.h" #include "loop_triangle_edgeonly.h"

47
regression/shapes/loop_tetrahedron.h Normal file
View File

@ -0,0 +1,47 @@
//
// 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_tetrahedron =
"#\n"
"# Tetrahedron oriented within an axially aligned cube:\n"
"#\n"
"v -1 -1 1\n"
"v 1 -1 -1\n"
"v 1 1 1\n"
"v -1 1 -1\n"
"\n"
"vt 0.375 0.217\n"
"vt 0.75 0.0\n"
"vt 0.375 0.65\n"
"vt 0.0 0.0\n"
"vt 0.25 1.0\n"
"vt 0.625 0.35\n"
"vt 1.0 1.0\n"
"\n"
"f 1/1 2/2 3/3\n"
"f 1/1 3/3 4/4\n"
"f 1/1 4/4 2/2\n"
"f 4/5 3/6 2/7\n"
"\n"
;