AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2025-01-09 08:10:07 +00:00
Code Issues Releases Wiki Activity

Fix CMakeLists: make project-relative include path overridable

Browse Source 
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.
This commit is contained in:
Takahito Tejima 2015-05-28 17:32:00 -07:00
parent c65995b834
commit 89dcea57c2
47 changed files with 174 additions and 598 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -687,6 +687,17 @@ endmacro()
#-------------------------------------------------------------------------------
# Build targets
# if you want to build examples against installed OpenSubdiv header files,
# use OPENSUBDIV_INCLUDE_DIR.
# example: if you have already installed opensubdiv libs in this cmake setup,
# set (OPENSUBDIV_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INCDIR_BASE})
if (NOT OPENSUBDIV_INCLUDE_DIR)
set(OPENSUBDIV_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/opensubdiv")
endif()
if (NOT NO_TESTS)
enable_testing()
endif()

3
examples/common/CMakeLists.txt
View File

@ -148,7 +148,7 @@ endif()
#-------------------------------------------------------------------------------
include_directories(
"${PROJECT_SOURCE_DIR}/opensubdiv"
"${OPENSUBDIV_INCLUDE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}"
)
@ -165,4 +165,3 @@ add_library(examples_common_obj
${EXAMPLES_COMMON_HEADER_FILES}
${INC_FILES}
)

3
examples/common/objAnim.cpp
View File

@ -23,8 +23,7 @@
//
#include "objAnim.h"
#include <../regression/common/shape_utils.h>
#include "../../regression/common/shape_utils.h"
#include <cassert>
#include <cstdio>

3
examples/dxPtexViewer/CMakeLists.txt
View File

@ -35,8 +35,7 @@ set(PLATFORM_LIBRARIES
)
include_directories(
"${PROJECT_SOURCE_DIR}/opensubdiv"
"${PROJECT_SOURCE_DIR}/regression"
"${OPENSUBDIV_INCLUDE_DIR}"
"${DXSDK_INCLUDE_DIR}"
"${PTEX_INCLUDE_DIR}"
)

2
examples/dxPtexViewer/dxPtexViewer.cpp
View File

@ -61,7 +61,7 @@ OpenSubdiv::Osd::D3D11MeshInterface *g_mesh;
#include "Ptexture.h"
#include "PtexUtils.h"
#include <common/vtr_utils.h>
#include "../../regression/common/vtr_utils.h"
#include "../common/stopwatch.h"
#include "../common/simple_math.h"
#include "../common/d3d11Hud.h"

3
examples/dxViewer/CMakeLists.txt
View File

@ -34,8 +34,7 @@ set(PLATFORM_LIBRARIES
)
include_directories(
"${PROJECT_SOURCE_DIR}/opensubdiv"
"${PROJECT_SOURCE_DIR}/regression"
"${OPENSUBDIV_INCLUDE_DIR}"
"${DXSDK_INCLUDE_DIR}"
)

2
examples/dxViewer/dxviewer.cpp
View File

@ -60,7 +60,7 @@
OpenSubdiv::Osd::D3D11MeshInterface *g_mesh = NULL;
OpenSubdiv::Osd::D3D11LegacyGregoryPatchTable *g_legacyGregoryPatchTable = NULL;
#include <common/vtr_utils.h>
#include "../../regression/common/vtr_utils.h"
#include "../common/stopwatch.h"
#include "../common/simple_math.h"
#include "../common/d3d11Hud.h"

59
examples/dxViewer/init_shapes.h
View File

@ -22,7 +22,8 @@
// language governing permissions and limitations under the Apache License.
//
#include <common/shape_utils.h>
#include "../../regression/common/shape_utils.h"
#include "../../regression/shapes/all.h"
struct ShapeDesc {
@ -36,62 +37,6 @@ struct ShapeDesc {
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.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_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_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_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/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("bilinear_cube", bilinear_cube, kBilinear) );

3
examples/farViewer/CMakeLists.txt
View File

@ -31,8 +31,7 @@ set(SHADER_FILES
)
include_directories(
"${PROJECT_SOURCE_DIR}/opensubdiv"
"${PROJECT_SOURCE_DIR}/regression"
"${OPENSUBDIV_INCLUDE_DIR}"
"${GLFW_INCLUDE_DIR}"
)

3
examples/farViewer/farViewer.cpp
View File

@ -55,8 +55,7 @@ GLFWmonitor* g_primary=0;
#include <far/stencilTableFactory.h>
#include <far/primvarRefiner.h>
#include <common/vtr_utils.h>
#include "../../regression/common/vtr_utils.h"
#include "../common/stopwatch.h"
#include "../common/simple_math.h"
#include "../common/glUtils.h"

4
examples/farViewer/gl_mesh.h
View File

@ -25,8 +25,8 @@
#ifndef GL_MESH_H
#define GL_MESH_H
#include <common/vtr_utils.h>
#include <common/hbr_utils.h>
#include "../../regression/common/vtr_utils.h"
#include "../../regression/common/hbr_utils.h"
#include <far/patchTable.h>
#include "../common/glUtils.h"

58
examples/farViewer/init_shapes.h
View File

@ -22,7 +22,8 @@
// language governing permissions and limitations under the Apache License.
//
#include <common/shape_utils.h>
#include "../../regression/common/shape_utils.h"
#include "../../regression/shapes/all.h"
struct ShapeDesc {
@ -36,61 +37,6 @@ struct ShapeDesc {
static std::vector<ShapeDesc> g_shapes;
#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.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_test0.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_helmet.h>
#include <shapes/catmark_pyramid_creases0.h>
#include <shapes/catmark_pyramid_creases1.h>
#include <shapes/catmark_pyramid.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/catmark_smoothtris0.h>
#include <shapes/catmark_smoothtris1.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_shapes.push_back( ShapeDesc("bilinear_cube", bilinear_cube, kBilinear) );

3
examples/glEvalLimit/CMakeLists.txt
View File

@ -30,8 +30,7 @@ list(APPEND PLATFORM_LIBRARIES
)
include_directories(
"${PROJECT_SOURCE_DIR}/opensubdiv"
"${PROJECT_SOURCE_DIR}/regression"
"${OPENSUBDIV_INCLUDE_DIR}"
"${GLFW_INCLUDE_DIR}"
)

2
examples/glEvalLimit/glEvalLimit.cpp
View File

@ -95,7 +95,7 @@ GLFWmonitor* g_primary=0;
#include <far/error.h>
#include <common/vtr_utils.h>
#include "../../regression/common/vtr_utils.h"
#include "../common/stopwatch.h"
#include "../common/simple_math.h"
#include "../common/glHud.h"

48
examples/glEvalLimit/init_shapes.h
View File

@ -22,7 +22,8 @@
// language governing permissions and limitations under the Apache License.
//
#include <common/shape_utils.h>
#include "../../regression/common/shape_utils.h"
#include "../../regression/shapes/all.h"
struct ShapeDesc {
@ -36,51 +37,6 @@ struct ShapeDesc {
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.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_gregory_test0.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_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_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>
//------------------------------------------------------------------------------
static void initShapes() {

3
examples/glFVarViewer/CMakeLists.txt
View File

@ -35,8 +35,7 @@ list(APPEND PLATFORM_LIBRARIES
)
include_directories(
"${PROJECT_SOURCE_DIR}/opensubdiv"
"${PROJECT_SOURCE_DIR}/regression"
"${OPENSUBDIV_INCLUDE_DIR}"
"${GLFW_INCLUDE_DIR}"
)

4
examples/glFVarViewer/glFVarViewer.cpp
View File

@ -43,14 +43,12 @@ GLFWwindow* g_window = 0;
GLFWmonitor* g_primary = 0;
#include <far/error.h>
#include <osd/cpuEvaluator.h>
#include <osd/cpuGLVertexBuffer.h>
#include <osd/glMesh.h>
OpenSubdiv::Osd::GLMeshInterface *g_mesh = NULL;
#include <common/vtr_utils.h>
#include "../../regression/common/vtr_utils.h"
#include "../common/stopwatch.h"
#include "../common/simple_math.h"
#include "../common/glHud.h"

60
examples/glFVarViewer/init_shapes.h
View File

@ -22,7 +22,8 @@
// language governing permissions and limitations under the Apache License.
//
#include <common/shape_utils.h>
#include "../../regression/common/shape_utils.h"
#include "../../regression/shapes/all.h"
struct ShapeDesc {
@ -36,63 +37,6 @@ struct ShapeDesc {
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_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.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_helmet.h>
#include <shapes/catmark_hole_test1.h>
#include <shapes/catmark_hole_test2.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_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() {

3
examples/glImaging/CMakeLists.txt
View File

@ -23,8 +23,7 @@
#
include_directories(
"${PROJECT_SOURCE_DIR}/opensubdiv"
"${PROJECT_SOURCE_DIR}/regression"
"${OPENSUBDIV_INCLUDE_DIR}"
"${GLFW_INCLUDE_DIR}"
)

2
examples/glImaging/glImaging.cpp
View File

@ -84,7 +84,7 @@
#include <osd/glMesh.h>
#include <common/vtr_utils.h>
#include "../../regression/common/vtr_utils.h"
#include "../common/patchColors.h"
#include "../common/stb_image_write.h" // common.obj has an implementation.
#include "../common/glShaderCache.h"

70
examples/glImaging/init_shapes.h
View File

@ -22,7 +22,8 @@
// language governing permissions and limitations under the Apache License.
//
#include <common/shape_utils.h>
#include "../../regression/common/shape_utils.h"
#include "../../regression/shapes/all.h"
struct ShapeDesc {
@ -36,73 +37,6 @@ struct ShapeDesc {
static std::vector<ShapeDesc> g_shapes;
#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_test0.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() {

3
examples/glPaintTest/CMakeLists.txt
View File

@ -37,8 +37,7 @@ list(APPEND PLATFORM_LIBRARIES
)
include_directories(
"${PROJECT_SOURCE_DIR}/opensubdiv"
"${PROJECT_SOURCE_DIR}/regression"
"${OPENSUBDIV_INCLUDE_DIR}"
"${GLEW_INCLUDE_DIR}"
"${GLFW_INCLUDE_DIR}"
)

4
examples/glPaintTest/glPaintTest.cpp
View File

@ -44,14 +44,12 @@ GLFWmonitor* g_primary=0;
#include <far/error.h>
#include <far/ptexIndices.h>
#include <osd/cpuEvaluator.h>
#include <osd/cpuGLVertexBuffer.h>
#include <osd/glMesh.h>
OpenSubdiv::Osd::GLMeshInterface *g_mesh;
#include <common/vtr_utils.h>
#include "../../regression/common/vtr_utils.h"
#include "../common/stopwatch.h"
#include "../common/simple_math.h"
#include "../common/glHud.h"

45
examples/glPaintTest/init_shapes.h
View File

@ -22,7 +22,8 @@
// language governing permissions and limitations under the Apache License.
//
#include <common/shape_utils.h>
#include "../../regression/common/shape_utils.h"
#include "../../regression/shapes/all.h"
struct ShapeDesc {
@ -36,48 +37,6 @@ struct ShapeDesc {
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.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_gregory_test1.h>
#include <shapes/catmark_gregory_test2.h>
#include <shapes/catmark_gregory_test3.h>
#include <shapes/catmark_gregory_test4.h>
#include <shapes/catmark_helmet.h>
#include <shapes/catmark_hole_test1.h>
#include <shapes/catmark_hole_test2.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_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>
//------------------------------------------------------------------------------
static void initShapes() {
g_defaultShapes.push_back( ShapeDesc("catmark_cube_corner0", catmark_cube_corner0, kCatmark ) );

3
examples/glPtexViewer/CMakeLists.txt
View File

@ -38,8 +38,7 @@ list(APPEND PLATFORM_LIBRARIES
)
include_directories(
"${PROJECT_SOURCE_DIR}/opensubdiv"
"${PROJECT_SOURCE_DIR}/regression"
"${OPENSUBDIV_INCLUDE_DIR}"
"${GLFW_INCLUDE_DIR}"
"${PTEX_INCLUDE_DIR}"
)

2
examples/glPtexViewer/glPtexViewer.cpp
View File

@ -92,7 +92,7 @@ OpenSubdiv::Osd::GLMeshInterface *g_mesh;
#include "Ptexture.h"
#include "PtexUtils.h"
#include <common/vtr_utils.h>
#include "../../regression/common/vtr_utils.h"
#include "../common/stopwatch.h"
#include "../common/simple_math.h"
#include "../common/glHud.h"

3
examples/glShareTopology/CMakeLists.txt
View File

@ -35,8 +35,7 @@ list(APPEND PLATFORM_LIBRARIES
)
include_directories(
"${PROJECT_SOURCE_DIR}/opensubdiv"
"${PROJECT_SOURCE_DIR}/regression"
"${OPENSUBDIV_INCLUDE_DIR}"
"${GLFW_INCLUDE_DIR}"
)

2
examples/glShareTopology/glShareTopology.cpp
View File

@ -82,7 +82,7 @@ GLFWmonitor* g_primary=0;
#endif
#include <common/vtr_utils.h>
#include "../../regression/common/vtr_utils.h"
#include "init_shapes.h"
#include "../common/stopwatch.h"

72
examples/glShareTopology/init_shapes.h
View File

@ -22,7 +22,8 @@
// language governing permissions and limitations under the Apache License.
//
#include <common/shape_utils.h>
#include "../../regression/common/shape_utils.h"
#include "../../regression/shapes/all.h"
struct ShapeDesc {
@ -38,75 +39,6 @@ struct ShapeDesc {
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_test0.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_lefthanded.h>
#include <shapes/catmark_righthanded.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 ) );

4
examples/glShareTopology/sceneBase.cpp
View File

@ -22,11 +22,11 @@
// language governing permissions and limitations under the Apache License.
//
#include "sceneBase.h"
#include <limits>
#include <common/vtr_utils.h>
#include "../../regression/common/vtr_utils.h"
#include <far/patchTableFactory.h>
#include <far/stencilTableFactory.h>
#include "sceneBase.h"
using namespace OpenSubdiv;

3
examples/glStencilViewer/CMakeLists.txt
View File

@ -30,8 +30,7 @@ list(APPEND PLATFORM_LIBRARIES
)
include_directories(
"${PROJECT_SOURCE_DIR}/opensubdiv"
"${PROJECT_SOURCE_DIR}/regression"
"${OPENSUBDIV_INCLUDE_DIR}"
"${GLFW_INCLUDE_DIR}"
)

2
examples/glStencilViewer/glStencilViewer.cpp
View File

@ -42,7 +42,7 @@
GLFWwindow* g_window=0;
GLFWmonitor* g_primary=0;
#include <common/vtr_utils.h>
#include "../../regression/common/vtr_utils.h"
#include "../common/stopwatch.h"
#include "../common/simple_math.h"
#include "../common/glUtils.h"

59
examples/glStencilViewer/init_shapes.h
View File

@ -22,7 +22,8 @@
// language governing permissions and limitations under the Apache License.
//
#include <common/shape_utils.h>
#include "../../regression/common/shape_utils.h"
#include "../../regression/shapes/all.h"
struct ShapeDesc {
@ -36,62 +37,6 @@ struct ShapeDesc {
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.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_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_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_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/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("bilinear_cube", bilinear_cube, kBilinear) );

3
examples/glViewer/CMakeLists.txt
View File

@ -30,8 +30,7 @@ set(SHADER_FILES
)
include_directories(
"${PROJECT_SOURCE_DIR}/opensubdiv"
"${PROJECT_SOURCE_DIR}/regression"
"${OPENSUBDIV_INCLUDE_DIR}"
"${GLFW_INCLUDE_DIR}"
)

2
examples/glViewer/glViewer.cpp
View File

@ -86,7 +86,7 @@ GLFWmonitor* g_primary=0;
OpenSubdiv::Osd::GLMeshInterface *g_mesh = NULL;
OpenSubdiv::Osd::GLLegacyGregoryPatchTable *g_legacyGregoryPatchTable = NULL;
#include <common/vtr_utils.h>
#include "../../regression/common/vtr_utils.h"
#include "../common/stopwatch.h"
#include "../common/simple_math.h"
#include "../common/glHud.h"

81
examples/glViewer/init_shapes.h
View File

@ -22,7 +22,8 @@
// language governing permissions and limitations under the Apache License.
//
#include <common/shape_utils.h>
#include "../../regression/common/shape_utils.h"
#include "../../regression/shapes/all.h"
struct ShapeDesc {
@ -38,84 +39,6 @@ struct ShapeDesc {
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_test0.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_lefthanded.h>
#include <shapes/catmark_righthanded.h>
#include <shapes/catmark_pole8.h>
#include <shapes/catmark_pole64.h>
#include <shapes/catmark_pole360.h>
#include <shapes/catmark_nonman_quadpole8.h>
#include <shapes/catmark_nonman_quadpole64.h>
#include <shapes/catmark_nonman_quadpole360.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>
#include <shapes/loop_pole8.h>
#include <shapes/loop_pole64.h>
#include <shapes/loop_pole360.h>
//------------------------------------------------------------------------------
static void initShapes() {
g_defaultShapes.push_back( ShapeDesc("catmark_cube_corner0", catmark_cube_corner0, kCatmark ) );

2
examples/mayaPolySmooth/CMakeLists.txt
View File

@ -41,7 +41,7 @@ set(PLATFORM_LIBRARIES
)
include_directories(
"${PROJECT_SOURCE_DIR}/opensubdiv"
"${OPENSUBDIV_INCLUDE_DIR}"
"${MAYA_INCLUDE_DIRS}"
)

5
regression/common/CMakeLists.txt
View File

@ -33,10 +33,7 @@ set(REGRESSION_COMMON_HEADER_FILES
vtr_utils.h
)
include_directories(
"${PROJECT_SOURCE_DIR}/opensubdiv"
"${CMAKE_CURRENT_BINARY_DIR}"
)
include_directories("${OPENSUBDIV_INCLUDE_DIR}")
add_library(regression_common_obj
OBJECT

2
regression/common/cmp_utils.h
View File

@ -27,7 +27,7 @@
#include <far/topologyRefinerFactory.h>
#include "../../regression/common/hbr_utils.h"
#include "hbr_utils.h"
//------------------------------------------------------------------------------

2
regression/common/hbr_utils.h
View File

@ -37,7 +37,7 @@
#include <hbr/cornerEdit.h>
#include <hbr/holeEdit.h>
#include "../../regression/common/shape_utils.h"
#include "shape_utils.h"
#include <sstream>

2
regression/common/vtr_utils.cpp
View File

@ -22,7 +22,7 @@
// language governing permissions and limitations under the Apache License.
//
#include "../../regression/common/vtr_utils.h"
#include "vtr_utils.h"
struct FVarVertex {

2
regression/common/vtr_utils.h
View File

@ -29,7 +29,7 @@
#include <far/primvarRefiner.h>
#include <far/types.h>
#include "../../regression/common/shape_utils.h"
#include "shape_utils.h"
//------------------------------------------------------------------------------

2
regression/far_regression/CMakeLists.txt
View File

@ -22,7 +22,7 @@
# language governing permissions and limitations under the Apache License.
#
include_directories("${PROJECT_SOURCE_DIR}/opensubdiv")
include_directories("${OPENSUBDIV_INCLUDE_DIR}")
set(SOURCE_FILES
far_regression.cpp

2
regression/hbr_regression/CMakeLists.txt
View File

@ -22,7 +22,7 @@
# language governing permissions and limitations under the Apache License.
#
include_directories("${PROJECT_SOURCE_DIR}/opensubdiv")
include_directories("${OPENSUBDIV_INCLUDE_DIR}")
_add_possibly_cuda_executable(hbr_regression
main.cpp

2
regression/osd_regression/CMakeLists.txt
View File

@ -23,7 +23,7 @@
#
include_directories(
"${PROJECT_SOURCE_DIR}/opensubdiv"
"${OPENSUBDIV_INCLUDE_DIR}"
"${GLFW_INCLUDE_DIR}"
)

9
regression/osd_regression/main.cpp
View File

@ -48,15 +48,12 @@ GLFWwindow* g_window=0;
#include <osd/cpuEvaluator.h>
#include <osd/cpuVertexBuffer.h>
#include <osd/cpuGLVertexBuffer.h>
#include <far/stencilTableFactory.h>
#include "../../regression/common/cmp_utils.h"
#include "../../regression/common/hbr_utils.h"
#include "../../regression/common/vtr_utils.h"
#include "../common/cmp_utils.h"
#include "../common/hbr_utils.h"
#include "../common/vtr_utils.h"
//
// Regression testing matching Osd to Hbr

105
regression/shapes/all.h Normal file
View File

@ -0,0 +1,105 @@
//
// Copyright 2015 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.
//
#ifndef OPENSUBDIV_REGRESSION_SHAPES_ALL_H
#define OPENSUBDIV_REGRESSION_SHAPES_ALL_H
#include "catmark_bishop.h"
#include "catmark_car.h"
#include "catmark_chaikin0.h"
#include "catmark_chaikin1.h"
#include "catmark_chaikin2.h"
#include "catmark_cube_corner0.h"
#include "catmark_cube_corner1.h"
#include "catmark_cube_corner2.h"
#include "catmark_cube_corner3.h"
#include "catmark_cube_corner4.h"
#include "catmark_cube_creases0.h"
#include "catmark_cube_creases1.h"
#include "catmark_cube_creases2.h"
#include "catmark_cube.h"
#include "catmark_dart_edgecorner.h"
#include "catmark_dart_edgeonly.h"
#include "catmark_edgecorner.h"
#include "catmark_edgeonly.h"
#include "catmark_fan.h"
#include "catmark_flap.h"
#include "catmark_flap2.h"
#include "catmark_fvar_bound0.h"
#include "catmark_fvar_bound1.h"
#include "catmark_fvar_bound2.h"
#include "catmark_gregory_test0.h"
#include "catmark_gregory_test1.h"
#include "catmark_gregory_test2.h"
#include "catmark_gregory_test3.h"
#include "catmark_gregory_test4.h"
#include "catmark_gregory_test5.h"
#include "catmark_gregory_test6.h"
#include "catmark_gregory_test7.h"
#include "catmark_helmet.h"
#include "catmark_hole_test1.h"
#include "catmark_hole_test2.h"
#include "catmark_hole_test3.h"
#include "catmark_hole_test4.h"
#include "catmark_lefthanded.h"
#include "catmark_righthanded.h"
#include "catmark_pole8.h"
#include "catmark_pole64.h"
#include "catmark_pole360.h"
#include "catmark_nonman_quadpole8.h"
#include "catmark_nonman_quadpole64.h"
#include "catmark_nonman_quadpole360.h"
#include "catmark_pawn.h"
#include "catmark_pyramid_creases0.h"
#include "catmark_pyramid_creases1.h"
#include "catmark_pyramid.h"
#include "catmark_rook.h"
#include "catmark_smoothtris0.h"
#include "catmark_smoothtris1.h"
#include "catmark_square_hedit0.h"
#include "catmark_square_hedit1.h"
#include "catmark_square_hedit2.h"
#include "catmark_square_hedit3.h"
#include "catmark_tent_creases0.h"
#include "catmark_tent_creases1.h"
#include "catmark_tent.h"
#include "catmark_torus.h"
#include "catmark_torus_creases0.h"
#include "bilinear_cube.h"
#include "loop_cube_creases0.h"
#include "loop_cube_creases1.h"
#include "loop_cube.h"
#include "loop_icosahedron.h"
#include "loop_saddle_edgecorner.h"
#include "loop_saddle_edgeonly.h"
#include "loop_triangle_edgecorner.h"
#include "loop_triangle_edgeonly.h"
#include "loop_chaikin0.h"
#include "loop_chaikin1.h"
#include "loop_pole8.h"
#include "loop_pole64.h"
#include "loop_pole360.h"
#endif // OPENSUBDIV_REGRESSION_SHAPES_ALL_H