Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 18:21:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

pass shared pointers by ref in Avatar::render()

Browse source
This commit is contained in:
Andrew Meadows 2017-04-12 10:14:14 -07:00
parent 9cddbbc42a
commit fbacbd74f7
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/Avatar.cpp
View file

@ -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; auto& batch = *renderArgs->_batch;
PROFILE_RANGE_BATCH(batch, __FUNCTION__); PROFILE_RANGE_BATCH(batch, __FUNCTION__);

2
interface/src/avatar/Avatar.h
View file

@ -81,7 +81,7 @@ public:
void simulate(float deltaTime, bool inView); void simulate(float deltaTime, bool inView);
virtual void simulateAttachments(float deltaTime); 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<render::Scene> scene, void addToScene(AvatarSharedPointer self, std::shared_ptr<render::Scene> scene,
render::Transaction& transaction); render::Transaction& transaction);

2
interface/src/avatar/MyAvatar.cpp
View file

@ -752,7 +752,7 @@ controller::Pose MyAvatar::getRightHandTipPose() const {
} }
// virtual // 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 // don't render if we've been asked to disable local rendering
if (!_shouldRender) { if (!_shouldRender) {
return; // exit early return; // exit early

2
interface/src/avatar/MyAvatar.h
View file

@ -525,7 +525,7 @@ private:
void simulate(float deltaTime); void simulate(float deltaTime);
void updateFromTrackers(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; virtual bool shouldRenderHead(const RenderArgs* renderArgs) const override;
void setShouldRenderLocally(bool shouldRender) { _shouldRender = shouldRender; setEnableMeshVisible(shouldRender); } void setShouldRenderLocally(bool shouldRender) { _shouldRender = shouldRender; setEnableMeshVisible(shouldRender); }
bool getShouldRenderLocally() const { return _shouldRender; } bool getShouldRenderLocally() const { return _shouldRender; }