diff options
author | don bright <hugh.m.bright@gmail.com> | 2011-11-05 18:17:06 (GMT) |
---|---|---|
committer | don bright <hugh.m.bright@gmail.com> | 2011-11-05 18:17:06 (GMT) |
commit | 273672c418e4ff2400a9cbc1dacb510a2452b734 (patch) | |
tree | 68d4cba8d98064482c1cdf68b514351468864b34 /tests/csgtexttest.cc | |
parent | 88b8080f30d6ca1a9a74b8005a7408d4066f481b (diff) | |
parent | d14a24a2b63d7d3815e02a79ef9dacd76cd01f4d (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tests/csgtexttest.cc')
-rw-r--r-- | tests/csgtexttest.cc | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/tests/csgtexttest.cc b/tests/csgtexttest.cc index fe94497..afa5bbe 100644 --- a/tests/csgtexttest.cc +++ b/tests/csgtexttest.cc @@ -1,6 +1,7 @@ /* - * OpenSCAD (www.openscad.at) - * Copyright (C) 2009 Clifford Wolf <clifford@clifford.at> + * OpenSCAD (www.openscad.org) + * Copyright (C) 2009-2011 Clifford Wolf <clifford@clifford.at> and + * Marius Kintel <marius@kintel.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -99,21 +100,7 @@ int main(int argc, char **argv) } Context root_ctx; - root_ctx.functions_p = &builtin_functions; - root_ctx.modules_p = &builtin_modules; - root_ctx.set_variable("$fn", Value(0.0)); - root_ctx.set_variable("$fs", Value(1.0)); - root_ctx.set_variable("$fa", Value(12.0)); - root_ctx.set_variable("$t", Value(0.0)); - - Value zero3; - zero3.type = Value::VECTOR; - zero3.append(new Value(0.0)); - zero3.append(new Value(0.0)); - zero3.append(new Value(0.0)); - root_ctx.set_variable("$vpt", zero3); - root_ctx.set_variable("$vpr", zero3); - + register_builtin(root_ctx); AbstractModule *root_module; ModuleInstantiation root_inst; |