summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix annotations in QNormalDiffuseMapMaterial defaultSean Harmer2016-01-172-2/+14
| | | | | Change-Id: I3da1cb2912efb6be8dc8dbacf3bae915199860ea Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in QNormalDiffuseSpecularMapMaterialSean Harmer2016-01-172-1/+14
| | | | | Change-Id: Id9cd5cacec76f342f5090eecba5f33cad6fd8007 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations for QPerVertexColorMaterial defaultSean Harmer2016-01-172-1/+14
| | | | | Change-Id: I91e8cb7277bd5957f60a8176c4a01f1f2188c93c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in QPhongAlphaMaterial defaultSean Harmer2016-01-172-1/+14
| | | | | Change-Id: Ie96e1276dad51536d42d7d01c59885a82431a033 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in DiffusMapMaterial QML defaultSean Harmer2016-01-171-0/+9
| | | | | Change-Id: Iefd0c460c0520699a7b4c847893b6b3fcde056ef Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations on DiffuseSpecularMapMaterial QML defaultSean Harmer2016-01-171-0/+10
| | | | | Change-Id: I44ce148a372a2101cfec42bb8d88ecc9b738132a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in GoochMaterial QML defaultSean Harmer2016-01-171-0/+10
| | | | | Change-Id: I4388c2b2656448666a53610f28ee576a1eda81b8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in NormalDiffuseMapAlphaMaterial QML defaultSean Harmer2016-01-171-0/+9
| | | | | Change-Id: I18512f30e8a0569a7b8326a23ffb8ee9ac915f18 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in NormalDiffuseMapMaterial QML defaultSean Harmer2016-01-171-0/+10
| | | | | Change-Id: I9ab4999d7b262fbec1052fa7f9be83a8c6d90b84 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in NormalDiffuseSpecularMapMaterial QML defaultSean Harmer2016-01-171-0/+10
| | | | | Change-Id: I7c5cf66fdcb6ea3398ea7c6d6084f46db424f39a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in PerVertexColorMaterial QML defaultSean Harmer2016-01-171-0/+10
| | | | | Change-Id: I9b2f441ee7c83cd097a89fcaf214a542e6921435 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in SkyBox QML defaultSean Harmer2016-01-171-0/+9
| | | | | Change-Id: Icce986e9cfb53fb2ccf4c06bc30dd31b54bd0a76 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in TextureMaterial QML defaultSean Harmer2016-01-171-0/+10
| | | | | Change-Id: I041fc2eb8df0cabcd161e78770e8f4aecdc4634a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in PhongAlphaMaterial QML defaultSean Harmer2016-01-171-0/+9
| | | | | Change-Id: Idec38e74dc461a142de77965e7c3fac353e894df Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotation on PhongMaterial QML defaultSean Harmer2016-01-171-0/+9
| | | | | Change-Id: I68dac8f0a3ef84bf134227c781ef85538d1dda27 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove outdated TODO commentSean Harmer2016-01-171-1/+0
| | | | | Change-Id: I3f04ad88b194a02bd7ffbc60edd407a5ea29615a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add annotation to QPhongMaterialSean Harmer2016-01-172-1/+15
| | | | | | | | Allows technique selector in QForwardRenderer to select from the available techniques rather than excluding them all. Change-Id: Ia044f3ccdf15e012b52d519fad5f0415592046fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move QCamera/QCameraLens to Qt3DRenderPaul Lemire2016-01-1628-1028/+96
| | | | | | | | Also get rid of Qt3DRender::QWindow and of the hard codes camera controller. Change-Id: I307735d01caf97b7a690b28de8dc99fc9866c35f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove the Quick3DConfiguration HackPaul Lemire2016-01-164-192/+0
| | | | | Change-Id: If256d843c2a783fb617c0082f5bd1f15ef72ef19 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Make ObjLoader available to unit tests/benchmarksTobias Koenig2016-01-161-1/+1
| | | | | Change-Id: If9376bb6f93f4fec7a0a57401a5a3b24563b97f1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Added QML bindings for new aggregate actionsColin Ogilvie2016-01-164-2/+184
| | | | | Change-Id: I1064a29049c083c053d80d15dede898e84e64cef Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Added link for inputs between sequential front and back endColin Ogilvie2016-01-163-4/+37
| | | | | Change-Id: I0b6a0456195d64c284a599e3bf08781e30bb723b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Backend Nodes for Aggregate ActionsColin Ogilvie2016-01-1610-2/+405
| | | | | Change-Id: I51dbd9eaedfd8b152e3f65c0c9e16cf81e69fb02 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Added initial parameters to input sequence and inputchordColin Ogilvie2016-01-164-0/+96
| | | | | Change-Id: Ib3128b7942c896a987b04d0e9fdddff9f295da93 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Support for DDS texturesMauro Persano2016-01-1613-124/+1013
| | | | | | | | | | | This commit adds support for DDS textures. It also adds QTextureLoader, a generic texture provider without a texture target. The actual texture target will be based on the properties of the texture loaded from its "source" property. Change-Id: If89cce7a55b3d82355f2da35588a091b7188f36c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Say hello to GenericDeviceBogDan Vatra2016-01-1618-28/+542
| | | | | | | | | | | | | | GenericDevice can be used to deliver events to Qt3D from any device which is not handled already by Qt3D. What the user need to do is to instantiate a GenericDevice object, set GenericDevice::axesMap and GenericDevice::buttonsMap properties, then use GenericDevice::axisEvent and GenericDevice::buttonEvent signals to deliver the events. [ChangeLog][Input] added GenericDevice Change-Id: Iaef3ff8fabf5002de41d55587ddf1352e6a3e458 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge "Merge branch '5.6' into dev" into refs/staging/devBogDan Vatra2016-01-1613-129/+57
|\
| * Merge branch '5.6' into devSean Harmer2016-01-1513-129/+57
| |\ | | | | | | | | | | | | | | | | | | Conflicts: examples/qt3d/qgltf/main.qml Change-Id: I03d4cc679a7812fb114461609e481d43a0bc5390
| | * Revert "Fix crash when Scene3DItem is removed from scene"Mauro Persano2016-01-152-34/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 658d7bee705224c9e2fbbab1d5e79d32c99858f7. The problem that this commit tried to fix still exists, but the commit seems to have just replaced a kind of shutdown crash with a different one. Change-Id: Ic34b4da9798269c2ed8b02992c811c2129eb5673 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | * centralize + fix use of system assimpOswald Buddenhagen2016-01-143-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | follow the foo.pri & foo_dependency.pri pattern found in qtbase to de-duplicate the code (and thus implicitly make it consistent) and synchronize the conditionals in the configure test. also document why we still can't enable the assimp sceneparser in all configurations. Change-Id: I3bdc30e077b6c9c7027a9311195c08a6c5f1fcf4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * Make axisIdentifier & buttonIdentifier constBogDan Vatra2016-01-145-10/+10
| | | | | | | | | | | | | | | Change-Id: Idedf3cab5d8a30d1a417ceb10555170b53b00d26 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * "cleanup" method needs to be virtual.BogDan Vatra2016-01-121-1/+1
| | | | | | | | | | | | | | | Change-Id: I0075adf8b927a29f06be6ab883622b216cca5b44 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | * Remove unused ListAllocationPolicy.Volker Krause2016-01-122-74/+0
| | | | | | | | | | | | | | | Change-Id: I59a6461fd3e81d578af3cc33248fb21d8b503135 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Link examples against static libPaul Lemire2016-01-161-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Contains: Qt3DWindow Qt3DQuickWindow QFirstPersonCameraController FirstPersonCameraController.qml This will allow to get rid of the Camera configuration hack Change-Id: I55c5634aa4c162f9dd2852d3258073a6352b426c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Don't use deprecated API for plugin loadingSean Harmer2016-01-152-4/+4
| | | | | | | | | | Change-Id: I6ea0e9cc8dc296f00a0547f71cda67a9d26443a5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QBlendState: Target particular Draw Buffers (glBlendFunci())Wieland Hagen2016-01-155-39/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are 3 ways blending can be configured, depending on GL version: pre-3.0: Globally 3.0-3.3: Individual GL_BLEND for each Draw Buffer, one glBlendFunc 4.0- : Individual GL_BLEND and glBlendFunci for each DrawBuffer QBlendStates now allow to specify whether the blend state should be enabled or not, and what Draw Buffer it is specifying. Defaults are global and enabled. Removed backend BlendStateSeparate, BlendState is going to handle both calls. Task-number: QTBUG-50005 Change-Id: I0059a53db0d629ef9818d933c3f14e5662c1d3df Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Add GraphicsContext::supportsDrawBuffersBlend()Wieland Hagen2016-01-144-2/+9
| | | | | | | | | | | | | | | | | | To check for availability of ARB_draw_buffers_blend Task-number: QTBUG-50005 Change-Id: I8f4e11ff401a9e1e3751f61421572cb1fc323979 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Added glEnablei, glDisablei, glBlendFuncSeparateiWieland Hagen2016-01-1413-1/+144
| | | | | | | | | | | | | | | | | | | | Added glEnablei, glDisablei, glBlendFuncSeparate to GraphicsHelpers and GraphicsContext Task-number: QTBUG-50005 Change-Id: I01c3a6e26fde9756d62694235ba0c1a0fe5155ae Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Fixed RenderView Uniform setting for QNode valuesWieland Hagen2016-01-141-2/+2
| | | | | | | | | | Change-Id: I3aac90e19019345892e08a2994ee04667a7058dc Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Use a more suitable name for qt3d input devices.BogDan Vatra2016-01-142-1/+2
| | | | | | | | | | | | | | Export proper MODULE_PLUGIN_TYPES Change-Id: Id1b51aafd318b1c0800cc194e006e5585d8c159d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Fix missing QML registration for AbstractActionInputColin Ogilvie2016-01-141-0/+1
| | | | | | | | | | Change-Id: I1796b543ba4f2868c842540718da73a9b0e94e64 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Renderer: handle compute and draw render commandsPaul Lemire2016-01-134-138/+161
| | | | | | | | | | Change-Id: I629dff26ce02fad1deaea8557d09a52e6d672ad7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Technique: cleanup properly clears thingsPaul Lemire2016-01-131-0/+3
| | | | | | | | | | Change-Id: Idbe854bdea0dca784fd1ac40cb34560bd7c22862 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | RenderViewJobUtils: fix technique filter wasn't setPaul Lemire2016-01-131-1/+1
| | | | | | | | | | Change-Id: Iaf54b8c2e201b728b7f1313ba98d9a8e93a107e8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | GraphicsHelper: add dispatch compute functionPaul Lemire2016-01-1313-3/+53
| | | | | | | | | | Change-Id: I3c2614f0fc484d6f492d9302a3ec9335e827f741 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | RenderCommand: add a type flag (Draw/Compute)Paul Lemire2016-01-132-0/+8
| | | | | | | | | | Change-Id: I5c194c73bd2e4db8895557bf5f69682420841b19 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | RenderView/GraphicsContext: support SSBO/UBO with buffer used as ParametersPaul Lemire2016-01-1322-115/+231
| | | | | | | | | | Change-Id: I347aa5deea6521b43b9033e2200ab2f8b272f671 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Rename QUniformPack to ShaderParameterPackPaul Lemire2016-01-1310-21/+21
| | | | | | | | | | | | | | | | This will make it more clear that it also contains other things like UBO/SSBO which are pure Uniform values. Change-Id: I641246798b8c868d7bfdfde381221d9a97ed2d35 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | GraphicsContext: use GLBuffer instead of QOpenGLBufferPaul Lemire2016-01-136-133/+162
| | | | | | | | | | | | | | | | This will be needed to simplify the process of binding SSBO/UBO buffers. Change-Id: Ice3bb97381328c5bddf1c9e46af30b4814ff2572 Note: ShaderData UBO handling temporarly disabled. Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Add handle type for GLBufferPaul Lemire2016-01-131-0/+2
| | | | | | | | | | Change-Id: I000b8c22a566639a622563a56edef87c1256c9c8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 00:10:22 +0000