try to get some numbers closer for the iso enter

This commit is contained in:
Bob - Home - Windows 2017-12-10 15:53:44 -05:00
parent ded7af69da
commit f252ec2c30
3 changed files with 17 additions and 17 deletions

View File

@ -159,7 +159,7 @@ module rounded_shape() {
module shape_hull(thickness_difference, depth_difference, extra_slices = 0){ module shape_hull(thickness_difference, depth_difference, extra_slices = 0){
render() { render() {
if ($linear_extrude_shape) { if ($linear_extrude_shape) {
linear_extrude_shape_hull(thickness_difference, depth_difference); linear_extrude_shape_hull(thickness_difference, depth_difference, extra_slices);
} else { } else {
hull_shape_hull(thickness_difference, depth_difference, extra_slices); hull_shape_hull(thickness_difference, depth_difference, extra_slices);
} }
@ -167,7 +167,8 @@ module shape_hull(thickness_difference, depth_difference, extra_slices = 0){
} }
//corollary is shape_hull //corollary is shape_hull
module linear_extrude_shape_hull(thickness_difference, depth_difference){ // extra_slices unused, only to match argument signatures
module linear_extrude_shape_hull(thickness_difference, depth_difference, extra_slices = 0){
height = $total_depth - depth_difference; height = $total_depth - depth_difference;
width_scale = top_total_key_width() / total_key_width(); width_scale = top_total_key_width() / total_key_width();

View File

@ -200,14 +200,10 @@ module g20() {
} }
module iso_enter() { module iso_enter() {
$bottom_key_width = 18.16;
$bottom_key_height = 18.16;
$key_length = 1.5; $key_length = 1.5;
$key_height = 2; $key_height = 2;
$total_depth = 7; $top_tilt = -3;
$top_tilt = 0;
$top_skew = 1.75;
$key_shape_type = "iso_enter"; $key_shape_type = "iso_enter";
$linear_extrude_shape = true; $linear_extrude_shape = true;
$linear_extrude_height_adjustment = 19.05 * 0.5; $linear_extrude_height_adjustment = 19.05 * 0.5;
@ -425,7 +421,10 @@ module legend(text, inset=false) {
children(); children();
} }
translate_u(1.125, 0.5) iso_enter() cherry() key(); translate_u(1.125, 0.5) oem_row(2) iso_enter() cherry() {
translate_u(0, 0) sa_row(2) legend("q", inset=true) cherry() {
/*key();*/ $top_tilt = 0;
$width_difference = 4.35;
$height_difference = 3.8;
key();
} }

View File

@ -39,15 +39,15 @@ module ISO_enter(width, height, width_difference, height_difference, corner_size
width_ratio = unit_length(1.25) / unit_length(1.5); width_ratio = unit_length(1.25) / unit_length(1.5);
height_ratio = unit_length(1) / unit_length(2); height_ratio = unit_length(1) / unit_length(2);
echo((unit_length(1.5) - unit_length(1.25))/ 2); // height and width difference currently don't do anything - but I think I should keep them. they don't do anything because we currently use scaling in the linear_extrude to express the difference in height and width of the top of the keycap
pointArray = [ pointArray = [
[ -width_difference/2, -height_difference/2], [ -width_difference/2, -height_difference/2], // top right
[ -width_difference/2, -height + height_difference/2], [ -width_difference/2, -height + height_difference/2], // bottom right
[-width * width_ratio + width_difference/2, -height + height_difference/2], [-width * width_ratio + width_difference/2, -height + height_difference/2], // bottom left
[-width * width_ratio + width_difference/2,-height * height_ratio + height_difference/2], [-width * width_ratio + width_difference/2,-height * height_ratio + height_difference/2], // inner middle point
[ -width + width_difference/2,-height * height_ratio + height_difference/2], [ -width + width_difference/2,-height * height_ratio + height_difference/2], // outer middle point
[ -width + width_difference/2, -height_difference/2] [ -width + width_difference/2, -height_difference/2] // top left
]; ];
minkowski(){ minkowski(){