diff options
| author | Marius Kintel <marius@kintel.net> | 2011-09-02 23:53:00 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-09-02 23:53:00 (GMT) |
| commit | c6209f15b70f743bace2bf21e2801b9e5238ada8 (patch) | |
| tree | bedb5c26b90cc77479f301b6ab181cbe15aefd3b /src | |
| parent | 4afdde51f45de5f35040b44680d306103888cdc9 (diff) | |
disable setting alpha without color
Diffstat (limited to 'src')
| -rw-r--r-- | src/OpenCSGRenderer.cc | 2 | ||||
| -rw-r--r-- | src/ThrownTogetherRenderer.cc | 2 | ||||
| -rw-r--r-- | src/color.cc | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/OpenCSGRenderer.cc b/src/OpenCSGRenderer.cc index d624a5f..f07b900 100644 --- a/src/OpenCSGRenderer.cc +++ b/src/OpenCSGRenderer.cc @@ -93,7 +93,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 (c[0] >= 0 || c[1] >= 0 || c[2] >= 0 || c[3] >= 0) { + } else if (c[0] >= 0 || c[1] >= 0 || c[2] >= 0) { // User-defined color from source glColor4dv(c); if (shaderinfo) { diff --git a/src/ThrownTogetherRenderer.cc b/src/ThrownTogetherRenderer.cc index 92a504a..598d542 100644 --- a/src/ThrownTogetherRenderer.cc +++ b/src/ThrownTogetherRenderer.cc @@ -92,7 +92,7 @@ void ThrownTogetherRenderer::renderCSGChain(CSGChain *chain, bool highlight, } else { chain->polysets[i]->render_surface(PolySet::COLORMODE_NONE, PolySet::csgmode_e(csgmode), m); } - } else if (c[0] >= 0 || c[1] >= 0 || c[2] >= 0 || c[3] >= 0) { + } else if (c[0] >= 0 || c[1] >= 0 || c[2] >= 0) { glColor4dv(c); chain->polysets[i]->render_surface(PolySet::COLORMODE_NONE, PolySet::csgmode_e(csgmode), m); if (showedges) { diff --git a/src/color.cc b/src/color.cc index a3c8101..7340612 100644 --- a/src/color.cc +++ b/src/color.cc @@ -47,7 +47,8 @@ AbstractNode *ColorModule::evaluate(const Context *ctx, const ModuleInstantiatio { ColorNode *node = new ColorNode(inst); - for (int i = 0; i < 4; i++) node->color[i] = -1; + node->color[0] = node->color[1] = node->color[2] = -1.0; + node->color[3] = 1.0; QVector<QString> argnames; QVector<Expression*> argexpr; |