From 649ae4a4485398843842d35c33ecdb4118a6aebf Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 25 Nov 2014 09:49:10 -0800 Subject: [PATCH] Update 3D overlays to only use one list --- interface/src/Application.cpp | 8 +- interface/src/ui/overlays/Base3DOverlay.cpp | 7 -- interface/src/ui/overlays/Base3DOverlay.h | 5 +- interface/src/ui/overlays/Overlays.cpp | 108 ++++++-------------- interface/src/ui/overlays/Overlays.h | 13 +-- 5 files changed, 37 insertions(+), 104 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 8d1e77ed25..de889c7f61 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2836,12 +2836,12 @@ void Application::updateShadowMap() { // render JS/scriptable overlays { PerformanceTimer perfTimer("3dOverlays"); - _overlays.render3D(RenderArgs::SHADOW_RENDER_MODE); + _overlays.render3D(false, RenderArgs::SHADOW_RENDER_MODE); } { PerformanceTimer perfTimer("3dOverlaysFront"); - _overlays.render3DFront(RenderArgs::SHADOW_RENDER_MODE); + _overlays.render3D(true, RenderArgs::SHADOW_RENDER_MODE); } glDisable(GL_POLYGON_OFFSET_FILL); @@ -3056,7 +3056,7 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly, RenderAr // render JS/scriptable overlays { PerformanceTimer perfTimer("3dOverlays"); - _overlays.render3D(); + _overlays.render3D(false); } // render the ambient occlusion effect if enabled @@ -3145,7 +3145,7 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly, RenderAr { PerformanceTimer perfTimer("3dOverlaysFront"); glClear(GL_DEPTH_BUFFER_BIT); - _overlays.render3DFront(); + _overlays.render3D(true); } } diff --git a/interface/src/ui/overlays/Base3DOverlay.cpp b/interface/src/ui/overlays/Base3DOverlay.cpp index 1c80b62782..55b4c88812 100644 --- a/interface/src/ui/overlays/Base3DOverlay.cpp +++ b/interface/src/ui/overlays/Base3DOverlay.cpp @@ -46,13 +46,6 @@ Base3DOverlay::Base3DOverlay(const Base3DOverlay* base3DOverlay) : Base3DOverlay::~Base3DOverlay() { } -void Base3DOverlay::setDrawInFront(bool value) { - if (value != _drawInFront) { - _drawInFront = value; - emit drawInFrontUpdated(value); - } -} - void Base3DOverlay::setProperties(const QScriptValue& properties) { Overlay::setProperties(properties); diff --git a/interface/src/ui/overlays/Base3DOverlay.h b/interface/src/ui/overlays/Base3DOverlay.h index 46d99cf3de..d57f9731c4 100644 --- a/interface/src/ui/overlays/Base3DOverlay.h +++ b/interface/src/ui/overlays/Base3DOverlay.h @@ -45,7 +45,7 @@ public: void setIsDashedLine(bool isDashedLine) { _isDashedLine = isDashedLine; } void setRotation(const glm::quat& value) { _rotation = value; } void setIgnoreRayIntersection(bool value) { _ignoreRayIntersection = value; } - void setDrawInFront(bool value); + void setDrawInFront(bool value) { _drawInFront = value; } virtual void setProperties(const QScriptValue& properties); virtual QScriptValue getProperty(const QString& property); @@ -57,9 +57,6 @@ public: return findRayIntersection(origin, direction, distance, face); } -signals: - void drawInFrontUpdated(bool newValue); - protected: void drawDashedLine(const glm::vec3& start, const glm::vec3& end); diff --git a/interface/src/ui/overlays/Overlays.cpp b/interface/src/ui/overlays/Overlays.cpp index 2d4edca781..151e3c3ba7 100644 --- a/interface/src/ui/overlays/Overlays.cpp +++ b/interface/src/ui/overlays/Overlays.cpp @@ -29,8 +29,7 @@ #include "TextOverlay.h" #include "Text3DOverlay.h" -Overlays::Overlays() : _nextOverlayID(1), _overlaySignalMapper() { - connect(&_overlaySignalMapper, SIGNAL(mapped(int)), this, SLOT(handleOverlayDrawInFrontUpdated(unsigned int))); +Overlays::Overlays() : _nextOverlayID(1) { } Overlays::~Overlays() { @@ -71,9 +70,6 @@ void Overlays::update(float deltatime) { foreach(Overlay* thisOverlay, _overlays3D) { thisOverlay->update(deltatime); } - foreach(Overlay* thisOverlay, _overlays3DFront) { - thisOverlay->update(deltatime); - } } if (!_overlaysToDelete.isEmpty()) { @@ -97,17 +93,9 @@ void Overlays::render2D() { } } -void Overlays::render3D(RenderArgs::RenderMode renderMode, RenderArgs::RenderSide renderSide) { - render3DOverlays(_overlays3D, renderMode, renderSide); -} - -void Overlays::render3DFront(RenderArgs::RenderMode renderMode, RenderArgs::RenderSide renderSide) { - render3DOverlays(_overlays3DFront, renderMode, renderSide); -} - -void Overlays::render3DOverlays(QMap& overlays, RenderArgs::RenderMode renderMode, RenderArgs::RenderSide renderSide) { +void Overlays::render3D(bool drawFront, RenderArgs::RenderMode renderMode, RenderArgs::RenderSide renderSide) { QReadLocker lock(&_lock); - if (overlays.size() == 0) { + if (_overlays3D.size() == 0) { return; } bool myAvatarComputed = false; @@ -123,7 +111,11 @@ void Overlays::render3DOverlays(QMap& overlays, RenderAr renderMode, renderSide, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - foreach(Overlay* thisOverlay, overlays) { + foreach(Overlay* thisOverlay, _overlays3D) { + Base3DOverlay* overlay3D = static_cast(thisOverlay); + if (overlay3D->getDrawInFront() != drawFront) { + continue; + } glPushMatrix(); switch (thisOverlay->getAnchor()) { case Overlay::MY_AVATAR: @@ -200,15 +192,7 @@ unsigned int Overlays::addOverlay(Overlay* overlay) { unsigned int thisID = _nextOverlayID; _nextOverlayID++; if (overlay->is3D()) { - Base3DOverlay* overlay3D = static_cast(overlay); - if (overlay3D->getDrawInFront()) { - _overlays3DFront[thisID] = overlay; - } else { - _overlays3D[thisID] = overlay; - } - - _overlaySignalMapper.setMapping(overlay3D, thisID); - connect(overlay3D, SIGNAL(drawInFrontUpdated(bool)), &_overlaySignalMapper, SLOT(map())); + _overlays3D[thisID] = overlay; } else { _overlays2D[thisID] = overlay; } @@ -233,8 +217,6 @@ bool Overlays::editOverlay(unsigned int id, const QScriptValue& properties) { thisOverlay = _overlays2D[id]; } else if (_overlays3D.contains(id)) { thisOverlay = _overlays3D[id]; - } else if (_overlays3DFront.contains(id)) { - thisOverlay = _overlays3DFront[id]; } if (thisOverlay) { thisOverlay->setProperties(properties); @@ -252,8 +234,6 @@ void Overlays::deleteOverlay(unsigned int id) { overlayToDelete = _overlays2D.take(id); } else if (_overlays3D.contains(id)) { overlayToDelete = _overlays3D.take(id); - } else if (_overlays3DFront.contains(id)) { - overlayToDelete = _overlays3DFront.take(id); } else { return; } @@ -263,22 +243,6 @@ void Overlays::deleteOverlay(unsigned int id) { _overlaysToDelete.push_back(overlayToDelete); } -void Overlays::handleOverlayDrawInFrontUpdated(int overlayID) { - if (_overlays3D.contains(overlayID)) { - Base3DOverlay* overlay = static_cast(_overlays3D[overlayID]); - if (overlay->getDrawInFront()) { - _overlays3D.remove(overlayID); - _overlays3DFront[overlayID] = overlay; - } - } else if (_overlays3DFront.contains(overlayID)) { - Base3DOverlay* overlay = static_cast(_overlays3DFront[overlayID]); - if (!overlay->getDrawInFront()) { - _overlays3DFront.remove(overlayID); - _overlays3D[overlayID] = overlay; - } - } -} - unsigned int Overlays::getOverlayAtPoint(const glm::vec2& point) { QReadLocker lock(&_lock); QMapIterator i(_overlays2D); @@ -302,8 +266,6 @@ OverlayPropertyResult Overlays::getProperty(unsigned int id, const QString& prop thisOverlay = _overlays2D[id]; } else if (_overlays3D.contains(id)) { thisOverlay = _overlays3D[id]; - } else if (_overlays3DFront.contains(id)) { - thisOverlay = _overlays3DFront[id]; } if (thisOverlay) { result.value = thisOverlay->getProperty(property); @@ -342,39 +304,33 @@ void OverlayPropertyResultFromScriptValue(const QScriptValue& value, OverlayProp } RayToOverlayIntersectionResult Overlays::findRayIntersection(const PickRay& ray) { - QMap* overlayMaps[] = { &_overlays3DFront, &_overlays3D }; - float bestDistance = std::numeric_limits::max(); + float bestIsFront = false; RayToOverlayIntersectionResult result; - for (int idx = 0; idx < 2; idx++) { - QMapIterator i(*overlayMaps[idx]); - i.toBack(); - while (i.hasPrevious()) { - i.previous(); - unsigned int thisID = i.key(); - Base3DOverlay* thisOverlay = static_cast(i.value()); - if (thisOverlay->getVisible() && !thisOverlay->getIgnoreRayIntersection() && thisOverlay->isLoaded()) { - float thisDistance; - BoxFace thisFace; - QString thisExtraInfo; - if (thisOverlay->findRayIntersectionExtraInfo(ray.origin, ray.direction, thisDistance, thisFace, thisExtraInfo)) { - if (thisDistance < bestDistance) { - bestDistance = thisDistance; - result.intersects = true; - result.distance = thisDistance; - result.face = thisFace; - result.overlayID = thisID; - result.intersection = ray.origin + (ray.direction * thisDistance); - result.extraInfo = thisExtraInfo; - } + QMapIterator i(_overlays3D); + i.toBack(); + while (i.hasPrevious()) { + i.previous(); + unsigned int thisID = i.key(); + Base3DOverlay* thisOverlay = static_cast(i.value()); + if (thisOverlay->getVisible() && !thisOverlay->getIgnoreRayIntersection() && thisOverlay->isLoaded()) { + float thisDistance; + BoxFace thisFace; + QString thisExtraInfo; + if (thisOverlay->findRayIntersectionExtraInfo(ray.origin, ray.direction, thisDistance, thisFace, thisExtraInfo)) { + bool isDrawInFront = thisOverlay->getDrawInFront(); + if (thisDistance < bestDistance && (!bestIsFront || isDrawInFront)) { + bestIsFront = isDrawInFront; + bestDistance = thisDistance; + result.intersects = true; + result.distance = thisDistance; + result.face = thisFace; + result.overlayID = thisID; + result.intersection = ray.origin + (ray.direction * thisDistance); + result.extraInfo = thisExtraInfo; } } } - if (result.intersects) { - // We first check the front overlays - if one has been intersected, prefer - // it over any other overlays and return it immediately. - break; - } } return result; } @@ -463,8 +419,6 @@ bool Overlays::isLoaded(unsigned int id) { thisOverlay = _overlays2D[id]; } else if (_overlays3D.contains(id)) { thisOverlay = _overlays3D[id]; - } else if (_overlays3DFront.contains(id)) { - thisOverlay = _overlays3DFront[id]; } else { return false; // not found } diff --git a/interface/src/ui/overlays/Overlays.h b/interface/src/ui/overlays/Overlays.h index c46d9474da..7acc2c7878 100644 --- a/interface/src/ui/overlays/Overlays.h +++ b/interface/src/ui/overlays/Overlays.h @@ -52,9 +52,7 @@ public: ~Overlays(); void init(QGLWidget* parent); void update(float deltatime); - void render3D(RenderArgs::RenderMode renderMode = RenderArgs::DEFAULT_RENDER_MODE, - RenderArgs::RenderSide renderSide = RenderArgs::MONO); - void render3DFront(RenderArgs::RenderMode renderMode = RenderArgs::DEFAULT_RENDER_MODE, + void render3D(bool drawFront, RenderArgs::RenderMode renderMode = RenderArgs::DEFAULT_RENDER_MODE, RenderArgs::RenderSide renderSide = RenderArgs::MONO); void render2D(); @@ -91,19 +89,10 @@ public slots: /// overlay; in meters if it is a 3D text overlay float textWidth(unsigned int id, const QString& text) const; -protected: - void render3DOverlays(QMap& overlays, RenderArgs::RenderMode renderMode, RenderArgs::RenderSide renderSide); - -private slots: - /// QSignalMapper unfortunately does not work with unsigned integers. - void handleOverlayDrawInFrontUpdated(int overlayID); - private: QMap _overlays2D; QMap _overlays3D; - QMap _overlays3DFront; QList _overlaysToDelete; - QSignalMapper _overlaySignalMapper; unsigned int _nextOverlayID; QGLWidget* _parent; QReadWriteLock _lock;