History

CR feedback

ZappoMan committed 11 years ago

Commit c1bb03e1 parent 8c0db261 file · +2 −1Browse files

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

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+2−1
@@ -57,7 +57,7 @@ void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm · 56 unmodified lines
57 57
58 Vec2Pair radiusKey(glm::vec2(radius, slices), glm::vec2(stacks, 0));58 Vec2Pair radiusKey(glm::vec2(radius, slices), glm::vec2(stacks, 0));
59 IntPair slicesStacksKey(slices, stacks);59 IntPair slicesStacksKey(slices, stacks);
60 Vec3Pair colorKey(glm::vec3(color.x, color.y, slices),glm::vec3(color.z, color.y, stacks));60 Vec3Pair colorKey(glm::vec3(color.x, color.y, slices), glm::vec3(color.z, color.y, stacks));
61 61
62 int vertices = slices * (stacks - 1) + 2; 62 int vertices = slices * (stacks - 1) + 2;
63 int indices = slices * (stacks - 1) * NUM_VERTICES_PER_TRIANGULATED_QUAD;63 int indices = slices * (stacks - 1) * NUM_VERTICES_PER_TRIANGULATED_QUAD;
@@ -1478,6 +1478,7 @@ void GeometryCache::renderDashedLine(const glm::vec3& start, const glm::vec3& en · 1414 unmodified lines
1478 1478
1479 1479
1480int GeometryCache::BatchItemDetails::population = 0;1480int GeometryCache::BatchItemDetails::population = 0;
1481
1481GeometryCache::BatchItemDetails::BatchItemDetails() :1482GeometryCache::BatchItemDetails::BatchItemDetails() :
1482 verticesBuffer(NULL),1483 verticesBuffer(NULL),
1483 colorBuffer(NULL),1484 colorBuffer(NULL),