grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2025-01-04 03:09:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Primitives bugfix.

Browse source
This commit is contained in:
Revar Desmera 2020-04-23 03:06:17 -07:00
parent d8b0528d0d
commit 97e67384c1
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
primitives.scad
View file

@ -184,10 +184,10 @@ function circle(r, d, realign=false, circum=false, anchor=CENTER, spin=0) =
// vnf_polyhedron(vnf); // vnf_polyhedron(vnf);
module cube(size=1, center, anchor, spin=0, orient=UP) module cube(size=1, center, anchor, spin=0, orient=UP)
{ {
size = scalar_vec3(size);
anchor = get_anchor(anchor, center, ALLNEG, ALLNEG); anchor = get_anchor(anchor, center, ALLNEG, ALLNEG);
vnf = cube(size, center=true); vnf = cube(size, center=true);
attachable(anchor,spin,orient, size=size) { siz = scalar_vec3(size);
attachable(anchor,spin,orient, size=siz) {
vnf_polyhedron(vnf, convexity=2); vnf_polyhedron(vnf, convexity=2);
children(); children();
} }
@ -195,22 +195,24 @@ module cube(size=1, center, anchor, spin=0, orient=UP)
function cube(size=1, center, anchor, spin=0, orient=UP) = function cube(size=1, center, anchor, spin=0, orient=UP) =
let( let(
size = scalar_vec3(size), siz = scalar_vec3(size),
anchor = get_anchor(anchor, center, ALLNEG, ALLNEG), anchor = get_anchor(anchor, center, ALLNEG, ALLNEG),
unscaled = [ unscaled = [
[-1,-1,-1],[1,-1,-1],[1,1,-1],[-1,1,-1], [-1,-1,-1],[1,-1,-1],[1,1,-1],[-1,1,-1],
[-1,-1, 1],[1,-1, 1],[1,1, 1],[-1,1, 1] [-1,-1, 1],[1,-1, 1],[1,1, 1],[-1,1, 1],
]/2, ]/2,
verts = vmul(unscaled, size), verts = is_num(size)? unscaled * size :
is_vector(size,3)? [for (p=unscaled) vmul(p,size)] :
assert(is_num(size) || is_vector(size,3)),
faces = [ faces = [
[0,1,2], [0,2,3], //TOP [0,1,2], [0,2,3], //BOTTOM
[0,4,5], [0,5,1], //FRONT [0,4,5], [0,5,1], //FRONT
[1,5,6], [1,6,2], //RIGHT [1,5,6], [1,6,2], //RIGHT
[2,6,7], [2,7,3], //BACK [2,6,7], [2,7,3], //BACK
[3,7,4], [3,4,0], //LEFT [3,7,4], [3,4,0], //LEFT
[6,4,7], [6,5,4] //BOT [6,4,7], [6,5,4] //TOP
] ]
) [reorient(anchor,spin,orient, size=size, p=verts), faces]; ) [reorient(anchor,spin,orient, size=siz, p=verts), faces];
// Function&Module: cylinder() // Function&Module: cylinder()

2
version.scad
View file

@ -8,7 +8,7 @@
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
BOSL_VERSION = [2,0,274]; BOSL_VERSION = [2,0,275];
// Section: BOSL Library Version Functions // Section: BOSL Library Version Functions