AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-12-24 00:40:33 +00:00
Code Issues Releases Wiki Activity

Exposed control for Gregory derivative weight eval

Browse Source 
The symbol OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES
determines the method used to compute derivative weights
for Gregory basis patches.

Setting this symbol during CMake configuration (and
hence during C++ and shader compilation) will enable
the use of true derivative weights.

The default behavior is to use a simpler approximation
for consistency with earlier releases.
This commit is contained in:
David G Yu 2016-10-11 13:45:07 -07:00 committed by David G. Yu
parent ffdb32cbac
commit 838fce27ab
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -284,6 +284,8 @@ option(NO_DX "Disable DirectX support")
option(NO_TESTS "Disable all tests")
option(NO_GLTESTS "Disable GL tests")
option(OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES "Enable true derivative evaluation for Gregory basis patches" OFF)
set(OSD_GPU FALSE)
# Check for dependencies
@ -516,6 +518,10 @@ else()
endif()
endif()
if( OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES )
add_definitions(-DOPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES)
endif()
# Link examples & regressions dynamically against Osd
if( OSD_GPU )
set( OSD_LINK_TARGET osd_dynamic_cpu osd_dynamic_gpu )

3
opensubdiv/far/patchBasis.cpp
View File

@ -425,10 +425,9 @@ void GetGregoryWeights(PatchParam const & param,
}
}
//#define _USE_BEZIER_PSEUDO_DERIVATIVES
// dclyde's note: skipping half of the product rule like this does seem to change the result a lot in my tests.
// This is not a runtime bottleneck for cloth sims anyway so I'm just using the accurate version.
#ifdef _USE_BEZIER_PSEUDO_DERIVATIVES
#ifndef OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES
// Approximation to the true Gregory derivatives by differentiating the Bezier patch
// unique to the given (s,t), i.e. having F = (g^+ * f^+) + (g^- * f^-) as its four
// interior points:

7
opensubdiv/osd/glslPatchShaderSource.cpp
View File

@ -56,7 +56,12 @@ GLSLPatchShaderSource::GetCommonShaderSource() {
/*static*/
std::string
GLSLPatchShaderSource::GetPatchBasisShaderSource() {
return std::string(patchBasisShaderSource);
std::stringstream ss;
#if defined(OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES)
ss << "#define OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES\n";
#endif
ss << std::string(patchBasisShaderSource);
return ss.str();
}
/*static*/

7
opensubdiv/osd/hlslPatchShaderSource.cpp
View File

@ -58,7 +58,12 @@ HLSLPatchShaderSource::GetCommonShaderSource() {
/*static*/
std::string
HLSLPatchShaderSource::GetPatchBasisShaderSource() {
return std::string(patchBasisShaderSource);
std::stringstream ss;
#if defined(OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES)
ss << "#define OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES\n";
#endif
ss << std::string(patchBasisShaderSource);
return ss.str();
}
/*static*/

3
opensubdiv/osd/patchBasisCommon.h
View File

@ -464,10 +464,9 @@ void OsdGetGregoryPatchWeights(
}
}
//#define _USE_BEZIER_PSEUDO_DERIVATIVES
// dclyde's note: skipping half of the product rule like this does seem to change the result a lot in my tests.
// This is not a runtime bottleneck for cloth sims anyway so I'm just using the accurate version.
#ifdef _USE_BEZIER_PSEUDO_DERIVATIVES
#ifndef OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES
// Approximation to the true Gregory derivatives by differentiating the Bezier patch
// unique to the given (s,t), i.e. having F = (g^+ * f^+) + (g^- * f^-) as its four
// interior points: