Smart pointers fixes
Showing the changes to interface/src/Application.cpp (1 of 61 files). Show all
Unified · Split
| @@ -363,7 +363,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 362 unmodified lines | ||
| 363 | 363 | _bookmarks = new Bookmarks(); // Before setting up the menu |
| 364 | 364 | |
| 365 | 365 | _runningScriptsWidget = new RunningScriptsWidget(_window); |
| 366 | − _renderEngine->addTask(render::TaskPointer(new RenderDeferredTask())); | |
| 366 | + _renderEngine->addTask(make_shared<RenderDeferredTask>()); | |
| 367 | 367 | _renderEngine->registerScene(_main3DScene); |
| 368 | 368 | |
| 369 | 369 | // start the nodeThread so its event loop is running |
| @@ -2231,8 +2231,8 @@ void Application::shrinkMirrorView() { · 1861 unmodified lines | ||
| 2231 | 2231 | |
| 2232 | 2232 | const float HEAD_SPHERE_RADIUS = 0.1f; |
| 2233 | 2233 | |
| 2234 | −bool Application::isLookingAtMyAvatar(Avatar* avatar) { | |
| 2235 | − glm::vec3 theirLookAt = avatar->getHead()->getLookAtPosition(); | |
| 2234 | +bool Application::isLookingAtMyAvatar(AvatarSharedPointer avatar) { | |
| 2235 | + glm::vec3 theirLookAt = dynamic_pointer_cast<Avatar>(avatar)->getHead()->getLookAtPosition(); | |
| 2236 | 2236 | glm::vec3 myEyePosition = _myAvatar->getHead()->getEyePosition(); |
| 2237 | 2237 | if (pointInSphere(theirLookAt, myEyePosition, HEAD_SPHERE_RADIUS * _myAvatar->getScale())) { |
| 2238 | 2238 | return true; |
| @@ -2296,7 +2296,7 @@ void Application::updateMyAvatarLookAtPosition() { · 57 unmodified lines | ||
| 2296 | 2296 | if (lookingAt && _myAvatar != lookingAt.get()) { |
| 2297 | 2297 | // If I am looking at someone else, look directly at one of their eyes |
| 2298 | 2298 | isLookingAtSomeone = true; |
| 2299 | − Head* lookingAtHead = static_cast<Avatar*>(lookingAt.get())->getHead(); | |
| 2299 | + auto lookingAtHead = static_pointer_cast<Avatar>(lookingAt)->getHead(); | |
| 2300 | 2300 | |
| 2301 | 2301 | const float MAXIMUM_FACE_ANGLE = 65.0f * RADIANS_PER_DEGREE; |
| 2302 | 2302 | glm::vec3 lookingAtFaceOrientation = lookingAtHead->getFinalOrientationInWorldFrame() * IDENTITY_FRONT; |
| @@ -3202,8 +3202,8 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 899 unmodified lines | ||
| 3202 | 3202 | |
| 3203 | 3203 | // Background rendering decision |
| 3204 | 3204 | if (BackgroundRenderData::_item == 0) { |
| 3205 | − auto backgroundRenderData = BackgroundRenderData::Pointer(new BackgroundRenderData(&_environment)); | |
| 3206 | − auto backgroundRenderPayload = render::PayloadPointer(new BackgroundRenderData::Payload(backgroundRenderData)); | |
| 3205 | + auto backgroundRenderData = make_shared<BackgroundRenderData>(&_environment); | |
| 3206 | + auto backgroundRenderPayload = make_shared<BackgroundRenderData::Payload>(backgroundRenderData); | |
| 3207 | 3207 | BackgroundRenderData::_item = _main3DScene->allocateID(); |
| 3208 | 3208 | pendingChanges.resetItem(WorldBoxRenderData::_item, backgroundRenderPayload); |
| 3209 | 3209 | } else { |
| @@ -3234,8 +3234,8 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 24 unmodified lines | ||
| 3234 | 3234 | |
| 3235 | 3235 | // Make sure the WorldBox is in the scene |
| 3236 | 3236 | if (WorldBoxRenderData::_item == 0) { |
| 3237 | − auto worldBoxRenderData = WorldBoxRenderData::Pointer(new WorldBoxRenderData()); | |
| 3238 | − auto worldBoxRenderPayload = render::PayloadPointer(new WorldBoxRenderData::Payload(worldBoxRenderData)); | |
| 3237 | + auto worldBoxRenderData = make_shared<WorldBoxRenderData>(); | |
| 3238 | + auto worldBoxRenderPayload = make_shared<WorldBoxRenderData::Payload>(worldBoxRenderData); | |
| 3239 | 3239 | |
| 3240 | 3240 | WorldBoxRenderData::_item = _main3DScene->allocateID(); |
| 3241 | 3241 | |