grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2024-12-29 16:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

small tweak to hide two functions

Browse source
This commit is contained in:
Adrian Mariano 2020-08-27 17:07:12 -04:00
parent 6eab7101e0
commit a8522854e4
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
polyhedra.scad
View file

@ -652,7 +652,7 @@ function regular_polyhedron_info(
let( let(
entry = ( entry = (
name == "trapezohedron"? ( name == "trapezohedron"? (
trapezohedron(faces=faces, side=side, longside=longside, h=h, r=r) _trapezohedron(faces=faces, side=side, longside=longside, h=h, r=r)
) : ( ) : (
_polyhedra_[!is_undef(index)? _polyhedra_[!is_undef(index)?
indexlist[index] : indexlist[index] :
@ -671,7 +671,7 @@ function regular_polyhedron_info(
) / entry[edgelen] ) / entry[edgelen]
), ),
face_triangles = hull(entry[vertices]), face_triangles = hull(entry[vertices]),
faces_normals_vertices = stellate_faces( faces_normals_vertices = _stellate_faces(
entry[edgelen], stellate, entry[vertices], entry[edgelen], stellate, entry[vertices],
entry[facevertices]==[3]? entry[facevertices]==[3]?
[face_triangles, [for(face=face_triangles) _facenormal(entry[vertices],face)]] : [face_triangles, [for(face=face_triangles) _facenormal(entry[vertices],face)]] :
@ -713,11 +713,7 @@ function regular_polyhedron_info(
assert(false, str("Unknown info type '",info,"' requested")); assert(false, str("Unknown info type '",info,"' requested"));
function _stellate_faces(scalefactor,stellate,vertices,faces_normals) =
/// hull solution fails due to roundoff
/// either cross product or just rotate to
///
function stellate_faces(scalefactor,stellate,vertices,faces_normals) =
(stellate == false || stellate == 0)? concat(faces_normals,[vertices]) : (stellate == false || stellate == 0)? concat(faces_normals,[vertices]) :
let( let(
faces = [for(face=faces_normals[0]) select(face,hull(select(vertices,face)))], faces = [for(face=faces_normals[0]) select(face,hull(select(vertices,face)))],
@ -730,8 +726,8 @@ function stellate_faces(scalefactor,stellate,vertices,faces_normals) =
) [newfaces, normals, allpts]; ) [newfaces, normals, allpts];
function trapezohedron(faces, r, side, longside, h, d) = function _trapezohedron(faces, r, side, longside, h, d) =
assert(faces%2==0, "Number of faces must be even") assert(faces%2==0, "Must set 'faces' to an even number for trapezohedron")
let( let(
r = get_radius(r=r, d=d, dflt=1), r = get_radius(r=r, d=d, dflt=1),
N = faces/2, N = faces/2,