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

Correction to recent changes to boundary weights of box-spline triangles:

Browse Source 
- fixed corner vertex cases (two boundary edges) in both Far and Osd
This commit is contained in:
barry 2019-02-06 18:30:26 -08:00
parent f83adf942e
commit 479a297bc6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opensubdiv/far/patchBasis.cpp
View File

@ -836,7 +836,7 @@ namespace {
}
if (edge1IsBoundary) {
REAL w0 = weights[6];
if (edge2IsBoundary) {
if (edge0IsBoundary) {
// P0 = B1 + (B1 - I1)
weights[5] += w0;
weights[5] += w0;
@ -855,7 +855,7 @@ namespace {
weights[4] -= w1;
REAL w2 = weights[11];
if (edge1IsBoundary) {
if (edge2IsBoundary) {
// P2 = B2 + (B2 - I1)
weights[8] += w2;
weights[8] += w2;
@ -871,7 +871,7 @@ namespace {
}
if (edge2IsBoundary) {
REAL w0 = weights[10];
if (edge2IsBoundary) {
if (edge1IsBoundary) {
// P0 = B1 + (B1 - I1)
weights[8] += w0;
weights[8] += w0;
@ -890,7 +890,7 @@ namespace {
weights[5] -= w1;
REAL w2 = weights[3];
if (edge1IsBoundary) {
if (edge0IsBoundary) {
// P2 = B2 + (B2 - I1)
weights[4] += w2;
weights[4] += w2;

8
opensubdiv/osd/patchBasisCommon.h
View File

@ -708,7 +708,7 @@ Osd_EvalBasisLinearTri(OSD_REAL s, OSD_REAL t,
}
if (edge1IsBoundary) {
OSD_REAL w0 = weights[6];
if (edge2IsBoundary) {
if (edge0IsBoundary) {
// P0 = B1 + (B1 - I1)
weights[5] += w0;
weights[5] += w0;
@ -727,7 +727,7 @@ Osd_EvalBasisLinearTri(OSD_REAL s, OSD_REAL t,
weights[4] -= w1;
OSD_REAL w2 = weights[11];
if (edge1IsBoundary) {
if (edge2IsBoundary) {
// P2 = B2 + (B2 - I1)
weights[8] += w2;
weights[8] += w2;
@ -743,7 +743,7 @@ Osd_EvalBasisLinearTri(OSD_REAL s, OSD_REAL t,
}
if (edge2IsBoundary) {
OSD_REAL w0 = weights[10];
if (edge2IsBoundary) {
if (edge1IsBoundary) {
// P0 = B1 + (B1 - I1)
weights[8] += w0;
weights[8] += w0;
@ -762,7 +762,7 @@ Osd_EvalBasisLinearTri(OSD_REAL s, OSD_REAL t,
weights[5] -= w1;
OSD_REAL w2 = weights[3];
if (edge1IsBoundary) {
if (edge0IsBoundary) {
// P2 = B2 + (B2 - I1)
weights[4] += w2;
weights[4] += w2;