diff options
author | Mike Krus <mike.krus@kdab.com> | 2017-05-02 09:31:04 +0100 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2017-05-03 20:30:53 +0000 |
commit | ba2974a8abdf0048d2c8ecc821d369c74598e39f (patch) | |
tree | 452a6f3f5dae44bc6ca5f9742d0877c13e4b0091 | |
parent | 6fb72aa81e454b31e042472144db672d39c3c311 (diff) |
Update qmltypes files
Task-number: QTBUG-60514
Change-Id: Idc42a21109abef5563e6e8cda1a338147bb8dfce
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | src/quick3d/imports/animation/plugins.qmltypes | 670 | ||||
-rw-r--r-- | src/quick3d/imports/core/plugins.qmltypes | 82 | ||||
-rw-r--r-- | src/quick3d/imports/extras/plugins.qmltypes | 394 | ||||
-rw-r--r-- | src/quick3d/imports/input/plugins.qmltypes | 86 | ||||
-rw-r--r-- | src/quick3d/imports/logic/plugins.qmltypes | 27 | ||||
-rw-r--r-- | src/quick3d/imports/render/plugins.qmltypes | 438 |
6 files changed, 1453 insertions, 244 deletions
diff --git a/src/quick3d/imports/animation/plugins.qmltypes b/src/quick3d/imports/animation/plugins.qmltypes new file mode 100644 index 000000000..08879ee52 --- /dev/null +++ b/src/quick3d/imports/animation/plugins.qmltypes @@ -0,0 +1,670 @@ +import QtQuick.tooling 1.2 + +// This file describes the plugin-supplied types contained in the library. +// It is used for QML tooling purposes only. +// +// This file was auto-generated by: +// 'qmlplugindump -nonrelocatable Qt3D.Animation 2.9' + +Module { + dependencies: ["QtQuick 2.8"] + Component { + name: "Qt3DAnimation::Animation::Quick::Quick3DChannelMapper" + defaultProperty: "mappings" + prototype: "Qt3DAnimation::QChannelMapper" + exports: ["Qt3D.Animation/ChannelMapper 2.9"] + exportMetaObjectRevisions: [0] + Property { + name: "mappings" + type: "Qt3DAnimation::QChannelMapping" + isList: true + isReadonly: true + } + } + Component { + name: "Qt3DAnimation::QAbstractAnimation" + prototype: "QObject" + exports: ["Qt3D.Animation/AbstractAnimation 2.9"] + isCreatable: false + exportMetaObjectRevisions: [0] + Enum { + name: "AnimationType" + values: { + "KeyframeAnimation": 1, + "MorphingAnimation": 2, + "VertexBlendAnimation": 3 + } + } + Property { name: "animationName"; type: "string" } + Property { name: "animationType"; type: "QAbstractAnimation::AnimationType"; isReadonly: true } + Property { name: "position"; type: "float" } + Property { name: "duration"; type: "float"; isReadonly: true } + Signal { + name: "animationNameChanged" + Parameter { name: "name"; type: "string" } + } + Signal { + name: "positionChanged" + Parameter { name: "position"; type: "float" } + } + Signal { + name: "durationChanged" + Parameter { name: "duration"; type: "float" } + } + Method { + name: "setAnimationName" + Parameter { name: "name"; type: "string" } + } + Method { + name: "setPosition" + Parameter { name: "position"; type: "float" } + } + } + Component { + name: "Qt3DAnimation::QAbstractAnimationClip" + prototype: "Qt3DCore::QNode" + exports: ["Qt3D.Animation/AbstractAnimationClip 2.9"] + isCreatable: false + exportMetaObjectRevisions: [0] + Property { name: "duration"; type: "float"; isReadonly: true } + Signal { + name: "durationChanged" + Parameter { name: "duration"; type: "float" } + } + } + Component { + name: "Qt3DAnimation::QAbstractClipAnimator" + prototype: "Qt3DCore::QComponent" + exports: ["Qt3D.Animation/AbstractClipAnimator 2.9"] + isCreatable: false + exportMetaObjectRevisions: [0] + Enum { + name: "Loops" + values: { + "Infinite": -1 + } + } + Property { name: "running"; type: "bool" } + Property { name: "loops"; type: "int" } + Property { name: "channelMapper"; type: "Qt3DAnimation::QChannelMapper"; isPointer: true } + Signal { + name: "runningChanged" + Parameter { name: "running"; type: "bool" } + } + Signal { + name: "channelMapperChanged" + Parameter { name: "channelMapper"; type: "Qt3DAnimation::QChannelMapper"; isPointer: true } + } + Signal { + name: "loopCountChanged" + Parameter { name: "loops"; type: "int" } + } + Method { + name: "setRunning" + Parameter { name: "running"; type: "bool" } + } + Method { + name: "setChannelMapper" + Parameter { name: "channelMapper"; type: "Qt3DAnimation::QChannelMapper"; isPointer: true } + } + Method { + name: "setLoopCount" + Parameter { name: "loops"; type: "int" } + } + } + Component { + name: "Qt3DAnimation::QAbstractClipBlendNode" + prototype: "Qt3DCore::QNode" + exports: ["Qt3D.Animation/AbstractClipBlendNode 2.9"] + isCreatable: false + exportMetaObjectRevisions: [0] + } + Component { + name: "Qt3DAnimation::QAdditiveClipBlend" + prototype: "Qt3DAnimation::QAbstractClipBlendNode" + exports: ["Qt3D.Animation/AdditiveClipBlend 2.9"] + exportMetaObjectRevisions: [0] + Property { name: "baseClip"; type: "Qt3DAnimation::QAbstractClipBlendNode"; isPointer: true } + Property { + name: "additiveClip" + type: "Qt3DAnimation::QAbstractClipBlendNode" + isPointer: true + } + Property { name: "additiveFactor"; type: "float" } + Signal { + name: "additiveFactorChanged" + Parameter { name: "additiveFactor"; type: "float" } + } + Signal { + name: "baseClipChanged" + Parameter { name: "baseClip"; type: "Qt3DAnimation::QAbstractClipBlendNode"; isPointer: true } + } + Signal { + name: "additiveClipChanged" + Parameter { + name: "additiveClip" + type: "Qt3DAnimation::QAbstractClipBlendNode" + isPointer: true + } + } + Method { + name: "setAdditiveFactor" + Parameter { name: "additiveFactor"; type: "float" } + } + Method { + name: "setBaseClip" + Parameter { name: "baseClip"; type: "Qt3DAnimation::QAbstractClipBlendNode"; isPointer: true } + } + Method { + name: "setAdditiveClip" + Parameter { + name: "additiveClip" + type: "Qt3DAnimation::QAbstractClipBlendNode" + isPointer: true + } + } + } + Component { + name: "Qt3DAnimation::QAnimationClip" + prototype: "Qt3DAnimation::QAbstractAnimationClip" + exports: ["Qt3D.Animation/AnimationClip 2.9"] + exportMetaObjectRevisions: [0] + Property { name: "clipData"; type: "Qt3DAnimation::QAnimationClipData" } + Signal { + name: "clipDataChanged" + Parameter { name: "clipData"; type: "Qt3DAnimation::QAnimationClipData" } + } + Method { + name: "setClipData" + Parameter { name: "clipData"; type: "Qt3DAnimation::QAnimationClipData" } + } + } + Component { + name: "Qt3DAnimation::QAnimationClipLoader" + prototype: "Qt3DAnimation::QAbstractAnimationClip" + exports: ["Qt3D.Animation/AnimationClipLoader 2.9"] + exportMetaObjectRevisions: [0] + Enum { + name: "Status" + values: { + "NotReady": 0, + "Ready": 1, + "Error": 2 + } + } + Property { name: "source"; type: "QUrl" } + Property { name: "status"; type: "Status"; isReadonly: true } + Signal { + name: "sourceChanged" + Parameter { name: "source"; type: "QUrl" } + } + Signal { + name: "statusChanged" + Parameter { name: "status"; type: "Status" } + } + Method { + name: "setSource" + Parameter { name: "source"; type: "QUrl" } + } + } + Component { + name: "Qt3DAnimation::QAnimationController" + prototype: "QObject" + Property { name: "activeAnimationGroup"; type: "int" } + Property { name: "position"; type: "float" } + Property { name: "positionScale"; type: "float" } + Property { name: "positionOffset"; type: "float" } + Property { name: "entity"; type: "Qt3DCore::QEntity"; isPointer: true } + Property { name: "recursive"; type: "bool" } + Signal { + name: "activeAnimationGroupChanged" + Parameter { name: "index"; type: "int" } + } + Signal { + name: "positionChanged" + Parameter { name: "position"; type: "float" } + } + Signal { + name: "positionScaleChanged" + Parameter { name: "scale"; type: "float" } + } + Signal { + name: "positionOffsetChanged" + Parameter { name: "offset"; type: "float" } + } + Signal { + name: "entityChanged" + Parameter { name: "entity"; type: "Qt3DCore::QEntity"; isPointer: true } + } + Signal { + name: "recursiveChanged" + Parameter { name: "recursive"; type: "bool" } + } + Method { + name: "setActiveAnimationGroup" + Parameter { name: "index"; type: "int" } + } + Method { + name: "setPosition" + Parameter { name: "position"; type: "float" } + } + Method { + name: "setPositionScale" + Parameter { name: "scale"; type: "float" } + } + Method { + name: "setPositionOffset" + Parameter { name: "offset"; type: "float" } + } + Method { + name: "setEntity" + Parameter { name: "entity"; type: "Qt3DCore::QEntity"; isPointer: true } + } + Method { + name: "setRecursive" + Parameter { name: "recursive"; type: "bool" } + } + Method { + name: "getAnimationIndex" + type: "int" + Parameter { name: "name"; type: "string" } + } + Method { + name: "getGroup" + type: "Qt3DAnimation::QAnimationGroup*" + Parameter { name: "index"; type: "int" } + } + } + Component { + name: "Qt3DAnimation::QAnimationGroup" + prototype: "QObject" + Property { name: "name"; type: "string" } + Property { name: "position"; type: "float" } + Property { name: "duration"; type: "float"; isReadonly: true } + Signal { + name: "nameChanged" + Parameter { name: "name"; type: "string" } + } + Signal { + name: "positionChanged" + Parameter { name: "position"; type: "float" } + } + Signal { + name: "durationChanged" + Parameter { name: "duration"; type: "float" } + } + Method { + name: "setName" + Parameter { name: "name"; type: "string" } + } + Method { + name: "setPosition" + Parameter { name: "position"; type: "float" } + } + } + Component { + name: "Qt3DAnimation::QBlendedClipAnimator" + prototype: "Qt3DAnimation::QAbstractClipAnimator" + exports: ["Qt3D.Animation/BlendedClipAnimator 2.9"] + exportMetaObjectRevisions: [0] + Property { name: "blendTree"; type: "Qt3DAnimation::QAbstractClipBlendNode"; isPointer: true } + Signal { + name: "blendTreeChanged" + Parameter { name: "blendTree"; type: "QAbstractClipBlendNode"; isPointer: true } + } + Method { + name: "setBlendTree" + Parameter { name: "blendTree"; type: "QAbstractClipBlendNode"; isPointer: true } + } + } + Component { name: "Qt3DAnimation::QChannelMapper"; prototype: "Qt3DCore::QNode" } + Component { + name: "Qt3DAnimation::QChannelMapping" + prototype: "Qt3DCore::QNode" + exports: ["Qt3D.Animation/ChannelMapping 2.9"] + exportMetaObjectRevisions: [0] + Property { name: "channelName"; type: "string" } + Property { name: "target"; type: "Qt3DCore::QNode"; isPointer: true } + Property { name: "property"; type: "string" } + Signal { + name: "channelNameChanged" + Parameter { name: "channelName"; type: "string" } + } + Signal { + name: "targetChanged" + Parameter { name: "target"; type: "Qt3DCore::QNode"; isPointer: true } + } + Signal { + name: "propertyChanged" + Parameter { name: "property"; type: "string" } + } + Method { + name: "setChannelName" + Parameter { name: "channelName"; type: "string" } + } + Method { + name: "setTarget" + Parameter { name: "target"; type: "Qt3DCore::QNode"; isPointer: true } + } + Method { + name: "setProperty" + Parameter { name: "property"; type: "string" } + } + } + Component { + name: "Qt3DAnimation::QClipAnimator" + prototype: "Qt3DAnimation::QAbstractClipAnimator" + exports: ["Qt3D.Animation/ClipAnimator 2.9"] + exportMetaObjectRevisions: [0] + Property { name: "clip"; type: "Qt3DAnimation::QAbstractAnimationClip"; isPointer: true } + Signal { + name: "clipChanged" + Parameter { name: "clip"; type: "Qt3DAnimation::QAbstractAnimationClip"; isPointer: true } + } + Method { + name: "setClip" + Parameter { name: "clip"; type: "Qt3DAnimation::QAbstractAnimationClip"; isPointer: true } + } + } + Component { + name: "Qt3DAnimation::QClipBlendValue" + prototype: "Qt3DAnimation::QAbstractClipBlendNode" + exports: ["Qt3D.Animation/ClipBlendValue 2.9"] + exportMetaObjectRevisions: [0] + Property { name: "clip"; type: "Qt3DAnimation::QAbstractAnimationClip"; isPointer: true } + Signal { + name: "clipChanged" + Parameter { name: "clip"; type: "Qt3DAnimation::QAbstractAnimationClip"; isPointer: true } + } + Method { + name: "setClip" + Parameter { name: "clip"; type: "Qt3DAnimation::QAbstractAnimationClip"; isPointer: true } + } + } + Component { + name: "Qt3DAnimation::QKeyframeAnimation" + prototype: "Qt3DAnimation::QAbstractAnimation" + Enum { + name: "RepeatMode" + values: { + "None": 0, + "Constant": 1, + "Repeat": 2 + } + } + Property { name: "framePositions"; type: "QVector<float>" } + Property { name: "target"; type: "Qt3DCore::QTransform"; isPointer: true } + Property { name: "easing"; type: "QEasingCurve" } + Property { name: "targetName"; type: "string" } + Property { name: "startMode"; type: "QKeyframeAnimation::RepeatMode" } + Property { name: "endMode"; type: "QKeyframeAnimation::RepeatMode" } + Signal { + name: "framePositionsChanged" + Parameter { name: "positions"; type: "QVector<float>" } + } + Signal { + name: "targetChanged" + Parameter { name: "target"; type: "Qt3DCore::QTransform"; isPointer: true } + } + Signal { + name: "easingChanged" + Parameter { name: "easing"; type: "QEasingCurve" } + } + Signal { + name: "targetNameChanged" + Parameter { name: "name"; type: "string" } + } + Signal { + name: "startModeChanged" + Parameter { name: "startMode"; type: "QKeyframeAnimation::RepeatMode" } + } + Signal { + name: "endModeChanged" + Parameter { name: "endMode"; type: "QKeyframeAnimation::RepeatMode" } + } + Method { + name: "setFramePositions" + Parameter { name: "positions"; type: "QVector<float>" } + } + Method { + name: "setTarget" + Parameter { name: "target"; type: "Qt3DCore::QTransform"; isPointer: true } + } + Method { + name: "setEasing" + Parameter { name: "easing"; type: "QEasingCurve" } + } + Method { + name: "setTargetName" + Parameter { name: "name"; type: "string" } + } + Method { + name: "setStartMode" + Parameter { name: "mode"; type: "RepeatMode" } + } + Method { + name: "setEndMode" + Parameter { name: "mode"; type: "RepeatMode" } + } + } + Component { + name: "Qt3DAnimation::QLerpClipBlend" + prototype: "Qt3DAnimation::QAbstractClipBlendNode" + exports: ["Qt3D.Animation/LerpClipBlend 2.9"] + exportMetaObjectRevisions: [0] + Property { name: "startClip"; type: "Qt3DAnimation::QAbstractClipBlendNode"; isPointer: true } + Property { name: "endClip"; type: "Qt3DAnimation::QAbstractClipBlendNode"; isPointer: true } + Property { name: "blendFactor"; type: "float" } + Signal { + name: "blendFactorChanged" + Parameter { name: "blendFactor"; type: "float" } + } + Signal { + name: "startClipChanged" + Parameter { name: "startClip"; type: "Qt3DAnimation::QAbstractClipBlendNode"; isPointer: true } + } + Signal { + name: "endClipChanged" + Parameter { name: "endClip"; type: "Qt3DAnimation::QAbstractClipBlendNode"; isPointer: true } + } + Method { + name: "setBlendFactor" + Parameter { name: "blendFactor"; type: "float" } + } + Method { + name: "setStartClip" + Parameter { name: "startClip"; type: "Qt3DAnimation::QAbstractClipBlendNode"; isPointer: true } + } + Method { + name: "setEndClip" + Parameter { name: "endClip"; type: "Qt3DAnimation::QAbstractClipBlendNode"; isPointer: true } + } + } + Component { + name: "Qt3DAnimation::QMorphTarget" + prototype: "QObject" + Property { name: "attributeNames"; type: "QStringList"; isReadonly: true } + Signal { + name: "attributeNamesChanged" + Parameter { name: "attributeNames"; type: "QStringList" } + } + Method { + name: "fromGeometry" + type: "QMorphTarget*" + Parameter { name: "geometry"; type: "Qt3DRender::QGeometry"; isPointer: true } + Parameter { name: "attributes"; type: "QStringList" } + } + } + Component { + name: "Qt3DAnimation::QMorphingAnimation" + prototype: "Qt3DAnimation::QAbstractAnimation" + Enum { + name: "Method" + values: { + "Normalized": 0, + "Relative": 1 + } + } + Property { name: "targetPositions"; type: "QVector<float>" } + Property { name: "interpolator"; type: "float"; isReadonly: true } + Property { name: "target"; type: "Qt3DRender::QGeometryRenderer"; isPointer: true } + Property { name: "targetName"; type: "string" } + Property { name: "method"; type: "QMorphingAnimation::Method" } + Property { name: "easing"; type: "QEasingCurve" } + Signal { + name: "targetPositionsChanged" + Parameter { name: "targetPositions"; type: "QVector<float>" } + } + Signal { + name: "interpolatorChanged" + Parameter { name: "interpolator"; type: "float" } + } + Signal { + name: "targetChanged" + Parameter { name: "target"; type: "Qt3DRender::QGeometryRenderer"; isPointer: true } + } + Signal { + name: "targetNameChanged" + Parameter { name: "name"; type: "string" } + } + Signal { + name: "methodChanged" + Parameter { name: "method"; type: "QMorphingAnimation::Method" } + } + Signal { + name: "easingChanged" + Parameter { name: "easing"; type: "QEasingCurve" } + } + Method { + name: "setTargetPositions" + Parameter { name: "targetPositions"; type: "QVector<float>" } + } + Method { + name: "setTarget" + Parameter { name: "target"; type: "Qt3DRender::QGeometryRenderer"; isPointer: true } + } + Method { + name: "setTargetName" + Parameter { name: "name"; type: "string" } + } + Method { + name: "setMethod" + Parameter { name: "method"; type: "QMorphingAnimation::Method" } + } + Method { + name: "setEasing" + Parameter { name: "easing"; type: "QEasingCurve" } + } + } + Component { + name: "Qt3DAnimation::Quick::QQuick3DAnimationController" + prototype: "Qt3DAnimation::QAnimationController" + exports: ["Qt3D.Animation/AnimationController 2.9"] + exportMetaObjectRevisions: [0] + Property { + name: "animationGroups" + type: "Qt3DAnimation::QAnimationGroup" + isList: true + isReadonly: true + } + } + Component { + name: "Qt3DAnimation::Quick::QQuick3DAnimationGroup" + prototype: "Qt3DAnimation::QAnimationGroup" + exports: ["Qt3D.Animation/AnimationGroup 2.9"] + exportMetaObjectRevisions: [0] + Property { + name: "animations" + type: "Qt3DAnimation::QAbstractAnimation" + isList: true + isReadonly: true + } + } + Component { + name: "Qt3DAnimation::Quick::QQuick3DKeyframeAnimation" + prototype: "Qt3DAnimation::QKeyframeAnimation" + exports: ["Qt3D.Animation/KeyframeAnimation 2.9"] + exportMetaObjectRevisions: [0] + Property { name: "keyframes"; type: "Qt3DCore::QTransform"; isList: true; isReadonly: true } + } + Component { + name: "Qt3DAnimation::Quick::QQuick3DMorphTarget" + prototype: "Qt3DAnimation::QMorphTarget" + exports: ["Qt3D.Animation/MorphTarget 2.9"] + exportMetaObjectRevisions: [0] + Property { name: "attributes"; type: "Qt3DRender::QAttribute"; isList: true; isReadonly: true } + } + Component { + name: "Qt3DAnimation::Quick::QQuick3DMorphingAnimation" + prototype: "Qt3DAnimation::QMorphingAnimation" + exports: ["Qt3D.Animation/MorphingAnimation 2.9"] + exportMetaObjectRevisions: [0] + Property { + name: "morphTargets" + type: "Qt3DAnimation::QMorphTarget" + isList: true + isReadonly: true + } + } + Component { + name: "Qt3DCore::QComponent" + prototype: "Qt3DCore::QNode" + Property { name: "isShareable"; type: "bool" } + Signal { + name: "shareableChanged" + Parameter { name: "isShareable"; type: "bool" } + } + Signal { + name: "addedToEntity" + Parameter { name: "entity"; type: "QEntity"; isPointer: true } + } + Signal { + name: "removedFromEntity" + Parameter { name: "entity"; type: "QEntity"; isPointer: true } + } + Method { + name: "setShareable" + Parameter { name: "isShareable"; type: "bool" } + } + } + Component { + name: "Qt3DCore::QNode" + prototype: "QObject" + Enum { + name: "PropertyTrackingMode" + values: { + "TrackFinalValues": 0, + "DontTrackValues": 1, + "TrackAllValues": 2 + } + } + Property { name: "parent"; type: "Qt3DCore::QNode"; isPointer: true } + Property { name: "enabled"; type: "bool" } + Property { name: "defaultPropertyTrackingMode"; revision: 9; type: "PropertyTrackingMode" } + Signal { + name: "parentChanged" + Parameter { name: "parent"; type: "QObject"; isPointer: true } + } + Signal { + name: "enabledChanged" + Parameter { name: "enabled"; type: "bool" } + } + Signal { + name: "defaultPropertyTrackingModeChanged" + Parameter { name: "mode"; type: "PropertyTrackingMode" } + } + Signal { name: "nodeDestroyed" } + Method { + name: "setParent" + Parameter { name: "parent"; type: "QNode"; isPointer: true } + } + Method { + name: "setEnabled" + Parameter { name: "isEnabled"; type: "bool" } + } + Method { + name: "setDefaultPropertyTrackingMode" + Parameter { name: "mode"; type: "PropertyTrackingMode" } + } + } +} diff --git a/src/quick3d/imports/core/plugins.qmltypes b/src/quick3d/imports/core/plugins.qmltypes index ed06f8e0c..87cdac04c 100644 --- a/src/quick3d/imports/core/plugins.qmltypes +++ b/src/quick3d/imports/core/plugins.qmltypes @@ -4,29 +4,41 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable Qt3D.Core 2.0' +// 'qmlplugindump -nonrelocatable Qt3D.Core 2.9' Module { - dependencies: ["QtQuick 2.7"] + dependencies: ["QtQuick 2.8"] Component { name: "Qt3DCore::QComponent" - prototype: "Qt3DCore::QNode" - Property { name: "isShareable"; type: "bool" } + defaultProperty: "data" + prototype: "Qt3DCore::QComponent" + Property { name: "propertyTrackingOverrides"; type: "QJSValue" } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "childNodes"; type: "Qt3DCore::QNode"; isList: true; isReadonly: true } Signal { - name: "shareableChanged" - Parameter { name: "isShareable"; type: "bool" } + name: "propertyTrackingOverridesChanged" + Parameter { name: "value"; type: "QJSValue" } } - Method { - name: "setShareable" - Parameter { name: "isShareable"; type: "bool" } + Signal { + name: "propertyTrackingOverridesChanged" + Parameter { name: "value"; type: "QJSValue" } } } Component { name: "Qt3DCore::QEntity"; prototype: "Qt3DCore::QNode" } Component { name: "Qt3DCore::QNode" prototype: "QObject" + Enum { + name: "PropertyTrackingMode" + values: { + "TrackFinalValues": 0, + "DontTrackValues": 1, + "TrackAllValues": 2 + } + } Property { name: "parent"; type: "Qt3DCore::QNode"; isPointer: true } Property { name: "enabled"; type: "bool" } + Property { name: "defaultPropertyTrackingMode"; revision: 9; type: "PropertyTrackingMode" } Signal { name: "parentChanged" Parameter { name: "parent"; type: "QObject"; isPointer: true } @@ -35,6 +47,10 @@ Module { name: "enabledChanged" Parameter { name: "enabled"; type: "bool" } } + Signal { + name: "defaultPropertyTrackingModeChanged" + Parameter { name: "mode"; type: "PropertyTrackingMode" } + } Signal { name: "nodeDestroyed" } Method { name: "setParent" @@ -44,11 +60,14 @@ Module { name: "setEnabled" Parameter { name: "isEnabled"; type: "bool" } } + Method { + name: "setDefaultPropertyTrackingMode" + Parameter { name: "mode"; type: "PropertyTrackingMode" } + } } Component { name: "Qt3DCore::QTransform" prototype: "Qt3DCore::QComponent" - exports: ["Qt3D.Core/Transform 2.0"] Property { name: "matrix"; type: "QMatrix4x4" } Property { name: "scale"; type: "float" } Property { name: "scale3D"; type: "QVector3D" } @@ -230,10 +249,8 @@ Module { Component { name: "Qt3DCore::Quick::Quick3DEntityLoader" defaultProperty: "data" - prototype: "Qt3DCore::QEntity" - exports: ["Qt3D.Core/EntityLoader 2.0"] - Property { name: "entity"; type: "Qt3DCore::QEntity"; isPointer: true; isReadonly: true } - Property { name: "source"; type: "QUrl" } + prototype: "Qt3DCore::Quick::Quick3DEntityLoader" + Property { name: "components"; type: "Qt3DCore::QComponent"; isList: true; isReadonly: true } } Component { name: "Qt3DCore::Quick::Quick3DNode" @@ -248,13 +265,36 @@ Module { Component { name: "Qt3DCore::Quick::Quick3DNodeInstantiator" defaultProperty: "delegate" + prototype: "Qt3DCore::Quick::Quick3DNodeInstantiator" + Property { name: "propertyTrackingOverrides"; type: "QJSValue" } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "childNodes"; type: "Qt3DCore::QNode"; isList: true; isReadonly: true } + Signal { + name: "propertyTrackingOverridesChanged" + Parameter { name: "value"; type: "QJSValue" } + } + Signal { + name: "propertyTrackingOverridesChanged" + Parameter { name: "value"; type: "QJSValue" } + } + } + Component { + name: "Qt3DCore::Quick::Quick3DNodeV9" + defaultProperty: "data" prototype: "Qt3DCore::QNode" - exports: ["Qt3D.Core/NodeInstantiator 2.0"] - Property { name: "active"; type: "bool" } - Property { name: "asynchronous"; type: "bool" } - Property { name: "model"; type: "QVariant" } - Property { name: "count"; type: "int"; isReadonly: true } - Property { name: "delegate"; type: "QQmlComponent" } - Property { name: "object"; type: "QObject"; isReadonly: true } + exports: ["Qt3D.Core/Node 2.9"] + isCreatable: false + exportMetaObjectRevisions: [9] + Property { name: "propertyTrackingOverrides"; type: "QJSValue" } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "childNodes"; type: "Qt3DCore::QNode"; isList: true; isReadonly: true } + Signal { + name: "propertyTrackingOverridesChanged" + Parameter { name: "value"; type: "QJSValue" } + } + Signal { + name: "propertyTrackingOverridesChanged" + Parameter { name: "value"; type: "QJSValue" } + } } } diff --git a/src/quick3d/imports/extras/plugins.qmltypes b/src/quick3d/imports/extras/plugins.qmltypes index cbe12c9ad..a623f385c 100644 --- a/src/quick3d/imports/extras/plugins.qmltypes +++ b/src/quick3d/imports/extras/plugins.qmltypes @@ -4,68 +4,30 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable Qt3D.Extras 2.0' +// 'qmlplugindump -nonrelocatable Qt3D.Extras 2.9' Module { - dependencies: [] - Component { - name: "Qt3DCore::QComponent" - prototype: "Qt3DCore::QNode" - Property { name: "isShareable"; type: "bool" } - Signal { - name: "shareableChanged" - Parameter { name: "isShareable"; type: "bool" } - } - Signal { - name: "addedToEntity" - Parameter { name: "entity"; type: "QEntity"; isPointer: true } - } - Signal { - name: "removedFromEntity" - Parameter { name: "entity"; type: "QEntity"; isPointer: true } - } - Method { - name: "setShareable" - Parameter { name: "isShareable"; type: "bool" } - } - } + dependencies: ["Qt3D.Logic 2.0"] Component { name: "Qt3DCore::QEntity"; prototype: "Qt3DCore::QNode" } Component { - name: "Qt3DCore::QNode" - prototype: "QObject" - Property { name: "parent"; type: "Qt3DCore::QNode"; isPointer: true } - Property { name: "enabled"; type: "bool" } - Signal { - name: "parentChanged" - Parameter { name: "parent"; type: "QObject"; isPointer: true } - } - Signal { - name: "enabledChanged" - Parameter { name: "enabled"; type: "bool" } - } - Signal { name: "nodeDestroyed" } - Method { - name: "setParent" - Parameter { name: "parent"; type: "QNode"; isPointer: true } - } - Method { - name: "setEnabled" - Parameter { name: "isEnabled"; type: "bool" } - } - } - Component { name: "Qt3DExtras::Extras::Quick::Quick3DLevelOfDetailLoader" prototype: "Qt3DCore::QEntity" - exports: ["Qt3D.Extras/LevelOfDetailLoader 2.2"] + exports: ["Qt3D.Extras/LevelOfDetailLoader 2.9"] exportMetaObjectRevisions: [0] Property { name: "sources"; type: "QVariantList" } Property { name: "camera"; type: "Qt3DRender::QCamera"; isPointer: true } Property { name: "currentIndex"; type: "int" } Property { name: "thresholdType"; type: "Qt3DRender::QLevelOfDetail::ThresholdType" } Property { name: "thresholds"; type: "QVector<qreal>" } - Property { name: "volumeOverride"; type: "Qt3DRender::QBoundingSphere"; isPointer: true } + Property { name: "volumeOverride"; type: "Qt3DRender::QLevelOfDetailBoundingSphere" } Property { name: "entity"; type: "QObject"; isReadonly: true; isPointer: true } Property { name: "source"; type: "QUrl"; isReadonly: true } + Method { + name: "createBoundingSphere" + type: "Qt3DRender::QLevelOfDetailBoundingSphere" + Parameter { name: "center"; type: "QVector3D" } + Parameter { name: "radius"; type: "float" } + } } Component { name: "Qt3DExtras::QConeGeometry" @@ -590,6 +552,90 @@ Module { } } Component { + name: "Qt3DExtras::QExtrudedTextGeometry" + prototype: "Qt3DRender::QGeometry" + exports: ["Qt3D.Extras/ExtrudedTextGeometry 2.9"] + exportMetaObjectRevisions: [0] + Property { name: "text"; type: "string" } + Property { name: "font"; type: "QFont" } + Property { name: "extrusionLength"; type: "float" } + Property { + name: "positionAttribute" + type: "Qt3DRender::QAttribute" + isReadonly: true + isPointer: true + } + Property { + name: "normalAttribute" + type: "Qt3DRender::QAttribute" + isReadonly: true + isPointer: true + } + Property { + name: "indexAttribute" + type: "Qt3DRender::QAttribute" + isReadonly: true + isPointer: true + } + Signal { + name: "textChanged" + Parameter { name: "text"; type: "string" } + } + Signal { + name: "fontChanged" + Parameter { name: "font"; type: "QFont" } + } + Signal { + name: "depthChanged" + Parameter { name: "extrusionLength"; type: "float" } + } + Method { + name: "setText" + Parameter { name: "text"; type: "string" } + } + Method { + name: "setFont" + Parameter { name: "font"; type: "QFont" } + } + Method { + name: "setDepth" + Parameter { name: "extrusionLength"; type: "float" } + } + } + Component { + name: "Qt3DExtras::QExtrudedTextMesh" + prototype: "Qt3DRender::QGeometryRenderer" + exports: ["Qt3D.Extras/ExtrudedTextMesh 2.9"] + exportMetaObjectRevisions: [0] + Property { name: "text"; type: "string" } + Property { name: "font"; type: "QFont" } + Property { name: "depth"; type: "float" } + Signal { + name: "textChanged" + Parameter { name: "text"; type: "string" } + } + Signal { + name: "fontChanged" + Parameter { name: "font"; type: "QFont" } + } + Signal { + name: "depthChanged" + Parameter { name: "depth"; type: "float" } + } + Method { + name: "setText" + Parameter { name: "text"; type: "string" } + } + Method { + name: "setFont" + Parameter { name: "font"; type: "QFont" } + } + Method { + name: "setDepth" + Parameter { name: "depth"; type: "float" } + } + } + Component { name: "Qt3DExtras::QFirstPersonCameraController" prototype: "Qt3DCore::QEntity" exports: ["Qt3D.Extras/FirstPersonCameraController 2.0"] @@ -599,6 +645,14 @@ Module { Property { name: "lookSpeed"; type: "float" } Property { name: "acceleration"; type: "float" } Property { name: "deceleration"; type: "float" } + Signal { + name: "accelerationChanged" + Parameter { name: "acceleration"; type: "float" } + } + Signal { + name: "decelerationChanged" + Parameter { name: "deceleration"; type: "float" } + } } Component { name: "Qt3DExtras::QForwardRenderer" @@ -612,6 +666,7 @@ Module { Property { name: "camera"; type: "Qt3DCore::QEntity"; isPointer: true } Property { name: "externalRenderTargetSize"; type: "QSize" } Property { name: "frustumCulling"; type: "bool" } + Property { name: "gamma"; revision: 9; type: "float" } Signal { name: "viewportRectChanged" Parameter { name: "viewportRect"; type: "QRectF" } @@ -636,6 +691,10 @@ Module { name: "frustumCullingEnabledChanged" Parameter { name: "enabled"; type: "bool" } } + Signal { + name: "gammaChanged" + Parameter { name: "gamma"; type: "float" } + } Method { name: "setViewportRect" Parameter { name: "viewportRect"; type: "QRectF" } @@ -660,6 +719,10 @@ Module { name: "setFrustumCullingEnabled" Parameter { name: "enabled"; type: "bool" } } + Method { + name: "setGamma" + Parameter { name: "gamma"; type: "float" } + } } Component { name: "Qt3DExtras::QGoochMaterial" @@ -733,18 +796,11 @@ Module { Component { name: "Qt3DExtras::QMetalRoughMaterial" prototype: "Qt3DRender::QMaterial" - exports: ["Qt3D.Extras/MetalRoughMaterial 2.2"] + exports: ["Qt3D.Extras/MetalRoughMaterial 2.9"] exportMetaObjectRevisions: [0] Property { name: "baseColor"; type: "QColor" } Property { name: "metalness"; type: "float" } Property { name: "roughness"; type: "float" } - Property { - name: "environmentIrradiance" - type: "Qt3DRender::QAbstractTexture" - isPointer: true - } - Property { name: "environmentSpecular"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } - Property { name: "exposure"; type: "float" } Signal { name: "baseColorChanged" Parameter { name: "baseColor"; type: "QColor" } @@ -757,22 +813,6 @@ Module { name: "roughnessChanged" Parameter { name: "roughness"; type: "float" } } - Signal { - name: "environmentIrradianceChanged" - Parameter { - name: "environmentIrradiance" - type: "Qt3DRender::QAbstractTexture" - isPointer: true - } - } - Signal { - name: "environmentSpecularChanged" - Parameter { name: "environmentSpecular"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } - } - Signal { - name: "exposureChanged" - Parameter { name: "exposure"; type: "float" } - } Method { name: "setBaseColor" Parameter { name: "baseColor"; type: "QColor" } @@ -785,21 +825,56 @@ Module { name: "setRoughness" Parameter { name: "roughness"; type: "float" } } + } + Component { + name: "Qt3DExtras::QMorphPhongMaterial" + prototype: "Qt3DRender::QMaterial" + exports: ["Qt3D.Extras/MorphPhongMaterial 2.9"] + exportMetaObjectRevisions: [0] + Property { name: "ambient"; type: "QColor" } + Property { name: "diffuse"; type: "QColor" } + Property { name: "specular"; type: "QColor" } + Property { name: "shininess"; type: "float" } + Property { name: "interpolator"; type: "float" } + Signal { + name: "ambientChanged" + Parameter { name: "ambient"; type: "QColor" } + } + Signal { + name: "diffuseChanged" + Parameter { name: "diffuse"; type: "QColor" } + } + Signal { + name: "specularChanged" + Parameter { name: "specular"; type: "QColor" } + } + Signal { + name: "shininessChanged" + Parameter { name: "shininess"; type: "float" } + } + Signal { + name: "interpolatorChanged" + Parameter { name: "interpolator"; type: "float" } + } Method { - name: "setEnvironmentIrradiance" - Parameter { - name: "environmentIrradiance" - type: "Qt3DRender::QAbstractTexture" - isPointer: true - } + name: "setAmbient" + Parameter { name: "ambient"; type: "QColor" } + } + Method { + name: "setDiffuse" + Parameter { name: "diffuse"; type: "QColor" } } Method { - name: "setEnvironmentSpecular" - Parameter { name: "environmentSpecular"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } + name: "setSpecular" + Parameter { name: "specular"; type: "QColor" } } Method { - name: "setExposure" - Parameter { name: "exposure"; type: "float" } + name: "setShininess" + Parameter { name: "shininess"; type: "float" } + } + Method { + name: "setInterpolator" + Parameter { name: "interpolator"; type: "float" } } } Component { @@ -1194,6 +1269,7 @@ Module { exportMetaObjectRevisions: [0] Property { name: "baseName"; type: "string" } Property { name: "extension"; type: "string" } + Property { name: "gammaCorrect"; revision: 9; type: "bool" } Signal { name: "baseNameChanged" Parameter { name: "path"; type: "string" } @@ -1202,6 +1278,22 @@ Module { name: "extensionChanged" Parameter { name: "extension"; type: "string" } } + Signal { + name: "gammaCorrectEnabledChanged" + Parameter { name: "enabled"; type: "bool" } + } + Method { + name: "setBaseName" + Parameter { name: "path"; type: "string" } + } + Method { + name: "setExtension" + Parameter { name: "extension"; type: "string" } + } + Method { + name: "setGammaCorrectEnabled" + Parameter { name: "enabled"; type: "bool" } + } } Component { name: "Qt3DExtras::QSphereGeometry" @@ -1318,105 +1410,34 @@ Module { } } Component { - name: "Qt3DExtras::QText3DGeometry" - prototype: "Qt3DRender::QGeometry" - exports: ["Qt3D.Extras/Text3DGeometry 2.2"] + name: "Qt3DExtras::QText2DEntity" + prototype: "Qt3DCore::QEntity" + exports: ["Qt3D.Extras/Text2DEntity 2.9"] exportMetaObjectRevisions: [0] - Property { name: "text"; type: "string" } Property { name: "font"; type: "QFont" } - Property { name: "depth"; type: "float" } - Property { name: "edgeSplitAngle"; type: "float" } - Property { - name: "positionAttribute" - type: "Qt3DRender::QAttribute" - isReadonly: true - isPointer: true - } - Property { - name: "normalAttribute" - type: "Qt3DRender::QAttribute" - isReadonly: true - isPointer: true - } - Property { - name: "indexAttribute" - type: "Qt3DRender::QAttribute" - isReadonly: true - isPointer: true - } - Signal { - name: "textChanged" - Parameter { name: "text"; type: "string" } - } + Property { name: "text"; type: "string" } + Property { name: "color"; type: "QColor" } + Property { name: "width"; type: "float" } + Property { name: "height"; type: "float" } Signal { name: "fontChanged" Parameter { name: "font"; type: "QFont" } } Signal { - name: "depthChanged" - Parameter { name: "depth"; type: "float" } - } - Signal { - name: "edgeSplitAngleChanged" - Parameter { name: "edgeSplitAngle"; type: "float" } - } - Method { - name: "setText" - Parameter { name: "text"; type: "string" } - } - Method { - name: "setFont" - Parameter { name: "font"; type: "QFont" } - } - Method { - name: "setDepth" - Parameter { name: "depth"; type: "float" } - } - Method { - name: "setEdgeSplitAngle" - Parameter { name: "edgeSplitAngle"; type: "float" } + name: "colorChanged" + Parameter { name: "color"; type: "QColor" } } - } - Component { - name: "Qt3DExtras::QText3DMesh" - prototype: "Qt3DRender::QGeometryRenderer" - exports: ["Qt3D.Extras/Text3DMesh 2.2"] - exportMetaObjectRevisions: [0] - Property { name: "text"; type: "string" } - Property { name: "font"; type: "QFont" } - Property { name: "depth"; type: "float" } - Property { name: "edgeSplitAngle"; type: "float" } Signal { name: "textChanged" Parameter { name: "text"; type: "string" } } Signal { - name: "fontChanged" - Parameter { name: "font"; type: "QFont" } - } - Signal { - name: "depthChanged" - Parameter { name: "depth"; type: "float" } + name: "widthChanged" + Parameter { name: "width"; type: "float" } } Signal { - name: "edgeSplitAngleChanged" - Parameter { name: "edgeSplitAngle"; type: "float" } - } - Method { - name: "setText" - Parameter { name: "text"; type: "string" } - } - Method { - name: "setFont" - Parameter { name: "font"; type: "QFont" } - } - Method { - name: "setDepth" - Parameter { name: "depth"; type: "float" } - } - Method { - name: "setEdgeSplitAngle" - Parameter { name: "edgeSplitAngle"; type: "float" } + name: "heightChanged" + Parameter { name: "height"; type: "float" } } } Component { @@ -1446,20 +1467,13 @@ Module { Component { name: "Qt3DExtras::QTexturedMetalRoughMaterial" prototype: "Qt3DRender::QMaterial" - exports: ["Qt3D.Extras/TexturedMetalRoughMaterial 2.2"] + exports: ["Qt3D.Extras/TexturedMetalRoughMaterial 2.9"] exportMetaObjectRevisions: [0] Property { name: "baseColor"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } Property { name: "metalness"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } Property { name: "roughness"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } Property { name: "ambientOcclusion"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } Property { name: "normal"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } - Property { - name: "environmentIrradiance" - type: "Qt3DRender::QAbstractTexture" - isPointer: true - } - Property { name: "environmentSpecular"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } - Property { name: "exposure"; type: "float" } Signal { name: "baseColorChanged" Parameter { name: "baseColor"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } @@ -1480,22 +1494,6 @@ Module { name: "normalChanged" Parameter { name: "normal"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } } - Signal { - name: "environmentIrradianceChanged" - Parameter { - name: "environmentIrradiance" - type: "Qt3DRender::QAbstractTexture" - isPointer: true - } - } - Signal { - name: "environmentSpecularChanged" - Parameter { name: "environmentSpecular"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } - } - Signal { - name: "exposureChanged" - Parameter { name: "exposure"; type: "float" } - } Method { name: "setBaseColor" Parameter { name: "baseColor"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } @@ -1516,22 +1514,6 @@ Module { name: "setNormal" Parameter { name: "normal"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } } - Method { - name: "setEnvironmentIrradiance" - Parameter { - name: "environmentIrradiance" - type: "Qt3DRender::QAbstractTexture" - isPointer: true - } - } - Method { - name: "setEnvironmentSpecular" - Parameter { name: "environmentSpecular"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } - } - Method { - name: "setExposure" - Parameter { name: "exposure"; type: "float" } - } } Component { name: "Qt3DExtras::QTorusGeometry" diff --git a/src/quick3d/imports/input/plugins.qmltypes b/src/quick3d/imports/input/plugins.qmltypes index 860ab4d68..24655977e 100644 --- a/src/quick3d/imports/input/plugins.qmltypes +++ b/src/quick3d/imports/input/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable Qt3D.Input 2.0' +// 'qmlplugindump -nonrelocatable Qt3D.Input 2.1' Module { - dependencies: ["QtQuick 2.7"] + dependencies: ["QtQuick 2.8"] Component { name: "Qt3DCore::QComponent" prototype: "Qt3DCore::QNode" @@ -16,6 +16,14 @@ Module { name: "shareableChanged" Parameter { name: "isShareable"; type: "bool" } } + Signal { + name: "addedToEntity" + Parameter { name: "entity"; type: "QEntity"; isPointer: true } + } + Signal { + name: "removedFromEntity" + Parameter { name: "entity"; type: "QEntity"; isPointer: true } + } Method { name: "setShareable" Parameter { name: "isShareable"; type: "bool" } @@ -24,8 +32,17 @@ Module { Component { name: "Qt3DCore::QNode" prototype: "QObject" + Enum { + name: "PropertyTrackingMode" + values: { + "TrackFinalValues": 0, + "DontTrackValues": 1, + "TrackAllValues": 2 + } + } Property { name: "parent"; type: "Qt3DCore::QNode"; isPointer: true } Property { name: "enabled"; type: "bool" } + Property { name: "defaultPropertyTrackingMode"; revision: 9; type: "PropertyTrackingMode" } Signal { name: "parentChanged" Parameter { name: "parent"; type: "QObject"; isPointer: true } @@ -34,6 +51,10 @@ Module { name: "enabledChanged" Parameter { name: "enabled"; type: "bool" } } + Signal { + name: "defaultPropertyTrackingModeChanged" + Parameter { name: "mode"; type: "PropertyTrackingMode" } + } Signal { name: "nodeDestroyed" } Method { name: "setParent" @@ -43,6 +64,10 @@ Module { name: "setEnabled" Parameter { name: "isEnabled"; type: "bool" } } + Method { + name: "setDefaultPropertyTrackingMode" + Parameter { name: "mode"; type: "PropertyTrackingMode" } + } } Component { name: "Qt3DInput::Input::Quick::Quick3DAction" @@ -101,6 +126,7 @@ Module { name: "Qt3DInput::Input::Quick::Quick3DPhysicalDevice" prototype: "Qt3DInput::QAbstractPhysicalDevice" exports: ["Qt3D.Input/QAbstractPhysicalDevice 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Property { name: "axisSettings"; type: "Qt3DInput::QAxisSetting"; isList: true; isReadonly: true } } @@ -186,6 +212,56 @@ Module { } } Component { + name: "Qt3DInput::QAxisAccumulator" + prototype: "Qt3DCore::QComponent" + exports: ["Qt3D.Input/AxisAccumulator 2.1"] + exportMetaObjectRevisions: [0] + Enum { + name: "SourceAxisType" + values: { + "Velocity": 0, + "Acceleration": 1 + } + } + Property { name: "sourceAxis"; type: "Qt3DInput::QAxis"; isPointer: true } + Property { name: "sourceAxisType"; type: "SourceAxisType" } + Property { name: "scale"; type: "float" } + Property { name: "value"; type: "float"; isReadonly: true } + Property { name: "velocity"; type: "float"; isReadonly: true } + Signal { + name: "sourceAxisChanged" + Parameter { name: "sourceAxis"; type: "Qt3DInput::QAxis"; isPointer: true } + } + Signal { + name: "sourceAxisTypeChanged" + Parameter { name: "sourceAxisType"; type: "QAxisAccumulator::SourceAxisType" } + } + Signal { + name: "valueChanged" + Parameter { name: "value"; type: "float" } + } + Signal { + name: "velocityChanged" + Parameter { name: "value"; type: "float" } + } + Signal { + name: "scaleChanged" + Parameter { name: "scale"; type: "float" } + } + Method { + name: "setSourceAxis" + Parameter { name: "sourceAxis"; type: "Qt3DInput::QAxis"; isPointer: true } + } + Method { + name: "setSourceAxisType" + Parameter { name: "sourceAxisType"; type: "QAxisAccumulator::SourceAxisType" } + } + Method { + name: "setScale" + Parameter { name: "scale"; type: "float" } + } + } + Component { name: "Qt3DInput::QAxisSetting" prototype: "Qt3DCore::QNode" exports: ["Qt3D.Input/AxisSetting 2.0"] @@ -337,7 +413,6 @@ Module { Component { name: "Qt3DInput::QKeyboardDevice" prototype: "Qt3DInput::QAbstractPhysicalDevice" - exports: ["Qt3D.Input/KeyboardDevice 2.0"] Property { name: "activeInput" type: "Qt3DInput::QKeyboardHandler" @@ -537,12 +612,13 @@ Module { Component { name: "Qt3DInput::QMouseDevice" prototype: "Qt3DInput::QAbstractPhysicalDevice" - exports: ["Qt3D.Input/MouseDevice 2.0"] Enum { name: "Axis" values: { "X": 0, - "Y": 1 + "Y": 1, + "WheelX": 2, + "WheelY": 3 } } Property { name: "sensitivity"; type: "float" } diff --git a/src/quick3d/imports/logic/plugins.qmltypes b/src/quick3d/imports/logic/plugins.qmltypes index 0c0ccc847..61b67ca73 100644 --- a/src/quick3d/imports/logic/plugins.qmltypes +++ b/src/quick3d/imports/logic/plugins.qmltypes @@ -7,7 +7,7 @@ import QtQuick.tooling 1.2 // 'qmlplugindump -nonrelocatable Qt3D.Logic 2.0' Module { - dependencies: ["QtQuick 2.7"] + dependencies: ["QtQuick 2.8"] Component { name: "Qt3DCore::QComponent" prototype: "Qt3DCore::QNode" @@ -16,6 +16,14 @@ Module { name: "shareableChanged" Parameter { name: "isShareable"; type: "bool" } } + Signal { + name: "addedToEntity" + Parameter { name: "entity"; type: "QEntity"; isPointer: true } + } + Signal { + name: "removedFromEntity" + Parameter { name: "entity"; type: "QEntity"; isPointer: true } + } Method { name: "setShareable" Parameter { name: "isShareable"; type: "bool" } @@ -24,8 +32,17 @@ Module { Component { name: "Qt3DCore::QNode" prototype: "QObject" + Enum { + name: "PropertyTrackingMode" + values: { + "TrackFinalValues": 0, + "DontTrackValues": 1, + "TrackAllValues": 2 + } + } Property { name: "parent"; type: "Qt3DCore::QNode"; isPointer: true } Property { name: "enabled"; type: "bool" } + Property { name: "defaultPropertyTrackingMode"; revision: 9; type: "PropertyTrackingMode" } Signal { name: "parentChanged" Parameter { name: "parent"; type: "QObject"; isPointer: true } @@ -34,6 +51,10 @@ Module { name: "enabledChanged" Parameter { name: "enabled"; type: "bool" } } + Signal { + name: "defaultPropertyTrackingModeChanged" + Parameter { name: "mode"; type: "PropertyTrackingMode" } + } Signal { name: "nodeDestroyed" } Method { name: "setParent" @@ -43,6 +64,10 @@ Module { name: "setEnabled" Parameter { name: "isEnabled"; type: "bool" } } + Method { + name: "setDefaultPropertyTrackingMode" + Parameter { name: "mode"; type: "PropertyTrackingMode" } + } } Component { name: "Qt3DLogic::QFrameAction" diff --git a/src/quick3d/imports/render/plugins.qmltypes b/src/quick3d/imports/render/plugins.qmltypes index 9e6e5fe38..aa0272430 100644 --- a/src/quick3d/imports/render/plugins.qmltypes +++ b/src/quick3d/imports/render/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable Qt3D.Render 2.0' +// 'qmlplugindump -nonrelocatable Qt3D.Render 2.9' Module { - dependencies: ["QtQuick 2.7"] + dependencies: ["QtQuick 2.8"] Component { name: "QWindow" prototype: "QObject" @@ -25,6 +25,13 @@ Module { "FullScreen": 5 } } + Enum { + name: "AncestorMode" + values: { + "ExcludeTransients": 0, + "IncludeTransients": 1 + } + } Property { name: "title"; type: "string" } Property { name: "modality"; type: "Qt::WindowModality" } Property { name: "flags"; type: "Qt::WindowFlags" } @@ -178,6 +185,14 @@ Module { name: "shareableChanged" Parameter { name: "isShareable"; type: "bool" } } + Signal { + name: "addedToEntity" + Parameter { name: "entity"; type: "QEntity"; isPointer: true } + } + Signal { + name: "removedFromEntity" + Parameter { name: "entity"; type: "QEntity"; isPointer: true } + } Method { name: "setShareable" Parameter { name: "isShareable"; type: "bool" } @@ -187,8 +202,17 @@ Module { Component { name: "Qt3DCore::QNode" prototype: "QObject" + Enum { + name: "PropertyTrackingMode" + values: { + "TrackFinalValues": 0, + "DontTrackValues": 1, + "TrackAllValues": 2 + } + } Property { name: "parent"; type: "Qt3DCore::QNode"; isPointer: true } Property { name: "enabled"; type: "bool" } + Property { name: "defaultPropertyTrackingMode"; revision: 9; type: "PropertyTrackingMode" } Signal { name: "parentChanged" Parameter { name: "parent"; type: "QObject"; isPointer: true } @@ -197,6 +221,10 @@ Module { name: "enabledChanged" Parameter { name: "enabled"; type: "bool" } } + Signal { + name: "defaultPropertyTrackingModeChanged" + Parameter { name: "mode"; type: "PropertyTrackingMode" } + } Signal { name: "nodeDestroyed" } Method { name: "setParent" @@ -206,6 +234,10 @@ Module { name: "setEnabled" Parameter { name: "isEnabled"; type: "bool" } } + Method { + name: "setDefaultPropertyTrackingMode" + Parameter { name: "mode"; type: "PropertyTrackingMode" } + } } Component { name: "Qt3DCore::Quick::Quick3DNode" @@ -404,7 +436,8 @@ Module { "CubeMapPositiveY": 34071, "CubeMapNegativeY": 34072, "CubeMapPositiveZ": 34073, - "CubeMapNegativeZ": 34074 + "CubeMapNegativeZ": 34074, + "AllFaces": 34075 } } Enum { @@ -446,6 +479,7 @@ Module { Property { name: "comparisonFunction"; type: "ComparisonFunction" } Property { name: "comparisonMode"; type: "ComparisonMode" } Property { name: "layers"; type: "int" } + Property { name: "samples"; type: "int" } Signal { name: "formatChanged" Parameter { name: "format"; type: "TextureFormat" } @@ -494,6 +528,10 @@ Module { name: "layersChanged" Parameter { name: "layers"; type: "int" } } + Signal { + name: "samplesChanged" + Parameter { name: "samples"; type: "int" } + } Method { name: "setFormat" Parameter { name: "format"; type: "TextureFormat" } @@ -538,6 +576,10 @@ Module { name: "setLayers" Parameter { name: "layers"; type: "int" } } + Method { + name: "setSamples" + Parameter { name: "samples"; type: "int" } + } } Component { name: "Qt3DRender::QAbstractTextureImage" @@ -625,7 +667,8 @@ Module { name: "AttributeType" values: { "VertexAttribute": 0, - "IndexAttribute": 1 + "IndexAttribute": 1, + "DrawIndirectAttribute": 2 } } Enum { @@ -651,6 +694,11 @@ Module { Property { name: "byteOffset"; type: "uint" } Property { name: "divisor"; type: "uint" } Property { name: "attributeType"; type: "AttributeType" } + Property { name: "defaultPositionAttributeName"; type: "string"; isReadonly: true } + Property { name: "defaultNormalAttributeName"; type: "string"; isReadonly: true } + Property { name: "defaultColorAttributeName"; type: "string"; isReadonly: true } + Property { name: "defaultTextureCoordinateAttributeName"; type: "string"; isReadonly: true } + Property { name: "defaultTangentAttributeName"; type: "string"; isReadonly: true } Signal { name: "bufferChanged" Parameter { name: "buffer"; type: "QBuffer"; isPointer: true } @@ -660,6 +708,14 @@ Module { Parameter { name: "name"; type: "string" } } Signal { + name: "vertexBaseTypeChanged" + Parameter { name: "vertexBaseType"; type: "VertexBaseType" } + } + Signal { + name: "vertexSizeChanged" + Parameter { name: "vertexSize"; type: "uint" } + } + Signal { name: "dataTypeChanged" Parameter { name: "vertexBaseType"; type: "VertexBaseType" } } @@ -696,6 +752,14 @@ Module { Parameter { name: "name"; type: "string" } } Method { + name: "setVertexBaseType" + Parameter { name: "type"; type: "VertexBaseType" } + } + Method { + name: "setVertexSize" + Parameter { name: "size"; type: "uint" } + } + Method { name: "setDataType" Parameter { name: "type"; type: "VertexBaseType" } } @@ -780,7 +844,8 @@ Module { "OneMinusConstantColor": 32770, "OneMinusConstantAlpha": 32772, "OneMinusSource1Alpha": 32773, - "OneMinusSource1Color": 32774 + "OneMinusSource1Color": 32774, + "OneMinusSource1Color0": 32774 } } Property { name: "sourceRgb"; type: "Blending" } @@ -848,6 +913,9 @@ Module { Component { name: "Qt3DRender::QBuffer" prototype: "Qt3DCore::QNode" + exports: ["Qt3D.Render/BufferBase 2.0", "Qt3D.Render/BufferBase 2.9"] + isCreatable: false + exportMetaObjectRevisions: [0, 9] Enum { name: "BufferType" values: { @@ -856,7 +924,8 @@ Module { "PixelPackBuffer": 35051, "PixelUnpackBuffer": 35052, "UniformBuffer": 35345, - "ShaderStorageBuffer": 37074 + "ShaderStorageBuffer": 37074, + "DrawIndirectBuffer": 36671 } } Enum { @@ -873,9 +942,18 @@ Module { "DynamicCopy": 35050 } } + Enum { + name: "AccessType" + values: { + "Write": 1, + "Read": 2, + "ReadWrite": 3 + } + } Property { name: "type"; type: "BufferType" } Property { name: "usage"; type: "UsageType" } Property { name: "syncData"; type: "bool" } + Property { name: "accessType"; revision: 9; type: "AccessType" } Signal { name: "dataChanged" Parameter { name: "bytes"; type: "QByteArray" } @@ -892,6 +970,11 @@ Module { name: "syncDataChanged" Parameter { name: "syncData"; type: "bool" } } + Signal { + name: "accessTypeChanged" + Parameter { name: "access"; type: "AccessType" } + } + Signal { name: "dataAvailable" } Method { name: "setType" Parameter { name: "type"; type: "BufferType" } @@ -904,6 +987,21 @@ Module { name: "setSyncData" Parameter { name: "syncData"; type: "bool" } } + Method { + name: "setAccessType" + Parameter { name: "access"; type: "AccessType" } + } + Method { + name: "updateData" + Parameter { name: "offset"; type: "int" } + Parameter { name: "bytes"; type: "QByteArray" } + } + } + Component { + name: "Qt3DRender::QBufferCapture" + prototype: "Qt3DRender::QFrameGraphNode" + exports: ["Qt3D.Render/BufferCapture 2.9"] + exportMetaObjectRevisions: [0] } Component { name: "Qt3DRender::QCamera" @@ -927,6 +1025,7 @@ Module { Property { name: "bottom"; type: "float" } Property { name: "top"; type: "float" } Property { name: "projectionMatrix"; type: "QMatrix4x4" } + Property { name: "exposure"; revision: 9; type: "float" } Property { name: "position"; type: "QVector3D" } Property { name: "upVector"; type: "QVector3D" } Property { name: "viewCenter"; type: "QVector3D" } @@ -973,6 +1072,10 @@ Module { Parameter { name: "projectionMatrix"; type: "QMatrix4x4" } } Signal { + name: "exposureChanged" + Parameter { name: "exposure"; type: "float" } + } + Signal { name: "positionChanged" Parameter { name: "position"; type: "QVector3D" } } @@ -1029,6 +1132,10 @@ Module { Parameter { name: "projectionMatrix"; type: "QMatrix4x4" } } Method { + name: "setExposure" + Parameter { name: "exposure"; type: "float" } + } + Method { name: "setPosition" Parameter { name: "position"; type: "QVector3D" } } @@ -1146,6 +1253,7 @@ Module { Property { name: "bottom"; type: "float" } Property { name: "top"; type: "float" } Property { name: "projectionMatrix"; type: "QMatrix4x4" } + Property { name: "exposure"; revision: 9; type: "float" } Signal { name: "projectionTypeChanged" Parameter { name: "projectionType"; type: "QCameraLens::ProjectionType" } @@ -1186,6 +1294,10 @@ Module { name: "projectionMatrixChanged" Parameter { name: "projectionMatrix"; type: "QMatrix4x4" } } + Signal { + name: "exposureChanged" + Parameter { name: "exposure"; type: "float" } + } Method { name: "setProjectionType" Parameter { name: "projectionType"; type: "ProjectionType" } @@ -1226,6 +1338,10 @@ Module { name: "setProjectionMatrix" Parameter { name: "projectionMatrix"; type: "QMatrix4x4" } } + Method { + name: "setExposure" + Parameter { name: "exposure"; type: "float" } + } } Component { name: "Qt3DRender::QCameraSelector" @@ -1496,6 +1612,34 @@ Module { } Component { name: "Qt3DRender::QEffect"; prototype: "Qt3DCore::QNode" } Component { + name: "Qt3DRender::QEnvironmentLight" + prototype: "Qt3DCore::QComponent" + exports: ["Qt3D.Render/EnvironmentLight 2.9"] + exportMetaObjectRevisions: [0] + Property { name: "irradiance"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } + Property { name: "specular"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } + Signal { + name: "irradianceChanged" + Parameter { + name: "environmentIrradiance" + type: "Qt3DRender::QAbstractTexture" + isPointer: true + } + } + Signal { + name: "specularChanged" + Parameter { name: "environmentSpecular"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } + } + Method { + name: "setIrradiance" + Parameter { name: "irradiance"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } + } + Method { + name: "setSpecular" + Parameter { name: "specular"; type: "Qt3DRender::QAbstractTexture"; isPointer: true } + } + } + Component { name: "Qt3DRender::QFilterKey" prototype: "Qt3DCore::QNode" exports: ["Qt3D.Render/FilterKey 2.0"] @@ -1523,7 +1667,6 @@ Module { name: "Qt3DRender::QFrameGraphNode" prototype: "Qt3DCore::QNode" exports: ["Qt3D.Render/FrameGraphNode 2.0"] - isCreatable: false exportMetaObjectRevisions: [0] } Component { @@ -1776,6 +1919,76 @@ Module { } Component { name: "Qt3DRender::QLayerFilter"; prototype: "Qt3DRender::QFrameGraphNode" } Component { + name: "Qt3DRender::QLevelOfDetail" + prototype: "Qt3DCore::QComponent" + exports: ["Qt3D.Render/LevelOfDetail 2.9"] + exportMetaObjectRevisions: [0] + Enum { + name: "ThresholdType" + values: { + "DistanceToCameraThreshold": 0, + "ProjectedScreenPixelSizeThreshold": 1 + } + } + Property { name: "camera"; type: "Qt3DRender::QCamera"; isPointer: true } + Property { name: "currentIndex"; type: "int" } + Property { name: "thresholdType"; type: "ThresholdType" } + Property { name: "thresholds"; type: "QVector<qreal>" } + Property { name: "volumeOverride"; type: "Qt3DRender::QLevelOfDetailBoundingSphere" } + Signal { + name: "cameraChanged" + Parameter { name: "camera"; type: "QCamera"; isPointer: true } + } + Signal { + name: "currentIndexChanged" + Parameter { name: "currentIndex"; type: "int" } + } + Signal { + name: "thresholdTypeChanged" + Parameter { name: "thresholdType"; type: "ThresholdType" } + } + Signal { + name: "thresholdsChanged" + Parameter { name: "thresholds"; type: "QVector<qreal>" } + } + Signal { + name: "volumeOverrideChanged" + Parameter { name: "volumeOverride"; type: "QLevelOfDetailBoundingSphere" } + } + Method { + name: "setCamera" + Parameter { name: "camera"; type: "QCamera"; isPointer: true } + } + Method { + name: "setCurrentIndex" + Parameter { name: "currentIndex"; type: "int" } + } + Method { + name: "setThresholdType" + Parameter { name: "thresholdType"; type: "ThresholdType" } + } + Method { + name: "setThresholds" + Parameter { name: "thresholds"; type: "QVector<qreal>" } + } + Method { + name: "setVolumeOverride" + Parameter { name: "volumeOverride"; type: "QLevelOfDetailBoundingSphere" } + } + Method { + name: "createBoundingSphere" + type: "QLevelOfDetailBoundingSphere" + Parameter { name: "center"; type: "QVector3D" } + Parameter { name: "radius"; type: "float" } + } + } + Component { + name: "Qt3DRender::QLevelOfDetailSwitch" + prototype: "Qt3DRender::QLevelOfDetail" + exports: ["Qt3D.Render/LevelOfDetailSwitch 2.9"] + exportMetaObjectRevisions: [0] + } + Component { name: "Qt3DRender::QMaterial" prototype: "Qt3DCore::QComponent" Property { name: "effect"; type: "Qt3DRender::QEffect"; isPointer: true } @@ -1789,6 +2002,39 @@ Module { } } Component { + name: "Qt3DRender::QMemoryBarrier" + prototype: "Qt3DRender::QFrameGraphNode" + Enum { + name: "Operation" + values: { + "None": 0, + "VertexAttributeArray": 1, + "ElementArray": 2, + "Uniform": 4, + "TextureFetch": 8, + "ShaderImageAccess": 16, + "Command": 32, + "PixelBuffer": 64, + "TextureUpdate": 128, + "BufferUpdate": 256, + "FrameBuffer": 512, + "TransformFeedback": 1024, + "AtomicCounter": 2048, + "ShaderStorage": 4096, + "QueryBuffer": 8192, + "All": -1 + } + } + Signal { + name: "waitOperationsChanged" + Parameter { name: "barrierTypes"; type: "QMemoryBarrier::Operations" } + } + Method { + name: "setWaitOperations" + Parameter { name: "operations"; type: "QMemoryBarrier::Operations" } + } + } + Component { name: "Qt3DRender::QMesh" prototype: "Qt3DRender::QGeometryRenderer" exports: ["Qt3D.Render/Mesh 2.0"] @@ -1913,11 +2159,35 @@ Module { exports: ["Qt3D.Render/PickEvent 2.0"] isCreatable: false exportMetaObjectRevisions: [0] + Enum { + name: "Buttons" + values: { + "LeftButton": 1, + "RightButton": 2, + "MiddleButton": 4, + "BackButton": 8, + "NoButton": 0 + } + } + Enum { + name: "Modifiers" + values: { + "NoModifier": 0, + "ShiftModifier": 33554432, + "ControlModifier": 67108864, + "AltModifier": 134217728, + "MetaModifier": 268435456, + "KeypadModifier": 536870912 + } + } Property { name: "accepted"; type: "bool" } Property { name: "position"; type: "QPointF"; isReadonly: true } Property { name: "distance"; type: "float"; isReadonly: true } Property { name: "localIntersection"; type: "QVector3D"; isReadonly: true } Property { name: "worldIntersection"; type: "QVector3D"; isReadonly: true } + Property { name: "button"; type: "Qt3DRender::QPickEvent::Buttons"; isReadonly: true } + Property { name: "buttons"; type: "int"; isReadonly: true } + Property { name: "modifiers"; type: "int"; isReadonly: true } Signal { name: "acceptedChanged" Parameter { name: "accepted"; type: "bool" } @@ -1946,8 +2216,17 @@ Module { "AllPicks": 1 } } + Enum { + name: "FaceOrientationPickingMode" + values: { + "FrontFace": 1, + "BackFace": 2, + "FrontAndBackFace": 3 + } + } Property { name: "pickMethod"; type: "PickMethod" } Property { name: "pickResultMode"; type: "PickResultMode" } + Property { name: "faceOrientationPickingMode"; type: "FaceOrientationPickingMode" } Signal { name: "pickMethodChanged" Parameter { name: "pickMethod"; type: "QPickingSettings::PickMethod" } @@ -1956,6 +2235,13 @@ Module { name: "pickResultModeChanged" Parameter { name: "pickResult"; type: "QPickingSettings::PickResultMode" } } + Signal { + name: "faceOrientationPickingModeChanged" + Parameter { + name: "faceOrientationPickingMode" + type: "QPickingSettings::FaceOrientationPickingMode" + } + } Method { name: "setPickMethod" Parameter { name: "pickMethod"; type: "PickMethod" } @@ -1964,6 +2250,10 @@ Module { name: "setPickResultMode" Parameter { name: "pickResultMode"; type: "PickResultMode" } } + Method { + name: "setFaceOrientationPickingMode" + Parameter { name: "faceOrientationPickingMode"; type: "FaceOrientationPickingMode" } + } } Component { name: "Qt3DRender::QPointLight" @@ -2054,6 +2344,42 @@ Module { } } Component { + name: "Qt3DRender::QRenderCapture" + prototype: "Qt3DRender::QFrameGraphNode" + exports: ["Qt3D.Render/RenderCapture 2.1"] + exportMetaObjectRevisions: [0] + Method { + name: "requestCapture" + type: "Qt3DRender::QRenderCaptureReply*" + Parameter { name: "captureId"; type: "int" } + } + Method { name: "requestCapture"; revision: 9; type: "Qt3DRender::QRenderCaptureReply*" } + } + Component { + name: "Qt3DRender::QRenderCaptureReply" + prototype: "QObject" + exports: ["Qt3D.Render/RenderCaptureReply 2.1"] + isCreatable: false + exportMetaObjectRevisions: [0] + Property { name: "image"; type: "QImage"; isReadonly: true } + Property { name: "captureId"; type: "int"; isReadonly: true } + Property { name: "complete"; type: "bool"; isReadonly: true } + Signal { + name: "completeChanged" + Parameter { name: "isComplete"; type: "bool" } + } + Signal { name: "completed" } + Method { + name: "saveImage" + type: "bool" + Parameter { name: "fileName"; type: "string" } + } + Method { + name: "saveToFile" + Parameter { name: "fileName"; type: "string" } + } + } + Component { name: "Qt3DRender::QRenderPass" prototype: "Qt3DCore::QNode" Property { name: "shaderProgram"; type: "Qt3DRender::QShaderProgram"; isPointer: true } @@ -2119,7 +2445,7 @@ Module { exports: ["Qt3D.Render/RenderSurfaceSelector 2.0"] exportMetaObjectRevisions: [0] Property { name: "surface"; type: "QObject"; isPointer: true } - Property { name: "externalRenderTargetSize"; type: "QSize"; isReadonly: true } + Property { name: "externalRenderTargetSize"; type: "QSize" } Property { name: "surfacePixelRatio"; type: "float" } Signal { name: "surfaceChanged" @@ -2141,6 +2467,10 @@ Module { name: "setSurfacePixelRatio" Parameter { name: "ratio"; type: "float" } } + Method { + name: "setExternalRenderTargetSize" + Parameter { name: "size"; type: "QSize" } + } } Component { name: "Qt3DRender::QRenderTarget"; prototype: "Qt3DCore::QComponent" } Component { @@ -2176,7 +2506,7 @@ Module { Property { name: "texture"; type: "QAbstractTexture"; isPointer: true } Property { name: "mipLevel"; type: "int" } Property { name: "layer"; type: "int" } - Property { name: "face"; type: "QAbstractTexture::CubeMapFace" } + Property { name: "face"; type: "Qt3DRender::QAbstractTexture::CubeMapFace" } Signal { name: "attachmentPointChanged" Parameter { name: "attachmentPoint"; type: "AttachmentPoint" } @@ -2243,6 +2573,17 @@ Module { "Error": 3 } } + Enum { + name: "ComponentType" + values: { + "UnknownComponent": 0, + "GeometryRendererComponent": 1, + "TransformComponent": 2, + "MaterialComponent": 3, + "LightComponent": 4, + "CameraLensComponent": 5 + } + } Property { name: "source"; type: "QUrl" } Property { name: "status"; type: "Status"; isReadonly: true } Signal { @@ -2261,6 +2602,20 @@ Module { name: "setStatus" Parameter { name: "status"; type: "Status" } } + Method { + name: "entity" + revision: 9 + type: "Qt3DCore::QEntity*" + Parameter { name: "entityName"; type: "string" } + } + Method { name: "entityNames"; revision: 9; type: "QStringList" } + Method { + name: "component" + revision: 9 + type: "Qt3DCore::QComponent*" + Parameter { name: "entityName"; type: "string" } + Parameter { name: "componentType"; type: "ComponentType" } + } } Component { name: "Qt3DRender::QScissorTest" @@ -2333,12 +2688,22 @@ Module { "Compute": 5 } } + Enum { + name: "Status" + values: { + "NotReady": 0, + "Ready": 1, + "Error": 2 + } + } Property { name: "vertexShaderCode"; type: "QByteArray" } Property { name: "tessellationControlShaderCode"; type: "QByteArray" } Property { name: "tessellationEvaluationShaderCode"; type: "QByteArray" } Property { name: "geometryShaderCode"; type: "QByteArray" } Property { name: "fragmentShaderCode"; type: "QByteArray" } Property { name: "computeShaderCode"; type: "QByteArray" } + Property { name: "log"; revision: 9; type: "string"; isReadonly: true } + Property { name: "status"; revision: 9; type: "Status"; isReadonly: true } Signal { name: "vertexShaderCodeChanged" Parameter { name: "vertexShaderCode"; type: "QByteArray" } @@ -2363,6 +2728,14 @@ Module { name: "computeShaderCodeChanged" Parameter { name: "computeShaderCode"; type: "QByteArray" } } + Signal { + name: "logChanged" + Parameter { name: "log"; type: "string" } + } + Signal { + name: "statusChanged" + Parameter { name: "status"; type: "Status" } + } Method { name: "setVertexShaderCode" Parameter { name: "vertexShaderCode"; type: "QByteArray" } @@ -2701,6 +3074,7 @@ Module { } Property { name: "source"; type: "QUrl" } Property { name: "status"; type: "Status"; isReadonly: true } + Property { name: "mirrored"; type: "bool" } Signal { name: "sourceChanged" Parameter { name: "source"; type: "QUrl" } @@ -2709,23 +3083,40 @@ Module { name: "statusChanged" Parameter { name: "status"; type: "Status" } } + Signal { + name: "mirroredChanged" + Parameter { name: "mirrored"; type: "bool" } + } Method { name: "setSource" Parameter { name: "source"; type: "QUrl" } } + Method { + name: "setMirrored" + Parameter { name: "mirrored"; type: "bool" } + } } Component { name: "Qt3DRender::QTextureLoader" prototype: "Qt3DRender::QAbstractTexture" Property { name: "source"; type: "QUrl" } + Property { name: "mirrored"; type: "bool" } Signal { name: "sourceChanged" Parameter { name: "source"; type: "QUrl" } } + Signal { + name: "mirroredChanged" + Parameter { name: "mirrored"; type: "bool" } + } Method { name: "setSource" Parameter { name: "source"; type: "QUrl" } } + Method { + name: "setMirrored" + Parameter { name: "mirrored"; type: "bool" } + } } Component { name: "Qt3DRender::QTextureRectangle"; prototype: "Qt3DRender::QAbstractTexture" } Component { @@ -2774,14 +3165,23 @@ Module { name: "Qt3DRender::QViewport" prototype: "Qt3DRender::QFrameGraphNode" Property { name: "normalizedRect"; type: "QRectF" } + Property { name: "gamma"; revision: 9; type: "float" } Signal { name: "normalizedRectChanged" Parameter { name: "normalizedRect"; type: "QRectF" } } + Signal { + name: "gammaChanged" + Parameter { name: "gamma"; type: "float" } + } Method { name: "setNormalizedRect" Parameter { name: "normalizedRect"; type: "QRectF" } } + Method { + name: "setGamma" + Parameter { name: "gamma"; type: "float" } + } } Component { name: "Qt3DRender::Render::Quick::Quick3DBuffer" @@ -2790,7 +3190,16 @@ Module { exportMetaObjectRevisions: [0] Property { name: "data"; type: "QVariant" } Signal { name: "bufferDataChanged" } - Signal { name: "bufferDataChanged" } + Method { + name: "updateData" + Parameter { name: "offset"; type: "int" } + Parameter { name: "bytes"; type: "QVariant" } + } + Method { + name: "readBinaryFile" + type: "QVariant" + Parameter { name: "fileUrl"; type: "QUrl" } + } } Component { name: "Qt3DRender::Render::Quick::Quick3DEffect" @@ -2823,6 +3232,13 @@ Module { Property { name: "parameters"; type: "Qt3DRender::QParameter"; isList: true; isReadonly: true } } Component { + name: "Qt3DRender::Render::Quick::Quick3DMemoryBarrier" + prototype: "Qt3DRender::QMemoryBarrier" + exports: ["Qt3D.Render/MemoryBarrier 2.9"] + exportMetaObjectRevisions: [0] + Property { name: "waitFor"; type: "int" } + } + Component { name: "Qt3DRender::Render::Quick::Quick3DParameter" prototype: "Qt3DRender::QParameter" exports: ["Qt3D.Render/Parameter 2.0"] @@ -2921,7 +3337,7 @@ Module { Component { name: "Qt3DRender::Render::Quick::Quick3DTextureExtension" defaultProperty: "textureImages" - prototype: "Qt3DRender::QTextureLoader" + prototype: "Qt3DRender::QTextureRectangle" exports: [ "Qt3D.Render/Texture1D 2.0", "Qt3D.Render/Texture1DArray 2.0", |