AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-12-23 08:20:06 +00:00
Code Issues Releases Wiki Activity
rc/v3_6_0
OpenSubdiv/examples/glFVarViewer/init_shapes.h

90 lines
6.5 KiB
C
Raw Permalink Normal View History

Landing 3.0.0.alpha Sync'ing the 'dev' branch with the 'feature_3.0dev' branch at commit 68c6d11fc36761ae1a5e6cdc3457be16f2e9704a The branch 'feature_3.0dev' is now locked and preserved for historical purposes.
2014-09-05 22:07:46 +00:00
//
// Copyright 2013 Pixar
//
// 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.
//
Fix CMakeLists: make project-relative include path overridable All examples, regression tests and tutorials directly looked into opensubdiv source directory to grab the header files. This is somewhat convenient during development but they can mistakenly access private header files. With this change, when OPENSUBDIV_INCLUDE_DIR is given to cmake, it will be used as an include search path to build examples etc. Otherwise it follows the same behavior as before. Also replaces include references to the files in regression dir to be relative, and cleanups some copy-paste patterns.
2015-05-29 00:32:00 +00:00
#include "../../regression/common/shape_utils.h"
#include "../../regression/shapes/all.h"
Moved definition of struct ShapeDesc into same header file as Shape: - added definition to regression/common/shape_utils.h - removed examples/common/shapeDesc.h and all references to it - removed local definitions of ShapeDesc from examples, regressions, etc. - overloaded Shape::parseObj() with ShapeDesc - updated examples to use Shape::parseObj(ShapeDesc const&); - removed axis argument to Shape::ParseObj() and ObjAnim::Create()
2019-04-23 19:05:14 +00:00
Landing 3.0.0.alpha Sync'ing the 'dev' branch with the 'feature_3.0dev' branch at commit 68c6d11fc36761ae1a5e6cdc3457be16f2e9704a The branch 'feature_3.0dev' is now locked and preserved for historical purposes.
2014-09-05 22:07:46 +00:00
static std::vector<ShapeDesc> g_defaultShapes;
//------------------------------------------------------------------------------
static void initShapes() {
minor improvements to examples/glFVarViewer: - added detection of shapes without UVs and report fatal error - fixed command line parsing of shape file arguments and other options - added missing UVs from shapes/catmark_fan
2017-01-27 22:22:54 +00:00
//
// Note that any shapes added here must have UVs -- loading a shape without UVs is a fatal
// error and will result in termination when it is selected.
//
Update shape list for examples/glFVarViewer: - included shapes added in recent pull requests - removed redundant shapes
2019-06-05 23:16:45 +00:00
g_defaultShapes.push_back(ShapeDesc("catmark_toroidal_tet", catmark_toroidal_tet, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_cube", catmark_cube, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_cubes_semisharp", catmark_cubes_semisharp, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_cubes_infsharp", catmark_cubes_infsharp, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_pyramid", catmark_pyramid, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_torus", catmark_torus, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_torus_creases0", catmark_torus_creases0, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_fvar_bound0", catmark_fvar_bound0, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_fvar_bound1", catmark_fvar_bound1, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_fvar_bound2", catmark_fvar_bound2, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_fvar_bound3", catmark_fvar_bound3, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_fvar_bound4", catmark_fvar_bound4, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_fvar_project0", catmark_fvar_project0, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_edgecorner", catmark_edgecorner, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_edgeonly", catmark_edgeonly, kCatmark));
Updated examples with new shapes for boundary interpolation "none": - added catmark_edgenone and loop_triangle_edgenone to shape lists
2020-01-14 22:27:51 +00:00
g_defaultShapes.push_back(ShapeDesc("catmark_edgenone", catmark_edgenone, kCatmark));
Update shape list for examples/glFVarViewer: - included shapes added in recent pull requests - removed redundant shapes
2019-06-05 23:16:45 +00:00
g_defaultShapes.push_back(ShapeDesc("catmark_quadstrips", catmark_quadstrips, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_xord_interior", catmark_xord_interior, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_xord_boundary", catmark_xord_boundary, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_nonquads", catmark_nonquads, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_nonman_verts", catmark_nonman_verts, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_nonman_edges", catmark_nonman_edges, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_hole_test1", catmark_hole_test1, kCatmark));
g_defaultShapes.push_back(ShapeDesc("catmark_hole_test2", catmark_hole_test2, kCatmark));
Landing 3.0.0.alpha Sync'ing the 'dev' branch with the 'feature_3.0dev' branch at commit 68c6d11fc36761ae1a5e6cdc3457be16f2e9704a The branch 'feature_3.0dev' is now locked and preserved for historical purposes.
2014-09-05 22:07:46 +00:00
Update shape list for examples/glFVarViewer: - included shapes added in recent pull requests - removed redundant shapes
2019-06-05 23:16:45 +00:00
g_defaultShapes.push_back(ShapeDesc("loop_toroidal_tet", loop_toroidal_tet, kLoop));
Added new Loop tetrahedron shape to main example viewers: - added to the main geometry viewers: glViewer, dxViewer, mtlViewer - added to glFVarViewer for viewing face-varying UVs
2019-06-14 22:24:00 +00:00
g_defaultShapes.push_back(ShapeDesc("loop_tetrahedron", loop_tetrahedron, kLoop));
Update shape list for examples/glFVarViewer: - included shapes added in recent pull requests - removed redundant shapes
2019-06-05 23:16:45 +00:00
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_infsharp", loop_cubes_infsharp, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_cube_asymmetric", loop_cube_asymmetric, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_icosahedron", loop_icosahedron, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_icos_semisharp", loop_icos_semisharp, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_icos_infsharp", loop_icos_infsharp, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_fvar_bound0", loop_fvar_bound0, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_fvar_bound1", loop_fvar_bound1, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_fvar_bound2", loop_fvar_bound2, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_fvar_bound3", loop_fvar_bound3, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgecorner", loop_triangle_edgecorner, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgeonly", loop_triangle_edgeonly, kLoop));
Updated examples with new shapes for boundary interpolation "none": - added catmark_edgenone and loop_triangle_edgenone to shape lists
2020-01-14 22:27:51 +00:00
g_defaultShapes.push_back(ShapeDesc("loop_triangle_edgenone", loop_triangle_edgenone, kLoop));
Update shape list for examples/glFVarViewer: - included shapes added in recent pull requests - removed redundant shapes
2019-06-05 23:16:45 +00:00
g_defaultShapes.push_back(ShapeDesc("loop_xord_interior", loop_xord_interior, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_xord_boundary", loop_xord_boundary, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_nonman_verts", loop_nonman_verts, kLoop));
g_defaultShapes.push_back(ShapeDesc("loop_nonman_edges", loop_nonman_edges, kLoop));
Several minor updates to the GL examples: - addition of new shapes -- mainly Loop and Bilinear - removal of redundant shapes and those not suited to a particular example - enforced consistent "Patch Type" coloring where provided - enforced consistent command line usage for common options and Obj input - enforced consistent default settings on initialization - added errors and/or assertions where legitimate limitations remain - improved error handling (OSD errors not being flushed before termination)
2019-02-06 01:22:10 +00:00
Update shape list for examples/glFVarViewer: - included shapes added in recent pull requests - removed redundant shapes
2019-06-05 23:16:45 +00:00
g_defaultShapes.push_back(ShapeDesc("bilinear_cube", bilinear_cube, kBilinear));
g_defaultShapes.push_back(ShapeDesc("bilinear_nonplanar", bilinear_nonplanar, kBilinear));
g_defaultShapes.push_back(ShapeDesc("bilinear_nonquads0", bilinear_nonquads0, kBilinear));
g_defaultShapes.push_back(ShapeDesc("bilinear_nonquads1", bilinear_nonquads1, kBilinear));
Landing 3.0.0.alpha Sync'ing the 'dev' branch with the 'feature_3.0dev' branch at commit 68c6d11fc36761ae1a5e6cdc3457be16f2e9704a The branch 'feature_3.0dev' is now locked and preserved for historical purposes.
2014-09-05 22:07:46 +00:00
}
//------------------------------------------------------------------------------
Reference in New Issue Copy Permalink