mirror of
https://github.com/overte-org/overte.git
synced 2025-07-23 12:04:03 +02:00
fix luci errors + updated config paths
This commit is contained in:
parent
3abd98b642
commit
e5e3c1bc08
6 changed files with 20 additions and 14 deletions
|
@ -60,7 +60,7 @@ Page.prototype.createView = function () {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
Pages = function (relativePath) {
|
function Pages(relativePath) {
|
||||||
print(relativePath)
|
print(relativePath)
|
||||||
this._relativePath = relativePath
|
this._relativePath = relativePath
|
||||||
this._pages = {};
|
this._pages = {};
|
||||||
|
@ -104,4 +104,10 @@ Pages.prototype.sendTo = function (command, message) {
|
||||||
this._pages[command].window.sendToQml(message);
|
this._pages[command].window.sendToQml(message);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
Page: Page,
|
||||||
|
Pages: Pages
|
||||||
|
}
|
||||||
|
|
||||||
}());
|
}());
|
||||||
|
|
|
@ -6,7 +6,7 @@ var Page = Script.require('../lib/skit/Page.js');
|
||||||
|
|
||||||
|
|
||||||
function openView() {
|
function openView() {
|
||||||
var pages = new Pages(Script.resolvePath("."));
|
var pages = new Page.Pages(Script.resolvePath("."));
|
||||||
|
|
||||||
function fromQml(message) {
|
function fromQml(message) {
|
||||||
if (pages.open(message.method)) {
|
if (pages.open(message.method)) {
|
||||||
|
|
|
@ -16,7 +16,7 @@ Column {
|
||||||
|
|
||||||
id: bloom
|
id: bloom
|
||||||
|
|
||||||
property var config: Render.getConfig("RenderMainView.DebugBloom")
|
property var config: Render.getConfig("RenderMainView.Bloom.DebugBloom")
|
||||||
|
|
||||||
Prop.PropBool {
|
Prop.PropBool {
|
||||||
label: "Apply Bloom"
|
label: "Apply Bloom"
|
||||||
|
|
|
@ -16,7 +16,7 @@ Column {
|
||||||
|
|
||||||
id: root;
|
id: root;
|
||||||
|
|
||||||
property var mainViewTask: Render.getConfig("RenderMainView")
|
property var mainViewTask: Render.getConfig("RenderMainView.DebugRenderDeferredTask")
|
||||||
|
|
||||||
spacing: 5
|
spacing: 5
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
|
|
|
@ -19,8 +19,8 @@ Column {
|
||||||
anchors.left: parent.left;
|
anchors.left: parent.left;
|
||||||
anchors.right: parent.right;
|
anchors.right: parent.right;
|
||||||
|
|
||||||
property var sceneOctree: Render.getConfig("RenderMainView.DrawSceneOctree");
|
property var sceneOctree: Render.getConfig("RenderMainView.DebugRenderDeferredTask.DrawSceneOctree");
|
||||||
property var itemSelection: Render.getConfig("RenderMainView.DrawItemSelection");
|
property var itemSelection: Render.getConfig("RenderMainView.DebugRenderDeferredTask.DrawItemSelection");
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
sceneOctree.enabled = true;
|
sceneOctree.enabled = true;
|
||||||
|
@ -35,8 +35,8 @@ Column {
|
||||||
Component.onDestruction: {
|
Component.onDestruction: {
|
||||||
sceneOctree.enabled = false;
|
sceneOctree.enabled = false;
|
||||||
itemSelection.enabled = false;
|
itemSelection.enabled = false;
|
||||||
Render.getConfig("RenderMainView.FetchSceneSelection").freezeFrustum = false;
|
Render.getConfig("RenderMainView.DebugRenderDeferredTask.FetchSceneSelection").freezeFrustum = false;
|
||||||
Render.getConfig("RenderMainView.CullSceneSelection").freezeFrustum = false;
|
Render.getConfig("RenderMainView.DebugRenderDeferredTask.CullSceneSelection").freezeFrustum = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
GroupBox {
|
GroupBox {
|
||||||
|
@ -54,8 +54,8 @@ Column {
|
||||||
text: "Freeze Culling Frustum"
|
text: "Freeze Culling Frustum"
|
||||||
checked: false
|
checked: false
|
||||||
onCheckedChanged: {
|
onCheckedChanged: {
|
||||||
Render.getConfig("RenderMainView.FetchSceneSelection").freezeFrustum = checked;
|
Render.getConfig("RenderMainView.DebugRenderDeferredTask.FetchSceneSelection").freezeFrustum = checked;
|
||||||
Render.getConfig("RenderMainView.CullSceneSelection").freezeFrustum = checked;
|
Render.getConfig("RenderMainView.DebugRenderDeferredTask.CullSceneSelection").freezeFrustum = checked;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Label {
|
Label {
|
||||||
|
@ -112,9 +112,9 @@ Column {
|
||||||
anchors.left: parent.left;
|
anchors.left: parent.left;
|
||||||
anchors.right: parent.right;
|
anchors.right: parent.right;
|
||||||
Repeater {
|
Repeater {
|
||||||
model: [ "Opaque:RenderMainView.DrawOpaqueDeferred", "Transparent:RenderMainView.DrawTransparentDeferred", "Light:RenderMainView.DrawLight",
|
model: [ "Opaque:RenderMainView.DebugRenderDeferredTask.DrawOpaqueDeferred", "Transparent:RenderMainView.DebugRenderDeferredTask.DrawTransparentDeferred", "Light:RenderMainView.DebugRenderDeferredTask.DrawLight",
|
||||||
"Opaque InFront:RenderMainView.DrawInFrontOpaque", "Transparent InFront:RenderMainView.DrawInFrontTransparent",
|
"Opaque InFront:RenderMainView.DebugRenderDeferredTask.DrawInFrontOpaque", "Transparent InFront:RenderMainView.DebugRenderDeferredTask.DrawInFrontTransparent",
|
||||||
"Opaque HUD:RenderMainView.DrawHUDOpaque", "Transparent HUD:RenderMainView.DrawHUDTransparent" ]
|
"Opaque HUD:RenderMainView.DebugRenderDeferredTask.DrawHUDOpaque", "Transparent HUD:RenderMainView.DebugRenderDeferredTask.DrawHUDTransparent" ]
|
||||||
Prop.PropScalar {
|
Prop.PropScalar {
|
||||||
label: qsTr(modelData.split(":")[0])
|
label: qsTr(modelData.split(":")[0])
|
||||||
integral: true
|
integral: true
|
||||||
|
|
|
@ -18,7 +18,7 @@ Column {
|
||||||
|
|
||||||
id: framebuffer
|
id: framebuffer
|
||||||
|
|
||||||
property var config: Render.getConfig("RenderMainView.DebugDeferredBuffer")
|
property var config: Render.getConfig("RenderMainView.DebugRenderDeferredTask.DebugDeferredBuffer")
|
||||||
|
|
||||||
function setDebugMode(mode) {
|
function setDebugMode(mode) {
|
||||||
framebuffer.config.enabled = (mode != 0);
|
framebuffer.config.enabled = (mode != 0);
|
||||||
|
|
Loading…
Reference in a new issue