From fbacbd74f7c4a8de747b04ebd2f80926fb584d95 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 12 Apr 2017 10:14:14 -0700 Subject: [PATCH] pass shared pointers by ref in Avatar::render() --- interface/src/avatar/Avatar.cpp | 2 +- interface/src/avatar/Avatar.h | 2 +- interface/src/avatar/MyAvatar.cpp | 2 +- interface/src/avatar/MyAvatar.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 9b99aa5d34..4e2c2b036b 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -579,7 +579,7 @@ void Avatar::postUpdate(float deltaTime) { } } -void Avatar::render(RenderArgs* renderArgs, render::ScenePointer scene, const Camera& camera) { +void Avatar::render(RenderArgs* renderArgs, const render::ScenePointer& scene, const Camera& camera) { auto& batch = *renderArgs->_batch; PROFILE_RANGE_BATCH(batch, __FUNCTION__); diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h index d054f9a342..95b682e715 100644 --- a/interface/src/avatar/Avatar.h +++ b/interface/src/avatar/Avatar.h @@ -81,7 +81,7 @@ public: void simulate(float deltaTime, bool inView); virtual void simulateAttachments(float deltaTime); - virtual void render(RenderArgs* renderArgs, render::ScenePointer scene, const Camera& camera); + virtual void render(RenderArgs* renderArgs, const render::ScenePointer& scene, const Camera& camera); void addToScene(AvatarSharedPointer self, std::shared_ptr scene, render::Transaction& transaction); diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 4dd28076c5..f3ba812e1f 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -752,7 +752,7 @@ controller::Pose MyAvatar::getRightHandTipPose() const { } // virtual -void MyAvatar::render(RenderArgs* renderArgs, render::ScenePointer scene, const Camera& camera) { +void MyAvatar::render(RenderArgs* renderArgs, const render::ScenePointer& scene, const Camera& camera) { // don't render if we've been asked to disable local rendering if (!_shouldRender) { return; // exit early diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index d732471a64..2b2a88a9b0 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -525,7 +525,7 @@ private: void simulate(float deltaTime); void updateFromTrackers(float deltaTime); - virtual void render(RenderArgs* renderArgs, render::ScenePointer scene, const Camera& camera) override; + virtual void render(RenderArgs* renderArgs, const render::ScenePointer& scene, const Camera& camera) override; virtual bool shouldRenderHead(const RenderArgs* renderArgs) const override; void setShouldRenderLocally(bool shouldRender) { _shouldRender = shouldRender; setEnableMeshVisible(shouldRender); } bool getShouldRenderLocally() const { return _shouldRender; }