kaan/MCAD-Library
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix inconsistant indentation

Browse source
This commit is contained in:
charlie 2018-02-22 15:28:53 +00:00
parent 6669ad1296
commit e46da241aa
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
2Dshapes.scad
View file

@ -116,13 +116,14 @@ module complexRoundSquare(
} }
module roundedSquare(pos=[10,10],r=2) { module roundedSquare(pos=[10,10],r=2) {
minkowski() minkowski()
{ {
square([pos[0]-r*2,pos[1]-r*2],center=true); square([pos[0]-r*2,pos[1]-r*2],center=true);
circle(r=r); circle(r=r);
} }
} }
// round shapes // round shapes
// The orientation might change with the implementation of circle... // The orientation might change with the implementation of circle...
module ngon(sides, radius, center=false) { module ngon(sides, radius, center=false) {
@ -131,18 +132,18 @@ module ngon(sides, radius, center=false) {
} }
module ellipsePart(width,height,numQuarters) { module ellipsePart(width,height,numQuarters) {
o = 1; //slight overlap to fix a bug o = 1; //slight overlap to fix a bug
difference() difference()
{ {
ellipse(width,height); ellipse(width,height);
if(numQuarters <= 3) if(numQuarters <= 3)
translate([0-width/2-o,0-height/2-o,0]) translate([0-width/2-o,0-height/2-o,0])
square([width/2+o,height/2+o]); square([width/2+o,height/2+o]);
if(numQuarters <= 2) if(numQuarters <= 2)
translate([0-width/2-o,-o,0]) translate([0-width/2-o,-o,0])
square([width/2+o,height/2+o*2]); square([width/2+o,height/2+o*2]);
if(numQuarters < 2) if(numQuarters < 2)
translate([-o,0,0]) translate([-o,0,0])
square([width/2+o*2,height/2+o]); square([width/2+o*2,height/2+o]);
} }
} }
@ -152,10 +153,10 @@ module donutSlice(innerSize,outerSize, start_angle, end_angle) {
{ {
pieSlice(outerSize, start_angle, end_angle); pieSlice(outerSize, start_angle, end_angle);
if(len(innerSize) > 1) if(len(innerSize) > 1)
ellipse(innerSize[0]*2,innerSize[1]*2); ellipse(innerSize[0]*2,innerSize[1]*2);
else else
circle(innerSize); circle(innerSize);
} }
} }
@ -189,6 +190,6 @@ module pieSlice(size, start_angle, end_angle) { //size in radius(es)
} }
module ellipse(width, height) { module ellipse(width, height) {
scale([1, height/width, 1]) scale([1, height/width, 1])
circle(r=width/2); circle(r=width/2);
} }