Getting rid of glLIghts and replacing by the model::Light
Showing the changes to libraries/render-utils/src/GeometryCache.cpp (1 of 23 files). Show all
Unified · Split
| @@ -1154,7 +1154,7 @@ void GeometryCache::renderQuad(const glm::vec2& minCorner, const glm::vec2& maxC · 1153 unmodified lines | |||
| 1154 | 1154 | ||
| 1155 | gpu::Batch batch; | 1155 | gpu::Batch batch; |
| 1156 | 1156 | ||
| 1157 | glEnable(GL_TEXTURE_2D); | 1157 | // glEnable(GL_TEXTURE_2D); |
| 1158 | //glBindTexture(GL_TEXTURE_2D, _currentTextureID); // this is quad specific... | 1158 | //glBindTexture(GL_TEXTURE_2D, _currentTextureID); // this is quad specific... |
| 1159 | 1159 | ||
| 1160 | batch.setInputFormat(details.streamFormat); | 1160 | batch.setInputFormat(details.streamFormat); |
| @@ -1168,8 +1168,8 @@ void GeometryCache::renderQuad(const glm::vec2& minCorner, const glm::vec2& maxC · 7 unmodified lines | |||
| 1168 | glDisableClientState(GL_COLOR_ARRAY); | 1168 | glDisableClientState(GL_COLOR_ARRAY); |
| 1169 | 1169 | ||
| 1170 | glBindBuffer(GL_ARRAY_BUFFER, 0); | 1170 | glBindBuffer(GL_ARRAY_BUFFER, 0); |
| 1171 | glBindTexture(GL_TEXTURE_2D, 0); | 1171 | // glBindTexture(GL_TEXTURE_2D, 0); |
| 1172 | glDisable(GL_TEXTURE_2D); | 1172 | // glDisable(GL_TEXTURE_2D); |
| 1173 | } | 1173 | } |
| 1174 | 1174 | ||
| 1175 | void GeometryCache::renderQuad(const glm::vec3& minCorner, const glm::vec3& maxCorner, const glm::vec4& color, int id) { | 1175 | void GeometryCache::renderQuad(const glm::vec3& minCorner, const glm::vec3& maxCorner, const glm::vec4& color, int id) { |