diff --git a/qmlui/qml/FunctionDelegate.qml b/qmlui/qml/FunctionDelegate.qml index 3f59a39407..56c1688f73 100644 --- a/qmlui/qml/FunctionDelegate.qml +++ b/qmlui/qml/FunctionDelegate.qml @@ -103,9 +103,15 @@ Rectangle drag.target: dragItem - onPressed: funcDelegate.mouseEvent(App.Pressed, cRef.id, cRef.type, funcDelegate, mouse.modifiers) - onClicked: funcDelegate.mouseEvent(App.Clicked, cRef.id, cRef.type, funcDelegate, mouse.modifiers) - onDoubleClicked: funcDelegate.mouseEvent(App.DoubleClicked, cRef.id, cRef.type, funcDelegate, mouse.modifiers) + onPressed: function(mouse) { + funcDelegate.mouseEvent(App.Pressed, cRef.id, cRef.type, funcDelegate, mouse.modifiers) + } + onClicked: function(mouse) { + funcDelegate.mouseEvent(App.Clicked, cRef.id, cRef.type, funcDelegate, mouse.modifiers) + } + onDoubleClicked: function(mouse) { + funcDelegate.mouseEvent(App.DoubleClicked, cRef.id, cRef.type, funcDelegate, mouse.modifiers) + } } DropArea diff --git a/qmlui/qml/fixturesfunctions/3DView/3DView.qml b/qmlui/qml/fixturesfunctions/3DView/3DView.qml index 5d59e20aeb..5ac220674b 100644 --- a/qmlui/qml/fixturesfunctions/3DView/3DView.qml +++ b/qmlui/qml/fixturesfunctions/3DView/3DView.qml @@ -17,13 +17,15 @@ limitations under the License. */ -import QtQuick +import QtQuick 2.15 -import QtQuick.Scene3D -import Qt3D.Core -import Qt3D.Render -import Qt3D.Input -import Qt3D.Extras +import QtQuick.Scene3D 2.15 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import Qt3D.Input 2.15 +import Qt3D.Extras 2.15 + +import "." Rectangle { @@ -452,7 +454,7 @@ Rectangle if (!mouse.modifiers || (mouse.modifiers & Qt.ShiftModifier && direction == Qt.Horizontal)) viewCamera.panAboutViewCenter(-xDelta, Qt.vector3d(0, 1, 0)) if (!mouse.modifiers || (mouse.modifiers & Qt.ShiftModifier && direction == Qt.Vertical)) - viewCamera.tiltAboutViewCenter(yDelta, Qt.vector3d(1, 0, 0)) + viewCamera.tiltAboutViewCenter(yDelta) } else if (mouse.buttons === Qt.MiddleButton) // camera translation { diff --git a/qmlui/qml/fixturesfunctions/3DView/DownsampleFilter.qml b/qmlui/qml/fixturesfunctions/3DView/DownsampleFilter.qml index 9b4c23e0ab..bb6861ef99 100644 --- a/qmlui/qml/fixturesfunctions/3DView/DownsampleFilter.qml +++ b/qmlui/qml/fixturesfunctions/3DView/DownsampleFilter.qml @@ -17,9 +17,9 @@ limitations under the License. */ -import Qt3D.Core -import Qt3D.Render -import QtQuick +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import QtQuick 2.15 TechniqueFilter { diff --git a/qmlui/qml/fixturesfunctions/3DView/Fixture3DItem.qml b/qmlui/qml/fixturesfunctions/3DView/Fixture3DItem.qml index 8ceb4bccdb..728309af01 100644 --- a/qmlui/qml/fixturesfunctions/3DView/Fixture3DItem.qml +++ b/qmlui/qml/fixturesfunctions/3DView/Fixture3DItem.qml @@ -18,15 +18,14 @@ limitations under the License. */ -import QtQuick +import QtQuick 2.15 -import Qt3D.Core -import Qt3D.Render -import Qt3D.Extras +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import Qt3D.Extras 2.15 import org.qlcplus.classes 1.0 import "Math3DView.js" as Math3D -import "." Entity { @@ -340,8 +339,7 @@ Entity property var lastPos - onClicked: - { + onClicked: function (pick) { console.log("3D item clicked") isSelected = !isSelected contextManager.setItemSelection(itemID, isSelected, pick.modifiers) diff --git a/qmlui/qml/fixturesfunctions/3DView/Generic3DItem.qml b/qmlui/qml/fixturesfunctions/3DView/Generic3DItem.qml index a16d91716b..fce3f8d4c1 100644 --- a/qmlui/qml/fixturesfunctions/3DView/Generic3DItem.qml +++ b/qmlui/qml/fixturesfunctions/3DView/Generic3DItem.qml @@ -54,8 +54,7 @@ Entity id: eObjectPicker dragEnabled: true - onClicked: - { + onClicked: function (pick) { console.log("3D item clicked") isSelected = !isSelected View3D.setItemSelection(itemID, isSelected, pick.modifiers) diff --git a/qmlui/qml/fixturesfunctions/3DView/GenericScreenQuadEntity.qml b/qmlui/qml/fixturesfunctions/3DView/GenericScreenQuadEntity.qml index 1c1bb0d4c7..b4e285c5af 100644 --- a/qmlui/qml/fixturesfunctions/3DView/GenericScreenQuadEntity.qml +++ b/qmlui/qml/fixturesfunctions/3DView/GenericScreenQuadEntity.qml @@ -48,6 +48,12 @@ Entity { id: quadMaterial effect: quadEffect + parameters: [ + Parameter { name: "tex"; value: Texture2D { format: Texture.RGBA32F } }, + Parameter { name: "colorTex"; value: Texture2D { format: Texture.RGBA32F } }, + Parameter { name: "albedoTex"; value: Texture2D { format: Texture.RGBA32F } }, + Parameter { name: "normalTex"; value: Texture2D { format: Texture.RGBA32F } } + ] } components: [ diff --git a/qmlui/qml/fixturesfunctions/3DView/MultiBeams3DItem.qml b/qmlui/qml/fixturesfunctions/3DView/MultiBeams3DItem.qml index 0415925d1d..caedb82571 100644 --- a/qmlui/qml/fixturesfunctions/3DView/MultiBeams3DItem.qml +++ b/qmlui/qml/fixturesfunctions/3DView/MultiBeams3DItem.qml @@ -222,8 +222,8 @@ Entity effect: sceneEffect parameters: [ - Parameter { name: "diffuse"; value: Qt.color("gray") }, - Parameter { name: "specular"; value: Qt.color("black") }, + Parameter { name: "diffuse"; value: Qt.rgba(211, 211, 211, 1) }, + Parameter { name: "specular"; value: Qt.rgba(0, 0, 0, 1) }, Parameter { name: "shininess"; value: 1.0 }, Parameter { name: "bloom"; value: 0 } ] @@ -274,8 +274,7 @@ Entity property var lastPos - onClicked: - { + onClicked: function (pick) { console.log("3D item clicked") isSelected = !isSelected contextManager.setItemSelection(itemID, isSelected, pick.modifiers) diff --git a/qmlui/qml/fixturesfunctions/3DView/PixelBar3DItem.qml b/qmlui/qml/fixturesfunctions/3DView/PixelBar3DItem.qml index 55581275bf..db1d9114d7 100644 --- a/qmlui/qml/fixturesfunctions/3DView/PixelBar3DItem.qml +++ b/qmlui/qml/fixturesfunctions/3DView/PixelBar3DItem.qml @@ -81,8 +81,8 @@ Entity effect: sceneEffect parameters: [ - Parameter { name: "diffuse"; value: Qt.color("gray") }, - Parameter { name: "specular"; value: Qt.color("black") }, + Parameter { name: "diffuse"; value: Qt.rgba(211, 211, 211, 1) }, + Parameter { name: "specular"; value: Qt.rgba(0, 0, 0, 1) }, Parameter { name: "shininess"; value: 1.0 }, Parameter { name: "bloom"; value: 0 } ] @@ -101,8 +101,7 @@ Entity id: headsRepeater //model: fixtureEntity.headsNumber - onObjectAdded: - { + onObjectAdded: function (index, object) { console.log("Head " + index + " added ----------------") if (index == fixtureEntity.headsNumber - 1) View3D.initializeFixture(itemID, fixtureEntity, null) @@ -144,7 +143,7 @@ Entity name: "diffuse" value: Qt.rgba(lightColor.r * lightIntensity, lightColor.g * lightIntensity, lightColor.b * lightIntensity, 1) }, - Parameter { name: "specular"; value: "black" }, + Parameter { name: "specular"; value: Qt.rgba(0, 0, 0, 1) }, Parameter { name: "shininess"; value: 1.0 }, Parameter { name: "bloom"; value: 1 } ] @@ -167,8 +166,7 @@ Entity property var lastPos - onClicked: - { + onClicked: function (pick) { console.log("3D item clicked") isSelected = !isSelected contextManager.setItemSelection(itemID, isSelected, pick.modifiers) diff --git a/qmlui/qml/fixturesfunctions/3DView/ScreenQuadEntity.qml b/qmlui/qml/fixturesfunctions/3DView/ScreenQuadEntity.qml index cd6e87710b..bd17df9958 100644 --- a/qmlui/qml/fixturesfunctions/3DView/ScreenQuadEntity.qml +++ b/qmlui/qml/fixturesfunctions/3DView/ScreenQuadEntity.qml @@ -51,6 +51,12 @@ Entity { Component.onCompleted: View3D.quadReady() effect: LightPassEffect { } + parameters: [ + Parameter { name: "albedoTex"; value: Texture2D { format: Texture.RGBA32F } }, + Parameter { name: "depthTex"; value: Texture2D { format: Texture.D32F } }, + Parameter { name: "normalTex"; value: Texture2D { format: Texture.RGBA32F } }, + Parameter { name: "specularTex"; value: Texture2D { format: Texture.RGBA32F } } + ] } ] } diff --git a/qmlui/qml/fixturesfunctions/3DView/ScreenQuadGammaCorrectEntity.qml b/qmlui/qml/fixturesfunctions/3DView/ScreenQuadGammaCorrectEntity.qml index 34babe5bc2..f98dd955fb 100644 --- a/qmlui/qml/fixturesfunctions/3DView/ScreenQuadGammaCorrectEntity.qml +++ b/qmlui/qml/fixturesfunctions/3DView/ScreenQuadGammaCorrectEntity.qml @@ -48,6 +48,10 @@ Entity Material { effect: GammaCorrectEffect { } + parameters: [ + Parameter { name: "hdrTex"; value: Texture2D { format: Texture.RGBA32F } }, + Parameter { name: "bloomTex"; value: Texture2D { format: Texture.RGBA32F } } + ] } ] } diff --git a/qmlui/qml/fixturesfunctions/3DView/SelectionEntity.qml b/qmlui/qml/fixturesfunctions/3DView/SelectionEntity.qml index 2d1f824064..e145cfdd81 100644 --- a/qmlui/qml/fixturesfunctions/3DView/SelectionEntity.qml +++ b/qmlui/qml/fixturesfunctions/3DView/SelectionEntity.qml @@ -49,7 +49,7 @@ Entity parameters: [ Parameter { name: "diffuse"; value: color }, - Parameter { name: "specular"; value: Qt.color("black") }, + Parameter { name: "specular"; value: Qt.rgba(0, 0, 0, 1) }, Parameter { name: "shininess"; value: 1.0 }, Parameter { name: "bloom"; value: 0 } ] diff --git a/qmlui/qml/fixturesfunctions/3DView/SelectionGeometry.qml b/qmlui/qml/fixturesfunctions/3DView/SelectionGeometry.qml index 32d32264fe..bc3ca1c274 100644 --- a/qmlui/qml/fixturesfunctions/3DView/SelectionGeometry.qml +++ b/qmlui/qml/fixturesfunctions/3DView/SelectionGeometry.qml @@ -17,9 +17,9 @@ limitations under the License. */ -import Qt3D.Core -import Qt3D.Render -import Qt3D.Extras +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import Qt3D.Extras 2.15 GeometryRenderer { diff --git a/qmlui/qml/fixturesfunctions/3DView/SpotlightConeEntity.qml b/qmlui/qml/fixturesfunctions/3DView/SpotlightConeEntity.qml index e9b69bd082..3cfc9aefef 100644 --- a/qmlui/qml/fixturesfunctions/3DView/SpotlightConeEntity.qml +++ b/qmlui/qml/fixturesfunctions/3DView/SpotlightConeEntity.qml @@ -42,8 +42,8 @@ Entity property Entity fxItem: null parameters: [ - Parameter { name: "diffuse"; value: Qt.color("blue") }, - Parameter { name: "specular"; value: Qt.color("black") }, + Parameter { name: "diffuse"; value: Qt.rgba(0, 0, 1, 1) }, + Parameter { name: "specular"; value: Qt.rgba(0, 0, 0, 1) }, Parameter { name: "shininess"; value: 1.0 }, Parameter { name: "bloom"; value: 0 }, diff --git a/qmlui/qml/fixturesfunctions/3DView/StageBox.qml b/qmlui/qml/fixturesfunctions/3DView/StageBox.qml index ac4f72bda8..93538bcada 100644 --- a/qmlui/qml/fixturesfunctions/3DView/StageBox.qml +++ b/qmlui/qml/fixturesfunctions/3DView/StageBox.qml @@ -37,8 +37,8 @@ Entity effect: stage.effect parameters: [ - Parameter { name: "diffuse"; value: Qt.color("lightgray") }, - Parameter { name: "specular"; value: Qt.color("black") }, + Parameter { name: "diffuse"; value: Qt.rgba(211, 211, 211, 1) }, + Parameter { name: "specular"; value: Qt.rgba(0, 0, 0, 1) }, Parameter { name: "shininess"; value: 1.0 }, Parameter { name: "bloom"; value: 0 } ] @@ -76,7 +76,9 @@ Entity ObjectPicker { id: groundPicker - onClicked: contextManager.setPositionPickPoint(pick.worldIntersection) + onClicked: function(pick) { + contextManager.setPositionPickPoint(pick.worldIntersection) + } } components: [ @@ -98,7 +100,9 @@ Entity ObjectPicker { id: leftPicker - onClicked: contextManager.setPositionPickPoint(pick.worldIntersection) + onClicked: function (pick) { + contextManager.setPositionPickPoint(pick.worldIntersection) + } } components: [ @@ -119,7 +123,9 @@ Entity ObjectPicker { id: rightPicker - onClicked: contextManager.setPositionPickPoint(pick.worldIntersection) + onClicked: function (pick) { + contextManager.setPositionPickPoint(pick.worldIntersection) + } } components: [ @@ -140,7 +146,9 @@ Entity ObjectPicker { id: backPicker - onClicked: contextManager.setPositionPickPoint(pick.worldIntersection) + onClicked: function (pick) { + contextManager.setPositionPickPoint(pick.worldIntersection) + } } components: [ diff --git a/qmlui/qml/fixturesfunctions/3DView/StageRock.qml b/qmlui/qml/fixturesfunctions/3DView/StageRock.qml index 583d3c6ca2..14c1ca8bcd 100644 --- a/qmlui/qml/fixturesfunctions/3DView/StageRock.qml +++ b/qmlui/qml/fixturesfunctions/3DView/StageRock.qml @@ -42,8 +42,8 @@ Entity effect: stage.effect parameters: [ - Parameter { name: "diffuse"; value: Qt.color("lightgray") }, - Parameter { name: "specular"; value: Qt.color("black") }, + Parameter { name: "diffuse"; value: Qt.rgba(211, 211, 211, 1) }, + Parameter { name: "specular"; value: Qt.rgba(0, 0, 0, 1) }, Parameter { name: "shininess"; value: 1.0 }, Parameter { name: "bloom"; value: 0 } ] @@ -203,7 +203,9 @@ Entity ObjectPicker { id: stagePicker - onClicked: contextManager.setPositionPickPoint(pick.worldIntersection) + onClicked: function (pick) { + contextManager.setPositionPickPoint(pick.worldIntersection) + } } components: [ diff --git a/qmlui/qml/fixturesfunctions/3DView/StageSimple.qml b/qmlui/qml/fixturesfunctions/3DView/StageSimple.qml index 28b8af2af2..155baa8f71 100644 --- a/qmlui/qml/fixturesfunctions/3DView/StageSimple.qml +++ b/qmlui/qml/fixturesfunctions/3DView/StageSimple.qml @@ -35,8 +35,8 @@ Entity { effect: stage.effect parameters: [ - Parameter { name: "diffuse"; value: Qt.color("lightgray") }, - Parameter { name: "specular"; value: Qt.color("black") }, + Parameter { name: "diffuse"; value: Qt.rgba(211, 211, 211, 1) }, + Parameter { name: "specular"; value: Qt.rgba(0, 0, 0, 1) }, Parameter { name: "shininess"; value: 1.0 }, Parameter { name: "bloom"; value: 0 } ] diff --git a/qmlui/qml/fixturesfunctions/3DView/StageTheatre.qml b/qmlui/qml/fixturesfunctions/3DView/StageTheatre.qml index 47aef124e2..3b35bdd6ac 100644 --- a/qmlui/qml/fixturesfunctions/3DView/StageTheatre.qml +++ b/qmlui/qml/fixturesfunctions/3DView/StageTheatre.qml @@ -45,8 +45,8 @@ Entity { effect: stage.effect parameters: [ - Parameter { name: "diffuse"; value: Qt.color("lightgray") }, - Parameter { name: "specular"; value: Qt.color("black") }, + Parameter { name: "diffuse"; value: Qt.rgba(211, 211, 211, 1) }, + Parameter { name: "specular"; value: Qt.rgba(0, 0, 0, 1) }, Parameter { name: "shininess"; value: 1.0 }, Parameter { name: "bloom"; value: 0 } ] @@ -167,7 +167,9 @@ Entity ObjectPicker { id: stagePicker - onClicked: contextManager.setPositionPickPoint(pick.worldIntersection) + onClicked: function (pick) { + contextManager.setPositionPickPoint(pick.worldIntersection) + } } components: [ diff --git a/qmlui/qml/fixturesfunctions/3DView/UpsampleFilter.qml b/qmlui/qml/fixturesfunctions/3DView/UpsampleFilter.qml index 586ee62d4d..1815afb672 100644 --- a/qmlui/qml/fixturesfunctions/3DView/UpsampleFilter.qml +++ b/qmlui/qml/fixturesfunctions/3DView/UpsampleFilter.qml @@ -17,9 +17,9 @@ limitations under the License. */ -import Qt3D.Core -import Qt3D.Render -import QtQuick +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import QtQuick 2.15 TechniqueFilter { diff --git a/qmlui/qml/fixturesfunctions/RightPanel.qml b/qmlui/qml/fixturesfunctions/RightPanel.qml index 407d335c86..574658e530 100644 --- a/qmlui/qml/fixturesfunctions/RightPanel.qml +++ b/qmlui/qml/fixturesfunctions/RightPanel.qml @@ -22,6 +22,7 @@ import QtQuick.Layouts 1.0 import QtQuick.Dialogs import org.qlcplus.classes 1.0 + import "." SidePanel @@ -102,8 +103,7 @@ SidePanel animatePanel(true) } - onContentLoaded: - { + onContentLoaded: function(item, ID) { if (item.hasOwnProperty("functionID")) item.functionID = itemID } diff --git a/qmlui/qml/fixturesfunctions/SceneEditor.qml b/qmlui/qml/fixturesfunctions/SceneEditor.qml index cc7bd4daae..162c277f6f 100644 --- a/qmlui/qml/fixturesfunctions/SceneEditor.qml +++ b/qmlui/qml/fixturesfunctions/SceneEditor.qml @@ -119,7 +119,9 @@ Rectangle id: toolbar visible: !boundToSequence text: sceneEditor ? sceneEditor.functionName : "" - onTextChanged: sceneEditor.functionName = text + onTextChanged: function(text) { + sceneEditor.functionName = text + } onBackClicked: {