SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-Add color overlay (#311)

Browse Source 
* fixed Chaperone toggle, toggle state on launch

* made update rates based on variable frame rate assuming 90 default

* added overlay color back in

* fixed opacity value not synching

* updated to ovr 1.8.19

* fixed license issue

* rolled back ovr update

* fixed overlay toggle state, formatting, and clamped max opacity to .85%
This commit is contained in:
ykeara
2019-11-08 14:45:26 -06:00
committed by GitHub
parent b148a3d6de
commit 05c12cd4a0
24 changed files with 866 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/res/img/video/color.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

src/res/qml/video_page/VideoPage.qml
+20 -1
View File
@@ -8,14 +8,17 @@ import "color"
import "supersampling"
import "miscvid"
import "profiles"
import "overlaycolorbright"
MyStackViewPage {
width: 1200
headerText: "Video Settings"
content: ColumnLayout {
spacing: 10
OverlayMethodGroupBox{
id: overlayMethodGroupBox
}
BrightnessGroupBox {
id: brightnessGroupBox}
ColorGroupBox {
@@ -36,4 +39,20 @@ MyStackViewPage {
}
}
Component.onCompleted: {
overlayMethodGroupBox.visible = VideoTabController.isOverlayMethodActive
brightnessGroupBox.visible = !(VideoTabController.isOverlayMethodActive);
colorGroupBox.visible = !(VideoTabController.isOverlayMethodActive);
}
Connections {
target: VideoTabController
onIsOverlayMethodActiveChanged:{
overlayMethodGroupBox.visible = VideoTabController.isOverlayMethodActive
brightnessGroupBox.visible = !(VideoTabController.isOverlayMethodActive);
colorGroupBox.visible = !(VideoTabController.isOverlayMethodActive);
}
}
}
src/res/qml/video_page/brightness/BrightnessGroupBox.qml
+3 -3
View File
@@ -36,7 +36,7 @@ GroupBox {
id: brightnessToggle
text: "Toggle On/Off"
onCheckedChanged: {
VideoTabController.setBrightnessEnabled(this.checked, false) }
VideoTabController.setBrightnessEnabled(this.checked, true) }
}
Item {
@@ -57,12 +57,12 @@ GroupBox {
value: 1.0
Layout.fillWidth: true
onPositionChanged: {
var val = (this.position * 100)
var val = (this.value * 100)
brightnessValueText.text = Math.round(val) + "%"
}
onValueChanged: {
VideoTabController.setBrightnessValue(value.toFixed(2), false)
VideoTabController.setBrightnessValue(value.toFixed(2), true)
}
}
src/res/qml/video_page/color/ColorGroupBox.qml
+6 -6
View File
@@ -41,7 +41,7 @@ GroupBox {
MySlider {
id: colorRedSlider
from: 0.01
to: 2.0
to: 1.0
stepSize: 0.01
value: 1.0
Layout.fillWidth: true
@@ -51,7 +51,7 @@ GroupBox {
}
onValueChanged: {
VideoTabController.setColorRed(value.toFixed(2), false)
VideoTabController.setColorRed(value.toFixed(2), true)
}
}
@@ -85,7 +85,7 @@ GroupBox {
MySlider {
id: colorGreenSlider
from: 0.01
to: 2.0
to: 1.0
stepSize: 0.01
value: 1.0
Layout.fillWidth: true
@@ -95,7 +95,7 @@ GroupBox {
}
onValueChanged: {
VideoTabController.setColorGreen(value.toFixed(2), false)
VideoTabController.setColorGreen(value.toFixed(2), true)
}
}
@@ -130,7 +130,7 @@ GroupBox {
MySlider {
id: colorBlueSlider
from: 0.01
to: 2.0
to: 1.0
stepSize: 0.01
value: 1.0
Layout.fillWidth: true
@@ -140,7 +140,7 @@ GroupBox {
}
onValueChanged: {
VideoTabController.setColorBlue(value.toFixed(2), false)
VideoTabController.setColorBlue(value.toFixed(2), true)
}
}
src/res/qml/video_page/miscvid/VideoMiscGroupBox.qml
+15 -1
View File
@@ -50,6 +50,17 @@ GroupBox {
VideoTabController.setAllowSupersampleFiltering(this.checked, false)
}
}
Item {
Layout.preferredWidth: 20
}
MyToggleButton {
id: videoUseOverlayToggle
text: "Use Overlay For Color"
onCheckedChanged: {
VideoTabController.setIsOverlayMethodActive(this.checked, true)
}
}
}
}
@@ -57,7 +68,7 @@ GroupBox {
Component.onCompleted: {
videoAllowSupersampleFilteringToggle.checked = VideoTabController.allowSupersampleFiltering
videoMotionSmoothingToggle.checked = VideoTabController.motionSmoothing
videoUseOverlayToggle.checked = VideoTabController.isOverlayMethodActive
}
Connections {
@@ -69,6 +80,9 @@ GroupBox {
onMotionSmoothingChanged: {
videoMotionSmoothingToggle.checked = VideoTabController.motionSmoothing
}
onIsOverlayMethodActiveChanged:{
videoUseOverlayToggle.checked = VideoTabController.isOverlayMethodActive
}
}
}
src/res/qml/video_page/overlaycolorbright/OverlayMethodGroupBox.qml
+329
View File
@@ -0,0 +1,329 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.3
import ovras.advsettings 1.0
import "../../common"
GroupBox {
id: overlayMethodGroupBox
Layout.fillWidth: true
label: MyText {
leftPadding: 10
text: "Brightness and Color (via overlay)"
bottomPadding: -10
}
background: Rectangle {
color: "transparent"
border.color: "#ffffff"
radius: 8
}
ColumnLayout {
anchors.fill: parent
Rectangle {
color: "#ffffff"
height: 1
Layout.fillWidth: true
Layout.bottomMargin: 5
}
RowLayout {
Layout.fillWidth: true
MyToggleButton {
id: brightnessToggle
text: "Toggle On/Off"
onCheckedChanged: {
VideoTabController.setBrightnessEnabled(this.checked, true)
}
}
Item {
Layout.preferredWidth: 150
}
MyText {
text: "Brightness:"
horizontalAlignment: Text.AlignRight
Layout.rightMargin: 10
}
MySlider {
id: brightnessSlider
from: 0.01
to: 1.0
stepSize: 0.01
value: 1.0
Layout.fillWidth: true
onPositionChanged: {
var val = (this.value * 100)
brightnessValueText.text = Math.round(val) + "%"
}
onValueChanged: {
VideoTabController.setBrightnessValue(value.toFixed(2), true)
}
}
MyTextField {
id: brightnessValueText
text: "100%"
keyBoardUID: 902
Layout.preferredWidth: 100
Layout.leftMargin: 10
horizontalAlignment: Text.AlignHCenter
function onInputEvent(input) {
var val2 = parseFloat(input)
if (!isNaN(val2)) {
if (val2 < 5) {
val2 = 5
} else if (val2 > 100.0) {
val2 = 100.0
}
var v2 = (val2/100).toFixed(2)
brightnessSlider.value = v
}
text = Math.round(VideoTabController.brightnessValue * 100) + "%"
}
}
}
RowLayout {
Layout.fillWidth: true
MyToggleButton {
id: colorToggle
text: "Toggle On/Off"
onCheckedChanged: {
VideoTabController.setColorOverlayEnabled(this.checked, true) }
}
Item {
Layout.preferredWidth: 150
}
MyText {
text: "Opacity:"
horizontalAlignment: Text.AlignRight
Layout.rightMargin: 10
}
MySlider {
id: opacitySlider
from: 0.01
to: 0.85
stepSize: 0.01
value: 0.01
Layout.fillWidth: true
onPositionChanged: {
var val = (this.value * 100)
opacityValueText.text = Math.round(val) + "%"
}
onValueChanged: {
VideoTabController.setColorOverlayOpacity(this.value.toFixed(2), true)
}
}
MyTextField {
id: opacityValueText
text: "1%"
keyBoardUID: 903
Layout.preferredWidth: 100
Layout.leftMargin: 10
horizontalAlignment: Text.AlignHCenter
function onInputEvent(input) {
var val = parseFloat(input)
if (!isNaN(val)) {
if (val < 5) {
val = 5
} else if (val > 85.0) {
val = 85.0
}
var v = (val/100).toFixed(2)
opacitySlider.value = v
}
text = Math.round(VideoTabController.colorOverlayOpacity * 100) + "%"
}
}
}
RowLayout {
Layout.fillWidth: true
MyText {
text: "Red:"
horizontalAlignment: Text.AlignRight
Layout.preferredWidth: 75
}
MySlider {
id: colorRedSlider
from: 0.01
to: 1.0
stepSize: 0.01
value: 1.0
Layout.fillWidth: true
onPositionChanged: {
var val = (this.value * 100)
colorRedText.text = Math.round(val) + "%"
}
onValueChanged: {
VideoTabController.setColorRed(value.toFixed(2), true)
}
}
MyTextField {
id: colorRedText
text: "100%"
keyBoardUID: 915
Layout.preferredWidth: 100
Layout.leftMargin: 10
horizontalAlignment: Text.AlignHCenter
function onInputEvent(input) {
var val = parseFloat(input)
if (!isNaN(val)) {
if (val < 5) {
val = 5
} else if (val > 100.0) {
val = 100.0
}
var v = (val/100).toFixed(2)
colorRedSlider.value = v
}
text = Math.round(VideoTabController.colorRed * 100) + "%"
}
}
MyText {
text: "Green:"
horizontalAlignment: Text.AlignRight
Layout.preferredWidth: 85
}
MySlider {
id: colorGreenSlider
from: 0.01
to: 1.0
stepSize: 0.01
value: 1.0
Layout.fillWidth: true
onPositionChanged: {
var val = (this.value * 100)
colorGreenText.text = Math.round(val) + "%"
}
onValueChanged: {
VideoTabController.setColorGreen(value.toFixed(2), true)
}
}
MyTextField {
id: colorGreenText
text: "100%"
keyBoardUID: 916
Layout.preferredWidth: 100
Layout.leftMargin: 10
horizontalAlignment: Text.AlignHCenter
function onInputEvent(input) {
var val = parseFloat(input)
if (!isNaN(val)) {
if (val < 5) {
val = 5
} else if (val > 100.0) {
val = 100.0
}
var v = (val/100).toFixed(2)
colorGreenSlider.value = v
}
text = Math.round(VideoTabController.colorGreen * 100) + "%"
}
}
MyText {
text: "Blue:"
horizontalAlignment: Text.AlignRight
Layout.preferredWidth: 75
}
MySlider {
id: colorBlueSlider
from: 0.01
to: 1.0
stepSize: 0.01
value: 1.0
Layout.fillWidth: true
onPositionChanged: {
var val = (this.value * 100)
colorBlueText.text = Math.round(val) + "%"
}
onValueChanged: {
VideoTabController.setColorBlue(value.toFixed(2), true)
}
}
MyTextField {
id: colorBlueText
text: "100%"
keyBoardUID: 917
Layout.preferredWidth: 100
Layout.leftMargin: 10
horizontalAlignment: Text.AlignHCenter
function onInputEvent(input) {
var val = parseFloat(input)
if (!isNaN(val)) {
if (val < 5) {
val = 5
} else if (val > 100.0) {
val = 100.0
}
var v = (val/100).toFixed(2)
colorBlueSlider.value = v
}
text = Math.round(VideoTabController.colorBlue * 100) + "%"
}
}
}
}
Component.onCompleted: {
brightnessSlider.value = VideoTabController.brightnessValue
brightnessToggle.checked = VideoTabController.brightnessEnabled
colorToggle.checked = VideoTabController.colorOverlayEnabled
opacitySlider.value = VideoTabController.colorOverlayOpacity
colorRedSlider.value = VideoTabController.colorRed
colorGreenSlider.value = VideoTabController.colorGreen
colorBlueSlider.value = VideoTabController.colorBlue
}
Connections {
target: VideoTabController
onBrightnessValueChanged: {
brightnessSlider.value = VideoTabController.brightnessValue
}
onBrightnessEnabledChanged: {
brightnessToggle.checked = VideoTabController.brightnessEnabled
}
onColorOverlayOpacityChanged:{
opacitySlider.value = VideoTabController.colorOverlayOpacity
}
onColorOverlayEnabledChanged:{
colorToggle.checked = VideoTabController.colorOverlayEnabled
}
onColorRedChanged:{
colorRedSlider.value = VideoTabController.colorRed
}
onColorGreenChanged:{
colorGreenSlider.value = VideoTabController.colorGreen
}
onColorBlueChanged:{
colorBlueSlider.value = VideoTabController.colorBlue
}
}
}