convert explicit shared pointer creation (using "new") to make_shared where possible/appropriate

Heather Anderson committed 5 years ago

Commit bcce9a21 parent 88b004562 files · +107 −107Browse files

Showing the changes to libraries/script-engine/src/ModelScriptingInterface.cpp (1 of 62 files). Show all

Unified · Split

libraries/script-engine/src/ModelScriptingInterface.cpp+2−2

@@ -102,7 +102,7 @@ QScriptValue ModelScriptingInterface::appendMeshes(MeshProxyList in) { · 101 unmodified lines
102	indexStartOffset += numVertices;	102	indexStartOffset += numVertices;
103	}	103	}
104		104
105	graphics::MeshPointer result(new graphics::Mesh());	105	graphics::MeshPointer result(std::make_shared<graphics::Mesh>());
106		106
107	gpu::Element vertexElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);	107	gpu::Element vertexElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
108	gpu::Buffer* combinedVertexBuffer = new gpu::Buffer(combinedVertexSize, combinedVertexData.get());	108	gpu::Buffer* combinedVertexBuffer = new gpu::Buffer(combinedVertexSize, combinedVertexData.get());
@@ -199,7 +199,7 @@ QScriptValue ModelScriptingInterface::getVertex(MeshProxy* meshProxy, int vertex · 90 unmodified lines
199	QScriptValue ModelScriptingInterface::newMesh(const QVector<glm::vec3>& vertices,	199	QScriptValue ModelScriptingInterface::newMesh(const QVector<glm::vec3>& vertices,
200	const QVector<glm::vec3>& normals,	200	const QVector<glm::vec3>& normals,
201	const QVector<MeshFace>& faces) {	201	const QVector<MeshFace>& faces) {
202	graphics::MeshPointer mesh(new graphics::Mesh());	202	graphics::MeshPointer mesh(std::make_shared<graphics::Mesh>());
203		203
204	// vertices	204	// vertices
205	auto vertexBuffer = std::make_shared<gpu::Buffer>(vertices.size() * sizeof(glm::vec3), (gpu::Byte*)vertices.data());	205	auto vertexBuffer = std::make_shared<gpu::Buffer>(vertices.size() * sizeof(glm::vec3), (gpu::Byte*)vertices.data());