From c7639537d03470d9cd0f3462e4b024891cad7ee1 Mon Sep 17 00:00:00 2001 From: Zander Otavka Date: Thu, 6 Aug 2015 16:13:21 -0700 Subject: [PATCH] Use implicit copy constructor for PanelAttachable. --- interface/src/ui/overlays/Billboard3DOverlay.cpp | 2 +- interface/src/ui/overlays/PanelAttachable.cpp | 14 -------------- interface/src/ui/overlays/PanelAttachable.h | 9 +++------ 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/interface/src/ui/overlays/Billboard3DOverlay.cpp b/interface/src/ui/overlays/Billboard3DOverlay.cpp index 04283664a8..7b195ad466 100644 --- a/interface/src/ui/overlays/Billboard3DOverlay.cpp +++ b/interface/src/ui/overlays/Billboard3DOverlay.cpp @@ -19,7 +19,7 @@ Billboard3DOverlay::Billboard3DOverlay() : Billboard3DOverlay::Billboard3DOverlay(const Billboard3DOverlay* billboard3DOverlay) : Planar3DOverlay(billboard3DOverlay), - PanelAttachable(billboard3DOverlay), + PanelAttachable(*billboard3DOverlay), _isFacingAvatar(billboard3DOverlay->_isFacingAvatar) { } diff --git a/interface/src/ui/overlays/PanelAttachable.cpp b/interface/src/ui/overlays/PanelAttachable.cpp index 37b65041e5..6626107247 100644 --- a/interface/src/ui/overlays/PanelAttachable.cpp +++ b/interface/src/ui/overlays/PanelAttachable.cpp @@ -13,20 +13,6 @@ #include -PanelAttachable::PanelAttachable() : - _parentPanel(nullptr), - _offsetPosition(0, 0, 0), - _offsetRotation(1, 0, 0, 0) -{ -} - -PanelAttachable::PanelAttachable(const PanelAttachable* panelAttachable) : - _parentPanel(panelAttachable->_parentPanel), - _offsetPosition(panelAttachable->_offsetPosition), - _offsetRotation(panelAttachable->_offsetRotation) -{ -} - bool PanelAttachable::getParentVisible() const { if (getParentPanel()) { return getParentPanel()->getVisible() && getParentPanel()->getParentVisible(); diff --git a/interface/src/ui/overlays/PanelAttachable.h b/interface/src/ui/overlays/PanelAttachable.h index 4cf9c768c5..db2665e6eb 100644 --- a/interface/src/ui/overlays/PanelAttachable.h +++ b/interface/src/ui/overlays/PanelAttachable.h @@ -19,9 +19,6 @@ class PanelAttachable { public: - PanelAttachable(); - PanelAttachable(const PanelAttachable* panelAttachable); - OverlayPanel::Pointer getParentPanel() const { return _parentPanel; } virtual glm::vec3 getOffsetPosition() const { return _offsetPosition; } virtual glm::quat getFacingRotation() const { return _offsetRotation; } @@ -38,9 +35,9 @@ protected: virtual void applyTransformTo(Transform& transform); private: - OverlayPanel::Pointer _parentPanel;// = nullptr; - glm::vec3 _offsetPosition;// = {0, 0, 0}; - glm::quat _offsetRotation;// = {1, 0, 0, 0}; + OverlayPanel::Pointer _parentPanel = nullptr; + glm::vec3 _offsetPosition = {0, 0, 0}; + glm::quat _offsetRotation = {1, 0, 0, 0}; }; #endif // hifi_PanelAttachable_h