Skip to content

Commit

Permalink
Merge pull request vircadia#302 from daleglass-overte/allow-fullscree…
Browse files Browse the repository at this point in the history 
…n-display-selection

Allow fullscreen display selection
  • Loading branch information
@JulianGro
JulianGro authored Apr 23, 2023
2 parents 54de00d + bd1fc19 commit 90efffa
Show file tree
Hide file tree
Showing 7 changed files with 289 additions and 20 deletions.
4 changes: 2 additions & 2 deletions interface/resources/qml/controlsUit/ComboBox.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ FocusScope {

function previousItem() { root.currentHighLightedIndex = (root.currentHighLightedIndex + comboBox.count - 1) % comboBox.count; }
function nextItem() { root.currentHighLightedIndex = (root.currentHighLightedIndex + comboBox.count + 1) % comboBox.count; }
function selectCurrentItem() { root.currentIndex = root.currentHighLightedIndex; close(); /*hideList();*/ }
function selectSpecificItem(index) { root.currentIndex = index; close();/*hideList();*/ }
function selectCurrentItem() { root.currentIndex = root.currentHighLightedIndex; /*hideList();*/ }
function selectSpecificItem(index) { root.currentIndex = index; /*hideList();*/ }

Keys.onUpPressed: previousItem();
Keys.onDownPressed: nextItem();
Expand Down
124 changes: 112 additions & 12 deletions interface/resources/qml/hifi/dialogs/graphics/GraphicsSettings.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ Item {
text: "Full World Detail"
}
}

HifiControlsUit.ComboBox {
id: worldDetailDropdown
enabled: performanceCustom.checked
Expand All @@ -175,7 +175,7 @@ Item {
Component.onCompleted: {
worldDetailDropdown.refreshWorldDetailDropdown();
}

onCurrentIndexChanged: {
LODManager.worldDetailQuality = currentIndex;
worldDetailDropdown.displayText = model.get(currentIndex).text;
Expand Down Expand Up @@ -337,7 +337,7 @@ Item {
refreshRatePreset: 2 // RefreshRateProfile::REALTIME
}
}

HifiControlsUit.ComboBox {
id: refreshRateDropdown
enabled: performanceCustom.checked
Expand All @@ -363,7 +363,7 @@ Item {
Component.onCompleted: {
refreshRateDropdown.refreshRefreshRateDropdownDisplay();
}

onCurrentIndexChanged: {
Performance.setRefreshRateProfile(model.get(currentIndex).refreshRatePreset);
refreshRateDropdown.displayText = model.get(currentIndex).text;
Expand All @@ -386,14 +386,14 @@ Item {
size: 16
color: "#FFFFFF"
}

HifiControlsUit.Slider {
id: resolutionScaleSlider
enabled: performanceCustom.checked
anchors.left: resolutionHeader.right
anchors.leftMargin: 57
anchors.top: parent.top
width: 150
width: 150
height: parent.height
colorScheme: hifi.colorSchemes.dark
minimumValue: 0.25
Expand Down Expand Up @@ -424,11 +424,11 @@ Item {
Layout.topMargin: 20
Layout.preferredWidth: parent.width
spacing: 0

Item {
Layout.preferredWidth: parent.width
Layout.preferredHeight: 35

HifiStylesUit.RalewayRegular {
id: antialiasingHeader
text: "Anti-aliasing"
Expand All @@ -454,7 +454,7 @@ Item {
text: "FXAA"
}
}

HifiControlsUit.ComboBox {
id: antialiasingDropdown
anchors.left: antialiasingHeader.right
Expand All @@ -465,22 +465,122 @@ Item {
colorScheme: hifi.colorSchemes.dark
model: antialiasingModel
currentIndex: -1

function refreshAntialiasingDropdown() {
antialiasingDropdown.currentIndex = Render.antialiasingMode;
}

Component.onCompleted: {
antialiasingDropdown.refreshAntialiasingDropdown();
}

onCurrentIndexChanged: {
Render.antialiasingMode = currentIndex;
antialiasingDropdown.displayText = model.get(currentIndex).text;
}
}
}
}

ColumnLayout {
Layout.topMargin: 20
Layout.preferredWidth: parent.width
spacing: 0

Item {
Layout.preferredWidth: parent.width
Layout.preferredHeight: 35

HifiStylesUit.RalewayRegular {
id: fullScreenDisplayHeader
text: "Full screen display"
anchors.left: parent.left
anchors.top: parent.top
width: 130
height: parent.height
size: 16
color: "#FFFFFF"
}

ListModel {
id: fullScreenDisplayModel

ListElement {
text: "Screen 1"
}

function refreshScreens() {
fullScreenDisplayModel.clear();
Render.getScreens().forEach(function(screen) {
fullScreenDisplayModel.append({"text" : screen});
});
}

Component.onCompleted: {
fullScreenDisplayModel.refreshScreens();
}
}

HifiControlsUit.ComboBox {
id: fullScreenDisplayDropdown
anchors.left: fullScreenDisplayHeader.right
anchors.leftMargin: 20
anchors.top: parent.top
width: 280
height: parent.height
colorScheme: hifi.colorSchemes.dark
model: fullScreenDisplayModel
currentIndex: 0

function refreshFullScreenDisplayDropdown() {
var screens = Render.getScreens();
var selected = Render.getFullScreenScreen();

for(let idx = 0; idx < screens.length; idx++) {
if (screens[idx] == selected) {
fullScreenDisplayDropdown.currentIndex = idx;
return;
}
}

console.log("Selected full screen screen", selected, "not found, falling back to primary screen");
console.log("List of screens is:", screens);
fullScreenDisplayDropdown.currentIndex = 0;
}

Component.onCompleted: {
model.refreshScreens();
fullScreenDisplayDropdown.refreshFullScreenDisplayDropdown();
fullScreenDisplayDropdown.displayText = model.get(currentIndex).text;
}

onCurrentIndexChanged: {
if (currentIndex >= 0) {
// Somehow, we end up going through here twice on every change of the combo box.
// The first one is with the new selected index, and the second one is with the
// index at -1.
//
// The first one comes from a sensible stack of:
// onCurrentIndexChanged (qrc:/qml/hifi/dialogs/graphics/GraphicsSettings.qml:559)
// refreshScreens (qrc:/qml/hifi/dialogs/graphics/GraphicsSettings.qml:514)
// onCompleted (qrc:/qml/hifi/dialogs/graphics/GraphicsSettings.qml:553)
// load (qrc:/qml/hifi/tablet/WindowRoot.qml:170)
// loadSource (qrc:/qml/hifi/tablet/WindowRoot.qml:63)
//
// The second seems to be called out of nowhere. This likely indicates some sort of bug.
// Might be related to Wayland?

Render.setFullScreenScreen(model.get(currentIndex).text);
fullScreenDisplayDropdown.displayText = model.get(currentIndex).text;
} else {
console.log("Called with currentIndex =", currentIndex);
console.trace();
}
}
}
}
}

}
}

Expand Down
48 changes: 48 additions & 0 deletions interface/src/scripting/RenderScriptingInterface.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#include "RenderScriptingInterface.h"

#include "LightingModel.h"
#include <QScreen>
#include "ScreenName.h"


RenderScriptingInterface* RenderScriptingInterface::getInstance() {
Expand All @@ -23,6 +25,7 @@ RenderScriptingInterface::RenderScriptingInterface() {
});
}


void RenderScriptingInterface::loadSettings() {
_renderSettingLock.withReadLock([&] {
_renderMethod = (_renderMethodSetting.get());
Expand All @@ -31,7 +34,17 @@ void RenderScriptingInterface::loadSettings() {
//_antialiasingMode = (_antialiasingModeSetting.get());
_antialiasingMode = static_cast<AntialiasingConfig::Mode>(_antialiasingModeSetting.get());
_viewportResolutionScale = (_viewportResolutionScaleSetting.get());
_fullScreenScreen = (_fullScreenScreenSetting.get());
});

// If full screen screen is not initialized, or set to an invalid value,
// set to the first screen.
auto screens = getScreens();
if (std::find(screens.begin(), screens.end(), _fullScreenScreen) == screens.end()) {
setFullScreenScreen(screens.first());
}


forceRenderMethod((RenderMethod)_renderMethod);
forceShadowsEnabled(_shadowsEnabled);
forceAmbientOcclusionEnabled(_ambientOcclusionEnabled);
Expand Down Expand Up @@ -193,6 +206,41 @@ void RenderScriptingInterface::setViewportResolutionScale(float scale) {
}
}

QStringList RenderScriptingInterface::getScreens() const {
QStringList screens;

for(QScreen *screen : qApp->screens()) {
screens << ScreenName::getNameForScreen(screen);
}

return screens;
}

bool RenderScriptingInterface::setFullScreenScreen(QString name) {
auto screens = getScreens();

if (std::find(screens.begin(), screens.end(), name) == screens.end()) {
// Screens can come and go and don't have a stable opaque ID, so we
// go by model here. For multiple screens with the same model we get names
// that include a serial number, so it works.
return false;
}

_renderSettingLock.withWriteLock([&] {
_fullScreenScreen = name;
_fullScreenScreenSetting.set(name);
});

emit settingsChanged();

return true;
}

QString RenderScriptingInterface::getFullScreenScreen() const {
return _fullScreenScreen;
}


void RenderScriptingInterface::forceViewportResolutionScale(float scale) {
// just not negative values or zero
if (scale <= 0.f) {
Expand Down
38 changes: 33 additions & 5 deletions interface/src/scripting/RenderScriptingInterface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "RenderForward.h"
#include "AntialiasingEffect.h"

#include <QScreen>

/*@jsdoc
* The <code>Render</code> API enables you to configure the graphics engine.
Expand All @@ -27,7 +27,7 @@
*
* @property {Render.RenderMethod} renderMethod - The render method being used.
* @property {boolean} shadowsEnabled - <code>true</code> if shadows are enabled, <code>false</code> if they're disabled.
* @property {boolean} ambientOcclusionEnabled - <code>true</code> if ambient occlusion is enabled, <code>false</code> if it's
* @property {boolean} ambientOcclusionEnabled - <code>true</code> if ambient occlusion is enabled, <code>false</code> if it's
* disabled.
* @property {integer} antialiasingMode - The active anti-aliasing mode.
* @property {number} viewportResolutionScale - The view port resolution scale, <code>&gt; 0.0</code>.
Expand All @@ -52,9 +52,9 @@ class RenderScriptingInterface : public QObject {
* <tr><th>Value</th><th>Name</th><th>Description</th>
* </thead>
* <tbody>
* <tr><td><code>0</code></td><td>DEFERRED</td><td>More complex rendering pipeline where lighting is applied to the
* <tr><td><code>0</code></td><td>DEFERRED</td><td>More complex rendering pipeline where lighting is applied to the
* scene as a whole after all objects have been rendered.</td></tr>
* <tr><td><code>1</code></td><td>FORWARD</td><td>Simpler rendering pipeline where each object in the scene, in turn,
* <tr><td><code>1</code></td><td>FORWARD</td><td>Simpler rendering pipeline where each object in the scene, in turn,
* is rendered and has lighting applied.</td></tr>
* </tbody>
* </table>
Expand All @@ -74,6 +74,7 @@ class RenderScriptingInterface : public QObject {
// Need to be called on start up to re-initialize the runtime to the saved setting states
void loadSettings();


public slots:
/*@jsdoc
* Gets the configuration for a rendering job by name.
Expand Down Expand Up @@ -172,8 +173,32 @@ public slots:
*/
void setViewportResolutionScale(float resolutionScale);

/*@jsdoc
* Returns the list of screens
* @function Render.getScreens
* @returns {string[]} The names of the available screens
*/
QStringList getScreens() const;

/*@jsdoc
* Gets the screen used when switching to full screen mode
* @function Render.getFullScreenScreen
* @returns {string} The name of the screen used for full screen mode
*/
QString getFullScreenScreen() const;

/*@jsdoc
* Sets the screen used when switching to full screen mode
* This function will only succeed if the name passed is one of the entries from Render.getScreens.
* Otherwise, it will return False and have no effect.
*
* @function Render.setFullScreenScreen
* @returns {bool} True if the setting was successful
*/
bool setFullScreenScreen(QString name);

signals:

/*@jsdoc
* Triggered when one of the <code>Render</code> API's properties changes.
* @function Render.settingsChanged
Expand All @@ -196,6 +221,8 @@ public slots:
bool _ambientOcclusionEnabled{ false };
AntialiasingConfig::Mode _antialiasingMode{ AntialiasingConfig::Mode::NONE };
float _viewportResolutionScale{ 1.0f };
QString _fullScreenScreen;


// Actual settings saved on disk
Setting::Handle<int> _renderMethodSetting { "renderMethod", RENDER_FORWARD ? render::Args::RenderMethod::FORWARD : render::Args::RenderMethod::DEFERRED };
Expand All @@ -204,6 +231,7 @@ public slots:
//Setting::Handle<AntialiasingConfig::Mode> _antialiasingModeSetting { "antialiasingMode", AntialiasingConfig::Mode::TAA };
Setting::Handle<int> _antialiasingModeSetting { "antialiasingMode", AntialiasingConfig::Mode::NONE };
Setting::Handle<float> _viewportResolutionScaleSetting { "viewportResolutionScale", 1.0f };
Setting::Handle<QString> _fullScreenScreenSetting { "fullScreenScreen", "" };

// Force assign both setting AND runtime value to the parameter value
void forceRenderMethod(RenderMethod renderMethod);
Expand Down
Loading

0 comments on commit 90efffa

Please sign in to comment.