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

cr feedback

Browse source
This commit is contained in:
David Kelly 2017-07-19 14:46:10 -07:00
parent a8ab115b12
commit f0091f16a1
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/ui/overlays/ContextOverlayInterface.cpp
View file

@ -11,10 +11,8 @@
#include "ContextOverlayInterface.h"
#include "Application.h"
#include "scripting/HMDScriptingInterface.h"
#include <EntityTreeRenderer.h>
#include <ui/TabletScriptingInterface.h>
ContextOverlayInterface::ContextOverlayInterface() {
// "context_overlay" debug log category disabled by default.
@ -24,6 +22,9 @@ ContextOverlayInterface::ContextOverlayInterface() {
QLoggingCategory::setFilterRules(QStringLiteral("hifi.context_overlay.debug=false"));
_entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
_hmdScriptingInterface = DependencyManager::get<HMDScriptingInterface>();
_tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
_entityPropertyFlags += PROP_POSITION;
_entityPropertyFlags += PROP_ROTATION;
@ -87,16 +88,13 @@ void ContextOverlayInterface::openMarketplace() {
// the marketplace (if the current entity has a
// marketplaceID)
if (!_currentEntityWithContextOverlay.isNull()) {
auto hmd = DependencyManager::get<HMDScriptingInterface>();
auto entity = qApp->getEntities()->getTree()->findEntityByID(_currentEntityWithContextOverlay);
if (entity->getMarketplaceID().length() > 0) {
auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
auto tablet = dynamic_cast<TabletProxy*>(_tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
// construct the url to the marketplace item
QString url = MARKETPLACE_BASE_URL + entity->getMarketplaceID();
tablet->gotoWebScreen(url);
hmd->openTablet();
_hmdScriptingInterface->openTablet();
}
}
}

5
interface/src/ui/overlays/ContextOverlayInterface.h
View file

@ -18,9 +18,12 @@
#include <DependencyManager.h>
#include <PointerEvent.h>
#include <ui/TabletScriptingInterface.h>
#include "EntityScriptingInterface.h"
#include "ui/overlays/Image3DOverlay.h"
#include "ui/overlays/Overlays.h"
#include "scripting/HMDScriptingInterface.h"
#include "EntityTree.h"
#include "ContextOverlayLogging.h"
@ -34,6 +37,8 @@ class ContextOverlayInterface : public QObject, public Dependency {
Q_PROPERTY(QUuid entityWithContextOverlay READ getCurrentEntityWithContextOverlay WRITE setCurrentEntityWithContextOverlay)
QSharedPointer<EntityScriptingInterface> _entityScriptingInterface;
EntityPropertyFlags _entityPropertyFlags;
QSharedPointer<HMDScriptingInterface> _hmdScriptingInterface;
QSharedPointer<TabletScriptingInterface> _tabletScriptingInterface;
OverlayID _contextOverlayID { UNKNOWN_OVERLAY_ID };
std::shared_ptr<Image3DOverlay> _contextOverlay { nullptr };
public: