james
/
KeyV2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix lexical scoping in sculpted square in V2.x.x

This commit is contained in:
Bob 2022-02-19 20:36:26 -05:00
parent 6f1ae47011
commit 065787ee99
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
customizer.scad
View File

@ -2108,18 +2108,18 @@ function skin_iso_enter_shape(size, delta, progress, thickness_difference) =
// rounded square shape with additional sculpting functions to better approximate // rounded square shape with additional sculpting functions to better approximate
// When sculpting sides, how much in should the tops come // When sculpting sides, how much in should the tops come
$side_sculpting_factor = 4.5; side_sculpting_factor = 4.5;
// When sculpting corners, how much extra radius should be added // When sculpting corners, how much extra radius should be added
$corner_sculpting_factor = 1; corner_sculpting_factor = 1;
// When doing more side sculpting corners, how much extra radius should be added // When doing more side sculpting corners, how much extra radius should be added
$more_side_sculpting_factor = 0.4; more_side_sculpting_factor = 0.4;
// side sculpting functions // side sculpting functions
// bows the sides out on stuff like SA and DSA keycaps // bows the sides out on stuff like SA and DSA keycaps
function side_sculpting(progress) = (1 - progress) * $side_sculpting_factor; function side_sculpting(progress) = (1 - progress) * side_sculpting_factor;
// makes the rounded corners of the keycap grow larger as they move upwards // makes the rounded corners of the keycap grow larger as they move upwards
function corner_sculpting(progress) = pow(progress, 2) * $corner_sculpting_factor; function corner_sculpting(progress) = pow(progress, 2) * corner_sculpting_factor;
module sculpted_square_shape(size, delta, progress) { module sculpted_square_shape(size, delta, progress) {
width = size[0]; width = size[0];
@ -2144,7 +2144,7 @@ module sculpted_square_shape(size, delta, progress) {
offset(r = extra_corner_radius_this_slice, $fa=360/$shape_facets) { offset(r = extra_corner_radius_this_slice, $fa=360/$shape_facets) {
offset(r = -extra_corner_radius_this_slice) { offset(r = -extra_corner_radius_this_slice) {
side_rounded_square(square_size, r = $more_side_sculpting_factor * progress); side_rounded_square(square_size, r = more_side_sculpting_factor * progress);
} }
} }
} }
@ -2199,7 +2199,7 @@ function skin_sculpted_square_shape(size, delta, progress, thickness_difference)
width - extra_width_this_slice - thickness_difference, width - extra_width_this_slice - thickness_difference,
height - extra_height_this_slice - thickness_difference height - extra_height_this_slice - thickness_difference
] ]
) new_side_rounded_square(square_size, $more_side_sculpting_factor * progress, extra_corner_radius_this_slice); ) new_side_rounded_square(square_size, more_side_sculpting_factor * progress, extra_corner_radius_this_slice);
module side_rounded_square(size, r) { module side_rounded_square(size, r) {

14
src/shapes/sculpted_square.scad
View File

@ -1,18 +1,18 @@
// rounded square shape with additional sculpting functions to better approximate // rounded square shape with additional sculpting functions to better approximate
// When sculpting sides, how much in should the tops come // When sculpting sides, how much in should the tops come
$side_sculpting_factor = 4.5; side_sculpting_factor = 4.5;
// When sculpting corners, how much extra radius should be added // When sculpting corners, how much extra radius should be added
$corner_sculpting_factor = 1; corner_sculpting_factor = 1;
// When doing more side sculpting corners, how much extra radius should be added // When doing more side sculpting corners, how much extra radius should be added
$more_side_sculpting_factor = 0.4; more_side_sculpting_factor = 0.4;
// side sculpting functions // side sculpting functions
// bows the sides out on stuff like SA and DSA keycaps // bows the sides out on stuff like SA and DSA keycaps
function side_sculpting(progress) = (1 - progress) * $side_sculpting_factor; function side_sculpting(progress) = (1 - progress) * side_sculpting_factor;
// makes the rounded corners of the keycap grow larger as they move upwards // makes the rounded corners of the keycap grow larger as they move upwards
function corner_sculpting(progress) = pow(progress, 2) * $corner_sculpting_factor; function corner_sculpting(progress) = pow(progress, 2) * corner_sculpting_factor;
module sculpted_square_shape(size, delta, progress) { module sculpted_square_shape(size, delta, progress) {
width = size[0]; width = size[0];
@ -37,7 +37,7 @@ module sculpted_square_shape(size, delta, progress) {
offset(r = extra_corner_radius_this_slice, $fa=360/$shape_facets) { offset(r = extra_corner_radius_this_slice, $fa=360/$shape_facets) {
offset(r = -extra_corner_radius_this_slice) { offset(r = -extra_corner_radius_this_slice) {
side_rounded_square(square_size, r = $more_side_sculpting_factor * progress); side_rounded_square(square_size, r = more_side_sculpting_factor * progress);
} }
} }
} }
@ -92,7 +92,7 @@ function skin_sculpted_square_shape(size, delta, progress, thickness_difference)
width - extra_width_this_slice - thickness_difference, width - extra_width_this_slice - thickness_difference,
height - extra_height_this_slice - thickness_difference height - extra_height_this_slice - thickness_difference
] ]
) new_side_rounded_square(square_size, $more_side_sculpting_factor * progress, extra_corner_radius_this_slice); ) new_side_rounded_square(square_size, more_side_sculpting_factor * progress, extra_corner_radius_this_slice);
module side_rounded_square(size, r) { module side_rounded_square(size, r) {