mirror of
https://github.com/PixarAnimationStudios/OpenSubdiv
synced 2024-12-13 04:20:10 +00:00
15b4135cfb
- change topology refiner to check for edge sharpnesses when selecting faces for isolation - add face-aggregator for edge tags to Vtr::Level - fix logic in Far::PatchTablesFactory to correctly tag single-crease patches along infinitely sharp edges note : this fix is a bit of a cludge - barfowl confirms that the vertex crease tags (VTags) are intended to carry neighborhood information, which they currently do not. we will revisit this shortly and fix the tags, which will allow us to simplify the traversal logic when isolating topology features. fixes #369
174 lines
11 KiB
C++
174 lines
11 KiB
C++
//
|
|
// 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.
|
|
//
|
|
|
|
#include <common/shape_utils.h>
|
|
|
|
struct ShapeDesc {
|
|
|
|
ShapeDesc(char const * iname, std::string const & idata, Scheme ischeme) :
|
|
name(iname), data(idata), scheme(ischeme) { }
|
|
|
|
std::string name,
|
|
data;
|
|
Scheme scheme;
|
|
};
|
|
|
|
static std::vector<ShapeDesc> g_defaultShapes;
|
|
|
|
#include <shapes/catmark_bishop.h>
|
|
#include <shapes/catmark_car.h>
|
|
#include <shapes/catmark_chaikin0.h>
|
|
#include <shapes/catmark_chaikin1.h>
|
|
#include <shapes/catmark_chaikin2.h>
|
|
#include <shapes/catmark_cube_corner0.h>
|
|
#include <shapes/catmark_cube_corner1.h>
|
|
#include <shapes/catmark_cube_corner2.h>
|
|
#include <shapes/catmark_cube_corner3.h>
|
|
#include <shapes/catmark_cube_corner4.h>
|
|
#include <shapes/catmark_cube_creases0.h>
|
|
#include <shapes/catmark_cube_creases1.h>
|
|
#include <shapes/catmark_cube_creases2.h>
|
|
#include <shapes/catmark_cube.h>
|
|
#include <shapes/catmark_dart_edgecorner.h>
|
|
#include <shapes/catmark_dart_edgeonly.h>
|
|
#include <shapes/catmark_edgecorner.h>
|
|
#include <shapes/catmark_edgeonly.h>
|
|
#include <shapes/catmark_fan.h>
|
|
#include <shapes/catmark_flap.h>
|
|
#include <shapes/catmark_flap2.h>
|
|
#include <shapes/catmark_fvar_bound0.h>
|
|
#include <shapes/catmark_fvar_bound1.h>
|
|
#include <shapes/catmark_fvar_bound2.h>
|
|
#include <shapes/catmark_gregory_test1.h>
|
|
#include <shapes/catmark_gregory_test2.h>
|
|
#include <shapes/catmark_gregory_test3.h>
|
|
#include <shapes/catmark_gregory_test4.h>
|
|
#include <shapes/catmark_gregory_test5.h>
|
|
#include <shapes/catmark_gregory_test6.h>
|
|
#include <shapes/catmark_gregory_test7.h>
|
|
#include <shapes/catmark_helmet.h>
|
|
#include <shapes/catmark_hole_test1.h>
|
|
#include <shapes/catmark_hole_test2.h>
|
|
#include <shapes/catmark_hole_test3.h>
|
|
#include <shapes/catmark_hole_test4.h>
|
|
#include <shapes/catmark_pawn.h>
|
|
#include <shapes/catmark_pyramid_creases0.h>
|
|
#include <shapes/catmark_pyramid_creases1.h>
|
|
#include <shapes/catmark_pyramid.h>
|
|
#include <shapes/catmark_rook.h>
|
|
#include <shapes/catmark_smoothtris0.h>
|
|
#include <shapes/catmark_smoothtris1.h>
|
|
#include <shapes/catmark_square_hedit0.h>
|
|
#include <shapes/catmark_square_hedit1.h>
|
|
#include <shapes/catmark_square_hedit2.h>
|
|
#include <shapes/catmark_square_hedit3.h>
|
|
#include <shapes/catmark_tent_creases0.h>
|
|
#include <shapes/catmark_tent_creases1.h>
|
|
#include <shapes/catmark_tent.h>
|
|
#include <shapes/catmark_torus.h>
|
|
#include <shapes/catmark_torus_creases0.h>
|
|
|
|
#include <shapes/bilinear_cube.h>
|
|
|
|
#include <shapes/loop_cube_creases0.h>
|
|
#include <shapes/loop_cube_creases1.h>
|
|
#include <shapes/loop_cube.h>
|
|
#include <shapes/loop_icosahedron.h>
|
|
#include <shapes/loop_saddle_edgecorner.h>
|
|
#include <shapes/loop_saddle_edgeonly.h>
|
|
#include <shapes/loop_triangle_edgecorner.h>
|
|
#include <shapes/loop_triangle_edgeonly.h>
|
|
#include <shapes/loop_chaikin0.h>
|
|
#include <shapes/loop_chaikin1.h>
|
|
|
|
//------------------------------------------------------------------------------
|
|
static void initShapes() {
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_cube_corner0", catmark_cube_corner0, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_cube_corner1", catmark_cube_corner1, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_cube_corner2", catmark_cube_corner2, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_cube_corner3", catmark_cube_corner3, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_cube_corner4", catmark_cube_corner4, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_cube_creases0", catmark_cube_creases0, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_cube_creases1", catmark_cube_creases1, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_cube_creases2", catmark_cube_creases2, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_cube", catmark_cube, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_dart_edgecorner", catmark_dart_edgecorner, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_dart_edgeonly", catmark_dart_edgeonly, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_edgecorner", catmark_edgecorner, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_edgeonly", catmark_edgeonly, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_chaikin0", catmark_chaikin0, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_chaikin1", catmark_chaikin1, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_chaikin2", catmark_chaikin2, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_fan", catmark_fan, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_flap", catmark_flap, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_flap2", catmark_flap2, 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_gregory_test1", catmark_gregory_test1, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_gregory_test2", catmark_gregory_test2, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_gregory_test3", catmark_gregory_test3, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_gregory_test4", catmark_gregory_test4, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_gregory_test5", catmark_gregory_test5, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_gregory_test6", catmark_gregory_test6, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_gregory_test7", catmark_gregory_test7, 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 ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_hole_test3", catmark_hole_test3, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_hole_test4", catmark_hole_test4, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_pyramid_creases0", catmark_pyramid_creases0, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_pyramid_creases1", catmark_pyramid_creases1, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_pyramid", catmark_pyramid, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_tent_creases0", catmark_tent_creases0, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_tent_creases1", catmark_tent_creases1 , kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_tent", catmark_tent, 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_smoothtris0", catmark_smoothtris0, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_smoothtris1", catmark_smoothtris1, kCatmark ) );
|
|
// g_defaultShapes.push_back( ShapeDesc("catmark_square_hedit0", catmark_square_hedit0, kCatmark ) );
|
|
// g_defaultShapes.push_back( ShapeDesc("catmark_square_hedit1", catmark_square_hedit1, kCatmark ) );
|
|
// g_defaultShapes.push_back( ShapeDesc("catmark_square_hedit2", catmark_square_hedit2, kCatmark ) );
|
|
// g_defaultShapes.push_back( ShapeDesc("catmark_square_hedit3", catmark_square_hedit3, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_bishop", catmark_bishop, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_car", catmark_car, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_helmet", catmark_helmet, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_pawn", catmark_pawn, kCatmark ) );
|
|
g_defaultShapes.push_back( ShapeDesc("catmark_rook", catmark_rook, kCatmark ) );
|
|
|
|
g_defaultShapes.push_back( ShapeDesc("bilinear_cube", bilinear_cube, kBilinear ) );
|
|
|
|
g_defaultShapes.push_back( ShapeDesc("loop_cube_creases0", loop_cube_creases0, kLoop ) );
|
|
g_defaultShapes.push_back( ShapeDesc("loop_cube_creases1", loop_cube_creases1, kLoop ) );
|
|
g_defaultShapes.push_back( ShapeDesc("loop_cube", loop_cube, kLoop ) );
|
|
g_defaultShapes.push_back( ShapeDesc("loop_icosahedron", loop_icosahedron, kLoop ) );
|
|
g_defaultShapes.push_back( ShapeDesc("loop_saddle_edgecorner", loop_saddle_edgecorner, kLoop ) );
|
|
g_defaultShapes.push_back( ShapeDesc("loop_saddle_edgeonly", loop_saddle_edgeonly, 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 ) );
|
|
g_defaultShapes.push_back( ShapeDesc("loop_chaikin0", loop_chaikin0, kLoop ) );
|
|
g_defaultShapes.push_back( ShapeDesc("loop_chaikin1", loop_chaikin1, kLoop ) );
|
|
}
|
|
//------------------------------------------------------------------------------
|