diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/csgtermtest.cc | 4 | ||||
| -rw-r--r-- | tests/opencsgtest.cc | 3 | ||||
| -rw-r--r-- | tests/regression/csgtermtest/allmodules-expected.txt | 2 | ||||
| -rw-r--r-- | tests/regression/csgtermtest/dxf_linear_extrude-expected.txt | 2 | ||||
| -rw-r--r-- | tests/regression/csgtermtest/dxf_rotate_extrude-expected.txt | 2 | ||||
| -rw-r--r-- | tests/regression/csgtermtest/linear_extrude-expected.txt | 2 | ||||
| -rw-r--r-- | tests/regression/csgtermtest/projection-expected.txt | 2 | ||||
| -rw-r--r-- | tests/regression/csgtermtest/rotate_extrude-expected.txt | 2 | ||||
| -rw-r--r-- | tests/regression/csgtermtest/surface-expected.txt | 2 |
9 files changed, 11 insertions, 10 deletions
diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc index 26b809a..7c37b0a 100644 --- a/tests/csgtermtest.cc +++ b/tests/csgtermtest.cc @@ -24,6 +24,7 @@ */ #include "myqhash.h" +#include "PolySetEvaluator.h" #include "CSGTermEvaluator.h" #include "CSGTextCache.h" #include "openscad.h" @@ -145,7 +146,8 @@ int main(int argc, char **argv) vector<CSGTerm*> highlights; vector<CSGTerm*> background; - CSGTermEvaluator evaluator(tree); + PolySetEvaluator psevaluator(tree); + CSGTermEvaluator evaluator(tree, &psevaluator); CSGTerm *root_term = evaluator.evaluateCSGTerm(*root_node, highlights, background); // cout << "Stored terms: " << evaluator.stored_term.size() << "\n"; diff --git a/tests/opencsgtest.cc b/tests/opencsgtest.cc index 72f7488..28c0daa 100644 --- a/tests/opencsgtest.cc +++ b/tests/opencsgtest.cc @@ -144,8 +144,7 @@ int main(int argc, char *argv[]) CsgInfo csgInfo; QHash<std::string, CGAL_Nef_polyhedron> cache; CGALEvaluator cgalevaluator(cache, tree); - PolySetCGALEvaluator psevaluator(cgalevaluator); - CSGTermEvaluator evaluator(tree, &psevaluator); + CSGTermEvaluator evaluator(tree, &cgalevaluator.psevaluator); CSGTerm *root_raw_term = evaluator.evaluateCSGTerm(*root_node, csgInfo.highlight_terms, csgInfo.background_terms); diff --git a/tests/regression/csgtermtest/allmodules-expected.txt b/tests/regression/csgtermtest/allmodules-expected.txt index d7a04fc..f544c01 100644 --- a/tests/regression/csgtermtest/allmodules-expected.txt +++ b/tests/regression/csgtermtest/allmodules-expected.txt @@ -1 +1 @@ -(((((((((((((linear_extrude14 + linear_extrude15) + rotate_extrude16) + rotate_extrude17) + import21) + cube23) + sphere24) + cylinder25) + polyhedron26) + square27) + circle28) + polygon29) + projection30) + surface32) +((((((cube23 + sphere24) + cylinder25) + polyhedron26) + square27) + circle28) + polygon29) diff --git a/tests/regression/csgtermtest/dxf_linear_extrude-expected.txt b/tests/regression/csgtermtest/dxf_linear_extrude-expected.txt index bebcc7a..a40cf60 100644 --- a/tests/regression/csgtermtest/dxf_linear_extrude-expected.txt +++ b/tests/regression/csgtermtest/dxf_linear_extrude-expected.txt @@ -1 +1 @@ -linear_extrude2 +No top-level CSG object diff --git a/tests/regression/csgtermtest/dxf_rotate_extrude-expected.txt b/tests/regression/csgtermtest/dxf_rotate_extrude-expected.txt index 318aa70..a40cf60 100644 --- a/tests/regression/csgtermtest/dxf_rotate_extrude-expected.txt +++ b/tests/regression/csgtermtest/dxf_rotate_extrude-expected.txt @@ -1 +1 @@ -rotate_extrude2 +No top-level CSG object diff --git a/tests/regression/csgtermtest/linear_extrude-expected.txt b/tests/regression/csgtermtest/linear_extrude-expected.txt index bebcc7a..a40cf60 100644 --- a/tests/regression/csgtermtest/linear_extrude-expected.txt +++ b/tests/regression/csgtermtest/linear_extrude-expected.txt @@ -1 +1 @@ -linear_extrude2 +No top-level CSG object diff --git a/tests/regression/csgtermtest/projection-expected.txt b/tests/regression/csgtermtest/projection-expected.txt index 2a4c47e..a40cf60 100644 --- a/tests/regression/csgtermtest/projection-expected.txt +++ b/tests/regression/csgtermtest/projection-expected.txt @@ -1 +1 @@ -projection2 +No top-level CSG object diff --git a/tests/regression/csgtermtest/rotate_extrude-expected.txt b/tests/regression/csgtermtest/rotate_extrude-expected.txt index 318aa70..a40cf60 100644 --- a/tests/regression/csgtermtest/rotate_extrude-expected.txt +++ b/tests/regression/csgtermtest/rotate_extrude-expected.txt @@ -1 +1 @@ -rotate_extrude2 +No top-level CSG object diff --git a/tests/regression/csgtermtest/surface-expected.txt b/tests/regression/csgtermtest/surface-expected.txt index d0e3459..a40cf60 100644 --- a/tests/regression/csgtermtest/surface-expected.txt +++ b/tests/regression/csgtermtest/surface-expected.txt @@ -1 +1 @@ -surface2 +No top-level CSG object |