diff options
| author | Marius Kintel <marius@kintel.net> | 2012-07-07 20:02:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-07-07 20:02:51 (GMT) |
| commit | 0d619e5ac155e37c432d57062d8224a58c9d59ab (patch) | |
| tree | 10183df17cd4786ee1ef43b95c988fefd13ca990 /tests/csgtestcore.cc | |
| parent | aa8aee623adc74cbfe87f9e92e30be4a9ed3a7c8 (diff) | |
| parent | b028b704e029a5161d3703efda35642a37c28cb6 (diff) | |
Merge branch 'master' into linear_extrude_argument
Diffstat (limited to 'tests/csgtestcore.cc')
| -rw-r--r-- | tests/csgtestcore.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/csgtestcore.cc b/tests/csgtestcore.cc index cb96940..acc7c31 100644 --- a/tests/csgtestcore.cc +++ b/tests/csgtestcore.cc @@ -258,7 +258,7 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type) std::string currentdir = boosty::stringy( fs::current_path() ); parser_init(QCoreApplication::instance()->applicationDirPath().toStdString()); - set_librarydir(boosty::stringy(fs::path(QCoreApplication::instance()->applicationDirPath().toStdString()) / "../libraries")); + add_librarydir(boosty::stringy(fs::path(QCoreApplication::instance()->applicationDirPath().toStdString()) / "../libraries")); Context root_ctx; register_builtin(root_ctx); @@ -302,8 +302,8 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type) } // CSG normalization - CSGTermNormalizer normalizer; - csgInfo.root_norm_term = normalizer.normalize(root_raw_term, 5000); + CSGTermNormalizer normalizer(5000); + csgInfo.root_norm_term = normalizer.normalize(root_raw_term); if (csgInfo.root_norm_term) { csgInfo.root_chain = new CSGChain(); csgInfo.root_chain->import(csgInfo.root_norm_term); @@ -319,7 +319,7 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type) csgInfo.highlights_chain = new CSGChain(); for (unsigned int i = 0; i < csgInfo.highlight_terms.size(); i++) { - csgInfo.highlight_terms[i] = normalizer.normalize(csgInfo.highlight_terms[i], 5000); + csgInfo.highlight_terms[i] = normalizer.normalize(csgInfo.highlight_terms[i]); csgInfo.highlights_chain->import(csgInfo.highlight_terms[i]); } } @@ -329,7 +329,7 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type) csgInfo.background_chain = new CSGChain(); for (unsigned int i = 0; i < csgInfo.background_terms.size(); i++) { - csgInfo.background_terms[i] = normalizer.normalize(csgInfo.background_terms[i], 5000); + csgInfo.background_terms[i] = normalizer.normalize(csgInfo.background_terms[i]); csgInfo.background_chain->import(csgInfo.background_terms[i]); } } |