summaryrefslogtreecommitdiff
path: root/src/csgterm.h
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-10-04 01:41:43 (GMT)
committerMarius Kintel <marius@kintel.net>2011-10-04 01:41:43 (GMT)
commitf5e0f3a531b0c8806e4ebc62cd91ca31275ae481 (patch)
tree98992f8b4f632ab8e29175eb362f4d3e03e06da3 /src/csgterm.h
parent85948590ee0c6a353502c5493ecaf45730e08984 (diff)
Rewrote some hard to read linear algebra code to use Eigen
Diffstat (limited to 'src/csgterm.h')
-rw-r--r--src/csgterm.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/csgterm.h b/src/csgterm.h
index 63d1240..1d9d9fd 100644
--- a/src/csgterm.h
+++ b/src/csgterm.h
@@ -23,11 +23,11 @@ public:
std::string label;
CSGTerm *left;
CSGTerm *right;
- double m[16];
+ Transform3d m;
double color[4];
int refcounter;
- CSGTerm(const shared_ptr<PolySet> &polyset, const double matrix[16], const double color[4], const std::string &label);
+ CSGTerm(const shared_ptr<PolySet> &polyset, const Transform3d &matrix, const double color[4], const std::string &label);
CSGTerm(type_e type, CSGTerm *left, CSGTerm *right);
CSGTerm *normalize();
@@ -42,14 +42,14 @@ class CSGChain
{
public:
std::vector<shared_ptr<PolySet> > polysets;
- std::vector<double*> matrices;
+ std::vector<Transform3d> matrices;
std::vector<double*> colors;
std::vector<CSGTerm::type_e> types;
std::vector<std::string> labels;
CSGChain();
- void add(const shared_ptr<PolySet> &polyset, double *m, double *color, CSGTerm::type_e type, std::string label);
+ void add(const shared_ptr<PolySet> &polyset, const Transform3d &m, double *color, CSGTerm::type_e type, std::string label);
void import(CSGTerm *term, CSGTerm::type_e type = CSGTerm::TYPE_UNION);
std::string dump();
contact: Jan Huwald // Impressum