diff options
| author | Marius Kintel <marius@kintel.net> | 2011-09-02 21:35:10 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-09-02 21:35:10 (GMT) |
| commit | ed8a99ed55d5d1ad043608ed471bb7564403bde9 (patch) | |
| tree | d0205bc5d22062ba6ddc0bbf87c88e9fafa58536 /src/csgterm.h | |
| parent | 287c20d2ff1f737acb414b3eda4969356c02c4fe (diff) | |
Refactoring: Moved color functionality into separate module and node
Diffstat (limited to 'src/csgterm.h')
| -rw-r--r-- | src/csgterm.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/csgterm.h b/src/csgterm.h index c1dc0fd..b0fffe4 100644 --- a/src/csgterm.h +++ b/src/csgterm.h @@ -20,10 +20,11 @@ public: QString label; CSGTerm *left; CSGTerm *right; - double m[20]; + double m[16]; + double color[4]; int refcounter; - CSGTerm(PolySet *polyset, const double m[20], QString label); + CSGTerm(PolySet *polyset, const double matrix[16], const double color[4], QString label); CSGTerm(type_e type, CSGTerm *left, CSGTerm *right); CSGTerm *normalize(); @@ -39,12 +40,13 @@ class CSGChain public: QVector<PolySet*> polysets; QVector<double*> matrices; + QVector<double*> colors; QVector<CSGTerm::type_e> types; QVector<QString> labels; CSGChain(); - void add(PolySet *polyset, double *m, CSGTerm::type_e type, QString label); + void add(PolySet *polyset, double *m, double *color, CSGTerm::type_e type, QString label); void import(CSGTerm *term, CSGTerm::type_e type = CSGTerm::TYPE_UNION); QString dump(); |