diff options
| -rw-r--r-- | src/OpenCSGRenderer.cc | 2 | ||||
| -rw-r--r-- | src/ThrownTogetherRenderer.cc | 2 | ||||
| -rw-r--r-- | src/transform.cc | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/OpenCSGRenderer.cc b/src/OpenCSGRenderer.cc index afb3e98..69013e9 100644 --- a/src/OpenCSGRenderer.cc +++ b/src/OpenCSGRenderer.cc @@ -97,7 +97,7 @@ void OpenCSGRenderer::renderCSGChain(CSGChain *chain, GLint *shaderinfo, chain->polysets[j]->render_surface(PolySet::COLORMODE_HIGHLIGHT, PolySet::csgmode_e(csgmode + 20), m, shaderinfo); } else if (background) { chain->polysets[j]->render_surface(PolySet::COLORMODE_BACKGROUND, PolySet::csgmode_e(csgmode + 10), m, shaderinfo); - } else if (m[16] >= 0 || m[17] >= 0 || m[18] >= 0 || m[19] >= 0) { + } else if (m[16] >= 0 || m[17] >= 0 || m[18] >= 0) { // User-defined color from source glColor4d(m[16], m[17], m[18], m[19]); if (shaderinfo) { diff --git a/src/ThrownTogetherRenderer.cc b/src/ThrownTogetherRenderer.cc index 0a0c9c8..6e0325e 100644 --- a/src/ThrownTogetherRenderer.cc +++ b/src/ThrownTogetherRenderer.cc @@ -91,7 +91,7 @@ void ThrownTogetherRenderer::renderCSGChain(CSGChain *chain, bool highlight, } else { chain->polysets[i]->render_surface(PolySet::COLORMODE_NONE, PolySet::csgmode_e(csgmode), m); } - } else if (m[16] >= 0 || m[17] >= 0 || m[18] >= 0 || m[19] >= 0) { + } else if (m[16] >= 0 || m[17] >= 0 || m[18] >= 0) { glColor4d(m[16], m[17], m[18], m[19]); chain->polysets[i]->render_surface(PolySet::COLORMODE_NONE, PolySet::csgmode_e(csgmode), m); if (showedges) { diff --git a/src/transform.cc b/src/transform.cc index d774a8c..9df9ade 100644 --- a/src/transform.cc +++ b/src/transform.cc @@ -69,8 +69,9 @@ AbstractNode *TransformModule::evaluate(const Context *ctx, const ModuleInstanti for (int i = 0; i < 16; i++) node->m[i] = i % 5 == 0 ? 1.0 : 0.0; - for (int i = 16; i < 20; i++) + for (int i = 16; i < 19; i++) node->m[i] = -1; + node->m[19] = 1; QVector<QString> argnames; QVector<Expression*> argexpr; @@ -367,7 +368,7 @@ QString TransformNode::dump(QString indent) const { if (dump_cache.isEmpty()) { QString text; - if (m[16] >= 0 || m[17] >= 0 || m[18] >= 0 || m[19] >= 0) + if (m[16] >= 0 || m[17] >= 0 || m[18] >= 0) text.sprintf("n%d: color([%g, %g, %g, %g])", idx, m[16], m[17], m[18], m[19]); else |