History

Merge pull request #1105 from HifiExperiments/colorspace

add a setting to workaround the GLES colorspace conversion issue

Dale Glass committed 2 years ago

Commit fb81ad62 parents 228d451 f987bbc6 files · +32 −12Browse files

Showing the changes to interface/src/Menu.cpp (1 of 6 files). Show all

Unified · Split

interface/src/Menu.cpp+8−0
@@ -46,6 +46,7 @@ · 45 unmodified lines
46#include "avatar/AvatarManager.h"46#include "avatar/AvatarManager.h"
47#include "avatar/AvatarPackager.h"47#include "avatar/AvatarPackager.h"
48#include "AvatarBookmarks.h"48#include "AvatarBookmarks.h"
49#include <display-plugins/OpenGLDisplayPlugin.h>
49#include "DomainAccountManager.h"50#include "DomainAccountManager.h"
50#include "MainWindow.h"51#include "MainWindow.h"
51#include "render/DrawStatus.h"52#include "render/DrawStatus.h"
@@ -549,6 +550,13 @@ Menu::Menu() { · 497 unmodified lines
549 drawStatusConfig, SLOT(setShowFade(bool)));550 drawStatusConfig, SLOT(setShowFade(bool)));
550 }551 }
551 552
553 {
554 action = addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::ExtraLinearTosRGBConversion, 0, OpenGLDisplayPlugin::getExtraLinearToSRGBConversion());
555 connect(action, &QAction::triggered, [action] {
556 OpenGLDisplayPlugin::setExtraLinearToSRGBConversion(action->isChecked());
557 });
558 }
559
552 // Developer > Assets >>>560 // Developer > Assets >>>
553 // Menu item is not currently needed but code should be kept in case it proves useful again at some stage.561 // Menu item is not currently needed but code should be kept in case it proves useful again at some stage.
554//#define WANT_ASSET_MIGRATION562//#define WANT_ASSET_MIGRATION