grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2025-12-07 19:32:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix rotate_sweep centroid calculation

Browse source
This commit is contained in:
Adrian Mariano 2025-08-27 17:38:15 -04:00
parent 3748cf4823
commit b23be10ad0
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
skin.scad
View file

@ -1397,7 +1397,15 @@ module rotate_sweep(
: tex_reps; : tex_reps;
tex_depth = is_def(tex_scale)? echo("In rotate_sweep() the 'tex_scale' parameter is deprecated and has been replaced by 'tex_depth'")tex_scale tex_depth = is_def(tex_scale)? echo("In rotate_sweep() the 'tex_scale' parameter is deprecated and has been replaced by 'tex_depth'")tex_scale
: default(tex_depth,1); : default(tex_depth,1);
region = _force_xplus(force_region(shape)); region = is_path(shape) && caps ? _force_xplus([deduplicate([[0,shape[0].y], each shape, [0,last(shape).y]])])
: _force_xplus(force_region(shape));
ctr2d = centroid(region);
ctr3d = [ctr2d.x, 0, ctr2d.y];
namedanch = angle==360 ? []
:[
named_anchor("start-centroid", ctr3d, FWD),
named_anchor("end-centroid", rot = zrot(angle)*move(ctr3d)*xrot(-90)*zrot(180))
];
check = assert(is_region(region), "\nInput is not a region or polygon."); check = assert(is_region(region), "\nInput is not a region or polygon.");
bounds = pointlist_bounds(flatten(region)); bounds = pointlist_bounds(flatten(region));
min_x = bounds[0].x; min_x = bounds[0].x;
@ -1406,13 +1414,6 @@ module rotate_sweep(
max_y = bounds[1].y; max_y = bounds[1].y;
h = max_y - min_y; h = max_y - min_y;
check2 = assert(min_x>=0, "\nInput region must exist entirely in the X+ half-plane."); check2 = assert(min_x>=0, "\nInput region must exist entirely in the X+ half-plane.");
ctr2d = centroid(shape);
ctr3d = [ctr2d.x, 0, ctr2d.y];
namedanch = angle==360 ? []
:[
named_anchor("start-centroid", ctr3d, FWD),
named_anchor("end-centroid", rot = zrot(angle)*move(ctr3d)*xrot(-90)*zrot(180))
];
if (!is_undef(texture)) { if (!is_undef(texture)) {
_textured_revolution( _textured_revolution(
shape, shape,
@ -1434,8 +1435,6 @@ module rotate_sweep(
) )
change_anchors(named=namedanch) children(); change_anchors(named=namedanch) children();
} else { } else {
region = is_path(shape) && caps ? [deduplicate([[0,shape[0].y], each shape, [0,last(shape).y]])]
: region;
steps = ceil(segs(max_x) * angle / 360) + (angle<360? 1 : 0); steps = ceil(segs(max_x) * angle / 360) + (angle<360? 1 : 0);
skmat = down(min_y) * skew(sxz=shift.x/h, syz=shift.y/h) * up(min_y); skmat = down(min_y) * skew(sxz=shift.x/h, syz=shift.y/h) * up(min_y);
transforms = [ transforms = [
@ -2710,8 +2709,8 @@ function sweep(shape, transforms, closed=false, caps, style="min_edge",
for (rgn=regions) each [ for (rgn=regions) each [
for (path=rgn) for (path=rgn)
sweep(path, transforms, closed=closed, caps=false, style=style), sweep(path, transforms, closed=closed, caps=false, style=style),
if (flatcaps[0]) vnf_from_region(rgn, transform=transforms[0], reverse=true), if (flatcaps[0]) vnf_from_region(rgn, transform=transforms[0], reverse=true, triangulate=true), // triangulation needed?
if (flatcaps[1]) vnf_from_region(rgn, transform=last(transforms)), if (flatcaps[1]) vnf_from_region(rgn, transform=last(transforms), triangulate=true),
], ],
], ],
vnf = vnf_join(vnfs) vnf = vnf_join(vnfs)
@ -4783,6 +4782,10 @@ function _textured_revolution(
testpoly = [[0,shape[0].y], each shape, [0,last(shape).y]] testpoly = [[0,shape[0].y], each shape, [0,last(shape).y]]
) )
[[is_polygon_clockwise(testpoly) ? shape : reverse(shape)]], [[is_polygon_clockwise(testpoly) ? shape : reverse(shape)]],
checks = [ checks = [
for (rgn=regions, path=rgn) for (rgn=regions, path=rgn)
assert(all(path, function(pt) pt.x>=0),"\nAll points in the shape must have non-negative x value."), assert(all(path, function(pt) pt.x>=0),"\nAll points in the shape must have non-negative x value."),

2
utility.scad
View file

@ -986,7 +986,7 @@ module assert_equal(got, expected, info) {
// Returns the differential geometry if they are not quite the same shape and size. // Returns the differential geometry if they are not quite the same shape and size.
// Arguments: // Arguments:
// eps = The surface of the two shapes must be within this size of each other. Default: 1/1024 // eps = The surface of the two shapes must be within this size of each other. Default: 1/1024
// Example: // Example(NORENDER): (Example disabled because OpenSCAD bug prevents it from displaying)
// $fn=36; // $fn=36;
// shape_compare() { // shape_compare() {
// sphere(d=100); // sphere(d=100);