diff --git a/scripts/developer/utilities/render/configSlider/RichSlider.qml b/scripts/developer/utilities/render/configSlider/RichSlider.qml index c44727cfa4..1613cac1b4 100644 --- a/scripts/developer/utilities/render/configSlider/RichSlider.qml +++ b/scripts/developer/utilities/render/configSlider/RichSlider.qml @@ -28,13 +28,11 @@ Item { function defaultSet(value) { } property var labelAreaWidthScale: 0.5 - property bool integral: false - property var valueVarGetter: defaultGet + property var valueVarSetter: defaultSet - // property string property - property alias valueVar : sliderControl.value - // property alias valueSetter : sliderControl.value + property alias valueVar : sliderControl.value + property alias min: sliderControl.minimumValue property alias max: sliderControl.maximumValue diff --git a/scripts/developer/utilities/render/lod.qml b/scripts/developer/utilities/render/lod.qml index 25a0d20db6..452d5c7930 100644 --- a/scripts/developer/utilities/render/lod.qml +++ b/scripts/developer/utilities/render/lod.qml @@ -42,17 +42,33 @@ Item { checked: Render.getConfig("RenderMainView.DrawSceneOctree").enabled onCheckedChanged: { Render.getConfig("RenderMainView.DrawSceneOctree").enabled = checked } } - HifiControls.CheckBox { - boxSize: 20 - text: "Auto LOD" - checked: LODManager.automaticLODAdjust - onCheckedChanged: { LODManager.automaticLODAdjust = (checked) } - } -property var lodObject: LODManager RichSlider { showLabel: true - label: "lodLevel" + showValue: false + label: "World Quality" + valueVar: LODManager["worldDetailQuality"] + valueVarSetter: (function (v) { LODManager["worldDetailQuality"] = v }) + max: 0.75 + min: 0.25 + integral: false + + anchors.left: autoLOD.left + anchors.right: parent.right + } + + HifiControls.CheckBox { + id: autoLOD + boxSize: 20 + text: "Auto LOD" + checked: LODManager.automaticLODAdjust + onCheckedChanged: { LODManager.automaticLODAdjust = (checked) } + } + + RichSlider { + visible: !LODManager.automaticLODAdjust + showLabel: true + label: "LOD Level" valueVar: LODManager["lodLevel"] valueVarSetter: (function (v) { LODManager["lodLevel"] = v }) max: 1.0 @@ -62,33 +78,6 @@ property var lodObject: LODManager anchors.left: parent.left anchors.right: parent.right } - RichSlider { - showLabel: true - // config: lodObject - // property: "worldDetailQuality" - // valueVar: LODManager["worldDetailQuality"] - label: "World Quality" - valueVar: LODManager["worldDetailQuality"] - // valueVarGetter: { return LODManager["worldDetailQuality"] } - valueVarSetter: (function (v) { LODManager["worldDetailQuality"] = v }) - max: 0.75 - min: 0.25 - integral: false - - anchors.left: parent.left - anchors.right: parent.right - } - /* HifiControls.Slider { - id: sliderControl - stepSize: 0.0 - minimumValue: 0.0 - maximumValue: 1.2 - anchors.left: parent.left - anchors.right: parent.right - value: LODManager["lodLevel"] - onValueChanged: { LODManager["lodLevel"] = value } - }*/ - } Column {