diff options
| author | Marius Kintel <marius@kintel.net> | 2011-08-05 23:08:32 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-08-05 23:08:32 (GMT) |
| commit | bdf1fda89b9886cf6b465edaa9b04a1106f0d638 (patch) | |
| tree | de2a7aa5f7bccc04ca10e1f60759b09641832d9a | |
| parent | cfea2f8934353bfc5635d05d81ecaac57b97e3b7 (diff) | |
Handle highlight and background modifiers
| -rw-r--r-- | tests/opencsgtest.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/opencsgtest.cc b/tests/opencsgtest.cc index 2eba509..026978d 100644 --- a/tests/opencsgtest.cc +++ b/tests/opencsgtest.cc @@ -148,18 +148,20 @@ int main(int argc, char *argv[]) Tree tree(root_node); + CsgInfo csgInfo; QHash<std::string, CGAL_Nef_polyhedron> cache; CGALEvaluator cgalevaluator(cache, tree); PolySetCGALEvaluator psevaluator(cgalevaluator); CSGTermEvaluator evaluator(tree); - CSGTerm *root_raw_term = evaluator.evaluateCSGTerm(*root_node, NULL, NULL); + CSGTerm *root_raw_term = evaluator.evaluateCSGTerm(*root_node, + csgInfo.highlight_terms, + csgInfo.background_terms); if (!root_raw_term) { cerr << "Error: CSG generation failed! (no top level object found)\n"; return 1; } - CsgInfo csgInfo; csgInfo.root_norm_term = root_raw_term->link(); // CSG normalization @@ -177,7 +179,7 @@ int main(int argc, char *argv[]) csgInfo.root_chain->import(csgInfo.root_norm_term); if (csgInfo.highlight_terms.size() > 0) { - cerr << "Compiling highlights (" << " CSG Trees)...\n"; + cerr << "Compiling highlights (" << csgInfo.highlight_terms.size() << " CSG Trees)...\n"; csgInfo.highlights_chain = new CSGChain(); for (unsigned int i = 0; i < csgInfo.highlight_terms.size(); i++) { |