diff options
| -rw-r--r-- | csgops.cc (renamed from csg.cc) | 0 | ||||
| -rw-r--r-- | mainwin.cc | 6 | ||||
| -rw-r--r-- | openscad.pro | 4 | ||||
| -rw-r--r-- | primitives.cc (renamed from primitive.cc) | 11 | ||||
| -rw-r--r-- | transform.cc (renamed from trans.cc) | 0 |
5 files changed, 7 insertions, 14 deletions
@@ -32,10 +32,8 @@ MainWindow::MainWindow(const char *filename) { root_ctx.functions_p = &builtin_functions; root_ctx.modules_p = &builtin_modules; - root_ctx.set_variable("$fs_render", Value(1.0)); - root_ctx.set_variable("$fa_render", Value(12.0)); - root_ctx.set_variable("$fs_preview", Value(1.0)); - root_ctx.set_variable("$fa_preview", Value(12.0)); + root_ctx.set_variable("$fs", Value(1.0)); + root_ctx.set_variable("$fa", Value(12.0)); root_module = NULL; root_node = NULL; diff --git a/openscad.pro b/openscad.pro index d8aa98a..0b0f6f1 100644 --- a/openscad.pro +++ b/openscad.pro @@ -14,8 +14,8 @@ YACCSOURCES += parser.y HEADERS += openscad.h SOURCES += openscad.cc mainwin.cc glview.cc SOURCES += value.cc expr.cc func.cc module.cc context.cc -SOURCES += csgterm.cc polyset.cc csg.cc trans.cc -SOURCES += primitive.cc +SOURCES += csgterm.cc polyset.cc csgops.cc transform.cc +SOURCES += primitives.cc QT += opengl diff --git a/primitive.cc b/primitives.cc index b2a7a01..1430d10 100644 --- a/primitive.cc +++ b/primitives.cc @@ -41,8 +41,7 @@ class PrimitiveNode : public AbstractPolyNode public: bool center; double x, y, z, h, r1, r2; - double fs_render, fa_render; - double fs_preview, fa_preview; + double fs, fa; primitive_type_e type; PrimitiveNode(primitive_type_e type) : type(type) { } virtual PolySet *render_polyset(render_mode_e mode) const; @@ -72,10 +71,8 @@ AbstractNode *PrimitiveModule::evaluate(const Context *ctx, const QVector<QStrin Context c(ctx); c.args(argnames, argexpr, call_argnames, call_argvalues); - node->fs_render = c.lookup_variable("$fs_render").num; - node->fa_render = c.lookup_variable("$fa_render").num; - node->fs_preview = c.lookup_variable("$fs_preview").num; - node->fa_preview = c.lookup_variable("$fa_preview").num; + node->fs = c.lookup_variable("$fs").num; + node->fa = c.lookup_variable("$fa").num; if (type == CUBE) { Value size = c.lookup_variable("size"); @@ -147,8 +144,6 @@ int get_fragments_from_r(double r, double fs, double fa) PolySet *PrimitiveNode::render_polyset(render_mode_e mode) const { PolySet *p = new PolySet(); - double fs = mode == RENDER_CGAL ? fs_render : fs_preview; - double fa = mode == RENDER_CGAL ? fa_render : fa_preview; if (type == CUBE && x > 0 && y > 0 && z > 0) { |