History

getting rid of QSHaredPointer in favor of std::shared_ptr

Sam Gateau committed 11 years ago

Commit ade404a1 parent fad623a11 files · +49 −30Browse files

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

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+7−7
@@ -69,7 +69,7 @@ void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm · 68 unmodified lines
69 || (!registered && !_sphereVertices.contains(radiusKey))) {69 || (!registered && !_sphereVertices.contains(radiusKey))) {
70 70
71 if (registered && _registeredSphereVertices.contains(id)) {71 if (registered && _registeredSphereVertices.contains(id)) {
72 _registeredSphereVertices[id].clear();72 _registeredSphereVertices[id].reset();
73 #ifdef WANT_DEBUG73 #ifdef WANT_DEBUG
74 qCDebug(renderutils) << "renderSphere()... RELEASING REGISTERED VERTICES BUFFER";74 qCDebug(renderutils) << "renderSphere()... RELEASING REGISTERED VERTICES BUFFER";
75 #endif75 #endif
@@ -133,7 +133,7 @@ void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm · 57 unmodified lines
133 || (!registered && !_sphereIndices.contains(slicesStacksKey))) {133 || (!registered && !_sphereIndices.contains(slicesStacksKey))) {
134 134
135 if (registered && _registeredSphereIndices.contains(id)) {135 if (registered && _registeredSphereIndices.contains(id)) {
136 _registeredSphereIndices[id].clear();136 _registeredSphereIndices[id].reset();
137 #ifdef WANT_DEBUG137 #ifdef WANT_DEBUG
138 qCDebug(renderutils) << "renderSphere()... RELEASING REGISTERED INDICES BUFFER";138 qCDebug(renderutils) << "renderSphere()... RELEASING REGISTERED INDICES BUFFER";
139 #endif139 #endif
@@ -219,7 +219,7 @@ void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm · 79 unmodified lines
219 || (!registered && !_sphereColors.contains(colorKey))) {219 || (!registered && !_sphereColors.contains(colorKey))) {
220 220
221 if (registered && _registeredSphereColors.contains(id)) {221 if (registered && _registeredSphereColors.contains(id)) {
222 _registeredSphereColors[id].clear();222 _registeredSphereColors[id].reset();
223 #ifdef WANT_DEBUG223 #ifdef WANT_DEBUG
224 qCDebug(renderutils) << "renderSphere()... RELEASING REGISTERED COLORS BUFFER";224 qCDebug(renderutils) << "renderSphere()... RELEASING REGISTERED COLORS BUFFER";
225 #endif225 #endif
@@ -1581,10 +1581,10 @@ GeometryCache::BatchItemDetails::~BatchItemDetails() { · 1355 unmodified lines
1581 1581
1582void GeometryCache::BatchItemDetails::clear() {1582void GeometryCache::BatchItemDetails::clear() {
1583 isCreated = false;1583 isCreated = false;
1584 verticesBuffer.clear();1584 verticesBuffer.reset();
1585 colorBuffer.clear();1585 colorBuffer.reset();
1586 streamFormat.clear();1586 streamFormat.reset();
1587 stream.clear();1587 stream.reset();
1588}1588}
1589 1589
1590void GeometryCache::renderLine(const glm::vec3& p1, const glm::vec3& p2, 1590void GeometryCache::renderLine(const glm::vec3& p1, const glm::vec3& p2,