summaryrefslogtreecommitdiffstats
path: root/src/src.pro
Commit message (Collapse)AuthorAgeFilesLines
* Make the OpenGL renderer a pluginPaul Lemire2020-02-051-1/+10
| | | | | | | | By default the QRenderAspect will try to load this plugin Change-Id: Ie55e207fb8e6d0b64f717bbb99699eb669eaa3f2 Task-number: QTBUG-61151 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix the build with -no-guiLiang Qi2019-04-091-0/+3
| | | | | | Task-number: QTBUG-74602 Change-Id: If9cf0795e887a0b3cdfed0a6f5e7798116ef137d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix loading of animation aspect on iOSMike Krus2018-12-201-0/+1
| | | | | | | | | | | Loading the animation aspect the same way logic and input aspect are handled. Otherwise aspect is not registered with the factory. Note: not ideal, should really fix the static registering of all aspects and not have any specific code like this Change-Id: Ic92256e344671ee3d550d32a06d91b1ddf396abf Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Documentation: Get rid of QT_INSTALL_HEADERS in documentation configTopi Reinio2018-11-071-4/+9
| | | | | | | | | | | The use of QT_INSTALL_HEADERS caused documentation build failures in certain configurations. Use an alternative method to pass the required include paths to QDoc; make the documentation subproject depend on (a subset of) Qt 3D modules to retrieve them. Task-number: QTBUG-67925 Change-Id: I2fb745fb59c319b85c51b544acdab95cded2207e Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge branch '5.9' into devSean Harmer2017-08-191-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/render/backend/renderer.cpp src/render/backend/renderview.cpp src/render/graphicshelpers/graphicscontext_p.h src/render/graphicshelpers/graphicshelperes2_p.h src/render/graphicshelpers/graphicshelpergl2_p.h src/render/graphicshelpers/graphicshelpergl3_2_p.h src/render/graphicshelpers/graphicshelpergl3_3_p.h src/render/graphicshelpers/graphicshelpergl4_p.h src/render/graphicshelpers/graphicshelperinterface_p.h src/render/jobs/pickboundingvolumejob.cpp tests/auto/animation/clipanimator/tst_clipanimator.cpp tests/auto/auto.pro tests/manual/manual.pro Also disabled the QQmlMetaType codepaths following commit 49a11e882059ee1729f776722e085dd21d378c36 in qtdeclarative. The QQmlMetaType codepaths will be re-enabled once a qt5.git integration has succeeded. Change-Id: Ia654d75425e6d406c472d19864383612208cad2b
| * Fix build: src/plugins/sceneparsers/assimp depends on Qt3DAnimationThiago Macieira2017-07-201-1/+1
| | | | | | | | | | | | | | | | | | /usr/bin/ld.gold: error: cannot find -lQt53DAnimation assimpimporter.o:assimpimporter.cpp:function Qt3DRender::AssimpImporter::node(aiNode*): error: undefined reference to 'Qt3DAnimation::QKeyframeAnimation::setTarget(Qt3DCore::QTransform*)' Change-Id: I84e45059a888497fb55ffffd14d2e19ea52ecf55 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Remove repeat src_animation targetSean Harmer2017-08-021-1/+0
| | | | | | | | | | Change-Id: I126a9f7b84f1011489a96fed5ac29e359578e68a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Allow to disable aspects at configure timePaul Lemire2017-08-021-23/+50
|/ | | | | | | | | This allows to remove dependencies and reduce deployment size when a given aspect is not required. Change-Id: I5aa90e4825b375cd446c47727aa11d03c40703c9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix build without quick moduleStephan Binner2017-04-271-76/+84
| | | | | | Change-Id: I5a2a5ac0d498e8ab5568d57cd2c16e83d947fe47 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move scene2d to own module and implement conditional plugin loadingAntti Määttä2017-02-281-1/+11
| | | | | | | | | | - 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>
* Merge branch 'wip/animation' into devSean Harmer2017-01-301-1/+16
|\ | | | | | | | | | | | | Conflicts: tests/manual/manual.pro Change-Id: I524b37ea4ca0f82ee10438836ae9d40aad29576c
| * Add animation aspect importsSean Harmer2017-01-251-0/+5
| | | | | | | | | | Change-Id: Ia848108bf3ca234681e2f1fecfb7e02fc1b89c38 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Merge branch 'dev' into wip/animationSean Harmer2017-01-251-0/+6
| |\ | | | | | | | | | Change-Id: I2b952a5d3358b0f76eeb1fc2ce83345aa66ff2d1
| * | Add missing build dependencySean Harmer2017-01-241-1/+1
| | | | | | | | | | | | | | | Change-Id: Icfd908f8a6846829e2647bbd42bb3235f73f1efd Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| * | Add skeleton quick3danimation librarySean Harmer2017-01-201-0/+5
| | | | | | | | | | | | | | | Change-Id: If4a76a4ab9840545b2f6ae71929e815cf6a1adaf Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| * | Long live Qt3DAnimation and QAnimationAspect!Sean Harmer2017-01-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Add empty aspect that will provide key-frame animation support within Qt 3D. Change-Id: Ife26ad58229aada74c1c6eca2148fc97b22267b0 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | | Merge branch 'wip/qtquickintegration' into devSean Harmer2017-01-291-2/+6
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quick3d/imports/render/qt3dquick3drenderplugin.cpp src/render/backend/triangleboundingvolume.cpp src/render/backend/triangleboundingvolume_p.h src/render/frontend/qrenderaspect.cpp src/render/frontend/sphere.cpp src/render/frontend/sphere_p.h src/render/jobs/pickboundingvolumejob.cpp src/render/jobs/pickboundingvolumejob_p.h src/render/picking/objectpicker.cpp src/render/raycasting/qcollisionqueryresult_p.h src/render/render.pro src/src.pro tests/auto/render/objectpicker/tst_objectpicker.cpp tests/auto/render/render.pro Change-Id: I95717c7855887850d5c90e7ad8f19f1ffb37a545
| * | Add scene2dpluginAntti Määttä2017-01-271-0/+5
| |/ | | | | | | | | | | Change-Id: I4875c1a8c319d03e002d591f406379a636f07d8d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* / QMesh geometry loading via plugin systemGuillermo A. Amaral2017-01-201-0/+6
|/ | | | | | | Ported ObjLoader to a plugin based system. Change-Id: I4bf50fe869f04173c022b6a22c45944ecdad4703 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add missing build depSean Harmer2016-08-041-1/+1
| | | | | | | | | Fixes parallel builds where they were sometimes failing on macOS with static builds. Task-number: QTBUG-54152 Change-Id: I8e3ab43031fcfe29bfb85a37d4215f02c461c40f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move last remaining pieces of examples-common to Qt3DExtrasPaul Lemire2016-05-011-1/+6
| | | | | | | Also created a Quick3DExtras for QML related extras (Qt3DQuickWindow) Change-Id: I1b95ea841e07ac8d68a07a1911d783b722e6fe03 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move defaults and geometries out of Qt3DRender and into Qt3DExtrasPaul Lemire2016-04-231-1/+11
| | | | | | | QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on. Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* OrbitController Qml and Cpp for Qt3D CameraRobert Brock2016-03-241-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Adding an Orbit control that will allow a user to orbit / pan in a 3D QML scene. --- QML - LMB translate - RMB orbit - RMB + LMB dolly - Arrow keys translate - Shift + Up/Down keys dolly - Alt + Arrow keys orbit --- CPP - LMB translate - RMB orbit - RMB + LMB dolly - Arrow keys translate - Shift + Up/Down keys dolly - Alt + Arrow keys orbit Both examples have their speed inputs clamped to -1 and 1 Zoom in can now be limited Change-Id: If24c45c7350767a1682dccfd2e4d49d95433fd5d Task-number: QTBUG-50660 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Register Axis/Action/LogicalDevice to QMLPaul Lemire2015-11-281-1/+1
| | | | | Change-Id: If39f60452327d2611f78ec7b5edbff961f40f435 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add a quick3dinput subprojectPaul Lemire2015-11-281-0/+4
| | | | | | | Will allow to create the QML specific extension classes Change-Id: I9075d77e6ae73c63fd60eef3ca400eb110e3b9dd Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove incomplete collision aspectAndy Nichols2015-11-071-10/+0
| | | | | | | | | | | | It does not make sense to release the collision aspect as is as the API is not final, and no backends have been implemented yet. The collision aspect is also out of scope for the current release, and for now we will just support rudimentary collision support to enable picking by casting rays at bounding spheres in the render aspect. Task-number: QTBUG-49091 Change-Id: I6aa9e2a38d5e4974ea22b87aead1c0af93585f39 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Doc: Move the doc artifacts outside of the submodule directoryVenugopal Shivashankar2015-10-281-1/+2
| | | | | | | | | | | | The qdocconf now lives in 'src/doc' because the documentation project defined by it covers the whole Qt 3D module. This change enables qmake to use 'qt3d' as the output directory for doc make targets. The new 'doc' directory also includes the relevant images, snippets, and the qdoc files. Change-Id: Ibc6d0912f8b1e665767e97630b3e5509e10c5710 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Rename Renderer -> Render throughoutSean Harmer2015-10-191-1/+1
| | | | | | | | This is for consistency between the C++ namespaces and QML imports and with the other aspects. Change-Id: I73392f138b4e519b12888f52530123e3d0ba445e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Rename .pro file to remove plural for consistencySean Harmer2015-10-131-1/+1
| | | | | Change-Id: I1f7f67f54716a53d1b4fd6e533196a462817f18f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add collision aspect QML pluginSean Harmer2015-08-101-0/+5
| | | | | Change-Id: I46bc3a704daf822fedc358aa2797722ded802fdd Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add new collision aspectSean Harmer2015-08-101-0/+5
| | | | | | | | | | | | | This will implement a simple collision-only (no physics) aspect that can be used to detect when collisions occur between entities that aggregate collider components. It is also intended to provide a concrete implementation of the ray cast service to permit users to perform ray casts and to also allow the input aspect to correctly deliver input events to entities. Change-Id: I20012ebdb0b3f1b2014ccdab039e87973d112c16 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add a new Logic aspect to allow synchronous operationsSean Harmer2015-08-061-0/+10
| | | | | | | | | | | | The QLogicComponent allows users to have code execute synchronously with the Qt3D engine each frame. Very useful for implementing some pieces of applicaton logic or for prototyping functionality that can later be folded back into Qt3D in a declarative manner. Change-Id: Ia7d69b77d782e67ace0a64a7c59188786fb731fd Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove incomplete bullet and OpenAL aspectsSean Harmer2015-02-191-19/+0
| | | | | | | This can be reverted following the merge from dev -> 5.5. Change-Id: I7b85e64aa91d9ed81e3ef4d866e531056314d72e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Have Scene3DItem deal with input eventsKevin Ottens2015-01-231-1/+1
| | | | | Change-Id: I8b7637d80e3b9b2ad1b140f32a5e824d2547a936 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move CameraController in the input aspectKevin Ottens2015-01-231-1/+1
| | | | | | | | | | | | | | | With this move it also becomes a private class. As a result I had to touch all the examples as you won't get camera navigation anymore if the input aspect is not registered. Quick3DConfiguration doesn't depend on the QuickWindow singleton hack anymore, it tries to get back to the aspects and set the camera on the ones having a corresponding property. It also mostly empties Window and QuickWindow. Change-Id: Ife1644bd338e51929bad1e99089bd5e4c68ebc68 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix dependencies in src.proPaul Lemire2015-01-221-1/+1
| | | | | Change-Id: I83c594fe308d7e332dd97727fa24f4ebe2647442 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add a Scene3D item to wrap Qt3D scenes in QQ2Kevin Ottens2015-01-181-0/+5
| | | | | | | | Comes with an example to try the embedding and check that transformations work on the Scene3D element. Change-Id: I93b4690b7fac0c9c90f8a89c53ad6b83aa2c89a6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Ensure input aspect is built before the quick input pluginSean Harmer2014-12-121-1/+1
| | | | | | | This should solve the CI integration failures on windows. Change-Id: I99b0d3fb2e560b11df98dc7996c4d55468a2c85b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Added Quick3D Inputs import pluginPaul Lemire2014-11-021-0/+5
| | | | | Change-Id: I1d85420884a60704b8f3e8086aba7241c9e9936b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Added empty QInputsAspectPaul Lemire2014-11-021-0/+4
| | | | | Change-Id: I188ae49f5ec183008a23c2efaeda973182125e57 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Assimp external dependencyPaul Lemire2014-08-191-1/+6
| | | | | | | | The AssimpParser is now a SceneParser plugin that is build if config tests for assimp succeed. Change-Id: I0e3f6a6ce2a43298b71b0261084f6c79521f214d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rename a few .pro files for nicer sub-project names in creatorSean Harmer2014-07-181-3/+3
| | | | | Change-Id: Iba4ef55295e224c8e8329a0113d056149df46779 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Build as much in parallel as we canSean Harmer2014-07-181-7/+54
| | | | | | | | This introduced correct dependency trackign between targets Change-Id: I7d312d55a8066130db80a4102a4fb988222de225 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add configure test for bullet physics and conditional buildSean Harmer2014-07-091-3/+6
| | | | | Change-Id: Iee429485135f186c183701bd2b4d5ce3d1b13c28 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add empty shell for a physics aspect using the Bullet engineSean Harmer2014-06-261-0/+1
| | | | | Change-Id: Ie2cfbc7ec6b6430f5b1cb7e8681591ac962be871 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* OpenAL aspect empty shellPaul Lemire2014-05-311-0/+1
| | | | | Change-Id: I9b3eb51c3f40eb4dd5e746502e4d26b0703b1abd Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Quick3D independent libraryPaul Lemire2014-05-241-1/+2
| | | | | | | | | | | | | | | | In order to be able to have Qt3D work without dependencies to the Qml module, a dedicated Quick3D library has been set up for that purpose. It offers a QQuickWindow class which extends Qt3D::Window and allows to load a Qml source file. Examples have been updated to use QuickWindow. Note: There are still dependencies to the Qml module in Qt3DCore and Qt3DRenderer. This patch is a first step toward the removal of those. Follow up commits will completely remove those dependencies. Change-Id: I603eec8fb01b3706f648550b43b62356b0b4b4ac Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Relocate the render aspect outside of coreSean Harmer2014-03-291-2/+3
| | | | | Change-Id: I636442d2d71342fd248b90674176cede895feab2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove Qt3D 1.x sourcesSean Harmer2014-03-281-3/+0
| | | | | | Change-Id: Ic6c05d78f617155892b546721946ee2c5c9b660a Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Rendering Aspect to dedicated Qt3D module library.Paul Lemire2014-03-251-1/+2
| | | | | | | | | | | | | | | | | | | Aspects are now independent Qt3D modules. This allows aspects to expose classes that can be reused by other aspects. Unlike plugins however, aspect modules have to be registered to the QAspectManager when the Qt3D window is created. At the moment there is only a single aspect : RendererAspect To load the RendererAspect QT += 3drenderer Examples updated to work with the changes. QML components defined in the RendererAspect are accessible by importing Qt3D.Render 2.0. Examples have been updated accordingly. Change-Id: I1281b1ffc1a633292b394c7d0460f1e16b34b488 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 03:21:32 +0000