Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 01:13:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use implicit copy constructor for PanelAttachable.

Browse source
This commit is contained in:
Zander Otavka 2015-08-06 16:13:21 -07:00
parent 13a63a5a3d
commit c7639537d0
3 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ui/overlays/Billboard3DOverlay.cpp
View file

@ -19,7 +19,7 @@ Billboard3DOverlay::Billboard3DOverlay() :
Billboard3DOverlay::Billboard3DOverlay(const Billboard3DOverlay* billboard3DOverlay) :
Planar3DOverlay(billboard3DOverlay),
PanelAttachable(billboard3DOverlay),
PanelAttachable(*billboard3DOverlay),
_isFacingAvatar(billboard3DOverlay->_isFacingAvatar)
{
}

14
interface/src/ui/overlays/PanelAttachable.cpp
View file

@ -13,20 +13,6 @@
#include <RegisteredMetaTypes.h>
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();

9
interface/src/ui/overlays/PanelAttachable.h
View file

@ -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