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

Merge pull request #1308 from davidgyu/dev_osd_real_cast

Browse Source 
Fixed OSD_REAL_CAST of some float constants
This commit is contained in:
Barry Fowler 2023-07-06 14:57:11 -07:00 committed by GitHub
commit 9d34513203
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opensubdiv/osd/patchBasisCommon.h
View File

@ -546,7 +546,7 @@ Osd_EvalBasisLinearTri(OSD_REAL s, OSD_REAL t,
int totalOrder = ds + dt;
if (totalOrder == 0) {
S *= OSD_REAL_CAST(1.0 / 12.0);
S *= OSD_REAL_CAST(1.0f / 12.0f);
w[0] = S * (1 - 2*M[1] - 4*M[2] + 6*M[4] + 6*M[5] + 2*M[6] - 6*M[8] - 4*M[9] - M[10] - 2*M[11] + 2*M[13] + M[14]);
w[1] = S * (1 + 2*M[1] - 2*M[2] - 6*M[4] - 4*M[6] + 6*M[8] + 2*M[9] + 2*M[10] + 4*M[11] - 2*M[13] - M[14]);
@ -561,7 +561,7 @@ Osd_EvalBasisLinearTri(OSD_REAL s, OSD_REAL t,
w[10] = S * ( 2*M[9] - 2*M[13] - M[14]);
w[11] = S * ( 2*M[13] + M[14]);
} else if (totalOrder == 1) {
S *= OSD_REAL_CAST(1.0 / 6.0);
S *= OSD_REAL_CAST(1.0f / 6.0f);
if (ds != 0) {
w[0] = S * (-1 + 3*M[2] + 3*M[3] - 3*M[5] - 2*M[6] - 3*M[7] + M[9]);
@ -618,7 +618,7 @@ Osd_EvalBasisLinearTri(OSD_REAL s, OSD_REAL t,
w[10] = S * ( M[2] - M[4] - M[5]);
w[11] = S * ( M[4] + M[5]);
} else {
S *= OSD_REAL_CAST(1.0 / 2.0);
S *= OSD_REAL_CAST(1.0f / 2.0f);
w[0] = S * ( 1 - 2*M[2] - M[3] + M[5]);
w[1] = S * (-1 + 2*M[2] + 2*M[3] - M[5]);