Fixing the last scripts maybe

This commit is contained in:
Sam Cake 2017-06-21 00:15:29 -07:00
parent c35be446e6
commit a78018345b
3 changed files with 33 additions and 36 deletions

View file

@ -14,9 +14,8 @@ import "configSlider"
Column {
id: root
spacing: 8
property var mainViewTask: Render.getConfig("RenderMainView");
property var sceneOctree: mainViewTask.getConfig("DrawSceneOctree");
property var itemSelection: mainViewTask.getConfig("DrawItemSelection");
property var sceneOctree: Render.getConfig("RenderMainView.DrawSceneOctree");
property var itemSelection: Render.getConfig("RenderMainView.DrawItemSelection");
Component.onCompleted: {
sceneOctree.enabled = true;
@ -31,8 +30,8 @@ Column {
Component.onDestruction: {
sceneOctree.enabled = false;
itemSelection.enabled = false;
mainViewTask.getConfig("FetchSceneSelection").freezeFrustum = false;
mainViewTask.getConfig("CullSceneSelection").freezeFrustum = false;
Render.getConfig("RenderMainView.FetchSceneSelection").freezeFrustum = false;
Render.getConfig("RenderMainView.CullSceneSelection").freezeFrustum = false;
}
GroupBox {
@ -46,8 +45,8 @@ Column {
text: "Freeze Culling Frustum"
checked: false
onCheckedChanged: {
mainViewTask.getConfig("FetchSceneSelection").freezeFrustum = checked;
mainViewTask.getConfig("CullSceneSelection").freezeFrustum = checked;
Render.getConfig("RenderMainView.FetchSceneSelection").freezeFrustum = checked;
Render.getConfig("RenderMainView.CullSceneSelection").freezeFrustum = checked;
}
}
Label {
@ -99,12 +98,12 @@ Column {
Column{
Repeater {
model: [ "Opaque:DrawOpaqueDeferred", "Transparent:DrawTransparentDeferred", "Light:DrawLight",
"Opaque Overlays:DrawOverlay3DOpaque", "Transparent Overlays:DrawOverlay3DTransparent" ]
model: [ "Opaque:RenderMainView.DrawOpaqueDeferred", "Transparent:RenderMainView.DrawTransparentDeferred", "Light:RenderMainView.DrawLight",
"Opaque Overlays:RenderMainView.DrawOverlay3DOpaque", "Transparent Overlays:RenderMainView.DrawOverlay3DTransparent" ]
ConfigSlider {
label: qsTr(modelData.split(":")[0])
integral: true
config: mainViewTask.getConfig(modelData.split(":")[1])
config: Render.getConfig(modelData.split(":")[1])
property: "maxDrawn"
max: config.numDrawn
min: -1

View file

@ -16,29 +16,28 @@ Column {
Column {
id: scattering
spacing: 10
property var mainViewTask: Render.getConfig("RenderMainView");
Column{
Column{
CheckBox {
text: "Scattering"
checked: mainViewTask.getConfig("Scattering").enableScattering
onCheckedChanged: { mainViewTask.getConfig("Scattering").enableScattering = checked }
checked: Render.getConfig("RenderMainView.Scattering").enableScattering
onCheckedChanged: { Render.getConfig("RenderMainView.Scattering").enableScattering = checked }
}
CheckBox {
text: "Show Scattering BRDF"
checked: mainViewTask.getConfig("Scattering").showScatteringBRDF
onCheckedChanged: { mainViewTask.getConfig("Scattering").showScatteringBRDF = checked }
checked: Render.getConfig("RenderMainView.Scattering").showScatteringBRDF
onCheckedChanged: { Render.getConfig("RenderMainView.Scattering").showScatteringBRDF = checked }
}
CheckBox {
text: "Show Curvature"
checked: mainViewTask.getConfig("Scattering").showCurvature
onCheckedChanged: { mainViewTask.getConfig("Scattering").showCurvature = checked }
checked: Render.getConfig("RenderMainView.Scattering").showCurvature
onCheckedChanged: { Render.getConfig("RenderMainView.Scattering").showCurvature = checked }
}
CheckBox {
text: "Show Diffused Normal"
checked: mainViewTask.getConfig("Scattering").showDiffusedNormal
onCheckedChanged: { mainViewTask.getConfig("Scattering").showDiffusedNormal = checked }
checked: Render.getConfig("RenderMainView.Scattering").showDiffusedNormal
onCheckedChanged: { Render.getConfig("RenderMainView.Scattering").showDiffusedNormal = checked }
}
Repeater {
model: [ "Scattering Bent Red:Scattering:bentRed:2.0",
@ -59,23 +58,23 @@ Column {
}
CheckBox {
text: "Scattering Profile"
checked: mainViewTask.getConfig("DebugScattering").showProfile
onCheckedChanged: { mainViewTask.getConfig("DebugScattering").showProfile = checked }
checked: Render.getConfig("RenderMainView.DebugScattering").showProfile
onCheckedChanged: { Render.getConfig("RenderMainView.DebugScattering").showProfile = checked }
}
CheckBox {
text: "Scattering Table"
checked: mainViewTask.getConfig("DebugScattering").showLUT
onCheckedChanged: { mainViewTask.getConfig("DebugScattering").showLUT = checked }
checked: Render.getConfig("RenderMainView.DebugScattering").showLUT
onCheckedChanged: { Render.getConfig("RenderMainView.DebugScattering").showLUT = checked }
}
CheckBox {
text: "Cursor Pixel"
checked: mainViewTask.getConfig("DebugScattering").showCursorPixel
onCheckedChanged: { mainViewTask.getConfig("DebugScattering").showCursorPixel = checked }
checked: Render.getConfig("RenderMainView.DebugScattering").showCursorPixel
onCheckedChanged: { Render.getConfig("RenderMainView.DebugScattering").showCursorPixel = checked }
}
CheckBox {
text: "Skin Specular Beckmann"
checked: mainViewTask.getConfig("DebugScattering").showSpecularTable
onCheckedChanged: { mainViewTask.getConfig("DebugScattering").showSpecularTable = checked }
checked: Render.getConfig("RenderMainView.DebugScattering").showSpecularTable
onCheckedChanged: { Render.getConfig("RenderMainView.DebugScattering").showSpecularTable = checked }
}
}
}

View file

@ -16,13 +16,12 @@ Column {
Column {
id: surfaceGeometry
spacing: 10
property var mainViewTask: Render.getConfig("RenderMainView");
Column{
ConfigSlider {
label: qsTr("Depth Threshold [cm]")
integral: false
config: mainViewTask.getConfig("SurfaceGeometry")
config: Render.getConfig("RenderMainView.SurfaceGeometry")
property: "depthThreshold"
max: 5.0
min: 0.0
@ -35,7 +34,7 @@ Column {
ConfigSlider {
label: qsTr(modelData.split(":")[0])
integral: (modelData.split(":")[3] == 'true')
config: mainViewTask.getConfig("SurfaceGeometry")
config: Render.getConfig("RenderMainView.SurfaceGeometry")
property: modelData.split(":")[1]
max: modelData.split(":")[2]
min: 0.0
@ -43,18 +42,18 @@ Column {
}
CheckBox {
text: "Half Resolution"
checked: mainViewTask.getConfig("SurfaceGeometry")["resolutionLevel"]
onCheckedChanged: { mainViewTask.getConfig("SurfaceGeometry")["resolutionLevel"] = checked }
checked: Render.getConfig("RenderMainView.SurfaceGeometry")["resolutionLevel"]
onCheckedChanged: { Render.getConfig("RenderMainView.SurfaceGeometry")["resolutionLevel"] = checked }
}
Repeater {
model: [ "Diffusion Scale:SurfaceGeometry:diffuseFilterScale:2.0",
"Diffusion Depth Threshold:SurfaceGeometry:diffuseDepthThreshold:1.0"
model: [ "Diffusion Scale:RenderMainView.SurfaceGeometry:diffuseFilterScale:2.0",
"Diffusion Depth Threshold:RenderMainView.SurfaceGeometry:diffuseDepthThreshold:1.0"
]
ConfigSlider {
label: qsTr(modelData.split(":")[0])
integral: false
config: mainViewTask.getConfig(modelData.split(":")[1])
config: Render.getConfig(modelData.split(":")[1])
property: modelData.split(":")[2]
max: modelData.split(":")[3]
min: 0.0