Showing the changes to scripts/developer (1 of 1 file). Show all
Unified · Split
| @@ -21,39 +21,25 @@ Rectangle { · 20 unmodified lines | |||
| 21 | anchors.margins: hifi.dimensions.contentMargin.x | 21 | anchors.margins: hifi.dimensions.contentMargin.x |
| 22 | 22 | ||
| 23 | color: hifi.colors.baseGray; | 23 | color: hifi.colors.baseGray; |
| 24 | property var mainViewTask: Render.getConfig("RenderMainView") | 24 | property var mainViewTask: Render.getConfig("RenderMainView") |
| 25 | 25 | ||
| 26 | Row { | ||
| 27 | anchors.left: parent.left | ||
| 28 | anchors.right: parent.right | ||
| 29 | anchors.margins: 10 | ||
| 30 | Column { | 26 | Column { |
| 31 | padding: 10 | ||
| 32 | spacing: 5 | 27 | spacing: 5 |
| 33 | |||
| 34 | // width: parent.width | ||
| 35 | anchors.left: parent.left | 28 | anchors.left: parent.left |
| 36 | anchors.right: parent.right | 29 | anchors.right: parent.right |
| 37 | // padding: hifi.dimensions.contentMargin.x | 30 | anchors.margins: hifi.dimensions.contentMargin.x |
| 38 | 31 | //padding: hifi.dimensions.contentMargin.x | |
| 39 | ConfigSlider { | 32 | HifiControls.Label { |
| 40 | label: qsTr("ToneMapping") | 33 | text: "Shading" |
| 41 | integral: false | ||
| 42 | config: render.mainViewTask.getConfig("ToneMapping") | ||
| 43 | property: "exposure" | ||
| 44 | max: 2 | ||
| 45 | min: 0 | ||
| 46 | |||
| 47 | anchors.left: parent.left | ||
| 48 | anchors.right: parent.right | ||
| 49 | } | 34 | } |
| 50 | |||
| 51 | Row { | 35 | Row { |
| 52 | 36 | anchors.left: parent.left | |
| 37 | anchors.right: parent.right | ||
| 38 | |||
| 53 | spacing: 20 | 39 | spacing: 20 |
| 54 | padding: 10 | ||
| 55 | Column { | 40 | Column { |
| 56 | spacing: 10 | 41 | spacing: 10 |
| 42 | // padding: 10 | ||
| 57 | Repeater { | 43 | Repeater { |
| 58 | model: [ | 44 | model: [ |
| 59 | "Unlit:LightingModel:enableUnlit", | 45 | "Unlit:LightingModel:enableUnlit", |
| @@ -116,6 +102,8 @@ Rectangle { · 56 unmodified lines | |||
| 116 | } | 102 | } |
| 117 | Separator {} | 103 | Separator {} |
| 118 | Column { | 104 | Column { |
| 105 | anchors.left: parent.left | ||
| 106 | anchors.right: parent.right | ||
| 119 | spacing: 10 | 107 | spacing: 10 |
| 120 | Repeater { | 108 | Repeater { |
| 121 | model: [ "Tone Mapping Exposure:ToneMapping:exposure:5.0:-5.0" | 109 | model: [ "Tone Mapping Exposure:ToneMapping:exposure:5.0:-5.0" |
| @@ -127,17 +115,22 @@ Rectangle { · 5 unmodified lines | |||
| 127 | property: modelData.split(":")[2] | 115 | property: modelData.split(":")[2] |
| 128 | max: modelData.split(":")[3] | 116 | max: modelData.split(":")[3] |
| 129 | min: modelData.split(":")[4] | 117 | min: modelData.split(":")[4] |
| 118 | |||
| 119 | anchors.left: parent.left | ||
| 120 | anchors.right: parent.right | ||
| 130 | } | 121 | } |
| 131 | } | 122 | } |
| 132 | 123 | ||
| 133 | Row { | 124 | Row { |
| 125 | anchors.left: parent.left | ||
| 126 | anchors.right: parent.right | ||
| 134 | HifiControls.Label { | 127 | HifiControls.Label { |
| 135 | text: "Tone Mapping Curve" | 128 | text: "Tone Mapping Curve" |
| 136 | anchors.left: root.left | 129 | // anchors.left: parent.left |
| 137 | } | 130 | } |
| 138 | 131 | ||
| 139 | HifiControls.ComboBox { | 132 | HifiControls.ComboBox { |
| 140 | anchors.right: root.right | 133 | // anchors.right: parent.right |
| 141 | currentIndex: 1 | 134 | currentIndex: 1 |
| 142 | model: ListModel { | 135 | model: ListModel { |
| 143 | id: cbItems | 136 | id: cbItems |
| @@ -151,7 +144,11 @@ Rectangle { · 7 unmodified lines | |||
| 151 | } | 144 | } |
| 152 | } | 145 | } |
| 153 | } | 146 | } |
| 147 | Separator {} | ||
| 148 | |||
| 154 | Row { | 149 | Row { |
| 150 | anchors.left: parent.left | ||
| 151 | anchors.right: parent.right | ||
| 155 | id: framebuffer | 152 | id: framebuffer |
| 156 | spacing: 10 | 153 | spacing: 10 |
| 157 | height: 24 | 154 | height: 24 |
| @@ -159,7 +156,7 @@ Rectangle { · 1 unmodified line | |||
| 159 | HifiControls.Label { | 156 | HifiControls.Label { |
| 160 | text: "Debug Framebuffer" | 157 | text: "Debug Framebuffer" |
| 161 | height: 24 | 158 | height: 24 |
| 162 | anchors.left: root.left | 159 | // anchors.left: parent.left |
| 163 | } | 160 | } |
| 164 | 161 | ||
| 165 | property var config: render.mainViewTask.getConfig("DebugDeferredBuffer") | 162 | property var config: render.mainViewTask.getConfig("DebugDeferredBuffer") |
| @@ -171,7 +168,7 @@ Rectangle { · 5 unmodified lines | |||
| 171 | 168 | ||
| 172 | HifiControls.ComboBox { | 169 | HifiControls.ComboBox { |
| 173 | height: 24 | 170 | height: 24 |
| 174 | anchors.right: root.right | 171 | // anchors.right: parent.right |
| 175 | currentIndex: 0 | 172 | currentIndex: 0 |
| 176 | model: ListModel { | 173 | model: ListModel { |
| 177 | id: cbItemsFramebuffer | 174 | id: cbItemsFramebuffer |
| @@ -273,5 +270,5 @@ Rectangle { · 95 unmodified lines | |||
| 273 | } | 270 | } |
| 274 | } | 271 | } |
| 275 | } | 272 | } |
| 276 | } | 273 | //} |
| 277 | } | 274 | } |