From c4968a0e24d76399a8df6731d0ff60d7fceadb65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Str=C3=B8mme?= <christian.stromme@qt.io>
Date: Fri, 6 Mar 2020 16:25:59 +0100
Subject: [PATCH] Update plugins.qmltypes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: Ib131ed865aab6d8cf100a35c8d511540f2df6ed8
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
---
src/imports/quick3d/plugins.qmltypes | 40 +++++++++++-----------------
1 file changed, 15 insertions(+), 25 deletions(-)
diff --git a/src/imports/quick3d/plugins.qmltypes b/src/imports/quick3d/plugins.qmltypes
index 28464ea78..c29922124 100644
--- a/src/imports/quick3d/plugins.qmltypes
+++ b/src/imports/quick3d/plugins.qmltypes
@@ -869,38 +869,13 @@ Module {
exports: ["QtQuick3D/Object3D 1.14"]
isCreatable: false
exportMetaObjectRevisions: [0]
- Enum {
- name: "Type"
- values: {
- "Unknown": 0,
- "SceneEnvironment": 1,
- "Node": 2,
- "Layer": 3,
- "Light": 4,
- "Camera": 5,
- "Model": 6,
- "DefaultMaterial": 7,
- "PrincipledMaterial": 8,
- "Image": 9,
- "Effect": 10,
- "Text": 11,
- "CustomMaterial": 12,
- "RenderPlugin": 13,
- "Lightmaps": 14,
- "Geometry": 15,
- "Item2D": 16,
- "LastKnownGraphObjectType": 17
- }
- }
Property { name: "parent"; type: "QQuick3DObject"; isPointer: true }
Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
Property { name: "children"; type: "QQuick3DObject"; isList: true; isReadonly: true }
- Property { name: "type"; type: "QQuick3DObject::Type"; isReadonly: true }
Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
Property { name: "state"; type: "string" }
- Signal { name: "sceneManagerChanged" }
Method { name: "update" }
Method {
name: "setParentItem"
@@ -1536,6 +1511,21 @@ Module {
Parameter { name: "depthPrePassEnabled"; type: "bool" }
}
}
+ Component {
+ name: "QQuick3DShaderApplyDepthValue"
+ prototype: "QQuick3DShaderUtilsRenderCommand"
+ exports: ["QtQuick3D/DepthInput 1.15"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "param"; type: "QByteArray" }
+ }
+ Component {
+ name: "QQuick3DShaderUtilsApplyValue"
+ prototype: "QQuick3DShaderUtilsRenderCommand"
+ exports: ["QtQuick3D/SetUniformValue 1.15"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "target"; type: "QByteArray" }
+ Property { name: "value"; type: "QVariant" }
+ }
Component {
name: "QQuick3DShaderUtilsBlending"
prototype: "QQuick3DShaderUtilsRenderCommand"
--
GitLab