Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:42:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix Developer > UI > Show Overlays + snap UI not hiding

Browse source
This commit is contained in:
HifiExperiments 2024-02-20 14:06:39 -08:00
parent a1089b5b50
commit 214c9c4ef7
5 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/Menu.cpp
View file

@ -388,13 +388,18 @@ Menu::Menu() {
// Developer > UI >>> // Developer > UI >>>
MenuWrapper* uiOptionsMenu = developerMenu->addMenu("UI"); MenuWrapper* uiOptionsMenu = developerMenu->addMenu("UI");
// Developer > UI > Show Overlays
action = addCheckableActionToQMenuAndActionHash(uiOptionsMenu, MenuOption::Overlays, 0, true);
connect(action, &QAction::triggered, [action] {
qApp->getApplicationOverlay().setEnabled(action->isChecked());
});
// Developer > UI > Desktop Tablet Becomes Toolbar
action = addCheckableActionToQMenuAndActionHash(uiOptionsMenu, MenuOption::DesktopTabletToToolbar, 0, action = addCheckableActionToQMenuAndActionHash(uiOptionsMenu, MenuOption::DesktopTabletToToolbar, 0,
qApp->getDesktopTabletBecomesToolbarSetting()); qApp->getDesktopTabletBecomesToolbarSetting());
// Developer > UI > Show Overlays
addCheckableActionToQMenuAndActionHash(uiOptionsMenu, MenuOption::Overlays, 0, true);
// Developer > UI > Desktop Tablet Becomes Toolbar
connect(action, &QAction::triggered, [action] { connect(action, &QAction::triggered, [action] {
qApp->setDesktopTabletBecomesToolbarSetting(action->isChecked()); qApp->setDesktopTabletBecomesToolbarSetting(action->isChecked());
}); });

2
interface/src/graphics/GraphicsEngine.cpp
View file

@ -281,7 +281,7 @@ void GraphicsEngine::render_performFrame() {
{ {
PROFILE_RANGE(render, "/runRenderFrame"); PROFILE_RANGE(render, "/runRenderFrame");
renderArgs._hudOperator = displayPlugin->getHUDOperator(); renderArgs._hudOperator = qApp->getApplicationOverlay().enabled() ? displayPlugin->getHUDOperator() : nullptr;
renderArgs._hudTexture = qApp->getApplicationOverlay().getOverlayTexture(); renderArgs._hudTexture = qApp->getApplicationOverlay().getOverlayTexture();
renderArgs._takingSnapshot = qApp->takeSnapshotOperators(snapshotOperators); renderArgs._takingSnapshot = qApp->takeSnapshotOperators(snapshotOperators);
renderArgs._blitFramebuffer = finalFramebuffer; renderArgs._blitFramebuffer = finalFramebuffer;

11
interface/src/ui/ApplicationOverlay.h
View file

@ -27,18 +27,17 @@ public:
void renderOverlay(RenderArgs* renderArgs); void renderOverlay(RenderArgs* renderArgs);
gpu::TexturePointer getOverlayTexture(); gpu::TexturePointer getOverlayTexture();
bool enabled() const { return _enabled; }
void setEnabled(bool enabled) { _enabled = enabled; }
private: private:
void renderStatsAndLogs(RenderArgs* renderArgs);
void renderDomainConnectionStatusBorder(RenderArgs* renderArgs); void renderDomainConnectionStatusBorder(RenderArgs* renderArgs);
void renderQmlUi(RenderArgs* renderArgs); void renderQmlUi(RenderArgs* renderArgs);
void renderOverlays(RenderArgs* renderArgs); void renderOverlays(RenderArgs* renderArgs);
void buildFramebufferObject(); void buildFramebufferObject();
float _alpha{ 1.0f };
float _trailingAudioLoudness{ 0.0f };
int _domainStatusBorder; int _domainStatusBorder;
int _magnifierBorder; int _magnifierBorder;
@ -47,6 +46,8 @@ private:
gpu::TexturePointer _overlayColorTexture; gpu::TexturePointer _overlayColorTexture;
gpu::FramebufferPointer _overlayFramebuffer; gpu::FramebufferPointer _overlayFramebuffer;
int _qmlGeometryId { 0 }; int _qmlGeometryId { 0 };
bool _enabled { true };
}; };
#endif // hifi_ApplicationOverlay_h #endif // hifi_ApplicationOverlay_h

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

@ -153,14 +153,6 @@ void Overlays::render(RenderArgs* renderArgs) {
} }
} }
void Overlays::disable() {
_enabled = false;
}
void Overlays::enable() {
_enabled = true;
}
Overlay::Pointer Overlays::take2DOverlay(const QUuid& id) { Overlay::Pointer Overlays::take2DOverlay(const QUuid& id) {
if (_shuttingDown) { if (_shuttingDown) {
return nullptr; return nullptr;
@ -378,7 +370,7 @@ QObject* Overlays::getOverlayObject(const QUuid& id) {
} }
QUuid Overlays::getOverlayAtPoint(const glm::vec2& point) { QUuid Overlays::getOverlayAtPoint(const glm::vec2& point) {
if (_shuttingDown || !_enabled) { if (_shuttingDown) {
return UNKNOWN_ENTITY_ID; return UNKNOWN_ENTITY_ID;
} }

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

@ -99,8 +99,6 @@ public:
void init(); void init();
void update(float deltatime); void update(float deltatime);
void render(RenderArgs* renderArgs); void render(RenderArgs* renderArgs);
void disable();
void enable();
Overlay::Pointer take2DOverlay(const QUuid& id); Overlay::Pointer take2DOverlay(const QUuid& id);
Overlay::Pointer get2DOverlay(const QUuid& id) const; Overlay::Pointer get2DOverlay(const QUuid& id) const;
@ -683,7 +681,6 @@ private:
unsigned int _stackOrder { 1 }; unsigned int _stackOrder { 1 };
bool _enabled { true };
std::atomic<bool> _shuttingDown { false }; std::atomic<bool> _shuttingDown { false };
PointerEvent calculateOverlayPointerEvent(const QUuid& id, const PickRay& ray, const RayToOverlayIntersectionResult& rayPickResult, PointerEvent calculateOverlayPointerEvent(const QUuid& id, const PickRay& ray, const RayToOverlayIntersectionResult& rayPickResult,