grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2025-01-04 03:09:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1221 from BelfrySCAD/revarbat_dev

Browse source 
Another gear tooth profile pruning bugfix.
This commit is contained in:
Revar Desmera 2023-07-27 17:30:04 -07:00 committed by GitHub
commit cf593eb5d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gears.scad
View file

@ -2258,16 +2258,17 @@ function _gear_tooth_profile(
for (i=[0:1:steps-1]) 0.2 + i/(steps-1)*0.8, for (i=[0:1:steps-1]) 0.2 + i/(steps-1)*0.8,
], ],
// Is there an undercut? // Find top of undercut.
has_undercut = [ undercut_max = max([
0,
for (u = us) let( for (u = us) let(
r = lerp(rrad, ma_rad, u), r = lerp(rrad, ma_rad, u),
a1 = lookup(r, involute_lup) + soff, a1 = lookup(r, involute_lup) + soff,
a2 = lookup(r, undercut_lup), a2 = lookup(r, undercut_lup),
a = internal || r < undercut_lup[0].x? a1 : min(a1,a2), a = internal || r < undercut_lup[0].x? a1 : min(a1,a2),
b = internal || r < undercut_lup[0].x? false : a1>a2 b = internal || r < undercut_lup[0].x? false : a1>a2
) if(a<90+180/teeth && b) 1 ) if(a<90+180/teeth && b) r
] != [], ]),
// Generate the left half of the tooth. // Generate the left half of the tooth.
tooth_half_raw = deduplicate([ tooth_half_raw = deduplicate([
@ -2285,7 +2286,7 @@ function _gear_tooth_profile(
// Strip "jaggies" if found. // Strip "jaggies" if found.
strip_left = function(path,i) strip_left = function(path,i)
i > len(path)? [] : i > len(path)? [] :
norm(path[i]) >= prad? [for (j=idx(path)) if(j>=i) path[j]] : norm(path[i]) >= undercut_max? [for (j=idx(path)) if(j>=i) path[j]] :
let( let(
angs = [ angs = [
for (j=[i+1:1:len(path)-1]) let( for (j=[i+1:1:len(path)-1]) let(
@ -2293,12 +2294,12 @@ function _gear_tooth_profile(
np = path[j], np = path[j],
r = norm(np), r = norm(np),
a = v_theta(np-p) a = v_theta(np-p)
) if(r<prad) a ) if(r<undercut_max) a
], ],
mti = !angs? 0 : min_index(angs), mti = !angs? 0 : min_index(angs),
out = concat([path[i]], strip_left(path, i + mti + 1)) out = concat([path[i]], strip_left(path, i + mti + 1))
) out, ) out,
tooth_half = !has_undercut? tooth_half_raw : tooth_half = !undercut_max? tooth_half_raw :
strip_left(tooth_half_raw, 0), strip_left(tooth_half_raw, 0),
// Mirror the tooth to complete it. // Mirror the tooth to complete it.