diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp index 8b5e5a4b39..d660b12b87 100644 --- a/ice-server/src/IceServer.cpp +++ b/ice-server/src/IceServer.cpp @@ -110,7 +110,7 @@ SharedNetworkPeer IceServer::addOrUpdateHeartbeatingPeer(const QByteArray& incom if (!matchingPeer) { // if we don't have this sender we need to create them now - matchingPeer = SharedNetworkPeer(new NetworkPeer(senderUUID, publicSocket, localSocket)); + matchingPeer = QSharedPointer::create(senderUUID, publicSocket, localSocket); _activePeers.insert(senderUUID, matchingPeer); qDebug() << "Added a new network peer" << *matchingPeer; diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index c39a08bd27..4352d1a75b 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -374,7 +374,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : _bookmarks = new Bookmarks(); // Before setting up the menu _runningScriptsWidget = new RunningScriptsWidget(_window); - _renderEngine->addTask(render::TaskPointer(new RenderDeferredTask())); + _renderEngine->addTask(make_shared()); _renderEngine->registerScene(_main3DScene); // start the nodeThread so its event loop is running @@ -3426,8 +3426,8 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se // Background rendering decision if (BackgroundRenderData::_item == 0) { - auto backgroundRenderData = BackgroundRenderData::Pointer(new BackgroundRenderData(&_environment)); - auto backgroundRenderPayload = render::PayloadPointer(new BackgroundRenderData::Payload(backgroundRenderData)); + auto backgroundRenderData = make_shared(&_environment); + auto backgroundRenderPayload = make_shared(backgroundRenderData); BackgroundRenderData::_item = _main3DScene->allocateID(); pendingChanges.resetItem(WorldBoxRenderData::_item, backgroundRenderPayload); } else { @@ -3475,8 +3475,8 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se // Make sure the WorldBox is in the scene if (WorldBoxRenderData::_item == 0) { - auto worldBoxRenderData = WorldBoxRenderData::Pointer(new WorldBoxRenderData()); - auto worldBoxRenderPayload = render::PayloadPointer(new WorldBoxRenderData::Payload(worldBoxRenderData)); + auto worldBoxRenderData = make_shared(); + auto worldBoxRenderPayload = make_shared(worldBoxRenderData); WorldBoxRenderData::_item = _main3DScene->allocateID(); diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index b1703c2a23..f1f34db9b3 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -434,7 +434,7 @@ void MyAvatar::startRecording() { return; } if (!_recorder) { - _recorder = RecorderPointer(new Recorder(this)); + _recorder = QSharedPointer::create(this); } // connect to AudioClient's signal so we get input audio auto audioClient = DependencyManager::get(); @@ -486,7 +486,7 @@ void MyAvatar::loadLastRecording() { return; } if (!_player) { - _player = PlayerPointer(new Player(this)); + _player = QSharedPointer::create(this); } _player->loadRecording(_recorder->getRecording()); diff --git a/interface/src/devices/Joystick.cpp b/interface/src/devices/Joystick.cpp index 91f3b98bac..8cb1c3fa6b 100644 --- a/interface/src/devices/Joystick.cpp +++ b/interface/src/devices/Joystick.cpp @@ -103,7 +103,7 @@ void Joystick::registerToUserInputMapper(UserInputMapper& mapper) { // Grab the current free device ID _deviceID = mapper.getFreeDeviceID(); - auto proxy = UserInputMapper::DeviceProxy::Pointer(new UserInputMapper::DeviceProxy(_name)); + auto proxy = std::make_shared(_name); proxy->getButton = [this] (const UserInputMapper::Input& input, int timestamp) -> bool { return this->getButton(input.getChannel()); }; proxy->getAxis = [this] (const UserInputMapper::Input& input, int timestamp) -> float { return this->getAxis(input.getChannel()); }; proxy->getAvailabeInputs = [this] () -> QVector { diff --git a/interface/src/devices/KeyboardMouseDevice.cpp b/interface/src/devices/KeyboardMouseDevice.cpp index dd8de00bc7..6eb675114b 100755 --- a/interface/src/devices/KeyboardMouseDevice.cpp +++ b/interface/src/devices/KeyboardMouseDevice.cpp @@ -159,7 +159,7 @@ void KeyboardMouseDevice::registerToUserInputMapper(UserInputMapper& mapper) { // Grab the current free device ID _deviceID = mapper.getFreeDeviceID(); - auto proxy = UserInputMapper::DeviceProxy::Pointer(new UserInputMapper::DeviceProxy("Keyboard")); + auto proxy = std::make_shared("Keyboard"); proxy->getButton = [this] (const UserInputMapper::Input& input, int timestamp) -> bool { return this->getButton(input.getChannel()); }; proxy->getAxis = [this] (const UserInputMapper::Input& input, int timestamp) -> float { return this->getAxis(input.getChannel()); }; proxy->getAvailabeInputs = [this] () -> QVector { diff --git a/interface/src/devices/SixenseManager.cpp b/interface/src/devices/SixenseManager.cpp index 12b6f4263b..2a2adbe617 100644 --- a/interface/src/devices/SixenseManager.cpp +++ b/interface/src/devices/SixenseManager.cpp @@ -662,7 +662,7 @@ void SixenseManager::registerToUserInputMapper(UserInputMapper& mapper) { // Grab the current free device ID _deviceID = mapper.getFreeDeviceID(); - auto proxy = UserInputMapper::DeviceProxy::Pointer(new UserInputMapper::DeviceProxy("Hydra")); + auto proxy = std::make_shared("Hydra"); proxy->getButton = [this] (const UserInputMapper::Input& input, int timestamp) -> bool { return this->getButton(input.getChannel()); }; proxy->getAxis = [this] (const UserInputMapper::Input& input, int timestamp) -> float { return this->getAxis(input.getChannel()); }; proxy->getAvailabeInputs = [this] () -> QVector { diff --git a/interface/src/ui/ApplicationCompositor.cpp b/interface/src/ui/ApplicationCompositor.cpp index 6cdf690d99..d1f7c67e51 100644 --- a/interface/src/ui/ApplicationCompositor.cpp +++ b/interface/src/ui/ApplicationCompositor.cpp @@ -620,8 +620,8 @@ void ApplicationCompositor::buildHemiVertices( auto geometryCache = DependencyManager::get(); - _hemiVertices = gpu::BufferPointer(new gpu::Buffer()); - _hemiIndices = gpu::BufferPointer(new gpu::Buffer()); + _hemiVertices = std::make_shared(); + _hemiIndices = std::make_shared(); if (fov >= PI) { @@ -683,7 +683,7 @@ void ApplicationCompositor::drawSphereSection(gpu::Batch& batch) { static const int VERTEX_DATA_SLOT = 0; static const int TEXTURE_DATA_SLOT = 1; static const int COLOR_DATA_SLOT = 2; - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); // 1 for everyone + auto streamFormat = std::make_shared(); // 1 for everyone streamFormat->setAttribute(gpu::Stream::POSITION, VERTEX_DATA_SLOT, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0); streamFormat->setAttribute(gpu::Stream::TEXCOORD, TEXTURE_DATA_SLOT, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::UV)); streamFormat->setAttribute(gpu::Stream::COLOR, COLOR_DATA_SLOT, gpu::Element(gpu::VEC4, gpu::FLOAT, gpu::RGBA)); diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 9a6400ae16..0266c1f697 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -617,7 +617,7 @@ void AvatarData::loadRecording(QString filename) { return; } if (!_player) { - _player = PlayerPointer(new Player(this)); + _player = QSharedPointer::create(this); } _player->loadFromFile(filename); @@ -629,7 +629,7 @@ void AvatarData::startPlaying() { return; } if (!_player) { - _player = PlayerPointer(new Player(this)); + _player = QSharedPointer::create(this); } _player->startPlaying(); } @@ -731,7 +731,7 @@ void AvatarData::stopPlaying() { } } -void AvatarData::changeReferential(Referential *ref) { +void AvatarData::changeReferential(Referential* ref) { delete _referential; _referential = ref; } diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp index 6d0d9d8d76..12c9f5c5e7 100644 --- a/libraries/avatars/src/AvatarHashMap.cpp +++ b/libraries/avatars/src/AvatarHashMap.cpp @@ -51,7 +51,7 @@ bool AvatarHashMap::isAvatarInRange(const glm::vec3& position, const float range } AvatarSharedPointer AvatarHashMap::newSharedAvatar() { - return AvatarSharedPointer(new AvatarData()); + return std::make_shared(); } AvatarSharedPointer AvatarHashMap::addAvatar(const QUuid& sessionUUID, const QWeakPointer& mixerWeakPointer) { diff --git a/libraries/avatars/src/Player.cpp b/libraries/avatars/src/Player.cpp index d3f33ca7c8..e7d94f0735 100644 --- a/libraries/avatars/src/Player.cpp +++ b/libraries/avatars/src/Player.cpp @@ -202,7 +202,7 @@ void Player::loadFromFile(const QString& file) { if (_recording) { _recording->clear(); } else { - _recording = RecordingPointer(new Recording()); + _recording = QSharedPointer(); } readRecordingFromFile(_recording, file); diff --git a/libraries/avatars/src/Recording.cpp b/libraries/avatars/src/Recording.cpp index ce0855462b..76e1d68050 100644 --- a/libraries/avatars/src/Recording.cpp +++ b/libraries/avatars/src/Recording.cpp @@ -417,7 +417,7 @@ RecordingPointer readRecordingFromFile(RecordingPointer recording, const QString // Reset the recording passed in the arguments if (!recording) { - recording.reset(new Recording()); + recording = QSharedPointer::create(); } QDataStream fileStream(byteArray); @@ -652,7 +652,7 @@ RecordingPointer readRecordingFromRecFile(RecordingPointer recording, const QStr timer.start(); if (!recording) { - recording.reset(new Recording()); + recording = QSharedPointer::create(); } QDataStream fileStream(byteArray); diff --git a/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp b/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp index 23b93250bc..a7a59ac88d 100644 --- a/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp @@ -23,7 +23,7 @@ #include "RenderableDebugableEntityItem.h" EntityItemPointer RenderableBoxEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { - return EntityItemPointer(new RenderableBoxEntityItem(entityID, properties)); + return std::make_shared(entityID, properties); } void RenderableBoxEntityItem::render(RenderArgs* args) { diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h index 2037788ace..1832ef28c3 100644 --- a/libraries/entities-renderer/src/RenderableEntityItem.h +++ b/libraries/entities-renderer/src/RenderableEntityItem.h @@ -37,8 +37,8 @@ public: bool addToScene(EntityItemPointer self, std::shared_ptr scene, render::PendingChanges& pendingChanges) { _myItem = scene->allocateID(); - auto renderData = RenderableEntityItemProxy::Pointer(new RenderableEntityItemProxy(self)); - auto renderPayload = render::PayloadPointer(new RenderableEntityItemProxy::Payload(renderData)); + auto renderData = std::make_shared(self); + auto renderPayload = std::make_shared(renderData); pendingChanges.resetItem(_myItem, renderPayload); diff --git a/libraries/entities-renderer/src/RenderableLightEntityItem.cpp b/libraries/entities-renderer/src/RenderableLightEntityItem.cpp index 819989d5ec..010a204810 100644 --- a/libraries/entities-renderer/src/RenderableLightEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableLightEntityItem.cpp @@ -21,7 +21,7 @@ #include "RenderableLightEntityItem.h" EntityItemPointer RenderableLightEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { - return EntityItemPointer(new RenderableLightEntityItem(entityID, properties)); + return std::make_shared(entityID, properties); } void RenderableLightEntityItem::render(RenderArgs* args) { diff --git a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp index 6eb575814a..03e4890445 100644 --- a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp @@ -21,7 +21,7 @@ #include "RenderableLineEntityItem.h" EntityItemPointer RenderableLineEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { - return EntityItemPointer(new RenderableLineEntityItem(entityID, properties)); + return std::make_shared(entityID, properties); } void RenderableLineEntityItem::updateGeometry() { diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index 14a64d289e..90d9e4e942 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -26,7 +26,7 @@ #include "RenderableModelEntityItem.h" EntityItemPointer RenderableModelEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { - return EntityItemPointer(new RenderableModelEntityItem(entityID, properties)); + return std::make_shared(entityID, properties); } RenderableModelEntityItem::~RenderableModelEntityItem() { @@ -171,8 +171,8 @@ bool RenderableModelEntityItem::addToScene(EntityItemPointer self, std::shared_p render::PendingChanges& pendingChanges) { _myMetaItem = scene->allocateID(); - auto renderData = RenderableModelEntityItemMeta::Pointer(new RenderableModelEntityItemMeta(self)); - auto renderPayload = render::PayloadPointer(new RenderableModelEntityItemMeta::Payload(renderData)); + auto renderData = std::make_shared(self); + auto renderPayload = std::make_shared(renderData); pendingChanges.resetItem(_myMetaItem, renderPayload); diff --git a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp index d00728a9eb..4277452b2b 100644 --- a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp @@ -21,7 +21,7 @@ #include "RenderableParticleEffectEntityItem.h" EntityItemPointer RenderableParticleEffectEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { - return EntityItemPointer(new RenderableParticleEffectEntityItem(entityID, properties)); + return std::make_shared(entityID, properties); } RenderableParticleEffectEntityItem::RenderableParticleEffectEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) : diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp index 46cfcefa40..8daa674e03 100644 --- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp @@ -42,7 +42,7 @@ #include "RenderablePolyVoxEntityItem.h" EntityItemPointer RenderablePolyVoxEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { - return EntityItemPointer(new RenderablePolyVoxEntityItem(entityID, properties)); + return std::make_shared(entityID, properties); } RenderablePolyVoxEntityItem::RenderablePolyVoxEntityItem(const EntityItemID& entityItemID, @@ -351,15 +351,16 @@ void RenderablePolyVoxEntityItem::getModel() { auto mesh = _modelGeometry.getMesh(); const std::vector& vecIndices = polyVoxMesh.getIndices(); - auto indexBuffer = new gpu::Buffer(vecIndices.size() * sizeof(uint32_t), (gpu::Byte*)vecIndices.data()); + auto indexBuffer = std::make_shared(vecIndices.size() * sizeof(uint32_t), + (gpu::Byte*)vecIndices.data()); auto indexBufferPtr = gpu::BufferPointer(indexBuffer); auto indexBufferView = new gpu::BufferView(indexBufferPtr, gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::RAW)); mesh->setIndexBuffer(*indexBufferView); const std::vector& vecVertices = polyVoxMesh.getVertices(); - auto vertexBuffer = new gpu::Buffer(vecVertices.size() * sizeof(PolyVox::PositionMaterialNormal), - (gpu::Byte*)vecVertices.data()); + auto vertexBuffer = std::make_shared(vecVertices.size() * sizeof(PolyVox::PositionMaterialNormal), + (gpu::Byte*)vecVertices.data()); auto vertexBufferPtr = gpu::BufferPointer(vertexBuffer); auto vertexBufferView = new gpu::BufferView(vertexBufferPtr, 0, diff --git a/libraries/entities-renderer/src/RenderableSphereEntityItem.cpp b/libraries/entities-renderer/src/RenderableSphereEntityItem.cpp index 6d9cb525d6..658aaa9f4a 100644 --- a/libraries/entities-renderer/src/RenderableSphereEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableSphereEntityItem.cpp @@ -23,7 +23,7 @@ #include "RenderableDebugableEntityItem.h" EntityItemPointer RenderableSphereEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { - return EntityItemPointer(new RenderableSphereEntityItem(entityID, properties)); + return std::make_shared(entityID, properties); } void RenderableSphereEntityItem::render(RenderArgs* args) { diff --git a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp index 245cf00a3d..52c53b3003 100644 --- a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp @@ -24,7 +24,7 @@ #include "GLMHelpers.h" EntityItemPointer RenderableTextEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { - return EntityItemPointer(new RenderableTextEntityItem(entityID, properties)); + return std::make_shared(entityID, properties); } void RenderableTextEntityItem::render(RenderArgs* args) { diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp index 94f88b8390..baa7925a65 100644 --- a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp @@ -32,7 +32,7 @@ const float DPI = 30.47f; const float METERS_TO_INCHES = 39.3701f; EntityItemPointer RenderableWebEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { - return EntityItemPointer(new RenderableWebEntityItem(entityID, properties)); + return std::make_shared(entityID, properties); } RenderableWebEntityItem::RenderableWebEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) : diff --git a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp index 8c147cac05..4afca6994a 100644 --- a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp @@ -21,7 +21,7 @@ #include EntityItemPointer RenderableZoneEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { - return EntityItemPointer(new RenderableZoneEntityItem(entityID, properties)); + return std::make_shared(entityID, properties); } template @@ -196,8 +196,8 @@ bool RenderableZoneEntityItem::addToScene(EntityItemPointer self, std::shared_pt render::PendingChanges& pendingChanges) { _myMetaItem = scene->allocateID(); - auto renderData = RenderableZoneEntityItemMeta::Pointer(new RenderableZoneEntityItemMeta(self)); - auto renderPayload = render::PayloadPointer(new RenderableZoneEntityItemMeta::Payload(renderData)); + auto renderData = std::make_shared(self); + auto renderPayload = std::make_shared(renderData); pendingChanges.resetItem(_myMetaItem, renderPayload); return true; diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp index a6ae9e04de..bd8c8d70dc 100644 --- a/libraries/entities/src/ModelEntityItem.cpp +++ b/libraries/entities/src/ModelEntityItem.cpp @@ -29,7 +29,7 @@ const float ModelEntityItem::DEFAULT_ANIMATION_FPS = 30.0f; EntityItemPointer ModelEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { - return EntityItemPointer(new ModelEntityItem(entityID, properties)); + return std::make_shared(entityID, properties); } ModelEntityItem::ModelEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) : diff --git a/libraries/entities/src/ParticleEffectEntityItem.cpp b/libraries/entities/src/ParticleEffectEntityItem.cpp index 5c8a5b63a1..a5c689fbbd 100644 --- a/libraries/entities/src/ParticleEffectEntityItem.cpp +++ b/libraries/entities/src/ParticleEffectEntityItem.cpp @@ -56,7 +56,7 @@ const QString ParticleEffectEntityItem::DEFAULT_TEXTURES = ""; EntityItemPointer ParticleEffectEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { - return EntityItemPointer(new ParticleEffectEntityItem(entityID, properties)); + return std::make_shared(entityID, properties); } // our non-pure virtual subclass for now... diff --git a/libraries/entities/src/PolyVoxEntityItem.cpp b/libraries/entities/src/PolyVoxEntityItem.cpp index 6f284caeaa..8dbf764431 100644 --- a/libraries/entities/src/PolyVoxEntityItem.cpp +++ b/libraries/entities/src/PolyVoxEntityItem.cpp @@ -28,12 +28,9 @@ const PolyVoxEntityItem::PolyVoxSurfaceStyle PolyVoxEntityItem::DEFAULT_VOXEL_SU PolyVoxEntityItem::SURFACE_MARCHING_CUBES; EntityItemPointer PolyVoxEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { - return EntityItemPointer(new PolyVoxEntityItem(entityID, properties)); + return std::make_shared(entityID, properties); } - - - QByteArray PolyVoxEntityItem::makeEmptyVoxelData(quint16 voxelXSize, quint16 voxelYSize, quint16 voxelZSize) { int rawSize = voxelXSize * voxelYSize * voxelZSize; @@ -48,8 +45,6 @@ QByteArray PolyVoxEntityItem::makeEmptyVoxelData(quint16 voxelXSize, quint16 vox return newVoxelData; } - - PolyVoxEntityItem::PolyVoxEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) : EntityItem(entityItemID), _voxelVolumeSize(PolyVoxEntityItem::DEFAULT_VOXEL_VOLUME_SIZE), diff --git a/libraries/entities/src/TextEntityItem.cpp b/libraries/entities/src/TextEntityItem.cpp index 31ee9e6676..8f50743410 100644 --- a/libraries/entities/src/TextEntityItem.cpp +++ b/libraries/entities/src/TextEntityItem.cpp @@ -30,7 +30,7 @@ const xColor TextEntityItem::DEFAULT_BACKGROUND_COLOR = { 0, 0, 0}; const bool TextEntityItem::DEFAULT_FACE_CAMERA = false; EntityItemPointer TextEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { - return EntityItemPointer(new TextEntityItem(entityID, properties)); + return std::make_shared(entityID, properties); } TextEntityItem::TextEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) : diff --git a/libraries/entities/src/WebEntityItem.cpp b/libraries/entities/src/WebEntityItem.cpp index 4c849f5270..b0b0864fdf 100644 --- a/libraries/entities/src/WebEntityItem.cpp +++ b/libraries/entities/src/WebEntityItem.cpp @@ -23,7 +23,7 @@ const QString WebEntityItem::DEFAULT_SOURCE_URL("http://www.google.com"); EntityItemPointer WebEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { - return EntityItemPointer(new WebEntityItem(entityID, properties)); + return std::make_shared(entityID, properties); } WebEntityItem::WebEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) : diff --git a/libraries/entities/src/ZoneEntityItem.cpp b/libraries/entities/src/ZoneEntityItem.cpp index 6f44223892..b82592f73a 100644 --- a/libraries/entities/src/ZoneEntityItem.cpp +++ b/libraries/entities/src/ZoneEntityItem.cpp @@ -30,7 +30,7 @@ const ShapeType ZoneEntityItem::DEFAULT_SHAPE_TYPE = SHAPE_TYPE_BOX; const QString ZoneEntityItem::DEFAULT_COMPOUND_SHAPE_URL = ""; EntityItemPointer ZoneEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) { - return EntityItemPointer(new ZoneEntityItem(entityID, properties)); + return std::make_shared(entityID, properties); } ZoneEntityItem::ZoneEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) : diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp index 236e2979f5..4d7bff4df0 100644 --- a/libraries/fbx/src/FBXReader.cpp +++ b/libraries/fbx/src/FBXReader.cpp @@ -1323,7 +1323,7 @@ void buildModelMesh(ExtractedMesh& extracted) { model::Mesh mesh; // Grab the vertices in a buffer - gpu::BufferPointer vb(new gpu::Buffer()); + auto vb = make_shared(); vb->setData(extracted.mesh.vertices.size() * sizeof(glm::vec3), (const gpu::Byte*) extracted.mesh.vertices.data()); gpu::BufferView vbv(vb, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ)); @@ -1348,7 +1348,7 @@ void buildModelMesh(ExtractedMesh& extracted) { int totalAttributeSize = clusterWeightsOffset + clusterWeightsSize; // Copy all attribute data in a single attribute buffer - gpu::BufferPointer attribBuffer(new gpu::Buffer()); + auto attribBuffer = make_shared(); attribBuffer->resize(totalAttributeSize); attribBuffer->setSubData(normalsOffset, normalsSize, (gpu::Byte*) fbxMesh.normals.constData()); attribBuffer->setSubData(tangentsOffset, tangentsSize, (gpu::Byte*) fbxMesh.tangents.constData()); @@ -1407,7 +1407,7 @@ void buildModelMesh(ExtractedMesh& extracted) { return; } - gpu::BufferPointer ib(new gpu::Buffer()); + auto ib = make_shared(); ib->resize(totalIndices * sizeof(int)); int indexNum = 0; @@ -1437,7 +1437,7 @@ void buildModelMesh(ExtractedMesh& extracted) { mesh.setIndexBuffer(ibv); if (parts.size()) { - gpu::BufferPointer pb(new gpu::Buffer()); + auto pb = make_shared(); pb->setData(parts.size() * sizeof(model::Mesh::Part), (const gpu::Byte*) parts.data()); gpu::BufferView pbv(pb, gpu::Element(gpu::VEC4, gpu::UINT32, gpu::XYZW)); mesh.setPartBuffer(pbv); @@ -1926,7 +1926,7 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping, } material.id = getID(object.properties); - material._material = model::MaterialPointer(new model::Material()); + material._material = make_shared(); material._material->setEmissive(material.emissive); if (glm::all(glm::equal(material.diffuse, glm::vec3(0.0f)))) { material._material->setDiffuse(material.diffuse); diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp index b7fea218d8..2ec80e3d85 100644 --- a/libraries/fbx/src/OBJReader.cpp +++ b/libraries/fbx/src/OBJReader.cpp @@ -131,7 +131,7 @@ void setMeshPartDefaults(FBXMeshPart& meshPart, QString materialID) { meshPart.materialID = materialID; meshPart.opacity = 1.0; - meshPart._material = model::MaterialPointer(new model::Material()); + meshPart._material = std::make_shared(); meshPart._material->setDiffuse(glm::vec3(1.0, 1.0, 1.0)); meshPart._material->setOpacity(1.0); meshPart._material->setMetallic(0.0); diff --git a/libraries/gpu/src/gpu/GLBackendState.cpp b/libraries/gpu/src/gpu/GLBackendState.cpp index ef272bb708..0d1b0b669d 100644 --- a/libraries/gpu/src/gpu/GLBackendState.cpp +++ b/libraries/gpu/src/gpu/GLBackendState.cpp @@ -40,97 +40,99 @@ const GLBackend::GLState::Commands makeResetStateCommands() { // and we have a 50/50 chance that State::DEFAULT is not yet initialized. // Since State::DEFAULT = State::Data() it is much easier to not use the actual State::DEFAULT // but another State::Data object with a default initialization. - State::Data DEFAULT = State::Data(); + const State::Data DEFAULT = State::Data(); - CommandPointer depthBiasCommand = CommandPointer(new CommandDepthBias(&GLBackend::do_setStateDepthBias, Vec2(DEFAULT.depthBias, DEFAULT.depthBiasSlopeScale))); - CommandPointer stencilCommand = CommandPointer(new CommandStencil(&GLBackend::do_setStateStencil, DEFAULT.stencilActivation, DEFAULT.stencilTestFront, DEFAULT.stencilTestBack)); + auto depthBiasCommand = std::make_shared(&GLBackend::do_setStateDepthBias, + Vec2(DEFAULT.depthBias, DEFAULT.depthBiasSlopeScale)); + auto stencilCommand = std::make_shared(&GLBackend::do_setStateStencil, DEFAULT.stencilActivation, + DEFAULT.stencilTestFront, DEFAULT.stencilTestBack); // The state commands to reset to default, // WARNING depending on the order of the State::Field enum return { - CommandPointer(new Command1I(&GLBackend::do_setStateFillMode, DEFAULT.fillMode)), - CommandPointer(new Command1I(&GLBackend::do_setStateCullMode, DEFAULT.cullMode)), - CommandPointer(new Command1B(&GLBackend::do_setStateFrontFaceClockwise, DEFAULT.frontFaceClockwise)), - CommandPointer(new Command1B(&GLBackend::do_setStateDepthClipEnable, DEFAULT.depthClipEnable)), - CommandPointer(new Command1B(&GLBackend::do_setStateScissorEnable, DEFAULT.scissorEnable)), - CommandPointer(new Command1B(&GLBackend::do_setStateMultisampleEnable, DEFAULT.multisampleEnable)), - CommandPointer(new Command1B(&GLBackend::do_setStateAntialiasedLineEnable, DEFAULT.antialisedLineEnable)), + std::make_shared(&GLBackend::do_setStateFillMode, DEFAULT.fillMode), + std::make_shared(&GLBackend::do_setStateCullMode, DEFAULT.cullMode), + std::make_shared(&GLBackend::do_setStateFrontFaceClockwise, DEFAULT.frontFaceClockwise), + std::make_shared(&GLBackend::do_setStateDepthClipEnable, DEFAULT.depthClipEnable), + std::make_shared(&GLBackend::do_setStateScissorEnable, DEFAULT.scissorEnable), + std::make_shared(&GLBackend::do_setStateMultisampleEnable, DEFAULT.multisampleEnable), + std::make_shared(&GLBackend::do_setStateAntialiasedLineEnable, DEFAULT.antialisedLineEnable), // Depth bias has 2 fields in State but really one call in GLBackend CommandPointer(depthBiasCommand), CommandPointer(depthBiasCommand), - CommandPointer(new CommandDepthTest(&GLBackend::do_setStateDepthTest, DEFAULT.depthTest)), + std::make_shared(&GLBackend::do_setStateDepthTest, DEFAULT.depthTest), // Depth bias has 3 fields in State but really one call in GLBackend CommandPointer(stencilCommand), CommandPointer(stencilCommand), CommandPointer(stencilCommand), - CommandPointer(new Command1B(&GLBackend::do_setStateAlphaToCoverageEnable, DEFAULT.alphaToCoverageEnable)), + std::make_shared(&GLBackend::do_setStateAlphaToCoverageEnable, DEFAULT.alphaToCoverageEnable), - CommandPointer(new Command1U(&GLBackend::do_setStateSampleMask, DEFAULT.sampleMask)), + std::make_shared(&GLBackend::do_setStateSampleMask, DEFAULT.sampleMask), - CommandPointer(new CommandBlend(&GLBackend::do_setStateBlend, DEFAULT.blendFunction)), + std::make_shared(&GLBackend::do_setStateBlend, DEFAULT.blendFunction), - CommandPointer(new Command1U(&GLBackend::do_setStateColorWriteMask, DEFAULT.colorWriteMask)) + std::make_shared(&GLBackend::do_setStateColorWriteMask, DEFAULT.colorWriteMask) }; } void generateFillMode(GLBackend::GLState::Commands& commands, State::FillMode fillMode) { - commands.push_back(CommandPointer(new Command1I(&GLBackend::do_setStateFillMode, int32(fillMode)))); + commands.push_back(std::make_shared(&GLBackend::do_setStateFillMode, int32(fillMode))); } void generateCullMode(GLBackend::GLState::Commands& commands, State::CullMode cullMode) { - commands.push_back(CommandPointer(new Command1I(&GLBackend::do_setStateCullMode, int32(cullMode)))); + commands.push_back(std::make_shared(&GLBackend::do_setStateCullMode, int32(cullMode))); } void generateFrontFaceClockwise(GLBackend::GLState::Commands& commands, bool isClockwise) { - commands.push_back(CommandPointer(new Command1B(&GLBackend::do_setStateFrontFaceClockwise, isClockwise))); + commands.push_back(std::make_shared(&GLBackend::do_setStateFrontFaceClockwise, isClockwise)); } void generateDepthClipEnable(GLBackend::GLState::Commands& commands, bool enable) { - commands.push_back(CommandPointer(new Command1B(&GLBackend::do_setStateDepthClipEnable, enable))); + commands.push_back(std::make_shared(&GLBackend::do_setStateDepthClipEnable, enable)); } void generateScissorEnable(GLBackend::GLState::Commands& commands, bool enable) { - commands.push_back(CommandPointer(new Command1B(&GLBackend::do_setStateScissorEnable, enable))); + commands.push_back(std::make_shared(&GLBackend::do_setStateScissorEnable, enable)); } void generateMultisampleEnable(GLBackend::GLState::Commands& commands, bool enable) { - commands.push_back(CommandPointer(new Command1B(&GLBackend::do_setStateMultisampleEnable, enable))); + commands.push_back(std::make_shared(&GLBackend::do_setStateMultisampleEnable, enable)); } void generateAntialiasedLineEnable(GLBackend::GLState::Commands& commands, bool enable) { - commands.push_back(CommandPointer(new Command1B(&GLBackend::do_setStateAntialiasedLineEnable, enable))); + commands.push_back(std::make_shared(&GLBackend::do_setStateAntialiasedLineEnable, enable)); } void generateDepthBias(GLBackend::GLState::Commands& commands, const State& state) { - commands.push_back(CommandPointer(new CommandDepthBias(&GLBackend::do_setStateDepthBias, Vec2(state.getDepthBias(), state.getDepthBiasSlopeScale())))); + commands.push_back(std::make_shared(&GLBackend::do_setStateDepthBias, Vec2(state.getDepthBias(), state.getDepthBiasSlopeScale()))); } void generateDepthTest(GLBackend::GLState::Commands& commands, const State::DepthTest& test) { - commands.push_back(CommandPointer(new CommandDepthTest(&GLBackend::do_setStateDepthTest, int32(test.getRaw())))); + commands.push_back(std::make_shared(&GLBackend::do_setStateDepthTest, int32(test.getRaw()))); } void generateStencil(GLBackend::GLState::Commands& commands, const State& state) { - commands.push_back(CommandPointer(new CommandStencil(&GLBackend::do_setStateStencil, state.getStencilActivation(), state.getStencilTestFront(), state.getStencilTestBack()))); + commands.push_back(std::make_shared(&GLBackend::do_setStateStencil, state.getStencilActivation(), state.getStencilTestFront(), state.getStencilTestBack())); } void generateAlphaToCoverageEnable(GLBackend::GLState::Commands& commands, bool enable) { - commands.push_back(CommandPointer(new Command1B(&GLBackend::do_setStateAlphaToCoverageEnable, enable))); + commands.push_back(std::make_shared(&GLBackend::do_setStateAlphaToCoverageEnable, enable)); } void generateSampleMask(GLBackend::GLState::Commands& commands, uint32 mask) { - commands.push_back(CommandPointer(new Command1U(&GLBackend::do_setStateSampleMask, mask))); + commands.push_back(std::make_shared(&GLBackend::do_setStateSampleMask, mask)); } void generateBlend(GLBackend::GLState::Commands& commands, const State& state) { - commands.push_back(CommandPointer(new CommandBlend(&GLBackend::do_setStateBlend, state.getBlendFunction()))); + commands.push_back(std::make_shared(&GLBackend::do_setStateBlend, state.getBlendFunction())); } void generateColorWriteMask(GLBackend::GLState::Commands& commands, uint32 mask) { - commands.push_back(CommandPointer(new Command1U(&GLBackend::do_setStateColorWriteMask, mask))); + commands.push_back(std::make_shared(&GLBackend::do_setStateColorWriteMask, mask)); } GLBackend::GLState* GLBackend::syncGPUObject(const State& state) { diff --git a/libraries/gpu/src/gpu/Texture.cpp b/libraries/gpu/src/gpu/Texture.cpp index 69c00336f1..d16ab5c047 100755 --- a/libraries/gpu/src/gpu/Texture.cpp +++ b/libraries/gpu/src/gpu/Texture.cpp @@ -80,7 +80,7 @@ bool Texture::Storage::allocateMip(uint16 level) { auto& mip = _mips[level]; for (auto& face : mip) { if (!face) { - face.reset(new Pixels()); + face = std::make_shared(); changed = true; } } @@ -419,7 +419,7 @@ bool Texture::generateIrradiance() { return false; } if (!_irradiance) { - _irradiance.reset(new SphericalHarmonics()); + _irradiance = std::make_shared(); } _irradiance->evalFromTexture(*this); @@ -563,7 +563,7 @@ glm::vec3 linearTosRGB(glm::vec3& color) { return glm::pow(color, glm::vec3(GAMMA_CORRECTION_INV)); } -// Originial code for the Spherical Harmonics taken from "Sun and Black Cat- Igor Dykhta (igor dykhta email) © 2007-2014 " +// Originial code for the Spherical Harmonics taken from "Sun and Black Cat- Igor Dykhta (igor dykhta email) � 2007-2014 " void sphericalHarmonicsAdd(float * result, int order, const float * inputA, const float * inputB) { const int numCoeff = order * order; for(int i=0; i < numCoeff; i++) { diff --git a/libraries/model/src/model/Light.cpp b/libraries/model/src/model/Light.cpp index 60c6f6b3af..0d030b611f 100755 --- a/libraries/model/src/model/Light.cpp +++ b/libraries/model/src/model/Light.cpp @@ -18,7 +18,7 @@ Light::Light() : _transform() { // only if created from nothing shall we create the Buffer to store the properties Schema schema; - _schemaBuffer = gpu::BufferView(new gpu::Buffer(sizeof(Schema), (const gpu::Byte*) &schema)); + _schemaBuffer = gpu::BufferView(std::make_shared(sizeof(Schema), (const gpu::Byte*) &schema)); } Light::Light(const Light& light) : diff --git a/libraries/model/src/model/Material.cpp b/libraries/model/src/model/Material.cpp index a3448889b0..7e52212fd1 100755 --- a/libraries/model/src/model/Material.cpp +++ b/libraries/model/src/model/Material.cpp @@ -20,7 +20,7 @@ Material::Material() : // only if created from nothing shall we create the Buffer to store the properties Schema schema; - _schemaBuffer = gpu::BufferView(new gpu::Buffer(sizeof(Schema), (const gpu::Byte*) &schema)); + _schemaBuffer = gpu::BufferView(std::make_shared(sizeof(Schema), (const gpu::Byte*) &schema)); } diff --git a/libraries/model/src/model/Skybox.cpp b/libraries/model/src/model/Skybox.cpp index 10199adda3..28b4f8d0cf 100755 --- a/libraries/model/src/model/Skybox.cpp +++ b/libraries/model/src/model/Skybox.cpp @@ -68,19 +68,19 @@ void Skybox::render(gpu::Batch& batch, const ViewFrustum& viewFrustum, const Sky SKYBOX_CONSTANTS_SLOT = skyShader->getUniforms().findLocation("skyboxBuffer"); } - auto skyState = gpu::StatePointer(new gpu::State()); + auto skyState = std::make_shared(); thePipeline = gpu::PipelinePointer(gpu::Pipeline::create(skyShader, skyState)); const float CLIP = 1.0f; const glm::vec2 vertices[4] = { {-CLIP, -CLIP}, {CLIP, -CLIP}, {-CLIP, CLIP}, {CLIP, CLIP}}; - theBuffer.reset(new gpu::Buffer(sizeof(vertices), (const gpu::Byte*) vertices)); + theBuffer = std::make_shared(sizeof(vertices), (const gpu::Byte*) vertices); - theFormat.reset(new gpu::Stream::Format()); + theFormat = std::make_shared(); theFormat->setAttribute(gpu::Stream::POSITION, gpu::Stream::POSITION, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::XYZ)); auto color = glm::vec4(1.0f); - theConstants.reset(new gpu::Buffer(sizeof(color), (const gpu::Byte*) &color)); + theConstants = std::make_shared(sizeof(color), (const gpu::Byte*) &color); } glm::mat4 projMat; diff --git a/libraries/model/src/model/Stage.cpp b/libraries/model/src/model/Stage.cpp index 4fff47e2fd..fa086d0d2b 100644 --- a/libraries/model/src/model/Stage.cpp +++ b/libraries/model/src/model/Stage.cpp @@ -136,7 +136,7 @@ void EarthSunModel::setSunLongitude(float lon) { Atmosphere::Atmosphere() { // only if created from nothing shall we create the Buffer to store the properties Data data; - _dataBuffer = gpu::BufferView(new gpu::Buffer(sizeof(Data), (const gpu::Byte*) &data)); + _dataBuffer = gpu::BufferView(std::make_shared(sizeof(Data), (const gpu::Byte*) &data)); setScatteringWavelength(_scatteringWavelength); setRayleighScattering(_rayleighScattering); @@ -188,8 +188,8 @@ const float NUM_HOURS_PER_DAY = 24.0f; const float NUM_HOURS_PER_HALF_DAY = NUM_HOURS_PER_DAY * 0.5f; SunSkyStage::SunSkyStage() : - _sunLight(new Light()), - _skybox(new Skybox()) + _sunLight(std::make_shared()), + _skybox(std::make_shared()) { _sunLight->setType(Light::SUN); @@ -204,9 +204,8 @@ SunSkyStage::SunSkyStage() : // Begining of march setYearTime(60.0f); - _skybox.reset(new Skybox()); + _skybox = std::make_shared(); _skybox->setColor(Color(1.0f, 0.0f, 0.0f)); - } SunSkyStage::~SunSkyStage() { @@ -302,4 +301,4 @@ void SunSkyStage::setBackgroundMode(BackgroundMode mode) { void SunSkyStage::setSkybox(const SkyboxPointer& skybox) { _skybox = skybox; invalidate(); -} +} diff --git a/libraries/networking/src/NetworkPeer.cpp b/libraries/networking/src/NetworkPeer.cpp index dfa4066dd2..09ab143d55 100644 --- a/libraries/networking/src/NetworkPeer.cpp +++ b/libraries/networking/src/NetworkPeer.cpp @@ -216,7 +216,7 @@ static QHash PEER_BANDWIDTH; BandwidthRecorder& getBandwidthRecorder(const QUuid & uuid) { if (!PEER_BANDWIDTH.count(uuid)) { - PEER_BANDWIDTH.insert(uuid, BandwidthRecorderPtr(new BandwidthRecorder())); + PEER_BANDWIDTH.insert(uuid, QSharedPointer::create()); } return *PEER_BANDWIDTH[uuid].data(); } diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index b49d1985bb..4d6470c315 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -62,7 +62,7 @@ void DeferredLightingEffect::init(AbstractViewStateInterface* viewState) { gpu::Shader::makeProgram(*program, slotBindings); gpu::Shader::makeProgram(*programTextured, slotBindings); - gpu::StatePointer state = gpu::StatePointer(new gpu::State()); + auto state = std::make_shared(); state->setCullMode(gpu::State::CULL_BACK); state->setDepthTest(true, true, gpu::LESS_EQUAL); state->setBlendFunction(false, @@ -70,7 +70,7 @@ void DeferredLightingEffect::init(AbstractViewStateInterface* viewState) { gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE); - gpu::StatePointer stateCullNone = gpu::StatePointer(new gpu::State()); + auto stateCullNone = std::make_shared(); stateCullNone->setCullMode(gpu::State::CULL_NONE); stateCullNone->setDepthTest(true, true, gpu::LESS_EQUAL); stateCullNone->setBlendFunction(false, @@ -106,7 +106,7 @@ void DeferredLightingEffect::init(AbstractViewStateInterface* viewState) { // Allocate a global light representing the Global Directional light casting shadow (the sun) and the ambient light _globalLights.push_back(0); - _allocatedLights.push_back(model::LightPointer(new model::Light())); + _allocatedLights.push_back(std::make_shared()); model::LightPointer lp = _allocatedLights[0]; @@ -187,7 +187,7 @@ void DeferredLightingEffect::addSpotLight(const glm::vec3& position, float radiu unsigned int lightID = _pointLights.size() + _spotLights.size() + _globalLights.size(); if (lightID >= _allocatedLights.size()) { - _allocatedLights.push_back(model::LightPointer(new model::Light())); + _allocatedLights.push_back(std::make_shared()); } model::LightPointer lp = _allocatedLights[lightID]; diff --git a/libraries/render-utils/src/Environment.cpp b/libraries/render-utils/src/Environment.cpp index 411beca0ae..87870ca057 100644 --- a/libraries/render-utils/src/Environment.cpp +++ b/libraries/render-utils/src/Environment.cpp @@ -68,7 +68,7 @@ void Environment::setupAtmosphereProgram(const char* vertSource, const char* fra gpu::Shader::BindingSet slotBindings; gpu::Shader::makeProgram(*program, slotBindings); - gpu::StatePointer state = gpu::StatePointer(new gpu::State()); + auto state = std::make_shared(); state->setCullMode(gpu::State::CULL_NONE); state->setDepthTest(false); diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp index 3e7e9a0adf..33e1372278 100644 --- a/libraries/render-utils/src/GeometryCache.cpp +++ b/libraries/render-utils/src/GeometryCache.cpp @@ -83,8 +83,8 @@ void GeometryCache::renderSphere(gpu::Batch& batch, float radius, int slices, in qCDebug(renderutils) << "renderSphere()... RELEASING REGISTERED VERTICES BUFFER"; #endif } - - gpu::BufferPointer verticesBuffer(new gpu::Buffer()); + + auto verticesBuffer = std::make_shared(); if (registered) { _registeredSphereVertices[id] = verticesBuffer; _lastRegisteredSphereVertices[id] = radiusKey; @@ -148,7 +148,7 @@ void GeometryCache::renderSphere(gpu::Batch& batch, float radius, int slices, in #endif } - gpu::BufferPointer indicesBuffer(new gpu::Buffer()); + auto indicesBuffer = std::make_shared(); if (registered) { _registeredSphereIndices[id] = indicesBuffer; _lastRegisteredSphereIndices[id] = slicesStacksKey; @@ -233,8 +233,8 @@ void GeometryCache::renderSphere(gpu::Batch& batch, float radius, int slices, in qCDebug(renderutils) << "renderSphere()... RELEASING REGISTERED COLORS BUFFER"; #endif } - - gpu::BufferPointer colorBuffer(new gpu::Buffer()); + + auto colorBuffer = std::make_shared(); if (registered) { _registeredSphereColors[id] = colorBuffer; _lastRegisteredSphereColors[id] = colorKey; @@ -279,7 +279,7 @@ void GeometryCache::renderSphere(gpu::Batch& batch, float radius, int slices, in const int VERTICES_SLOT = 0; const int NORMALS_SLOT = 1; const int COLOR_SLOT = 2; - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); // 1 for everyone + auto streamFormat = std::make_shared(); // 1 for everyone streamFormat->setAttribute(gpu::Stream::POSITION, VERTICES_SLOT, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0); streamFormat->setAttribute(gpu::Stream::NORMAL, NORMALS_SLOT, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ)); streamFormat->setAttribute(gpu::Stream::COLOR, COLOR_SLOT, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA)); @@ -414,7 +414,7 @@ void GeometryCache::renderGrid(gpu::Batch& batch, int xDivisions, int yDivisions int vertices = (xDivisions + 1 + yDivisions + 1) * 2; if (!_gridBuffers.contains(key)) { - gpu::BufferPointer verticesBuffer(new gpu::Buffer()); + auto verticesBuffer = std::make_shared(); GLfloat* vertexData = new GLfloat[vertices * 2]; GLfloat* vertex = vertexData; @@ -445,7 +445,7 @@ void GeometryCache::renderGrid(gpu::Batch& batch, int xDivisions, int yDivisions } if (!_gridColors.contains(colorKey)) { - gpu::BufferPointer colorBuffer(new gpu::Buffer()); + auto colorBuffer = std::make_shared(); _gridColors[colorKey] = colorBuffer; int compactColor = ((int(color.x * 255.0f) & 0xFF)) | @@ -468,7 +468,7 @@ void GeometryCache::renderGrid(gpu::Batch& batch, int xDivisions, int yDivisions const int VERTICES_SLOT = 0; const int COLOR_SLOT = 1; - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); // 1 for everyone + auto streamFormat = std::make_shared(); // 1 for everyone streamFormat->setAttribute(gpu::Stream::POSITION, VERTICES_SLOT, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::XYZ), 0); streamFormat->setAttribute(gpu::Stream::COLOR, COLOR_SLOT, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA)); @@ -507,7 +507,7 @@ void GeometryCache::renderGrid(gpu::Batch& batch, int x, int y, int width, int h int vertices = (cols + 1 + rows + 1) * 2; if ((registered && !_registeredAlternateGridBuffers.contains(id)) || (!registered && !_alternateGridBuffers.contains(key))) { - gpu::BufferPointer verticesBuffer(new gpu::Buffer()); + auto verticesBuffer = std::make_shared(); GLfloat* vertexData = new GLfloat[vertices * 2]; GLfloat* vertex = vertexData; @@ -550,7 +550,7 @@ void GeometryCache::renderGrid(gpu::Batch& batch, int x, int y, int width, int h } if (!_gridColors.contains(colorKey)) { - gpu::BufferPointer colorBuffer(new gpu::Buffer()); + auto colorBuffer = std::make_shared(); _gridColors[colorKey] = colorBuffer; int compactColor = ((int(color.x * 255.0f) & 0xFF)) | @@ -575,7 +575,7 @@ void GeometryCache::renderGrid(gpu::Batch& batch, int x, int y, int width, int h const int VERTICES_SLOT = 0; const int COLOR_SLOT = 1; - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); // 1 for everyone + auto streamFormat = std::make_shared(); // 1 for everyone streamFormat->setAttribute(gpu::Stream::POSITION, VERTICES_SLOT, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::XYZ), 0); streamFormat->setAttribute(gpu::Stream::COLOR, COLOR_SLOT, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA)); @@ -603,11 +603,11 @@ void GeometryCache::updateVertices(int id, const QVector& points, con details.isCreated = true; details.vertices = points.size(); details.vertexSize = FLOATS_PER_VERTEX; - - gpu::BufferPointer verticesBuffer(new gpu::Buffer()); - gpu::BufferPointer colorBuffer(new gpu::Buffer()); - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); - gpu::BufferStreamPointer stream(new gpu::BufferStream()); + + auto verticesBuffer = std::make_shared(); + auto colorBuffer = std::make_shared(); + auto streamFormat = std::make_shared(); + auto stream = std::make_shared(); details.verticesBuffer = verticesBuffer; details.colorBuffer = colorBuffer; @@ -664,11 +664,11 @@ void GeometryCache::updateVertices(int id, const QVector& points, con details.isCreated = true; details.vertices = points.size(); details.vertexSize = FLOATS_PER_VERTEX; - - gpu::BufferPointer verticesBuffer(new gpu::Buffer()); - gpu::BufferPointer colorBuffer(new gpu::Buffer()); - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); - gpu::BufferStreamPointer stream(new gpu::BufferStream()); + + auto verticesBuffer = std::make_shared(); + auto colorBuffer = std::make_shared(); + auto streamFormat = std::make_shared(); + auto stream = std::make_shared(); details.verticesBuffer = verticesBuffer; details.colorBuffer = colorBuffer; @@ -727,11 +727,11 @@ void GeometryCache::updateVertices(int id, const QVector& points, con details.isCreated = true; details.vertices = points.size(); details.vertexSize = FLOATS_PER_VERTEX; - - gpu::BufferPointer verticesBuffer(new gpu::Buffer()); - gpu::BufferPointer colorBuffer(new gpu::Buffer()); - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); - gpu::BufferStreamPointer stream(new gpu::BufferStream()); + + auto verticesBuffer = std::make_shared(); + auto colorBuffer = std::make_shared(); + auto streamFormat = std::make_shared(); + auto stream = std::make_shared(); details.verticesBuffer = verticesBuffer; details.colorBuffer = colorBuffer; @@ -818,7 +818,7 @@ void GeometryCache::renderSolidCube(gpu::Batch& batch, float size, const glm::ve const int NORMALS_OFFSET = sizeof(GLfloat) * FLOATS_PER_VERTEX; if (!_solidCubeVertices.contains(size)) { - gpu::BufferPointer verticesBuffer(new gpu::Buffer()); + auto verticesBuffer = std::make_shared(); _solidCubeVertices[size] = verticesBuffer; GLfloat* vertexData = new GLfloat[vertexPoints * 2]; // vertices and normals @@ -869,15 +869,15 @@ void GeometryCache::renderSolidCube(gpu::Batch& batch, float size, const glm::ve 12,13,14, 14,15,12, // left 16,17,18, 18,19,16, // bottom 20,21,22, 22,23,20 }; // back - - gpu::BufferPointer indexBuffer(new gpu::Buffer()); + + auto indexBuffer = std::make_shared(); _solidCubeIndexBuffer = indexBuffer; _solidCubeIndexBuffer->append(sizeof(cannonicalIndices), (gpu::Byte*) cannonicalIndices); } if (!_solidCubeColors.contains(colorKey)) { - gpu::BufferPointer colorBuffer(new gpu::Buffer()); + auto colorBuffer = std::make_shared(); _solidCubeColors[colorKey] = colorBuffer; const int NUM_COLOR_SCALARS_PER_CUBE = 24; @@ -900,7 +900,7 @@ void GeometryCache::renderSolidCube(gpu::Batch& batch, float size, const glm::ve const int VERTICES_SLOT = 0; const int NORMALS_SLOT = 1; const int COLOR_SLOT = 2; - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); // 1 for everyone + auto streamFormat = std::make_shared(); // 1 for everyone streamFormat->setAttribute(gpu::Stream::POSITION, VERTICES_SLOT, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0); streamFormat->setAttribute(gpu::Stream::NORMAL, NORMALS_SLOT, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ)); @@ -935,7 +935,7 @@ void GeometryCache::renderWireCube(gpu::Batch& batch, float size, const glm::vec const int indices = (TOP_EDGES + BOTTOM_EDGES + SIDE_EDGES) * VERTICES_PER_EDGE; if (!_cubeVerticies.contains(size)) { - gpu::BufferPointer verticesBuffer(new gpu::Buffer()); + auto verticesBuffer = std::make_shared(); _cubeVerticies[size] = verticesBuffer; int vertexPoints = vertices * FLOATS_PER_VERTEX; @@ -961,15 +961,15 @@ void GeometryCache::renderWireCube(gpu::Batch& batch, float size, const glm::vec 4, 5, 5, 6, 6, 7, 7, 4, // (bottom) 0, 4, 1, 5, 2, 6, 3, 7, // (side edges) }; - - gpu::BufferPointer indexBuffer(new gpu::Buffer()); + + auto indexBuffer = std::make_shared(); _wireCubeIndexBuffer = indexBuffer; _wireCubeIndexBuffer->append(sizeof(cannonicalIndices), (gpu::Byte*) cannonicalIndices); } if (!_cubeColors.contains(colorKey)) { - gpu::BufferPointer colorBuffer(new gpu::Buffer()); + auto colorBuffer = std::make_shared(); _cubeColors[colorKey] = colorBuffer; const int NUM_COLOR_SCALARS_PER_CUBE = 8; @@ -987,7 +987,7 @@ void GeometryCache::renderWireCube(gpu::Batch& batch, float size, const glm::vec const int VERTICES_SLOT = 0; const int COLOR_SLOT = 1; - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); // 1 for everyone + auto streamFormat = std::make_shared(); // 1 for everyone streamFormat->setAttribute(gpu::Stream::POSITION, VERTICES_SLOT, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0); streamFormat->setAttribute(gpu::Stream::COLOR, COLOR_SLOT, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA)); @@ -1036,11 +1036,11 @@ void GeometryCache::renderBevelCornersRect(gpu::Batch& batch, int x, int y, int details.isCreated = true; details.vertices = NUM_VERTICES; details.vertexSize = FLOATS_PER_VERTEX; - - gpu::BufferPointer verticesBuffer(new gpu::Buffer()); - gpu::BufferPointer colorBuffer(new gpu::Buffer()); - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); - gpu::BufferStreamPointer stream(new gpu::BufferStream()); + + auto verticesBuffer = std::make_shared(); + auto colorBuffer = std::make_shared(); + auto streamFormat = std::make_shared(); + auto stream = std::make_shared(); details.verticesBuffer = verticesBuffer; details.colorBuffer = colorBuffer; @@ -1144,11 +1144,11 @@ void GeometryCache::renderQuad(gpu::Batch& batch, const glm::vec2& minCorner, co details.isCreated = true; details.vertices = vertices; details.vertexSize = FLOATS_PER_VERTEX; - - gpu::BufferPointer verticesBuffer(new gpu::Buffer()); - gpu::BufferPointer colorBuffer(new gpu::Buffer()); - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); - gpu::BufferStreamPointer stream(new gpu::BufferStream()); + + auto verticesBuffer = std::make_shared(); + auto colorBuffer = std::make_shared(); + auto streamFormat = std::make_shared(); + auto stream = std::make_shared(); details.verticesBuffer = verticesBuffer; details.colorBuffer = colorBuffer; @@ -1250,11 +1250,11 @@ void GeometryCache::renderQuad(gpu::Batch& batch, const glm::vec2& minCorner, co details.isCreated = true; details.vertices = vertices; details.vertexSize = FLOATS_PER_VERTEX; - - gpu::BufferPointer verticesBuffer(new gpu::Buffer()); - gpu::BufferPointer colorBuffer(new gpu::Buffer()); - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); - gpu::BufferStreamPointer stream(new gpu::BufferStream()); + + auto verticesBuffer = std::make_shared(); + auto colorBuffer = std::make_shared(); + auto streamFormat = std::make_shared(); + auto stream = std::make_shared(); details.verticesBuffer = verticesBuffer; details.colorBuffer = colorBuffer; @@ -1329,11 +1329,11 @@ void GeometryCache::renderQuad(gpu::Batch& batch, const glm::vec3& minCorner, co details.isCreated = true; details.vertices = vertices; details.vertexSize = FLOATS_PER_VERTEX; - - gpu::BufferPointer verticesBuffer(new gpu::Buffer()); - gpu::BufferPointer colorBuffer(new gpu::Buffer()); - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); - gpu::BufferStreamPointer stream(new gpu::BufferStream()); + + auto verticesBuffer = std::make_shared(); + auto colorBuffer = std::make_shared(); + auto streamFormat = std::make_shared(); + auto stream = std::make_shared(); details.verticesBuffer = verticesBuffer; details.colorBuffer = colorBuffer; @@ -1432,11 +1432,11 @@ void GeometryCache::renderQuad(gpu::Batch& batch, const glm::vec3& topLeft, cons details.isCreated = true; details.vertices = vertices; details.vertexSize = FLOATS_PER_VERTEX; // NOTE: this isn't used for BatchItemDetails maybe we can get rid of it - - gpu::BufferPointer verticesBuffer(new gpu::Buffer()); - gpu::BufferPointer colorBuffer(new gpu::Buffer()); - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); - gpu::BufferStreamPointer stream(new gpu::BufferStream()); + + auto verticesBuffer = std::make_shared(); + auto colorBuffer = std::make_shared(); + auto streamFormat = std::make_shared(); + auto stream = std::make_shared(); details.verticesBuffer = verticesBuffer; details.colorBuffer = colorBuffer; @@ -1519,11 +1519,11 @@ void GeometryCache::renderDashedLine(gpu::Batch& batch, const glm::vec3& start, details.vertices = (segmentCountFloor + 1) * 2; details.vertexSize = FLOATS_PER_VERTEX; details.isCreated = true; - - gpu::BufferPointer verticesBuffer(new gpu::Buffer()); - gpu::BufferPointer colorBuffer(new gpu::Buffer()); - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); - gpu::BufferStreamPointer stream(new gpu::BufferStream()); + + auto verticesBuffer = std::make_shared(); + auto colorBuffer = std::make_shared(); + auto streamFormat = std::make_shared(); + auto stream = std::make_shared(); details.verticesBuffer = verticesBuffer; details.colorBuffer = colorBuffer; @@ -1684,11 +1684,11 @@ void GeometryCache::renderLine(gpu::Batch& batch, const glm::vec3& p1, const glm details.isCreated = true; details.vertices = vertices; details.vertexSize = FLOATS_PER_VERTEX; - - gpu::BufferPointer verticesBuffer(new gpu::Buffer()); - gpu::BufferPointer colorBuffer(new gpu::Buffer()); - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); - gpu::BufferStreamPointer stream(new gpu::BufferStream()); + + auto verticesBuffer = std::make_shared(); + auto colorBuffer = std::make_shared(); + auto streamFormat = std::make_shared(); + auto stream = std::make_shared(); details.verticesBuffer = verticesBuffer; details.colorBuffer = colorBuffer; @@ -1774,11 +1774,11 @@ void GeometryCache::renderLine(gpu::Batch& batch, const glm::vec2& p1, const glm details.isCreated = true; details.vertices = vertices; details.vertexSize = FLOATS_PER_VERTEX; - - gpu::BufferPointer verticesBuffer(new gpu::Buffer()); - gpu::BufferPointer colorBuffer(new gpu::Buffer()); - gpu::Stream::FormatPointer streamFormat(new gpu::Stream::Format()); - gpu::BufferStreamPointer stream(new gpu::BufferStream()); + + auto verticesBuffer = std::make_shared(); + auto colorBuffer = std::make_shared(); + auto streamFormat = std::make_shared(); + auto stream = std::make_shared(); details.verticesBuffer = verticesBuffer; details.colorBuffer = colorBuffer; @@ -1835,7 +1835,7 @@ void GeometryCache::useSimpleDrawPipeline(gpu::Batch& batch) { auto program = gpu::ShaderPointer(gpu::Shader::createProgram(vs, ps)); gpu::Shader::makeProgram((*program)); - auto state = gpu::StatePointer(new gpu::State()); + auto state = std::make_shared(); // enable decal blend state->setBlendFunction(true, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA); @@ -2213,8 +2213,8 @@ void NetworkGeometry::downloadFinished(QNetworkReply* reply) { } QVariantHash lods = _mapping.value("lod").toHash(); for (QVariantHash::const_iterator it = lods.begin(); it != lods.end(); it++) { - QSharedPointer geometry(new NetworkGeometry(url.resolved(it.key()), - QSharedPointer(), true, _mapping, _textureBase)); + auto geometry = QSharedPointer::create(url.resolved(it.key()), + QSharedPointer(), true, _mapping, _textureBase); geometry->setSelf(geometry.staticCast()); geometry->setLODParent(_lodParent); _lods.insert(it.value().toFloat(), geometry); @@ -2290,7 +2290,7 @@ void NetworkGeometry::setGeometry(const FBXGeometry& geometry) { } { - networkMesh._indexBuffer = gpu::BufferPointer(new gpu::Buffer()); + networkMesh._indexBuffer = std::make_shared(); networkMesh._indexBuffer->resize(totalIndices * sizeof(int)); int offset = 0; foreach(const FBXMeshPart& part, mesh.parts) { @@ -2304,7 +2304,7 @@ void NetworkGeometry::setGeometry(const FBXGeometry& geometry) { } { - networkMesh._vertexBuffer = gpu::BufferPointer(new gpu::Buffer()); + networkMesh._vertexBuffer = std::make_shared(); // if we don't need to do any blending, the positions/normals can be static if (mesh.blendshapes.isEmpty()) { int normalsOffset = mesh.vertices.size() * sizeof(glm::vec3); @@ -2332,7 +2332,7 @@ void NetworkGeometry::setGeometry(const FBXGeometry& geometry) { mesh.clusterWeights.size() * sizeof(glm::vec4), (gpu::Byte*) mesh.clusterWeights.constData()); // otherwise, at least the cluster indices/weights can be static - networkMesh._vertexStream = gpu::BufferStreamPointer(new gpu::BufferStream()); + networkMesh._vertexStream = std::make_shared(); networkMesh._vertexStream->addBuffer(networkMesh._vertexBuffer, 0, sizeof(glm::vec3)); if (mesh.normals.size()) networkMesh._vertexStream->addBuffer(networkMesh._vertexBuffer, normalsOffset, sizeof(glm::vec3)); if (mesh.tangents.size()) networkMesh._vertexStream->addBuffer(networkMesh._vertexBuffer, tangentsOffset, sizeof(glm::vec3)); @@ -2343,7 +2343,7 @@ void NetworkGeometry::setGeometry(const FBXGeometry& geometry) { if (mesh.clusterWeights.size()) networkMesh._vertexStream->addBuffer(networkMesh._vertexBuffer, clusterWeightsOffset, sizeof(glm::vec4)); int channelNum = 0; - networkMesh._vertexFormat = gpu::Stream::FormatPointer(new gpu::Stream::Format()); + networkMesh._vertexFormat = std::make_shared(); networkMesh._vertexFormat->setAttribute(gpu::Stream::POSITION, channelNum++, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0); if (mesh.normals.size()) networkMesh._vertexFormat->setAttribute(gpu::Stream::NORMAL, channelNum++, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ)); if (mesh.tangents.size()) networkMesh._vertexFormat->setAttribute(gpu::Stream::TANGENT, channelNum++, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ)); @@ -2374,7 +2374,7 @@ void NetworkGeometry::setGeometry(const FBXGeometry& geometry) { networkMesh._vertexBuffer->setSubData(clusterWeightsOffset, mesh.clusterWeights.size() * sizeof(glm::vec4), (gpu::Byte*) mesh.clusterWeights.constData()); - networkMesh._vertexStream = gpu::BufferStreamPointer(new gpu::BufferStream()); + networkMesh._vertexStream = std::make_shared(); if (mesh.tangents.size()) networkMesh._vertexStream->addBuffer(networkMesh._vertexBuffer, 0, sizeof(glm::vec3)); if (mesh.colors.size()) networkMesh._vertexStream->addBuffer(networkMesh._vertexBuffer, colorsOffset, sizeof(glm::vec3)); if (mesh.texCoords.size()) networkMesh._vertexStream->addBuffer(networkMesh._vertexBuffer, texCoordsOffset, sizeof(glm::vec2)); @@ -2382,7 +2382,7 @@ void NetworkGeometry::setGeometry(const FBXGeometry& geometry) { if (mesh.clusterWeights.size()) networkMesh._vertexStream->addBuffer(networkMesh._vertexBuffer, clusterWeightsOffset, sizeof(glm::vec4)); int channelNum = 0; - networkMesh._vertexFormat = gpu::Stream::FormatPointer(new gpu::Stream::Format()); + networkMesh._vertexFormat = std::make_shared(); networkMesh._vertexFormat->setAttribute(gpu::Stream::POSITION, channelNum++, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ)); if (mesh.normals.size()) networkMesh._vertexFormat->setAttribute(gpu::Stream::NORMAL, channelNum++, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ)); if (mesh.tangents.size()) networkMesh._vertexFormat->setAttribute(gpu::Stream::TANGENT, channelNum++, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ)); diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 93f3f345f0..d03f80358e 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -121,11 +121,11 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key, gpu::Shader::makeProgram(*program, slotBindings); - auto locations = std::shared_ptr(new Locations()); + auto locations = std::make_shared(); initLocations(program, *locations); - gpu::StatePointer state = gpu::StatePointer(new gpu::State()); + auto state = std::make_shared(); // Backface on shadow if (key.isShadow()) { @@ -152,7 +152,7 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key, if (!key.isWireFrame()) { RenderKey wireframeKey(key.getRaw() | RenderKey::IS_WIREFRAME); - gpu::StatePointer wireframeState = gpu::StatePointer(new gpu::State(state->getValues())); + auto wireframeState = std::make_shared(state->getValues()); wireframeState->setFillMode(gpu::State::FILL_LINE); @@ -165,7 +165,7 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key, if (!key.isShadow()) { RenderKey mirrorKey(key.getRaw() | RenderKey::IS_MIRROR); - gpu::StatePointer mirrorState = gpu::StatePointer(new gpu::State(state->getValues())); + auto mirrorState = std::make_shared(state->getValues()); mirrorState->setFrontFaceClockwise(true); @@ -175,7 +175,7 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key, if (!key.isWireFrame()) { RenderKey wireframeKey(key.getRaw() | RenderKey::IS_MIRROR | RenderKey::IS_WIREFRAME); - gpu::StatePointer wireframeState = gpu::StatePointer(new gpu::State(state->getValues()));; + auto wireframeState = std::make_shared(state->getValues()); wireframeState->setFillMode(gpu::State::FILL_LINE); @@ -481,8 +481,8 @@ bool Model::updateGeometry() { MeshState state; state.clusterMatrices.resize(mesh.clusters.size()); _meshStates.append(state); - - gpu::BufferPointer buffer(new gpu::Buffer()); + + auto buffer = std::make_shared(); if (!mesh.blendshapes.isEmpty()) { buffer->resize((mesh.vertices.size() + mesh.normals.size()) * sizeof(glm::vec3)); buffer->setSubData(0, mesh.vertices.size() * sizeof(glm::vec3), (gpu::Byte*) mesh.vertices.constData()); @@ -890,7 +890,7 @@ bool Model::addToScene(std::shared_ptr scene, render::PendingChan foreach (auto renderItem, _transparentRenderItems) { auto item = scene->allocateID(); auto renderData = MeshPartPayload::Pointer(renderItem); - auto renderPayload = render::PayloadPointer(new MeshPartPayload::Payload(renderData)); + auto renderPayload = std::make_shared(renderData); pendingChanges.resetItem(item, renderPayload); _renderItems.insert(item, renderPayload); somethingAdded = true; @@ -899,7 +899,7 @@ bool Model::addToScene(std::shared_ptr scene, render::PendingChan foreach (auto renderItem, _opaqueRenderItems) { auto item = scene->allocateID(); auto renderData = MeshPartPayload::Pointer(renderItem); - auto renderPayload = render::PayloadPointer(new MeshPartPayload::Payload(renderData)); + auto renderPayload = std::make_shared(renderData); pendingChanges.resetItem(item, renderPayload); _renderItems.insert(item, renderPayload); somethingAdded = true; @@ -2103,9 +2103,9 @@ void Model::segregateMeshGroups() { for (int partIndex = 0; partIndex < totalParts; partIndex++) { // this is a good place to create our renderPayloads if (translucentMesh) { - _transparentRenderItems << std::shared_ptr(new MeshPartPayload(true, this, i, partIndex)); + _transparentRenderItems << std::make_shared(true, this, i, partIndex); } else { - _opaqueRenderItems << std::shared_ptr(new MeshPartPayload(false, this, i, partIndex)); + _opaqueRenderItems << std::make_shared(false, this, i, partIndex); } } } @@ -2152,7 +2152,7 @@ bool Model::initWhenReady(render::ScenePointer scene) { foreach (auto renderItem, _transparentRenderItems) { auto item = scene->allocateID(); auto renderData = MeshPartPayload::Pointer(renderItem); - auto renderPayload = render::PayloadPointer(new MeshPartPayload::Payload(renderData)); + auto renderPayload = std::make_shared(renderData); _renderItems.insert(item, renderPayload); pendingChanges.resetItem(item, renderPayload); } @@ -2160,7 +2160,7 @@ bool Model::initWhenReady(render::ScenePointer scene) { foreach (auto renderItem, _opaqueRenderItems) { auto item = scene->allocateID(); auto renderData = MeshPartPayload::Pointer(renderItem); - auto renderPayload = render::PayloadPointer(new MeshPartPayload::Payload(renderData)); + auto renderPayload = std::make_shared(renderData); _renderItems.insert(item, renderPayload); pendingChanges.resetItem(item, renderPayload); } diff --git a/libraries/render-utils/src/OglplusHelpers.cpp b/libraries/render-utils/src/OglplusHelpers.cpp index 47f9778cac..2205893d46 100644 --- a/libraries/render-utils/src/OglplusHelpers.cpp +++ b/libraries/render-utils/src/OglplusHelpers.cpp @@ -57,7 +57,7 @@ ProgramPtr loadDefaultShader() { void compileProgram(ProgramPtr & result, const std::string& vs, const std::string& fs) { using namespace oglplus; try { - result = ProgramPtr(new Program()); + result = QSharedPointer::create(); // attach the shaders to the program result->AttachShader( VertexShader() diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp index e0c66eb604..b5da7c7f00 100755 --- a/libraries/render-utils/src/RenderDeferredTask.cpp +++ b/libraries/render-utils/src/RenderDeferredTask.cpp @@ -180,8 +180,8 @@ const gpu::PipelinePointer& DrawOverlay3D::getOpaquePipeline() { auto vs = gpu::ShaderPointer(gpu::Shader::createVertex(std::string(overlay3D_vert))); auto ps = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(overlay3D_frag))); auto program = gpu::ShaderPointer(gpu::Shader::createProgram(vs, ps)); - - auto state = gpu::StatePointer(new gpu::State()); + + auto state = std::make_shared(); state->setDepthTest(true, true, gpu::LESS_EQUAL); _opaquePipeline.reset(gpu::Pipeline::create(program, state)); diff --git a/libraries/render-utils/src/TextRenderer3D.cpp b/libraries/render-utils/src/TextRenderer3D.cpp index d202d89aba..b7dd7340b2 100644 --- a/libraries/render-utils/src/TextRenderer3D.cpp +++ b/libraries/render-utils/src/TextRenderer3D.cpp @@ -340,7 +340,7 @@ void Font3D::setupGPU() { _outlineLoc = program->getUniforms().findLocation("Outline"); _colorLoc = program->getUniforms().findLocation("Color"); - gpu::StatePointer state = gpu::StatePointer(new gpu::State()); + auto state = std::make_shared(); state->setCullMode(gpu::State::CULL_BACK); state->setDepthTest(true, true, gpu::LESS_EQUAL); state->setBlendFunction(false, @@ -356,7 +356,7 @@ void Font3D::setupGPU() { assert(sizeof(QuadBuilder) == 4 * sizeof(TextureVertex)); // Setup rendering structures - _format.reset(new gpu::Stream::Format()); + _format = std::make_shared(); _format->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::XYZ), 0); _format->setAttribute(gpu::Stream::TEXCOORD, 0, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::UV), OFFSET); } @@ -369,7 +369,7 @@ void Font3D::drawString(gpu::Batch& batch, float x, float y, const QString& str, } if (str != _lastStringRendered || bounds != _lastBounds) { - _verticesBuffer.reset(new gpu::Buffer()); + _verticesBuffer = std::make_shared(); _numVertices = 0; _lastStringRendered = str; _lastBounds = bounds; diff --git a/libraries/render/src/render/DrawTask.h b/libraries/render/src/render/DrawTask.h index 8a4d424005..16d84f809a 100755 --- a/libraries/render/src/render/DrawTask.h +++ b/libraries/render/src/render/DrawTask.h @@ -43,11 +43,11 @@ public: Varying() {} template - Varying(const T& data) : _concept(new Job::Varying::Model(data)) {} + Varying(const T& data) : _concept(std::make_shared>(data)) {} // Access the _data contained win the concept explicitely - template T& edit() { return (static_cast*> (_concept.get())->_data); } - template const T& get() const { return (static_cast*> (_concept.get())->_data); } + template T& edit() { return std::static_pointer_cast>(_concept)->_data; } + template const T& get() const { return std::static_pointer_cast>(_concept)->_data; } protected: friend class Job; diff --git a/libraries/render/src/render/Engine.cpp b/libraries/render/src/render/Engine.cpp index 1697271121..86f35eb831 100644 --- a/libraries/render/src/render/Engine.cpp +++ b/libraries/render/src/render/Engine.cpp @@ -15,8 +15,8 @@ using namespace render; Engine::Engine() : - _sceneContext(new SceneContext()), - _renderContext(new RenderContext()) + _sceneContext(std::make_shared()), + _renderContext(std::make_shared()) { } @@ -45,6 +45,6 @@ void Engine::buildStandardTaskPipeline() { _tasks.clear(); } - addTask(TaskPointer(new DrawSceneTask())); + addTask(std::make_shared()); } diff --git a/libraries/render/src/render/Scene.h b/libraries/render/src/render/Scene.h index ae5a5b0f23..918b9609f8 100644 --- a/libraries/render/src/render/Scene.h +++ b/libraries/render/src/render/Scene.h @@ -398,7 +398,7 @@ public: void removeItem(ItemID id); template void updateItem(ItemID id, std::function func) { - updateItem(id, UpdateFunctorPointer(new UpdateFunctor(func))); + updateItem(id, std::make_shared>(func)); } void updateItem(ItemID id, const UpdateFunctorPointer& functor); diff --git a/libraries/script-engine/src/SceneScriptingInterface.h b/libraries/script-engine/src/SceneScriptingInterface.h index 8359aa58fa..e2a206c695 100644 --- a/libraries/script-engine/src/SceneScriptingInterface.h +++ b/libraries/script-engine/src/SceneScriptingInterface.h @@ -113,7 +113,7 @@ protected: SceneScriptingInterface() {}; ~SceneScriptingInterface() {}; - model::SunSkyStagePointer _skyStage = model::SunSkyStagePointer(new model::SunSkyStage()); + model::SunSkyStagePointer _skyStage = std::make_shared(); bool _shouldRenderAvatars = true; bool _shouldRenderEntities = true; diff --git a/libraries/shared/src/Transform.h b/libraries/shared/src/Transform.h index e961f379c8..f5afd9125c 100644 --- a/libraries/shared/src/Transform.h +++ b/libraries/shared/src/Transform.h @@ -156,8 +156,7 @@ protected: mutable Flags _flags; // Cached transform - // TODO: replace this auto ptr by a "unique ptr" as soon as we are compiling in C++11 - mutable std::auto_ptr _matrix; + mutable std::unique_ptr _matrix; bool isCacheInvalid() const { return _flags[FLAG_CACHE_INVALID]; } void validCache() const { _flags.set(FLAG_CACHE_INVALID, false); } diff --git a/libraries/ui/src/InfoView.cpp b/libraries/ui/src/InfoView.cpp index dd754f209a..77b641e8c6 100644 --- a/libraries/ui/src/InfoView.cpp +++ b/libraries/ui/src/InfoView.cpp @@ -25,7 +25,7 @@ InfoView::InfoView(QQuickItem* parent) : QQuickItem(parent) { } void InfoView::registerType() { - qmlRegisterType("Hifi", 1, 0, NAME.toLocal8Bit().constData()); + qmlRegisterType("Hifi", 1, 0, NAME.toLocal8Bit().constData()); } QString fetchVersion(const QUrl& url) { diff --git a/tools/scribe/src/TextTemplate.cpp b/tools/scribe/src/TextTemplate.cpp index f860860ae4..c468df278b 100755 --- a/tools/scribe/src/TextTemplate.cpp +++ b/tools/scribe/src/TextTemplate.cpp @@ -42,7 +42,7 @@ const TextTemplatePointer TextTemplate::Config::addInclude(const ConfigPointer& String includeStream; if (config->_includerCallback(config, include, includeStream)) { // ok, then create a new Template on the include file with this as lib - included = TextTemplatePointer(new TextTemplate(include, config)); + included = std::make_shared(include, config); std::stringstream src(includeStream); @@ -398,7 +398,7 @@ const BlockPointer TextTemplate::processStepVar(const BlockPointer& block, Strin BlockPointer parent = Block::getCurrentBlock(block); // Add a new BLock - BlockPointer newBlock = BlockPointer(new Block(_root->sourceName)); + BlockPointer newBlock = std::make_shared(_root->sourceName); (newBlock->ostr) << grabbed; newBlock->command.type = Command::VAR; @@ -460,7 +460,7 @@ const BlockPointer TextTemplate::processStepDef(const BlockPointer& block, Strin BlockPointer parent = Block::getCurrentBlock(block); // Add a new BLock - BlockPointer newBlock = BlockPointer(new Block(_root->sourceName)); + BlockPointer newBlock = std::make_shared(_root->sourceName); (newBlock->ostr) << grabbed; newBlock->command.type = Command::DEF; @@ -482,12 +482,12 @@ const BlockPointer TextTemplate::processStepCommandIf(const BlockPointer& block, BlockPointer parent = Block::getCurrentBlock(block); // Add a new BLock depth - BlockPointer newIfBlock = BlockPointer(new Block(_root->sourceName)); + BlockPointer newIfBlock = std::make_shared(_root->sourceName); newIfBlock->command.type = Command::IFBLOCK; Block::addNewBlock(parent, newIfBlock); - BlockPointer newBlock = BlockPointer(new Block(_root->sourceName)); + BlockPointer newBlock = std::make_shared(_root->sourceName); (newBlock->ostr) << grabbed; newBlock->command.type = Command::IF; @@ -506,7 +506,7 @@ const BlockPointer TextTemplate::processStepCommandEndIf(const BlockPointer& blo if ((parent->command.type == Command::IF) || (parent->command.type == Command::ELIF) || (parent->command.type == Command::ELSE)) { - BlockPointer newBlock = BlockPointer(new Block(_root->sourceName)); + BlockPointer newBlock = std::make_shared(_root->sourceName); (newBlock->ostr) << grabbed; newBlock->command.type = Command::ENDIF; @@ -533,7 +533,7 @@ const BlockPointer TextTemplate::processStepCommandElse(const BlockPointer& bloc parent = parent->parent; // Add a new BLock depth - BlockPointer newBlock = BlockPointer(new Block(_root->sourceName)); + BlockPointer newBlock = std::make_shared(_root->sourceName); newBlock->ostr << grabbed; newBlock->command.type = Command::ELSE; newBlock->command.arguments.push_back(expression); @@ -562,7 +562,7 @@ const BlockPointer TextTemplate::processStepCommandElif(const BlockPointer& bloc parent = parent->parent; // Add a new BLock depth - BlockPointer newBlock = BlockPointer(new Block(_root->sourceName)); + BlockPointer newBlock = std::make_shared(_root->sourceName); (newBlock->ostr) << grabbed; newBlock->command.type = Command::ELIF; @@ -595,7 +595,7 @@ const BlockPointer TextTemplate::processStepInclude(const BlockPointer& block, S BlockPointer parent = Block::getCurrentBlock(block); // Add a new BLock - BlockPointer newBlock = BlockPointer(new Block(_root->sourceName)); + BlockPointer newBlock = std::make_shared(_root->sourceName); (newBlock->ostr) << grabbed; newBlock->command.type = Command::INCLUDE; @@ -631,7 +631,7 @@ const BlockPointer TextTemplate::processStepFunc(const BlockPointer& block, Stri BlockPointer parent = Block::getCurrentBlock(block); // Add a new BLock - BlockPointer newBlock = BlockPointer(new Block(_root->sourceName)); + BlockPointer newBlock = std::make_shared(_root->sourceName); (newBlock->ostr) << grabbed; newBlock->command.type = Command::FUNC; @@ -660,7 +660,7 @@ const BlockPointer TextTemplate::processStepEndFunc(const BlockPointer& block, S // Everything is cool , so let's unplugg the FUnc block from this tree and just put the EndFunc block - BlockPointer newBlock = BlockPointer(new Block(_root->sourceName)); + BlockPointer newBlock = std::make_shared(_root->sourceName); (newBlock->ostr) << grabbed; newBlock->command.type = Command::ENDFUNC; diff --git a/tools/scribe/src/TextTemplate.h b/tools/scribe/src/TextTemplate.h index 30a17bc1c9..a19d2938da 100755 --- a/tools/scribe/src/TextTemplate.h +++ b/tools/scribe/src/TextTemplate.h @@ -141,7 +141,7 @@ public: static bool loadFile(const Config::Pointer& config, const char* filename, String& source); - TextTemplate(const String& name, const Config::Pointer& config = Config::Pointer(new Config())); + TextTemplate(const String& name, const Config::Pointer& config = std::make_shared()); ~TextTemplate(); // Scibe does all the job of parsing an inout template stream and then gneerating theresulting stream using the vars diff --git a/tools/scribe/src/main.cpp b/tools/scribe/src/main.cpp index 10f0a026ca..cc44fedacc 100755 --- a/tools/scribe/src/main.cpp +++ b/tools/scribe/src/main.cpp @@ -31,7 +31,7 @@ int main (int argc, char** argv) { bool showParseTree = false; bool makeCPlusPlus = false; - TextTemplate::Config::Pointer config(new TextTemplate::Config()); + auto config = std::make_shared(); enum Mode { READY = 0, @@ -165,7 +165,7 @@ int main (int argc, char** argv) { return 0; } - TextTemplate::Pointer scribe(new TextTemplate(srcFilename, config)); + auto scribe = std::make_shared(srcFilename, config); // ready to parse and generate std::ostringstream destStringStream;