openscad/dotSCAD
1
0
Fork 0
mirror of https://github.com/JustinSDK/dotSCAD.git synced 2025-08-11 17:24:20 +02:00
Code Issues Releases Wiki Activity

refactor: avoid atan2

Browse Source
This commit is contained in:
Justin Lin
2022-04-16 11:34:21 +08:00
parent 3ba4b3fdec
commit b024c6084f
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/line2d.scad
View File

@@ -15,14 +15,21 @@ module line2d(p1, p2, width = 1, p1Style = "CAP_SQUARE", p2Style = "CAP_SQUARE"
half_width = 0.5 * width; half_width = 0.5 * width;
v = p2 - p1; v = p2 - p1;
atan_angle = atan2(v.y, v.x);
leng = norm(v); leng = norm(v);
c = v.x / leng;
s = v.y/ leng;
rotation_m = [
[c, -s, 0, 0],
[s, c, 0, 0],
[0, 0, 1, 0],
[0, 0, 0, 1]
];
frags = __nearest_multiple_of_4(__frags(half_width)); frags = __nearest_multiple_of_4(__frags(half_width));
module square_end(point) { module square_end(point) {
translate(point) translate(point)
rotate(atan_angle) multmatrix(rotation_m)
square(width, center = true); square(width, center = true);
// hook for testing // hook for testing
@@ -31,7 +38,7 @@ module line2d(p1, p2, width = 1, p1Style = "CAP_SQUARE", p2Style = "CAP_SQUARE"
module round_end(point) { module round_end(point) {
translate(point) translate(point)
rotate(atan_angle) multmatrix(rotation_m)
circle(half_width, $fn = frags); circle(half_width, $fn = frags);
// hook for testing // hook for testing
@@ -45,7 +52,7 @@ module line2d(p1, p2, width = 1, p1Style = "CAP_SQUARE", p2Style = "CAP_SQUARE"
} }
translate(p1) translate(p1)
rotate(atan_angle) multmatrix(rotation_m)
translate([0, -width / 2]) translate([0, -width / 2])
square([leng, width]); square([leng, width]);
@@ -56,13 +63,13 @@ module line2d(p1, p2, width = 1, p1Style = "CAP_SQUARE", p2Style = "CAP_SQUARE"
} }
// hook for testing // hook for testing
test_line2d_line(atan_angle, leng, width, frags); test_line2d_line(leng, width, frags);
} }
// override them to test // override them to test
module test_line2d_cap(point, style) { module test_line2d_cap(point, style) {
} }
module test_line2d_line(angle, length, width, frags) { module test_line2d_line(length, width, frags) {
} }

3
test/test_line2d.scad
View File

@@ -10,8 +10,7 @@ module test_line2d_cap(point, style) {
); );
} }
module test_line2d_line(angle, length, width, frags) { module test_line2d_line(length, width, frags) {
assertEqualNum(0, angle);
assertEqualNum(5, length); assertEqualNum(5, length);
assertEqualNum(1, width); assertEqualNum(1, width);
assertEqualNum(24, frags); assertEqualNum(24, frags);