diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-12-01 00:46:46 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-12-01 00:46:46 (GMT) |
| commit | 8e85f09b29ff8c56c26fa69e369080f1d7e09203 (patch) | |
| tree | f1645b2af10067f316039b720033bef141a80ad6 /src/ThrownTogetherRenderer.cc | |
| parent | bcc6120f9b7ce4187c56e0f83dd021674ccdec80 (diff) | |
| parent | 24d7edd8cab9cf359ccd89bf88bf7a55e2cfc21b (diff) | |
Merge remote branch 'upstream/master' into cakebaby
Diffstat (limited to 'src/ThrownTogetherRenderer.cc')
| -rw-r--r-- | src/ThrownTogetherRenderer.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ThrownTogetherRenderer.cc b/src/ThrownTogetherRenderer.cc index 01c7513..336c4c7 100644 --- a/src/ThrownTogetherRenderer.cc +++ b/src/ThrownTogetherRenderer.cc @@ -30,6 +30,8 @@ #include "system-gl.h" +#include <boost/unordered_map.hpp> + ThrownTogetherRenderer::ThrownTogetherRenderer(CSGChain *root_chain, CSGChain *highlights_chain, CSGChain *background_chain) @@ -60,9 +62,9 @@ void ThrownTogetherRenderer::renderCSGChain(CSGChain *chain, bool highlight, bool fberror) const { glDepthFunc(GL_LEQUAL); - QHash<QPair<PolySet*,Transform3d*>,int> polySetVisitMark; + boost::unordered_map<std::pair<PolySet*,Transform3d*>,int> polySetVisitMark; for (size_t i = 0; i < chain->polysets.size(); i++) { - if (polySetVisitMark[QPair<PolySet*,Transform3d*>(chain->polysets[i].get(), &chain->matrices[i])]++ > 0) + if (polySetVisitMark[std::make_pair(chain->polysets[i].get(), &chain->matrices[i])]++ > 0) continue; const Transform3d &m = chain->matrices[i]; double *c = chain->colors[i]; |