summaryrefslogtreecommitdiffstats
path: root/src/quick3d/imports
Commit message (Collapse)AuthorAgeFilesLines
* Move defaults and geometries out of Qt3DRender and into Qt3DExtrasPaul Lemire2016-04-2320-94/+404
| | | | | | | QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on. Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QVectorize Quick3DShaderDataArrayRobert Brock2016-04-211-1/+1
| | | | | Change-Id: I68f7ce1995534a6775d26ecaa936c47f3a18e35a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* AntiAliasing added as RenderstateRobert Brock2016-04-201-0/+2
| | | | | | | | Adding antialiasing that can be enabled in renderstates Change-Id: I0728e69dba5896ca86e56b940682990fafd0a297 Task-number: QTBUG-52191 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge branch '5.6' into 5.7Sean Harmer2016-04-163-5/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/qt3d/examples-common/qorbitcontrol.h src/core/qnodecreatedchange.cpp src/core/qnodecreatedchange.h src/input/frontend/qaxisactionhandler.h src/input/frontend/qinputaspect.h src/input/frontend/qkeyboardhandler.h src/input/frontend/qmousedevice.h src/input/frontend/qmousehandler.h src/input/frontend/qphysicaldevicecreatedchange.h src/input/input.pro src/logic/qframeaction.h src/plugins/sceneparsers/assimp/assimp.pro src/quick3d/imports/input/importsinput.pro src/quick3d/imports/render/importsrender.pro src/render/backend/trianglesextractor.cpp src/render/framegraph/qclearbuffer.h src/render/framegraph/qlighting.h src/render/framegraph/qstateset.h src/render/frontend/qrenderattachment.h src/render/geometry/qabstractattribute.h src/render/geometry/qabstractbuffer.h src/render/geometry/qattribute.h src/render/geometry/qboundingvolumespecifier.h src/render/geometry/qbuffer.h src/render/materialsystem/qfilterkey.h src/render/materialsystem/qparameter.h src/render/materialsystem/qparametermapping.h src/render/renderstates/qblendstate.h src/render/renderstates/qdepthmask.h src/render/renderstates/qpointsize.cpp src/render/renderstates/qrenderstatecreatedchange.cpp src/render/renderstates/qstencilop.h src/render/renderstates/qstencilopseparate.h src/render/renderstates/qstenciltestseparate.h src/render/texture/qabstracttexture.h src/render/texture/qabstracttextureimage.h src/render/texture/qtextureproviders.h Change-Id: I894d7781042cabdaa0cac690c198b57a41127bd4
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-253-6/+6
| | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: Ied46fc47e5f998053ab8a31547e09676144a65c1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Remove QAbstractAggregateActionInputPaul Lemire2016-04-151-4/+4
| | | | | | | | | | | | Change-Id: I48109b0149cf16699f5d3a6cafbaec4555d4db0b Task-number: QTBUG-51493 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Removed QBlendStateSeparateWieland Hagen2016-04-071-1/+0
| | | | | | | | | | | | | | | | | | Added slots+signals to QBlendEquationArguments that provide glBlendFunc behavior (treat RGB+A uniformly) Task-number: QTBUG-51511 Change-Id: Icfa6c87d3a2ce2803170d22ea8a36533f738cb0f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QAbstractTextureProvider renamed to QAbstractTexturePaul Lemire2016-04-061-1/+1
| | | | | | | | | | | | Change-Id: If8ea2c9806e28f6d97eb3fb852686647c0c04d8f Task-number: QTBUG-51504 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Make QGenericInputDevice privateMike Krus2016-03-241-1/+1
| | | | | | | | | | | | | | | | Still need to decide how to expose it to QML Task-number: QTBUG-51426 Change-Id: I8fa6927ddaf7f07afb389bf1915798639439244c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QLighting removalRobert Brock2016-03-231-2/+0
| | | | | | | | | | | | | | | | Removed QLighting and Lighting Change-Id: Idae02cc5fb736355481e35424f54de03b757f9d1 Task-number: QTBUG-51472 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix install with GamepadAnton Kudryavtsev2016-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | Include Qt3DInput/private/qgamepadinput_p.h istead of Qt3DInput/qgamepadinput.h. Since QGamepadInput is private now. Task-number: QTBUG-52080 Change-Id: Icd5908e4761c9a9d62b8dc545d05d9765ba638fe Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fixes to ForwardRendererMike Krus2016-03-221-2/+2
| | | | | | | | | | | | | | Missing changes after Viewport, ClearBuffer and QForwardRenderer changes Change-Id: Id396c97e546d3f8b3670cf8f36e5d68745832f7e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Remove QBoundingVolumeSpecifierMike Krus2016-03-221-2/+0
| | | | | | | | | | | | | | | | Replaced with boundingVolumePositionAttribute Task-number: QTBUG-51495 Change-Id: Ic404ce6e53ebb23d792b01a414dbd8cc21e2dbc7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Remove QViewport::clearColorMike Krus2016-03-221-1/+2
| | | | | | | | | | | | Task-number: QTBUG-51460 Change-Id: I616f4506dffd649efb931824fab82efcdefaeee3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QDepthMask transformed into QNoDepthMaskPaul Lemire2016-03-212-5/+5
| | | | | | | | | | | | | | | | | | By default the absence of a QNoDepthMask node in a RenderStateSet implies depth mask is enabled. Its presence, disables it. Change-Id: Iaa22b6cee12ee76e64d66a00e97f8aadfa82398b Task-number: QTBUG-51433 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Rename QClearBuffer to QClearBuffersMike Krus2016-03-202-4/+4
| | | | | | | | | | | | Task-number: QTBUG-51460 Change-Id: I3f522f5eaea7bf0f94dbcdc1e7463f2827c0fe3b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QRenderSurfaceSelector cleanupPaul Lemire2016-03-201-2/+2
| | | | | | | | | | | | Change-Id: Ic38c88d5e940f04667278015dc4f6c45f162e936 Task-number: QTBUG-51508 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Follow Annotation API changes.Volker Krause2016-03-202-6/+6
| | | | | | | | | | Change-Id: I9bb7fbe438d942d2cb776ab8cd3d8301a5862524 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QStencilOpSeparate renamed to QStencilOperationArgumentsRobert Brock2016-03-181-2/+2
| | | | | | | | | | | | | | | | As per API review Change-Id: If0f4f5719508a41d786810c36051446b2c7a08db Task-number: QTBUG-51436 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge QAbstractSceneLoader down into QSceneLoaderMike Krus2016-03-171-2/+0
| | | | | | | | | | | | Task-number: QTBUG-51484 Change-Id: I8eebe105331cb94306d27739996e34862fbd1a0a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QAnnotation changesFranck Arrecot2016-03-1713-41/+41
| | | | | | | | | | | | Task-number: QTBUG-51454 Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Class QKeyboardController rename to QKeyboardDeviceFranck Arrecot2016-03-161-2/+2
| | | | | | | | | | | | Task-number: QTBUG-51441 Change-Id: I030d7d60be0c4d543f773090eb866e8f8729512c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Make QBoundingVolumeDebug privateMike Krus2016-03-131-1/+1
| | | | | | | | | | | | | | | | QML type exported though, need to decide where/how to hide it Change-Id: I2d341456c3e09101da895ccd4a925f85a01089b0 Task-number: QTBUG-51449 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QRenderAspect: move some code to pimplMike Krus2016-03-132-5/+6
| | | | | | | | | | | | Change-Id: Ie54d6bab2b22088f3b857b19e9df5a03371eff61 Task-number: QTBUG-51510 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Complete the QStencilTestSeparate to QStencilTestArguments renaming.Volker Krause2016-03-121-1/+1
| | | | | | | | | | Change-Id: I01a48f8e95f78ebf49906c42bf87a63dad71d534 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix accidentally renamed Technique.annotations properties.Volker Krause2016-03-122-6/+6
| | | | | | | | | | Change-Id: Ia1fbc14bc22555875ca9f8d2ab8ea781c614a447 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Class QLogicComponent changesFranck Arrecot2016-03-111-2/+2
| | | | | | | | | | | | Task-number: QTBUG-51448 Change-Id: I1359cbfe61dbef291859d15b16bda61639493432 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QMouseController changes and renameFranck Arrecot2016-03-111-2/+2
| | | | | | | | | | | | Task-number: QTBUG-51450 Change-Id: I7f2dbe9cf4afbd41450f42fbb6da10baa2ca7116 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QStencilOp rename to QStencilOperationFranck Arrecot2016-03-111-2/+2
| | | | | | | | | | | | | | | | | | Comment: code still hold a QStencilOpSeparate, might want to rename it to QStencilOperationSeparate ? Task-number: QTBUG-51422 Change-Id: I5caf4e26720647ddb9a8b596b9dd33561fb90a08 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QRenderSettings: Move picking related properties in QPickingSettingsMike Krus2016-03-111-0/+2
| | | | | | | | | | | | | | | | | | Have only one picking property returning a pointer to that object (grouped QML property) Backend still has everything in one class though Task-Id: QTBUG-51506 Change-Id: Ib9626420a8ee86ad28168db02b171355499f87e3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix picking with Scene3DMäättä Antti2016-03-113-1/+31
| | | | | | | | | | | | | | | | | | Pass the correct picking area to pick job using rendersurfaceselector Task-number: QTBUG-49271 Change-Id: I30511199b9b35c0e70d03f31165eb35c8c015cd1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Drop QFrameGraph in favor of QRenderSettingsWieland Hagen2016-03-092-8/+6
| | | | | | | | | | | | | | | | | | QFrameGraph did store just the Frame Graph Root, and was not configurable at runtime. This functionality has been moved to QRenderSettings. The renderer now gets the scene graph root directly from QRenderSettings. Change-Id: I3012eb96b8073717f96f5e42374859a3f4a89bfc Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Partially revert 02da4f2Sean Harmer2016-03-099-27/+27
| | | | | | | | | | | | | | | | It accidentally renamed QML properties in the defaults that were not meant to be changed at that time. Change-Id: Iae0f0d42555682376c0e94113dd36d55cd9c5303 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | QStencilTestSeparate renamed to QStencilTestArgumentsRobert Brock2016-03-081-2/+2
| | | | | | | | | | | | Task-number: QTBUG-51423 Change-Id: I8612803b238ae6a3d9242983140745ef82babcd0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QTechnique renamingRobert Brock2016-03-0811-33/+33
| | | | | | | | | | | | | | | | | | | | annotations -> filterKeys addPass -> addRenderPass removePass -> removeRenderPass Change-Id: Ica1731ee3100b249e4fef04f45c0e6326732d644 Task-number: QTBUG-51458 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Class QSortMethod renamed to QSortPolicyFranck Arrecot2016-03-071-2/+2
| | | | | | | | | | | | Task-number: QTBUG-51471 Change-Id: I41e9c547a86ff0918ceb2f1e4f2eed75ac948662 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QBlendState cleanupPaul Lemire2016-03-052-11/+11
| | | | | | | | | | | | | | | | | | * renamed to QBlendEquationArguments * property names expanded Change-Id: Id25f0181415b4f093f2054238dbf3be26e36ff32 Task-number: QTBUG-51509 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QComputeJob cleanupPaul Lemire2016-03-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | * Renamed to QComputeCommand * Removed protected ctor * Added x,y,z workgroup properties * Renamed backend elements to match frontend Change-Id: I3959ec671a7d6e86239f72336f02452ea58919ee Task-number: QTBUG-51514 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QBlendEquation renamed mode to functionRobert Brock2016-03-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | BlendMode became BlendFunction mode became blendFunction removed Func prefix in enums As per API review Change-Id: I95271abc3ba4b8d04b3caf46845e1a5e47d47322 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Renamed to QKeyboardHandlerMike Krus2016-03-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | Also: - rename property controller to sourceDevice - remove protected ctor - move keyEvent() to the dpointer class Change-Id: I0badbc4d0ef0bcc202866f8cbdbaea8d107374fa Task-Id: QTBUG-51439 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Rename to QMouseInput to QMouseHandlerMike Krus2016-03-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | also: - rename property controller to sourceDevice - remove protected ctor - move other protected methods to dpointer Change-Id: Ibce97ec4ab7927ec2bb758f3e872691d52e3c785 Task-Id: QTBUG-51443 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Class QRendererSettings rename to QRenderSettingsFranck Arrecot2016-03-041-2/+2
| | | | | | | | | | | | Task-number: QTBUG-51459 Change-Id: Id304a16f81d310345792cf13c95fde7741246f5c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QRenderAttachment renamed to QRenderTargetOutputRobert Brock2016-03-031-4/+4
| | | | | | | | | | | | | | As per API review Change-Id: Icaca9797c01100402e6d103be2a0425820a717ec Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Follow API changes in TechniqueFilter.Volker Krause2016-03-021-1/+1
| | | | | | | | | | | | Change-Id: I5f32a4c7c830b22106088d41bd33ee8fd0aeb8d9 Reviewed-by: Janne Koskinen <janne.p.koskinen@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Follow API changes in TextureImage.Volker Krause2016-03-021-6/+6
| | | | | | | | | | Change-Id: I0d8ca510a28a5e499befb533d93ab6d1d2b0dc4b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-012-2/+2
| | | | | | | | | | | | | | | | | | | | ... or equivalent. This amends a similar commit on 5.6. Task-number: QTBUG-45291 Change-Id: I0d76f5c9b95db38f03771acaba1b4a80e4762ec9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Class QStateSet renamed to QRenderStateSetFranck Arrecot2016-03-011-1/+1
| | | | | | | | | | | | Task-number: QTBUG-51470 Change-Id: Ibf2de3cc0027b5851fa663c590b9b2f181c3077c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Missed a rect to normalizedRect changeRobert Brock2016-02-291-1/+1
| | | | | | | | | | | | | | Should now fix any broken examples Change-Id: I0856d6e737a8ce45f5645ee6a7957fd8a7acc774 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Inputs overhauledPaul Lemire2016-02-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | - Remove QAxisActionHandler - Remove AxisAxtionHandler, AxisActionPayload, UpdateHandlerJob - Make QLogicalDevice a QComponent - QAction sending action active update to frontend - QAxis sending axis value update to frontend - QFirstPersonCameraController rewritten in a more efficient manner Change-Id: I09a83f95b97238e4393a88103f76d8ba93e1403d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QDepthTest rename func to depthFunctionRobert Brock2016-02-262-4/+4
| | | | | | | | | | | | | | As per API review Change-Id: Iea3cbdb16618b248e221817000b71822a588bf6a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 21:08:06 +0000