diff options
| author | Marius Kintel <marius@kintel.net> | 2011-09-02 21:35:10 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-09-02 21:35:10 (GMT) |
| commit | ed8a99ed55d5d1ad043608ed471bb7564403bde9 (patch) | |
| tree | d0205bc5d22062ba6ddc0bbf87c88e9fafa58536 /src/OpenCSGRenderer.cc | |
| parent | 287c20d2ff1f737acb414b3eda4969356c02c4fe (diff) | |
Refactoring: Moved color functionality into separate module and node
Diffstat (limited to 'src/OpenCSGRenderer.cc')
| -rw-r--r-- | src/OpenCSGRenderer.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/OpenCSGRenderer.cc b/src/OpenCSGRenderer.cc index 6cbe849..d624a5f 100644 --- a/src/OpenCSGRenderer.cc +++ b/src/OpenCSGRenderer.cc @@ -85,6 +85,7 @@ void OpenCSGRenderer::renderCSGChain(CSGChain *chain, GLint *shaderinfo, if (shaderinfo) glUseProgram(shaderinfo[0]); for (; j < i; j++) { double *m = chain->matrices[j]; + double *c = chain->colors[j]; glPushMatrix(); glMultMatrixd(m); int csgmode = chain->types[j] == CSGTerm::TYPE_DIFFERENCE ? PolySet::CSGMODE_DIFFERENCE : PolySet::CSGMODE_NORMAL; @@ -92,12 +93,12 @@ 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 (c[0] >= 0 || c[1] >= 0 || c[2] >= 0 || c[3] >= 0) { // User-defined color from source - glColor4d(m[16], m[17], m[18], m[19]); + glColor4dv(c); if (shaderinfo) { - glUniform4f(shaderinfo[1], m[16], m[17], m[18], m[19]); - glUniform4f(shaderinfo[2], (m[16]+1)/2, (m[17]+1)/2, (m[18]+1)/2, 1.0); + glUniform4f(shaderinfo[1], c[0], c[1], c[2], c[3]); + glUniform4f(shaderinfo[2], (c[0]+1)/2, (c[1]+1)/2, (c[2]+1)/2, 1.0); } chain->polysets[j]->render_surface(PolySet::COLORMODE_NONE, PolySet::csgmode_e(csgmode), m, shaderinfo); } else if (chain->types[j] == CSGTerm::TYPE_DIFFERENCE) { |