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

fix torus function torus_verts performance. #4958

Merged
merged 1 commit into from
Jul 24, 2023
Merged

fix torus function torus_verts performance. #4958

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions nodes/generator/torus_mk2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ def torus_verts(R, r, N1, N2, rPhase, sPhase, rExponent, sExponent, sTwist, Sepa
theta = a1 + rPhase # revolution angle
sin_theta = sin(theta) # cached for performance
cos_theta = cos(theta) # cached for performance
pow_cos_theta = pow(abs(cos_theta), rExponent) * sign(cos_theta)
pow_sin_theta = pow(abs(sin_theta), rExponent) * sign(sin_theta)
cx = R * cos_theta # torus tube center
cy = R * sin_theta # torus tube center

twist_angle = da2 * n1 / N1 * sTwist

Expand All @@ -67,8 +71,6 @@ def torus_verts(R, r, N1, N2, rPhase, sPhase, rExponent, sExponent, sTwist, Sepa

pow_cos_phi = pow(abs(cos_phi), sExponent) * sign(cos_phi)
pow_sin_phi = pow(abs(sin_phi), sExponent) * sign(sin_phi)
pow_cos_theta = pow(abs(cos_theta), rExponent) * sign(cos_theta)
pow_sin_theta = pow(abs(sin_theta), rExponent) * sign(sin_theta)

x = (R + r * pow_cos_phi) * pow_cos_theta
y = (R + r * pow_cos_phi) * pow_sin_theta
Expand All @@ -78,8 +80,6 @@ def torus_verts(R, r, N1, N2, rPhase, sPhase, rExponent, sExponent, sTwist, Sepa
add_vert([x, y, z])

# append normal
cx = R * cos_theta # torus tube center
cy = R * sin_theta # torus tube center
norm = [x - cx, y - cy, z]
list_norms.append(norm)

Expand Down