remove unnecessary changes

This commit is contained in:
Bob 2020-06-18 16:54:53 -04:00
parent c1bbaed9a2
commit c7168eae68
3 changed files with 14 additions and 58 deletions

View File

@ -851,17 +851,6 @@ module debug() {
%children(); %children();
} }
module display() {
$height_slices = 30;
$minkowski_facets = 64;
$shape_facets = 64;
$stem_type = "disable";
$support_type = "disable";
$stem_support_type = "disable";
children();
}
module arrows(profile, rows = [4,4,4,3]) { module arrows(profile, rows = [4,4,4,3]) {
positions = [[0, 0], [1, 0], [2, 0], [1, 1]]; positions = [[0, 0], [1, 0], [2, 0], [1, 1]];
legends = ["←", "↓", "→", "↑"]; legends = ["←", "↓", "→", "↑"];
@ -967,6 +956,7 @@ unit = 19.05;
// NOT 3D // NOT 3D
function unit_length(length) = unit * (length - 1) + 18.16; function unit_length(length) = unit * (length - 1) + 18.16;
module ISO_enter_shape(size, delta, progress){ module ISO_enter_shape(size, delta, progress){
width = size[0]; width = size[0];
height = size[1]; height = size[1];
@ -981,19 +971,21 @@ module ISO_enter_shape(size, delta, progress){
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);
delta = delta / 2;
pointArray = [ pointArray = [
[ 0, 0], // top right [ 0-delta.x, 0-delta.y], // top right
[ 0, -height], // bottom right [ 0-delta.x, -height+delta.y], // bottom right
[-width * width_ratio, -height], // bottom left [-width * width_ratio+delta.x, -height+delta.y], // bottom left
[-width * width_ratio,-height * height_ratio], // inner middle point [-width * width_ratio + delta.x,-height * height_ratio+delta.y], // inner middle point
[ -width,-height * height_ratio], // outer middle point [ -width + delta.x,-height * height_ratio + delta.y], // outer middle point
[ -width, 0] // top left [ -width + delta.x, 0-delta.y] // top left
]; ];
minkowski(){ minkowski(){
circle(r=corner_size); circle(r=$corner_radius);
// gives us rounded inner corner // gives us rounded inner corner
offset(r=-corner_size*2) { offset(r=-$corner_radius*2) {
translate([(width * width_ratio)/2, height/2]) polygon(points=pointArray); translate([(width * width_ratio)/2, height/2]) polygon(points=pointArray);
} }
} }
@ -1192,7 +1184,7 @@ module rounded_square_shape(size, delta, progress, center = true) {
// for skin // for skin
function skin_rounded_square(size, delta, progress, thickness_difference) = function skin_rounded_square(size, delta, progress, thickness_difference) =
rounded_rectangle_profile(size - (delta * progress), fn=$shape_facets, r=$corner_radius); rounded_rectangle_profile(size - (delta * progress) - [thickness_difference, thickness_difference], fn=$shape_facets, r=$corner_radius);
SMALLEST_POSSIBLE = 1/128; SMALLEST_POSSIBLE = 1/128;
// I use functions when I need to compute special variables off of other special variables // I use functions when I need to compute special variables off of other special variables

View File

@ -9,32 +9,7 @@ include <./includes.scad>
// example key // example key
/* $skin_key_shape = true; */ dcs_row(5) legend("⇪", size=9) key();
difference() {
/* top_of_key() { */
/* cube(10); */
/* } */
/* key(); */
}
/* simple_layout(lets_split_layout) {
dcs_row($row) key();
} */
dcs_row(1) legend("h") front_legend("q"
) {
$key_length = 2.75;
key();
}
translate_u(0,1) dcs_row(1) {
$key_length = 0.86;
key();
}
/* debug() key(); */
// example row // example row
/* for (x = [0:1:4]) { /* for (x = [0:1:4]) {

View File

@ -177,14 +177,3 @@ module debug() {
%children(); %children();
} }
module display() {
$height_slices = 30;
$minkowski_facets = 64;
$shape_facets = 64;
$stem_type = "disable";
$support_type = "disable";
$stem_support_type = "disable";
children();
}