getting back height parameter for linear_extrude in csg (#5113)

Co-authored-by: Guenther Sohler <guenther.sohler@photeon.com> Co-authored-by: Marius Kintel <marius@kintel.net>
openscad · May 9, 2024 · 6e993d3 · 6e993d3
1 parent 4bc1ae5
commit 6e993d3
Show file tree

Hide file tree

Showing 15 changed files with 117 additions and 110 deletions.
diff --git a/src/core/LinearExtrudeNode.cc b/src/core/LinearExtrudeNode.cc
@@ -169,7 +169,14 @@ std::string LinearExtrudeNode::toString() const
            << "timestamp = " << (fs::exists(path) ? fs::last_write_time(path) : 0) << ", "
     ;
   }
-  stream << "v = [ " <<  this->height[0] << ", " << this->height[1] << ", " << this->height[2] << "]" ;
+  double height=this->height.norm();
+  stream << "height = " << height;
+  if(height > 0) {
+    Vector3d v=this->height/height;
+    if(v[2] < 1) {
+      stream << ", v = [ " <<  v[0] << ", " << v[1] << ", " << v[2] << "]" ;
+    }
+  }
   if (this->center) {
     stream << ", center = true";
   }

diff --git a/tests/regression/dumptest/allmodules-expected.csg b/tests/regression/dumptest/allmodules-expected.csg
@@ -10,8 +10,8 @@ group() {
 union();
 difference();
 intersection();
-linear_extrude(v = [ 0, 0, 100], $fn = 0, $fa = 12, $fs = 2);
-linear_extrude(v = [ 0, 0, 100], $fn = 0, $fa = 12, $fs = 2);
+linear_extrude(height = 100, $fn = 0, $fa = 12, $fs = 2);
+linear_extrude(height = 100, $fn = 0, $fa = 12, $fs = 2);
 rotate_extrude(angle = 360, convexity = 2, $fn = 0, $fa = 12, $fs = 2);
 rotate_extrude(angle = 360, convexity = 2, $fn = 0, $fa = 12, $fs = 2);
 import(file = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2, timestamp = 0);

diff --git a/tests/regression/dumptest/include-tests-expected.csg b/tests/regression/dumptest/include-tests-expected.csg
@@ -62,7 +62,7 @@ group() {
 								multmatrix([[0, 0, 1, 0], [1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 0, 1]]) {
 									group() {
 										multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
-											linear_extrude(v = [ 0, 0, 12], $fn = 0, $fa = 12, $fs = 2) {
+											linear_extrude(height = 12, $fn = 0, $fa = 12, $fs = 2) {
 												polygon(points = [[0, 0], [18, 0], [0, 4]], paths = [[0, 1, 2]], convexity = 1);
 											}
 										}

diff --git a/tests/regression/dumptest/intersection-tests-expected.csg b/tests/regression/dumptest/intersection-tests-expected.csg
@@ -62,7 +62,7 @@ multmatrix([[1, 0, 0, 0], [0, 1, 0, -12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 multmatrix([[1, 0, 0, 0], [0, 1, 0, -12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 	intersection() {
 		cube(size = [4, 4, 4], center = true);
-		linear_extrude(v = [ 0, 0, 100], $fn = 0, $fa = 12, $fs = 2);
+		linear_extrude(height = 100, $fn = 0, $fa = 12, $fs = 2);
 	}
 }
 multmatrix([[1, 0, 0, 0], [0, 1, 0, -16], [0, 0, 1, 0], [0, 0, 0, 1]]) {