Merge remote-tracking branch 'upstream/master'

Author: RAMilewski

.github/workflows/gen_docs.yml

@@ -4,6 +4,7 @@ on: [workflow_dispatch]
 jobs:
   RegenerateDocs:
     runs-on: ubuntu-latest
+    timeout-minutes: 90
     steps:
     - name: Checkout
       uses: actions/checkout@v4

.github/workflows/gen_tutorials.yml

@@ -4,6 +4,7 @@ on: [workflow_dispatch]
 jobs:
   RegenerateTutorials:
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -35,11 +36,6 @@ jobs:
         cd $GITHUB_WORKSPACE
         ./scripts/check_for_tabs.sh
 
-    - name: FooTest
-      env:
-        OPENSCADPATH: ${{ github.workspace }}/..
-      run: echo $OPENSCADPATH
-
     - name: Generate Tutorials
       uses: GabrielBB/xvfb-action@v1.6
       env:

.github/workflows/main.yml

@@ -1,9 +1,13 @@
 name: Checks
-on: [pull_request]
+on:
+  pull_request:
+  push:
+    branches: [master]
 
 jobs:
   Regressions:
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -14,7 +18,7 @@ jobs:
     - name: Install OpenSCAD
       run: |
         cd $GITHUB_WORKSPACE
-        wget https://github.com/openscad/openscad/releases/download/openscad-2021.01/OpenSCAD-2021.01-x86_64.AppImage
+        wget -q https://github.com/openscad/openscad/releases/download/openscad-2021.01/OpenSCAD-2021.01-x86_64.AppImage
         sudo mv OpenSCAD-2021.01*-x86_64.AppImage /usr/local/bin/openscad
         sudo chmod +x /usr/local/bin/openscad
 
@@ -26,8 +30,34 @@ jobs:
         cd $GITHUB_WORKSPACE
         ./scripts/run_tests.sh
 
+  FuncCoverage:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Check Function Test Coverage
+      run: |
+        cd $GITHUB_WORKSPACE
+        OUTPUT=$(python3 scripts/func_coverage.py)
+        echo "$OUTPUT"
+        # Extract coverage percentage
+        COVERAGE=$(echo "$OUTPUT" | grep "Total coverage:" | grep -oP '[0-9]+\.[0-9]+(?=%)')
+        echo "Coverage: ${COVERAGE}%"
+        # Fail if coverage dropped below 99%
+        python3 -c "
+        coverage = float('${COVERAGE}')
+        if coverage < 99.0:
+            print(f'::error::Function test coverage dropped to {coverage}% (minimum: 99%)')
+            exit(1)
+        else:
+            print(f'Coverage OK: {coverage}%')
+        "
+
   CheckTutorials:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -50,7 +80,7 @@ jobs:
     - name: Install OpenSCAD
       run: |
         cd $GITHUB_WORKSPACE
-        wget https://github.com/openscad/openscad/releases/download/openscad-2021.01/OpenSCAD-2021.01-x86_64.AppImage
+        wget -q https://github.com/openscad/openscad/releases/download/openscad-2021.01/OpenSCAD-2021.01-x86_64.AppImage
         sudo mv OpenSCAD-2021.01*-x86_64.AppImage /usr/local/bin/openscad
         sudo chmod +x /usr/local/bin/openscad
 
@@ -69,6 +99,7 @@ jobs:
 
   CheckDocs:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -91,7 +122,7 @@ jobs:
     - name: Install OpenSCAD
       run: |
         cd $GITHUB_WORKSPACE
-        wget https://github.com/openscad/openscad/releases/download/openscad-2021.01/OpenSCAD-2021.01-x86_64.AppImage
+        wget -q https://github.com/openscad/openscad/releases/download/openscad-2021.01/OpenSCAD-2021.01-x86_64.AppImage
         sudo mv OpenSCAD-2021.01*-x86_64.AppImage /usr/local/bin/openscad
         sudo chmod +x /usr/local/bin/openscad
 
@@ -101,4 +132,3 @@ jobs:
         echo "::add-matcher::.github/openscad_docsgen.json"
         export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
         openscad-docsgen -Tmf
-

.github/workflows/version_stamp.yml

@@ -8,6 +8,7 @@ on:
 jobs:
   version-stamp:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     permissions:
       contents: write
     steps:

.github/workflows/weekly_release.yml

@@ -8,6 +8,7 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     permissions:
       contents: write
     steps:

tests/test_transforms.scadtest

@@ -9,6 +9,20 @@ module test_translate() {
         assert_equal(translate(val), [[1,0,0,val.x],[0,1,0,val.y],[0,0,1,val.z],[0,0,0,1]]);
         assert_equal(translate(val, p=[1,2,3]), [1,2,3]+val);
     }
+    // 2D translation: 2-element vector
+    assert_equal(translate([4,5]), [[1,0,0,4],[0,1,0,5],[0,0,1,0],[0,0,0,1]]);
+    assert_equal(translate([4,5], p=[1,2,3]), [5,7,3]);
+    assert_equal(translate([0,0], p=[1,2,3]), [1,2,3]);
+    // 2D translation with 2D point
+    assert_equal(translate([3,4], p=[10,20]), [13,24]);
+    // Translation with large negative values
+    assert_equal(translate([-100,-200,-300], p=[1,2,3]), [-99,-198,-297]);
+    // Single-axis translation
+    assert_equal(translate([5,0,0], p=[0,0,0]), [5,0,0]);
+    assert_equal(translate([0,5,0], p=[0,0,0]), [0,5,0]);
+    assert_equal(translate([0,0,5], p=[0,0,0]), [0,0,5]);
+    // List of points
+    assert_equal(translate([1,2,3], p=[[0,0,0],[10,10,10]]), [[1,2,3],[11,12,13]]);
     // Verify that module at least doesn't crash.
     translate([-5,-5,-5]) translate([0,0,0]) translate([5,5,5]) union(){};
 }
@@ -33,6 +47,18 @@ module test_move() {
     assert_equal(move("centroid", sq), move(-centroid(sq),sq));
     assert_equal(move("mean", vals), move(-mean(vals), vals));
     assert_equal(move("box", vals), move(-mean(pointlist_bounds(vals)),vals));
+    // 2D move: 2-element vector
+    assert_equal(move([4,5]), [[1,0,0,4],[0,1,0,5],[0,0,1,0],[0,0,0,1]]);
+    assert_equal(move([4,5], p=[1,2,3]), [5,7,3]);
+    assert_equal(move([0,0], p=[7,8,9]), [7,8,9]);
+    // 2D point with 2D vector
+    assert_equal(move([3,4], p=[10,20]), [13,24]);
+    // List of points
+    assert_equal(move([1,1,1], p=[[0,0,0],[5,5,5]]), [[1,1,1],[6,6,6]]);
+    // Large negative values
+    assert_equal(move([-1000,2000,-3000], p=[1,2,3]), [-999,2002,-2997]);
+    // Composition: move(a) * move(b) = move(a+b)
+    assert_approx(move([1,2,3]) * move([4,5,6]), move([5,7,9]));
 }
 test_move();
 '''
@@ -168,6 +194,23 @@ module test_scale() {
     assert_equal(scale([2,2], cp=[0.5,0.5], p=square(1)), move([-0.5,-0.5], p=square([2,2])));
     assert_equal(scale([2,3,4], p=cb), cube([2,3,4]));
     assert_equal(scale([-2,-3,-4], p=cb), [[for (p=cb[0]) v_mul(p,[-2,-3,-4])], [for (f=cb[1]) reverse(f)]]);
+    // Uniform scale 1 = identity
+    assert_equal(scale(1), [[1,0,0,0],[0,1,0,0],[0,0,1,0],[0,0,0,1]]);
+    assert_equal(scale(1, p=[7,8,9]), [7,8,9]);
+    assert_equal(scale([1,1,1]), [[1,0,0,0],[0,1,0,0],[0,0,1,0],[0,0,0,1]]);
+    assert_equal(scale([1,1,1], p=[7,8,9]), [7,8,9]);
+    // Zero scale
+    assert_equal(scale(0, p=[5,10,15]), [0,0,0]);
+    assert_equal(scale([0,0,0], p=[5,10,15]), [0,0,0]);
+    // Uniform negative scale
+    assert_equal(scale(-1, p=[3,4,5]), [-3,-4,-5]);
+    // Scale with list of points
+    assert_equal(scale(2, p=[[1,0,0],[0,1,0]]), [[2,0,0],[0,2,0]]);
+    assert_equal(scale([2,3,4], p=[[1,1,1],[2,2,2]]), [[2,3,4],[4,6,8]]);
+    // 2D scale
+    assert_equal(scale([2,3], p=[[1,1],[2,2]]), [[2,3],[4,6]]);
+    // Composition: scale(a) * scale(a) = scale(a^2) for uniform scale
+    assert_approx(scale(3) * scale(3), scale(9));
     // Verify that module at least doesn't crash.
     scale(-5) scale(5) union(){};
 }
@@ -251,6 +294,23 @@ module test_mirror() {
         // Verify that module at least doesn't crash.
         mirror(val) union(){};
     }
+    // Double mirror = identity
+    assert_approx(mirror([1,0,0]) * mirror([1,0,0]), affine3d_identity(), "double mirror X = identity");
+    assert_approx(mirror([0,1,0]) * mirror([0,1,0]), affine3d_identity(), "double mirror Y = identity");
+    assert_approx(mirror([0,0,1]) * mirror([0,0,1]), affine3d_identity(), "double mirror Z = identity");
+    // Mirror with diagonal vector
+    assert_approx(mirror([1,1,0]) * mirror([1,1,0]), affine3d_identity(), "double mirror diagonal = identity");
+    // Mirror with point at origin: stays at origin
+    assert_approx(mirror([1,0,0], p=[0,0,0]), [0,0,0], "mirror origin stays at origin");
+    // Mirroring on each axis inverts only that axis component
+    assert_approx(mirror([1,0,0], p=[5,7,9]), [-5,7,9], "mirror X axis");
+    assert_approx(mirror([0,1,0], p=[5,7,9]), [5,-7,9], "mirror Y axis");
+    assert_approx(mirror([0,0,1], p=[5,7,9]), [5,7,-9], "mirror Z axis");
+    // Mirror with list of points
+    assert_approx(mirror([1,0,0], p=[[1,2,3],[4,5,6]]), [[-1,2,3],[-4,5,6]], "mirror point list");
+    // Non-unit vector: should work the same (internally normalized)
+    assert_approx(mirror([2,0,0], p=[5,7,9]), [-5,7,9], "mirror non-unit vector");
+    assert_approx(mirror([0,10,0], p=[5,7,9]), [5,-7,9], "mirror scaled vector");
 }
 test_mirror();
 '''
@@ -263,6 +323,18 @@ include <../std.scad>
 module test_xflip() {
     assert_approx(xflip(), [[-1,0,0,0],[0,1,0,0],[0,0,1,0],[0,0,0,1]]);
     assert_approx(xflip(p=[1,2,3]), [-1,2,3]);
+    // Zero value stays zero
+    assert_approx(xflip(p=[0,5,10]), [0,5,10]);
+    // Negative values
+    assert_approx(xflip(p=[-3,2,1]), [3,2,1]);
+    // Double flip = identity
+    assert_approx(xflip() * xflip(), affine3d_identity(), "double xflip = identity");
+    // Flip with offset
+    assert_approx(xflip(x=5, p=[5,2,3]), [5,2,3], "xflip at x=5, point on plane");
+    assert_approx(xflip(x=5, p=[7,2,3]), [3,2,3], "xflip at x=5, point off plane");
+    assert_approx(xflip(x=5, p=[0,0,0]), [10,0,0], "xflip at x=5, origin");
+    // List of points
+    assert_approx(xflip(p=[[1,2,3],[4,5,6]]), [[-1,2,3],[-4,5,6]]);
     // Verify that module at least doesn't crash.
     xflip() union(){};
 }
@@ -277,6 +349,18 @@ include <../std.scad>
 module test_yflip() {
     assert_approx(yflip(), [[1,0,0,0],[0,-1,0,0],[0,0,1,0],[0,0,0,1]]);
     assert_approx(yflip(p=[1,2,3]), [1,-2,3]);
+    // Zero value stays zero
+    assert_approx(yflip(p=[5,0,10]), [5,0,10]);
+    // Negative values
+    assert_approx(yflip(p=[1,-3,2]), [1,3,2]);
+    // Double flip = identity
+    assert_approx(yflip() * yflip(), affine3d_identity(), "double yflip = identity");
+    // Flip with offset
+    assert_approx(yflip(y=5, p=[2,5,3]), [2,5,3], "yflip at y=5, point on plane");
+    assert_approx(yflip(y=5, p=[2,7,3]), [2,3,3], "yflip at y=5, point off plane");
+    assert_approx(yflip(y=5, p=[0,0,0]), [0,10,0], "yflip at y=5, origin");
+    // List of points
+    assert_approx(yflip(p=[[1,2,3],[4,5,6]]), [[1,-2,3],[4,-5,6]]);
     // Verify that module at least doesn't crash.
     yflip() union(){};
 }
@@ -291,6 +375,18 @@ include <../std.scad>
 module test_zflip() {
     assert_approx(zflip(), [[1,0,0,0],[0,1,0,0],[0,0,-1,0],[0,0,0,1]]);
     assert_approx(zflip(p=[1,2,3]), [1,2,-3]);
+    // Zero value stays zero
+    assert_approx(zflip(p=[5,10,0]), [5,10,0]);
+    // Negative values
+    assert_approx(zflip(p=[1,2,-3]), [1,2,3]);
+    // Double flip = identity
+    assert_approx(zflip() * zflip(), affine3d_identity(), "double zflip = identity");
+    // Flip with offset
+    assert_approx(zflip(z=5, p=[2,3,5]), [2,3,5], "zflip at z=5, point on plane");
+    assert_approx(zflip(z=5, p=[2,3,7]), [2,3,3], "zflip at z=5, point off plane");
+    assert_approx(zflip(z=5, p=[0,0,0]), [0,0,10], "zflip at z=5, origin");
+    // List of points
+    assert_approx(zflip(p=[[1,2,3],[4,5,6]]), [[1,2,-3],[4,5,-6]]);
     // Verify that module at least doesn't crash.
     zflip() union(){};
 }
@@ -483,6 +579,10 @@ include <../std.scad>
 module test_frame_map() {
     assert(approx(frame_map(x=[1,1,0], y=[-1,1,0]), affine3d_zrot(45)));
     assert(approx(frame_map(x=[0,1,0], y=[0,0,1]), rot(v=[1,1,1],a=120)));
+    // Identity: default axes
+    assert_approx(frame_map(x=[1,0,0], y=[0,1,0]), affine3d_identity(), "frame_map identity");
+    // Swapping X and Y axes is equivalent to a 90-degree rotation about Z
+    assert_approx(frame_map(x=[0,1,0], y=[-1,0,0]), affine3d_zrot(90), "frame_map 90 deg Z");
 }
 test_frame_map();
 '''
@@ -496,6 +596,26 @@ module test_skew() {
     m = affine3d_skew(sxy=2, sxz=3, syx=4, syz=5, szx=6, szy=7);
     assert_approx(skew(sxy=2, sxz=3, syx=4, syz=5, szx=6, szy=7), m);
     assert_approx(skew(sxy=2, sxz=3, syx=4, syz=5, szx=6, szy=7, p=[1,2,3]), apply(m,[1,2,3]));
+    // Zero skew = identity
+    assert_approx(skew(), affine3d_identity(), "skew with no args = identity");
+    assert_approx(skew(sxy=0, sxz=0, syx=0, syz=0, szx=0, szy=0), affine3d_identity(), "skew all zeros = identity");
+    // Zero skew applied to a point leaves it unchanged
+    assert_approx(skew(p=[5,10,15]), [5,10,15], "skew zero on point = identity");
+    // Single-axis skew
+    assert_approx(skew(sxy=1, p=[1,2,3]), apply(affine3d_skew(sxy=1), [1,2,3]), "skew sxy only");
+    assert_approx(skew(sxz=1, p=[1,2,3]), apply(affine3d_skew(sxz=1), [1,2,3]), "skew sxz only");
+    assert_approx(skew(syx=1, p=[1,2,3]), apply(affine3d_skew(syx=1), [1,2,3]), "skew syx only");
+    assert_approx(skew(syz=1, p=[1,2,3]), apply(affine3d_skew(syz=1), [1,2,3]), "skew syz only");
+    assert_approx(skew(szx=1, p=[1,2,3]), apply(affine3d_skew(szx=1), [1,2,3]), "skew szx only");
+    assert_approx(skew(szy=1, p=[1,2,3]), apply(affine3d_skew(szy=1), [1,2,3]), "skew szy only");
+    // Skew with negative values
+    assert_approx(skew(sxy=-3, p=[1,2,3]), apply(affine3d_skew(sxy=-3), [1,2,3]), "skew negative sxy");
+    // Skew via angle
+    assert_approx(skew(axy=45, p=[1,2,3]), skew(sxy=tan(45), p=[1,2,3]), "skew axy=45 == sxy=tan(45)");
+    assert_approx(skew(ayx=30, p=[1,2,3]), skew(syx=tan(30), p=[1,2,3]), "skew ayx=30 == syx=tan(30)");
+    // List of points
+    m2 = affine3d_skew(sxy=2);
+    assert_approx(skew(sxy=2, p=[[1,0,0],[0,1,0],[0,0,1]]), apply(m2, [[1,0,0],[0,1,0],[0,0,1]]), "skew point list");
     // Verify that module at least doesn't crash.
     skew(undef,2,3,4,5,6,7) union(){};
 }