Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Introduced Anisotropic Surfacing Kernels and PCA methods #1634

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Introduced Anisotropic Surfacing Kernels and PCA methods #1634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dfb6129
Removed unused AttributeHandle member
Idclip Jul 4, 2023
f5ca9ea
Fixed some precision issues in Matrix methods
Idclip Jul 4, 2023
003b638
Initial implementation of anisotropic surfacing, including re-work of…
Idclip Jul 4, 2023
9ccea74
Fixed an issue where the sigma tolerance was being compared to exactl…
Idclip Sep 26, 2023
e504fb6
Switch to include self contribution during PCA
Idclip Sep 26, 2023
d4ec038
Fixed an issue with smooth position rasterization which wouldn't alwa…
Idclip Aug 28, 2023
7f8b438
Moved the old 'sphereScale' rasterizer param to be a uniform scale fo…
Idclip Oct 25, 2023
25907b7
Fixed an issue where smoothed/unsorted positions provided to the elli…
Idclip Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions openvdb/openvdb/math/Mat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ MatType
rotation(Axis axis, typename MatType::value_type angle)
{
using T = typename MatType::value_type;
T c = static_cast<T>(cos(angle));
T s = static_cast<T>(sin(angle));
T c = static_cast<T>(std::cos(angle));
T s = static_cast<T>(std::sin(angle));

MatType result;
result.setIdentity();
Expand Down Expand Up @@ -256,9 +256,9 @@ rotation(const Vec3<typename MatType::value_type> &_axis, typename MatType::valu
Vec3<T> axis(_axis.unit());

// compute trig properties of angle:
T c(cos(double(angle)));
T s(sin(double(angle)));
T t(1 - c);
const T c = static_cast<T>(std::cos(double(angle)));
const T s = static_cast<T>(std::sin(double(angle)));
const T t = T(1) - c;

MatType result;
// handle diagonal elements
Expand Down
42 changes: 21 additions & 21 deletions openvdb/openvdb/math/Mat3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,48 +680,48 @@ pivot(int i, int j, Mat3<T>& S, Vec3<T>& D, Mat3<T>& Q)

double Sjj_minus_Sii = D[j] - D[i];

if (fabs(Sjj_minus_Sii) * (10*math::Tolerance<T>::value()) > fabs(Sij)) {
if (std::abs(Sjj_minus_Sii) * (10*math::Tolerance<T>::value()) > std::abs(Sij)) {
tan_of_theta = Sij / Sjj_minus_Sii;
} else {
/// pivot on Sij
cotan_of_2_theta = 0.5*Sjj_minus_Sii / Sij ;

if (cotan_of_2_theta < 0.) {
tan_of_theta =
-1./(sqrt(1. + cotan_of_2_theta*cotan_of_2_theta) - cotan_of_2_theta);
-1./(std::sqrt(1. + cotan_of_2_theta*cotan_of_2_theta) - cotan_of_2_theta);
} else {
tan_of_theta =
1./(sqrt(1. + cotan_of_2_theta*cotan_of_2_theta) + cotan_of_2_theta);
1./(std::sqrt(1. + cotan_of_2_theta*cotan_of_2_theta) + cotan_of_2_theta);
}
}

cosin_of_theta = 1./sqrt( 1. + tan_of_theta * tan_of_theta);
cosin_of_theta = 1./std::sqrt( 1. + tan_of_theta * tan_of_theta);
sin_of_theta = cosin_of_theta * tan_of_theta;
z = tan_of_theta * Sij;
S(i,j) = 0;
D[i] -= z;
D[j] += z;
D[i] -= T(z);
D[j] += T(z);
for (int k = 0; k < i; ++k) {
temp = S(k,i);
S(k,i) = cosin_of_theta * temp - sin_of_theta * S(k,j);
S(k,j)= sin_of_theta * temp + cosin_of_theta * S(k,j);
S(k,i) = T(cosin_of_theta * temp - sin_of_theta * S(k,j));
S(k,j) = T(sin_of_theta * temp + cosin_of_theta * S(k,j));
}
for (int k = i+1; k < j; ++k) {
temp = S(i,k);
S(i,k) = cosin_of_theta * temp - sin_of_theta * S(k,j);
S(k,j) = sin_of_theta * temp + cosin_of_theta * S(k,j);
S(i,k) = T(cosin_of_theta * temp - sin_of_theta * S(k,j));
S(k,j) = T(sin_of_theta * temp + cosin_of_theta * S(k,j));
}
for (int k = j+1; k < n; ++k) {
temp = S(i,k);
S(i,k) = cosin_of_theta * temp - sin_of_theta * S(j,k);
S(j,k) = sin_of_theta * temp + cosin_of_theta * S(j,k);
S(i,k) = T(cosin_of_theta * temp - sin_of_theta * S(j,k));
S(j,k) = T(sin_of_theta * temp + cosin_of_theta * S(j,k));
}
for (int k = 0; k < n; ++k)
{
temp = Q(k,i);
Q(k,i) = cosin_of_theta * temp - sin_of_theta*Q(k,j);
Q(k,j) = sin_of_theta * temp + cosin_of_theta*Q(k,j);
}
{
temp = Q(k,i);
Q(k,i) = T(cosin_of_theta * temp - sin_of_theta * Q(k,j));
Q(k,j) = T(sin_of_theta * temp + cosin_of_theta * Q(k,j));
}
}

} // namespace mat3_internal
Expand Down Expand Up @@ -758,7 +758,7 @@ diagonalizeSymmetricMatrix(const Mat3<T>& input, Mat3<T>& Q, Vec3<T>& D,
double er = 0;
for (int i = 0; i < n; ++i) {
for (int j = i+1; j < n; ++j) {
er += fabs(S(i,j));
er += std::abs(S(i,j));
}
}
if (std::abs(er) < math::Tolerance<T>::value()) {
Expand All @@ -773,12 +773,12 @@ diagonalizeSymmetricMatrix(const Mat3<T>& input, Mat3<T>& Q, Vec3<T>& D,
for (int i = 0; i < n; ++i) {
for (int j = i+1; j < n; ++j){

if ( fabs(D[i]) * (10*math::Tolerance<T>::value()) > fabs(S(i,j))) {
if ( std::abs(D[i]) * (10*math::Tolerance<T>::value()) > std::abs(S(i,j))) {
/// value too small to pivot on
S(i,j) = 0;
}
if (fabs(S(i,j)) > max_element) {
max_element = fabs(S(i,j));
if (std::abs(S(i,j)) > max_element) {
max_element = std::abs(S(i,j));
ip = i;
jp = j;
}
Expand Down
3 changes: 0 additions & 3 deletions openvdb/openvdb/points/AttributeArray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,9 +886,6 @@ class AttributeHandle
template <bool IsUnknownCodec>
typename std::enable_if<!IsUnknownCodec, ValueType>::type get(Index index) const;

// local copy of AttributeArray (to preserve compression)
AttributeArray::Ptr mLocalArray;

Index mStrideOrTotalSize;
Index mSize;
bool mCollapseOnDestruction;
Expand Down
Loading
Loading