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
6969 || (!registered && !_sphereVertices.contains(radiusKey))) {
7070
7171 if (registered && _registeredSphereVertices.contains(id)) {
72− _registeredSphereVertices[id].clear();
72+ _registeredSphereVertices[id].reset();
7373 #ifdef WANT_DEBUG
7474 qCDebug(renderutils) << "renderSphere()... RELEASING REGISTERED VERTICES BUFFER";
7575 #endif
@@ -133,7 +133,7 @@ void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm · 57 unmodified lines
133133 || (!registered && !_sphereIndices.contains(slicesStacksKey))) {
134134
135135 if (registered && _registeredSphereIndices.contains(id)) {
136− _registeredSphereIndices[id].clear();
136+ _registeredSphereIndices[id].reset();
137137 #ifdef WANT_DEBUG
138138 qCDebug(renderutils) << "renderSphere()... RELEASING REGISTERED INDICES BUFFER";
139139 #endif
@@ -219,7 +219,7 @@ void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm · 79 unmodified lines
219219 || (!registered && !_sphereColors.contains(colorKey))) {
220220
221221 if (registered && _registeredSphereColors.contains(id)) {
222− _registeredSphereColors[id].clear();
222+ _registeredSphereColors[id].reset();
223223 #ifdef WANT_DEBUG
224224 qCDebug(renderutils) << "renderSphere()... RELEASING REGISTERED COLORS BUFFER";
225225 #endif
@@ -1581,10 +1581,10 @@ GeometryCache::BatchItemDetails::~BatchItemDetails() { · 1355 unmodified lines
15811581
15821582 void GeometryCache::BatchItemDetails::clear() {
15831583 isCreated = false;
1584− verticesBuffer.clear();
1585− colorBuffer.clear();
1586− streamFormat.clear();
1587− stream.clear();
1584+ verticesBuffer.reset();
1585+ colorBuffer.reset();
1586+ streamFormat.reset();
1587+ stream.reset();
15881588 }
15891589
15901590 void GeometryCache::renderLine(const glm::vec3& p1, const glm::vec3& p2,