mirror of
https://github.com/overte-org/overte.git
synced 2025-06-28 06:09:47 +02:00
c62f9007e9
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
74 lines
1.7 KiB
C++
74 lines
1.7 KiB
C++
//
|
|
// Created by Bradley Austin Davis on 2015/06/08
|
|
// Copyright 2015 High Fidelity, Inc.
|
|
//
|
|
// Distributed under the Apache License, Version 2.0.
|
|
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
|
//
|
|
|
|
#pragma once
|
|
#include <stdint.h>
|
|
#include <DependencyManager.h>
|
|
|
|
#include <GLMHelpers.h>
|
|
|
|
namespace Cursor {
|
|
enum class Source {
|
|
MOUSE,
|
|
UNKNOWN,
|
|
};
|
|
|
|
enum Icon {
|
|
SYSTEM,
|
|
DEFAULT,
|
|
LINK,
|
|
GRAB,
|
|
ARROW,
|
|
RETICLE,
|
|
|
|
// Add new system cursors here
|
|
|
|
// User cursors will have ids over this value
|
|
USER_BASE = 0xFF,
|
|
};
|
|
class Instance {
|
|
public:
|
|
virtual Source getType() const = 0;
|
|
virtual void setIcon(uint16_t icon);
|
|
virtual uint16_t getIcon() const;
|
|
private:
|
|
uint16_t _icon;
|
|
};
|
|
|
|
class MouseInstance : public Instance {
|
|
Source getType() const override {
|
|
return Source::MOUSE;
|
|
}
|
|
};
|
|
|
|
class Manager : public QObject, public Dependency {
|
|
SINGLETON_DEPENDENCY
|
|
|
|
Manager();
|
|
Manager(const Manager& other) = delete;
|
|
public:
|
|
static Manager& instance();
|
|
uint8_t getCount();
|
|
float getScale();
|
|
void setScale(float scale);
|
|
Instance* getCursor(uint8_t index = 0);
|
|
uint16_t registerIcon(const QString& path);
|
|
QList<uint16_t> registeredIcons() const;
|
|
const QString& getIconImage(uint16_t icon);
|
|
|
|
static QMap<uint16_t, QString> ICON_NAMES;
|
|
static Icon lookupIcon(const QString& name);
|
|
static const QString& getIconName(const Icon& icon);
|
|
private:
|
|
MouseInstance mouseInstance;
|
|
float _scale{ 1.0f };
|
|
QMap<uint16_t, QString> ICONS;
|
|
};
|
|
}
|
|
|
|
|