vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Clifford Wolf: 

Some housekeeping..



git-svn-id: http://svn.clifford.at/openscad/trunk@28 b57f626f-c46c-0410-a088-ec61d464b74c
stl_dim
clifford 2009-06-26 22:09:50 +00:00
parent ae9cc6d1ed
commit 221ae18327
5 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
csg.cc → csgops.cc
View File

6
mainwin.cc
View File

@ -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;

4
openscad.pro
View File

@ -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

11
primitive.cc → primitives.cc
View File

@ -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)
{

0
trans.cc → transform.cc
View File