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

Fix AABox bounds handling in Overlays

Browse source
This commit is contained in:
Ryan Huffman 2015-05-29 09:40:23 -07:00
parent b21d0a3a53
commit 0e5cf273ab
5 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/ui/overlays/Overlay.cpp
View file

@ -225,8 +225,3 @@ float Overlay::updatePulse() {
return _pulse;
}
AABox Overlay::getBounds() const {
return AABox();
}

3
interface/src/ui/overlays/Overlay.h
View file

@ -57,9 +57,6 @@ public:
float getGlowLevel();
Anchor getAnchor() const { return _anchor; }
virtual AABox getBounds() const = 0;
float getPulseMax() const { return _pulseMax; }
float getPulseMin() const { return _pulseMin; }
float getPulsePeriod() const { return _pulsePeriod; }

4
interface/src/ui/overlays/Overlay2D.cpp
View file

@ -28,10 +28,6 @@ Overlay2D::Overlay2D(const Overlay2D* overlay2D) :
Overlay2D::~Overlay2D() {
}
AABox Overlay2D::getBounds() const {
return AABox(glm::vec3(_bounds.x, _bounds.y, 0.0f), glm::vec3(_bounds.width, _bounds.height, 0.1f));
}
void Overlay2D::setProperties(const QScriptValue& properties) {
Overlay::setProperties(properties);

1
interface/src/ui/overlays/Overlay2D.h
View file

@ -38,7 +38,6 @@ public:
int getWidth() const { return _bounds.width(); }
int getHeight() const { return _bounds.height(); }
const QRect& getBounds() const { return _bounds; }
virtual AABox getBounds() const;
// setters
void setX(int x) { _bounds.setX(x); }

8
interface/src/ui/overlays/Overlays.cpp
View file

@ -16,6 +16,7 @@
#include <Application.h>
#include <avatar/AvatarManager.h>
#include <LODManager.h>
#include <render/Scene.h>
#include "BillboardOverlay.h"
#include "Circle3DOverlay.h"
@ -45,7 +46,12 @@ namespace render {
}
}
template <> const Item::Bound payloadGetBound(const Overlay::Pointer& overlay) {
return static_cast<Overlay*>(overlay.get())->getBounds();
if (overlay->is3D()) {
return static_cast<Base3DOverlay*>(overlay.get())->getBounds();
} else {
QRect bounds = static_cast<Overlay2D*>(overlay.get())->getBounds();
return AABox(glm::vec3(bounds.x(), bounds.y(), 0.0f), glm::vec3(bounds.width(), bounds.height(), 0.1f));
}
}
template <> void payloadRender(const Overlay::Pointer& overlay, RenderArgs* args) {
if (args) {