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

7196 Mouse pointer no longer visible in HMD mode

Browse source 
The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because
Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins.

The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins
This commit is contained in:
beholder 2017-09-03 15:20:59 +03:00
parent 8723ff2df2
commit c62f9007e9
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -604,6 +604,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
DependencyManager::registerInheritance<SpatialParentFinder, InterfaceParentFinder>(); DependencyManager::registerInheritance<SpatialParentFinder, InterfaceParentFinder>();
// Set dependencies // Set dependencies
DependencyManager::set<Cursor::Manager>();
DependencyManager::set<AccountManager>(std::bind(&Application::getUserAgent, qApp)); DependencyManager::set<AccountManager>(std::bind(&Application::getUserAgent, qApp));
DependencyManager::set<StatTracker>(); DependencyManager::set<StatTracker>();
DependencyManager::set<ScriptEngines>(ScriptEngine::CLIENT_SCRIPT); DependencyManager::set<ScriptEngines>(ScriptEngine::CLIENT_SCRIPT);

14
libraries/ui/src/CursorManager.cpp
View file

@ -24,13 +24,6 @@ namespace Cursor {
return _icon; return _icon;
} }
class MouseInstance : public Instance {
Source getType() const override {
return Source::MOUSE;
}
};
QMap<uint16_t, QString> Manager::ICON_NAMES { QMap<uint16_t, QString> Manager::ICON_NAMES {
{ Icon::SYSTEM, "SYSTEM", }, { Icon::SYSTEM, "SYSTEM", },
{ Icon::DEFAULT, "DEFAULT", }, { Icon::DEFAULT, "DEFAULT", },
@ -38,7 +31,7 @@ namespace Cursor {
{ Icon::ARROW, "ARROW", }, { Icon::ARROW, "ARROW", },
{ Icon::RETICLE, "RETICLE", }, { Icon::RETICLE, "RETICLE", },
}; };
QMap<uint16_t, QString> Manager::ICONS;
static uint16_t _customIconId = Icon::USER_BASE; static uint16_t _customIconId = Icon::USER_BASE;
Manager::Manager() { Manager::Manager() {
@ -62,8 +55,8 @@ namespace Cursor {
} }
Manager& Manager::instance() { Manager& Manager::instance() {
static Manager instance; static QSharedPointer<Manager> instance = DependencyManager::get<Cursor::Manager>();
return instance; return *instance;
} }
QList<uint16_t> Manager::registeredIcons() const { QList<uint16_t> Manager::registeredIcons() const {
@ -76,7 +69,6 @@ namespace Cursor {
Instance* Manager::getCursor(uint8_t index) { Instance* Manager::getCursor(uint8_t index) {
Q_ASSERT(index < getCount()); Q_ASSERT(index < getCount());
static MouseInstance mouseInstance;
if (index == 0) { if (index == 0) {
return &mouseInstance; return &mouseInstance;
} }

14
libraries/ui/src/CursorManager.h
View file

@ -8,6 +8,7 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include <DependencyManager.h>
#include <GLMHelpers.h> #include <GLMHelpers.h>
@ -39,7 +40,15 @@ namespace Cursor {
uint16_t _icon; uint16_t _icon;
}; };
class Manager { class MouseInstance : public Instance {
Source getType() const override {
return Source::MOUSE;
}
};
class Manager : public QObject, public Dependency {
SINGLETON_DEPENDENCY
Manager(); Manager();
Manager(const Manager& other) = delete; Manager(const Manager& other) = delete;
public: public:
@ -52,12 +61,13 @@ namespace Cursor {
QList<uint16_t> registeredIcons() const; QList<uint16_t> registeredIcons() const;
const QString& getIconImage(uint16_t icon); const QString& getIconImage(uint16_t icon);
static QMap<uint16_t, QString> ICONS;
static QMap<uint16_t, QString> ICON_NAMES; static QMap<uint16_t, QString> ICON_NAMES;
static Icon lookupIcon(const QString& name); static Icon lookupIcon(const QString& name);
static const QString& getIconName(const Icon& icon); static const QString& getIconName(const Icon& icon);
private: private:
MouseInstance mouseInstance;
float _scale{ 1.0f }; float _scale{ 1.0f };
QMap<uint16_t, QString> ICONS;
}; };
} }