diff options
| author | Marius Kintel <marius@kintel.net> | 2011-10-04 01:41:43 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-10-04 01:41:43 (GMT) |
| commit | f5e0f3a531b0c8806e4ebc62cd91ca31275ae481 (patch) | |
| tree | 98992f8b4f632ab8e29175eb362f4d3e03e06da3 /src/ThrownTogetherRenderer.cc | |
| parent | 85948590ee0c6a353502c5493ecaf45730e08984 (diff) | |
Rewrote some hard to read linear algebra code to use Eigen
Diffstat (limited to 'src/ThrownTogetherRenderer.cc')
| -rw-r--r-- | src/ThrownTogetherRenderer.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ThrownTogetherRenderer.cc b/src/ThrownTogetherRenderer.cc index 7a92e7f..01c7513 100644 --- a/src/ThrownTogetherRenderer.cc +++ b/src/ThrownTogetherRenderer.cc @@ -60,14 +60,14 @@ void ThrownTogetherRenderer::renderCSGChain(CSGChain *chain, bool highlight, bool fberror) const { glDepthFunc(GL_LEQUAL); - QHash<QPair<PolySet*,double*>,int> polySetVisitMark; + QHash<QPair<PolySet*,Transform3d*>,int> polySetVisitMark; for (size_t i = 0; i < chain->polysets.size(); i++) { - if (polySetVisitMark[QPair<PolySet*,double*>(chain->polysets[i].get(), chain->matrices[i])]++ > 0) + if (polySetVisitMark[QPair<PolySet*,Transform3d*>(chain->polysets[i].get(), &chain->matrices[i])]++ > 0) continue; - double *m = chain->matrices[i]; + const Transform3d &m = chain->matrices[i]; double *c = chain->colors[i]; glPushMatrix(); - glMultMatrixd(m); + glMultMatrixd(m.data()); int csgmode = chain->types[i] == CSGTerm::TYPE_DIFFERENCE ? PolySet::CSGMODE_DIFFERENCE : PolySet::CSGMODE_NORMAL; if (highlight) { chain->polysets[i]->render_surface(PolySet::COLORMODE_HIGHLIGHT, PolySet::csgmode_e(csgmode + 20), m); |