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

fix legacy gregory patch shader to support higher valence

Browse Source 
Note that the actual limitation stays same, due to hardware capability
(GL_MAX_VARYING_VECTORS)
This commit is contained in:
Takahito Tejima 2015-06-22 11:08:11 -07:00
parent 2103d9e159
commit e008776325
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
documentation/intro_30.rst
View File

@ -169,8 +169,11 @@ continuous limit surface between them.
additional global shader configuration).
The new implementations of the GregoryBasis and BSpline approximations relax
the previous max valence limit. Users are still encouraged to use models with
vertices of low valence for both improved model quality and performance.
the previous max valence limit. Legacy Gregory patch still has a limitation
of max valence (typically 24, depending on the hardware capability of
GL_MAX_VARYING_VECTORS).
Users are still encouraged to use models with vertices of low valence for
both improved model quality and performance.
----

34
opensubdiv/osd/glslPatchCommon.glsl
View File

@ -1331,22 +1331,33 @@ OsdEvalPatchGregory(ivec3 patchParam, vec2 UV, vec3 cv[20],
// ----------------------------------------------------------------------------
#if defined(OSD_PATCH_GREGORY) || defined(OSD_PATCH_GREGORY_BOUNDARY)
#if OSD_MAX_VALENCE<=10
uniform float ef[7] = float[](
0.813008, 0.500000, 0.363636, 0.287505,
0.238692, 0.204549, 0.179211
);
#else
uniform float ef[27] = float[](
0.812816, 0.500000, 0.363644, 0.287514,
// precomputed catmark coefficient table up to valence 29
uniform float OsdCatmarkCoefficient[30] = float[](
0, 0, 0, 0.812816, 0.500000, 0.363644, 0.287514,
0.238688, 0.204544, 0.179229, 0.159657,
0.144042, 0.131276, 0.120632, 0.111614,
0.103872, 0.09715, 0.0912559, 0.0860444,
0.0814022, 0.0772401, 0.0734867, 0.0700842,
0.0669851, 0.0641504, 0.0615475, 0.0591488,
0.0569311, 0.0548745, 0.0529621
);
);
float
OsdComputeCatmarkCoefficient(int valence)
{
#if OSD_MAX_VALENCE < 30
return OsdCatmarkCoefficient[valence];
#else
if (valence < 30) {
return OsdCatmarkCoefficient[valence];
} else {
float t = 2.0f * float(M_PI) / float(valence);
return 1.0f / (valence * (cos(t) + 5.0f +
sqrt((cos(t) + 9) * (cos(t) + 1)))/16.0f);
}
#endif
}
float cosfn(int n, int j) {
return cos((2.0f * M_PI * j)/float(n));
@ -1502,8 +1513,9 @@ OsdComputePerVertexGregory(int vID, vec3 P, out OsdPerVertexGregory v)
v.e0 += cosfn(valence, i)*e;
v.e1 += sinfn(valence, i)*e;
}
v.e0 *= ef[valence - 3];
v.e1 *= ef[valence - 3];
float ef = OsdComputeCatmarkCoefficient(valence);
v.e0 *= ef;
v.e1 *= ef;
#ifdef OSD_PATCH_GREGORY_BOUNDARY
v.zerothNeighbor = zerothNeighbor;