History

Revert "Merge pull request #5106 from jherico/render_cursor"

This reverts commit 4d18bd7cec710b5188d1f6ad5c58010117d7a77d, reversing changes made to 24fda9a7336e4eff1d1310dd3359dd6cbbb6acb5.

ZappoMan committed 11 years ago

Commit 0cdc2b51 parent a5b286610 files · +467 −325Browse files

Showing the changes to libraries/render-utils/src/GeometryCache.cpp (1 of 10 files). Show all

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+0−15
@@ -1179,21 +1179,6 @@ void GeometryCache::renderQuad(gpu::Batch& batch, const glm::vec2& minCorner, co · 1178 unmodified lines
1179 batch.draw(gpu::QUADS, 4, 0);1179 batch.draw(gpu::QUADS, 4, 0);
1180}1180}
1181 1181
1182void GeometryCache::renderUnitQuad(const glm::vec4& color, int id) {
1183 gpu::Batch batch;
1184 renderUnitQuad(batch, color, id);
1185 gpu::GLBackend::renderBatch(batch);
1186}
1187
1188void GeometryCache::renderUnitQuad(gpu::Batch& batch, const glm::vec4& color, int id) {
1189 static const glm::vec2 topLeft(-1, 1);
1190 static const glm::vec2 bottomRight(1, -1);
1191 static const glm::vec2 texCoordTopLeft(0.0f, 1.0f);
1192 static const glm::vec2 texCoordBottomRight(1.0f, 0.0f);
1193 renderQuad(batch, topLeft, bottomRight, texCoordTopLeft, texCoordBottomRight, color, id);
1194}
1195
1196
1197void GeometryCache::renderQuad(const glm::vec2& minCorner, const glm::vec2& maxCorner,1182void GeometryCache::renderQuad(const glm::vec2& minCorner, const glm::vec2& maxCorner,
1198 const glm::vec2& texCoordMinCorner, const glm::vec2& texCoordMaxCorner, 1183 const glm::vec2& texCoordMinCorner, const glm::vec2& texCoordMaxCorner,
1199 const glm::vec4& color, int id) {1184 const glm::vec4& color, int id) {