summaryrefslogtreecommitdiffstats
path: root/src/quick3d/imports
Commit message (Collapse)AuthorAgeFilesLines
* Scene3DRenderer: ensure window pointer stays the same while renderingv5.9.4Paul Lemire2018-01-102-9/+20
| | | | | | | | | | | | | | | | | It appears that the pointer value for the window could in some cases be updated meanwhile we were rendering, which resulted in random crashes. We now save the window pointer to a member variable on startup or whenever the windowChanged signal is fired and use a mutex to ensure the pointer won't change while we are rendering. This also covers the case where the item is destroyed but the cross-thread signals are not received before rendering happens. Task-number: QTBUG-63897 Task-number: QTBUG-65407 Change-Id: I5f2797e2210b532f9086ed186959fce27ea9f514 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Set devicePixelRatio on item size changeMorten Johan Sørvig2017-12-143-7/+10
| | | | | | | | | Propagate the dpr to the QRenderSurfaceSelector in addition to the the item size. Task-number: QTBUG-62235 Change-Id: I6555685392334b8edf2327fae97d5d531cffeaae Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Make sure Qt3D gets a clean OpenGL state in Scene3D itemWieland Hagen2017-06-291-0/+4
| | | | | | | | | We need to reset the state before and after rendering, because it may have been dirty before and it might be dirty afterwards. Change-Id: Iaa32243aa5721d3e2319b2a58987624f30d6482d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix qmlClearTypeRegistrations for Qt 3DMäättä Antti2017-05-122-0/+6
| | | | | | | | | | Unregister valueTypeProvider in qtquick_global.cpp to prevent multiple registrations. The Quick3DColorProvider doesn't seem to cause problems so leave as it is. Task-number: QTBUG-56546 Change-Id: I79139d8e8ab80458e72633dd97e15dbf108388e4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add quick3d class for VertexBlendAnimationAntti Määttä2017-05-091-0/+3
| | | | | | | | | Add the missing class for VertexBlendAnimation so that it can be used from qml. Task-number: QTBUG-60618 Change-Id: If47dccf5e44d0158053ca3b9122fcef91d73ea93 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Scene3DRenderer: fix race conditionv5.9.0-beta4Paul Lemire2017-05-063-4/+18
| | | | | | | | | | | | When the window geometry changes, the Scene3DRenderer was updating a Qt3D frontend node's property from the QSGRenderThread. This resulted in the QPostman::notifyBackend being called from possibly two threads at the same time, resulting in a race condition where the changes would never be submitted again to the backend. Change-Id: I842aaa54637d85d4d45eb54620749efb36168e2a Task-number: QTBUG-54900 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oleg Evseev <ev.mipt@gmail.com>
* Add a new mirrored property to QPlane(Mesh|Geometry)Kevin Ottens2017-05-051-0/+2
| | | | | | | | | | | This is regularly necessary to be able to flip vertically the UV coordinates on the plane mesh depending if we are using a texture in model space coords or in window coords. Especially necessary now with Scene2D which outputs textures in window coords. This property is necessary to make it usable. Change-Id: I0fe7d3fdc125f1791492cf39ebe908bbc20f1db2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge 5.9 into 5.9.0Oswald Buddenhagen2017-05-041-0/+2
|\ | | | | | | Change-Id: I02adbc5294f9d5879cb05e75eccad74196ea2a7c
| * Fix build for -no-feature-wheeleventStephan Binner2017-04-271-0/+2
| | | | | | | | | | | | | | Change-Id: I72591f43c0e2c4cc6e3e589f8d8e52fbb1041666 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Update qmltypes filesMike Krus2017-05-036-244/+1453
|/ | | | | | Task-number: QTBUG-60514 Change-Id: Idc42a21109abef5563e6e8cda1a338147bb8dfce Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add plugins.qmltypes file for scene2dMäättä Antti2017-04-121-0/+121
| | | | | | | | Add plugins.qmltypes file for scene2d for tooling Task-number: QTBUG-60100 Change-Id: I23376960f6cdedd099006ad89132e7e4904e6588 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Export QAnimationClip to QMLSean Harmer2017-04-111-0/+2
| | | | | Change-Id: I3a96ca3a56690ed9c50fb7e70eb9c2aba33357ec Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Hook Scene3D cleanup on scenegraphInvalidated tooLaszlo Agocs2017-04-052-10/+24
| | | | | | | | | | | | | The invalidated signal is nice since it works in all cases, both with real QQuickWindows and ones driven via QQuickRenderControl (e.g. QQuickWidget). With QQuickWidget just relying on windowChanged is pretty bad since the window change comes way too late due to the diffeerences in widget handling internals. Task-number: QTBUG-52132 Change-Id: I8639e4d60514eeeb00fa9dda2329de6088f2a44d Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Fix Scene3D initialization in QQuickWidgetLaszlo Agocs2017-04-032-2/+23
| | | | | | | | | | Scene3D can now be used inside a QQuickWidget. There are some remaining problems, most notably an assert when exiting, but at least the scene shows up now. Task-number: QTBUG-52132 Change-Id: Ifc05d859711f5f42342e111c1d7cbea7ba373552 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix QML registration of QAnimationClipLoaderSean Harmer2017-04-031-1/+1
| | | | | Change-Id: I8fae537aa38059ff2592c2f49c238408ea27f7e0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge branch '5.8' into 5.9Sean Harmer2017-04-0217-140/+147
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/jobs/qthreadpooler.cpp src/core/nodes/qcomponent.cpp src/core/qpostman.cpp src/core/qscene_p.h src/core/services/qservicelocator_p.h src/input/frontend/qinputaspect.cpp src/plugins/sceneparsers/assimp/assimpimporter.cpp src/plugins/sceneparsers/assimp/assimpimporter.h src/plugins/sceneparsers/gltf/gltfimporter.h src/plugins/sceneparsers/gltf/gltfio.cpp src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp src/quick3d/imports/render/qt3dquick3drenderplugin.cpp src/quick3d/quick3dextras/qt3dquickwindow.cpp Change-Id: I3566708c6f74a34959e7bb64b64e93647ca3f699
| * Coding convention fix for Src/importscore, importsextras,5.8Robert Brock2017-04-0117-129/+135
| | | | | | | | | | | | | | | | | | importsinput, importsrender, importsscene3d Reordering the header includes to comply with Qt coding conventions Task-number: QTBUG-56185 Change-Id: I3b2b3ee60e397772bbcebac09b07c059fbd922db Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Change some Scene3D/Window qWarnings to qCDebugv5.9.0-beta1Laszlo Agocs2017-03-311-2/+2
| | | | | | | | | | | | | | | | None of these is fatal. It is perfectly possible to get input via other means, for example. Change-Id: I7880c8f5aa611908d7e09d03fe0c8100f8c8d183 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Don't explicitly disable the Qt3D category loggingLaszlo Agocs2017-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Category logging is off by default, so explicitly turning it off will just make it harder to turn it on in the application. qt.*.debug has special behavior in the sense that defaults to off. Other categories, like Qt3D.*.debug default to true. Therefore the only correct way in Qt 3D is to always specify warning-and-up as the default enabled severity. Change-Id: I91daf48e049b7a9fcfac9720982138b178ee4804 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* | Remove clips property from QAbstractClipBlendNode and friendsSean Harmer2017-03-261-3/+1
| | | | | | | | | | | | | | | | No longer needed as concrete subclasses each provide their own specific APIs for managing clips or sub trees. Change-Id: I8e090bcf18ad9bf0d19e36128d7556aaa6cd6edf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | scene2d: Add qcoreapplication.h to header includesMikko Gronoff2017-03-201-0/+1
| | | | | | | | | | | | | | Required for Q_COREAPP_STARTUP_FUNCTION macro Change-Id: Icaa66a7f3aa206bf4741a086c75f3d7b79b7af6d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Cleanup scene2d - remove event forwardAntti Määttä2017-03-151-2/+0
| | | | | | | | | | | | | | | | | | Remove event forward related stuff as they are no longer necessary after the mouse event changes. Task-number: QTBUG-58876 Change-Id: I2c9c52e41d5af3078d04ac9d5cc66753898e0ad9 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | cleanup scene2d - change mouse event handlingAntti Määttä2017-03-032-2/+3
| | | | | | | | | | | | Task-number: QTBUG-58876 Change-Id: I103125ff15a4b28a67832eb7b86b1abbd2f3fde8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Export QClipBlendValue to QMLSean Harmer2017-03-021-0/+2
| | | | | | | | | | | | Task-number: QTBUG-58901 Change-Id: I1a944da01a948a5e5821ecba307a898d8a0129ad Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Move scene2d to own module and implement conditional plugin loadingAntti Määttä2017-02-285-4/+140
| | | | | | | | | | | | | | | | | | | | - Add quick3dscene2d module - Add importsscene2d qml module - Modify RenderAspect to load plugins conditionally - change autotests to match the module change Change-Id: If6596472acbd9a377561b2bfd2094a0585c781ac Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* | Rename QAdditiveBlend -> QAdditiveClipBlendSean Harmer2017-02-241-2/+2
| | | | | | | | | | | | | | | | Also rename backend type accordingly. Task-number: QTBUG-58903 Change-Id: Ia1ad670937487dd84768e79d8c2be59ed3b6d0a5 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Rename QLerpBlend to QLerpClipBlendSean Harmer2017-02-241-2/+2
| | | | | | | | | | | | | | | | Also rename backend class accordingly. Task-number: QTBUG-58904 Change-Id: I3a8d3898507e5055c2727e4bb1b19b06fdba988b Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Introduce QAbstractAnimationClip and rename QAnimationClipSean Harmer2017-02-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Introduced an abstract base class for types of animation clip. Also renamed QAnimationClip to QAnimationClipLoader since it loads data from files. Also renamed corresponding backend type and fixed up unit tests accordingly. Task-number: QTBUG-58898 Change-Id: I01a96e108cbbcd12e01913693e96610598965018 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Expose QEnvironmentLight to QMLKevin Ottens2017-02-241-0/+2
| | | | | | | | | | Change-Id: I7925df5d4bec59c353e4a07bbbc57f5e0c4ff5ff Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QBoundingSphere cleanupPaul Lemire2017-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | Is now a Q_GADGET value type Added QBoundingSphere creator functions on QLevelOfDetails and Quick3DLevelOfDetailsLoader Note: cannot be a nested type on QLevelOfDetails as moc doesn't support it Task-number: QTBUG-58892 Change-Id: Ic7b6d68c6e1119c1f61a858f49379efc1e9c2104 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QNode PropertyTrackMode cleanupPaul Lemire2017-02-241-1/+2
| | | | | | | | | | | | Task-number: QTBUG-58897 Change-Id: Ie92c26e7b34ea7730461786f484ff50b003f747a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QDistanceFieldText cleanupPaul Lemire2017-02-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | -renamed QDistanceFieldText to QText2DEntity -renamed QDistanceFieldMaterial to QText2DMaterial -removed fontScale property -replace position property by width/height properties -adjusted manual test accordingly Task-number: QTBUG-58883 Change-Id: Ieb1aae2ef8f397e3a6a636ad651cf83a5565daa0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QDistanceFieldGlyphCache cleanupPaul Lemire2017-02-231-3/+0
| | | | | | | | | | | | | | | | | | | | | | -made QDistanceFieldGlyphCache and QTextureAtlas private -remove dptr on QDistanceFieldGlyphCache -use a static hash on glyphCaches based on current scene being used -QTextureAtlas parented by scene root node Task-number: QTBUG-58881 Change-Id: If51d7dfe75e4233b9e7a36473c71fe530247aef7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Introduce QAbstractClipAnimatorKevin Ottens2017-02-231-0/+2
| | | | | | | | | | | | | | | | This becomes the new base class for QClipAnimator. Change-Id: I53d38cae8c3cee73e07084d2d58e317ba19ced7b Task-Id: QTBUG-58899 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Clean up QRenderCapture(Reply) APIKevin Ottens2017-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need the captureId in the public API so deprecate the functions which make it appear and create overloads with no such id when appropriate. Only a pointer to a QRenderCaptureReply is needed to represent a capture request. Also the "isCompleted" parameter is unneeded on the signal since it is always true anyway. If we'd want to do error management it would go via a status flag property or similar. Change-Id: I9571ece3e3f82f46db5b3993ccf035e770c9d55e Task-Id: QTBUG-58877 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Start using REVISION on our propertiesKevin Ottens2017-02-233-0/+10
| | | | | | | | | | | | | | | | | | Adding REVISION 9 on all the new properties from this release. Also registering the extra revisions on the QML side. Change-Id: Ic7eda36bee8ca19508cd73b61cea534f956c6997 Task-Id: QTBUG-58895 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix QML version registration for 5.9 typesKevin Ottens2017-02-233-29/+30
| | | | | | | | | | | | | | | | | | | | | | | | Put a couple of the types which ended up wrongly at 2.0 with the other ones. Also applies the decision to go from 2.1 straight to 2.9 to realign the minor version with the Qt one. Will make it easier to manage. Change-Id: I7088b6c493296924a1d313c83107d5755e548ede Task-Id: QTBUG-58890 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Metal/Rough materials: metallic -> metalnessKevin Ottens2017-02-161-10/+10
| | | | | | | | | | | | | | | | Rename decided during API review in order to match with roughness. Change-Id: I4b1a13e6028ba410fb31a80e6c64f9539581f8c4 Task-Id: QTBUG-58894 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Extruded Text cleanupPaul Lemire2017-02-161-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | -rename QText3DGeometry to QExtrudedTextGeometry -rename QText3DMesh to QExtrudedTextMesh -rename the depth property to extrusionLength -removed the edgeSplitAngle property -updated the example Task-number: QTBUG-58880 Change-Id: Ib2d1a58e62b34949db12b9245f1474baf9cf9b91 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Remove QConductedClipAnimator and defer to laterSean Harmer2017-02-161-2/+0
| | | | | | | | | | | | | | | | Too much to fix up for 5.9 so remove and defer for 5.10. Task-number: QTBUG-58905 Change-Id: Ie5b4f172e57beac12933fa0db5f102b4dc9346fc Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* | Register QMorphPhongMaterial for qmlAntti Määttä2017-02-131-0/+2
| | | | | | | | | | Change-Id: Ie15dbf44ccbdc09f51cb8525cbe77984d7e29791 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Initialize members in Scene3DRendererSean Harmer2017-02-121-0/+2
| | | | | | | | | | | | Change-Id: Ifd2015207346987be498a63302ec6f352a489fb1 Coverity-Id: 154585 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Initialize members in Scene3DSGMaterialShaderSean Harmer2017-02-122-0/+8
| | | | | | | | | | | | Change-Id: Ia2f4f7840ad68c3868a7dfba9c81689f96ee524c Coverity-Id: 154584 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Move animations from extras to animationsAntti Määttä2017-02-072-19/+20
| | | | | | | | | | Change-Id: If3bcfe24ebe7ecfb4519e0e400e601819783edad Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Quick3DExtras: fix QAbstractAnimation import versionPaul Lemire2017-02-061-1/+1
| | | | | | | | | | Change-Id: I7ad91e31b76b5913b8b102413c2ac47ec481ec3e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix iOS static buildMike Krus2017-02-051-1/+0
| | | | | | | | | | | | | | (think some of the qml related files need cleaning up) Change-Id: Ibf982c0b168ad845966d42f36ecd616cf74732f4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge "Merge branch 'wip/animation' into dev" into refs/staging/devSean Harmer2017-01-313-1/+42
|\ \
| * \ Merge branch 'wip/animation' into devSean Harmer2017-01-313-1/+42
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/extras/defaults/defaults.pri src/extras/extras.qrc src/quick3d/imports/extras/importsextras.pro src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp src/quick3d/quick3dextras/items/items.pri src/quick3d/quick3dextras/quick3dextras.pro tests/manual/manual.pro Change-Id: I62232cb21495612f31f48a6749a52b68777c4ae3
| | * | Animation support for Qt3DAntti Määttä2017-01-313-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modded assimp loader to load animations and to load submeshes into child entities. Added keyframeanimation for node animations and morphing mesh. Also added animation group for controlling multiple nodes as one animation and animation controller to select and play animations. Assimp loader adds QKeyFrameAnimations targeting an entity as child objects of that entity, the QAnimationController finds them when the entity is set and creates QAnimationGroups from based on the animation name. Change-Id: I7e2e7a4479af49f8023b4a359b2b3118efdaa0da Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | | Renamed QAddBlend to QAdditiveBlendPaul Lemire2017-01-311-2/+2
|/ / / | | | | | | | | | | | | Change-Id: I1a2737c335790507c3b598e274f8dc5f8f82d1a1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 19:04:19 +0000