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

Merge pull request #173 from bear454/per-legend-fonts 

Font can be explicitly set on a legend
This commit is contained in:
Bob 2022-10-14 23:52:27 -04:00 committed by GitHub
parent 0a29b1bff8 8fdd3dcb43
commit 7a5d2f00ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/features/legends.scad
View File

@ -1,9 +1,9 @@
module keytext(text, position, font_size, depth) { module keytext(text, position, font_size, font_face, depth) {
woffset = (top_total_key_width()/3.5) * position[0]; woffset = (top_total_key_width()/3.5) * position[0];
hoffset = (top_total_key_height()/3.5) * -position[1]; hoffset = (top_total_key_height()/3.5) * -position[1];
translate([woffset, hoffset, -depth]){ translate([woffset, hoffset, -depth]){
color($tertiary_color) linear_extrude(height=$dish_depth + depth){ color($tertiary_color) linear_extrude(height=$dish_depth + depth){
text(text=text, font=$font, size=font_size, halign="center", valign="center"); text(text=text, font=font_face, size=font_size, halign="center", valign="center");
} }
} }
} }
@ -12,14 +12,14 @@ module legends(depth=0) {
if (len($front_legends) > 0) { if (len($front_legends) > 0) {
front_of_key() { front_of_key() {
for (i=[0:len($front_legends)-1]) { for (i=[0:len($front_legends)-1]) {
rotate([90,0,0]) keytext($front_legends[i][0], $front_legends[i][1], $front_legends[i][2], depth); rotate([90,0,0]) keytext($front_legends[i][0], $front_legends[i][1], $front_legends[i][2], $front_legends[i][3], depth);
} }
} }
} }
if (len($legends) > 0) { if (len($legends) > 0) {
top_of_key() { top_of_key() {
for (i=[0:len($legends)-1]) { for (i=[0:len($legends)-1]) {
keytext($legends[i][0], $legends[i][1], $legends[i][2], depth); keytext($legends[i][0], $legends[i][1], $legends[i][2], $legends[i][3], depth);
} }
} }
} }

16
src/key_transformations.scad
View File

@ -158,15 +158,17 @@ module flat_support() {
children(); children();
} }
module legend(text, position=[0,0], size=undef) { module legend(text, position=[0,0], size=undef, font=undef) {
font_size = size == undef ? $font_size : size; font_size = size == undef ? $font_size : size;
$legends = [for(L=[$legends, [[text, position, font_size]]], a=L) a]; font_face = font == undef ? $font : font;
$legends = [for(L=[$legends, [[text, position, font_size, font_face]]], a=L) a];
children(); children();
} }
module front_legend(text, position=[0,0], size=undef) { module front_legend(text, position=[0,0], size=undef, font=undef) {
font_size = size == undef ? $font_size : size; font_size = size == undef ? $font_size : size;
$front_legends = [for(L=[$front_legends, [[text, position, font_size]]], a=L) a]; font_face = font == undef ? $font : font;
$front_legends = [for(L=[$front_legends, [[text, position, font_size, font_face]]], a=L) a];
children(); children();
} }
@ -206,7 +208,7 @@ module sideways() {
* then we extend the line created by the slope of the keytop to that line * then we extend the line created by the slope of the keytop to that line
* the angle of the latter line off the ground is $top_tilt, and * the angle of the latter line off the ground is $top_tilt, and
* you can create a right triangle with the adjacent edge being $bottom_key_height/2 * you can create a right triangle with the adjacent edge being $bottom_key_height/2
* raised up $total_depth. this gets you x, the component of the extended * raised up $total_depth. this gets you x, the component of the extended
* keytop slope line, and y, a component of the first perpendicular line. * keytop slope line, and y, a component of the first perpendicular line.
* by a very similar triangle you get r and s, where x is the hypotenuse of that * by a very similar triangle you get r and s, where x is the hypotenuse of that
* right triangle and the right angle is again against the first perpendicular line * right triangle and the right angle is again against the first perpendicular line
@ -229,7 +231,7 @@ module backside() {
s = cos(-$top_tilt) * x; s = cos(-$top_tilt) * x;
q = atan2(s, (y + b - r)); q = atan2(s, (y + b - r));
translate([0,0,cos(q) * total_key_height()/2]) translate([0,0,cos(q) * total_key_height()/2])
rotate([-90 - q, 0,0]) children(); rotate([-90 - q, 0,0]) children();
} }
@ -285,4 +287,4 @@ module resin() {
$stem_inner_slop = 0; $stem_inner_slop = 0;
$stem_support_type = "disable"; $stem_support_type = "disable";
children(); children();
} }