summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-09-041-0/+20
| | | | | | Change-Id: Ia7f358a01d71f4ddeec76aa30788785318576270 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Expand QCamera::exposure documentationMichael Brasser2019-08-201-0/+20
| | | | | Change-Id: Ia844b046720b530fbb9b7bac096d1853710225c3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Expand EnvironmentLight documentationMichael Brasser2019-08-201-3/+31
| | | | | Change-Id: Ia6e6ca65469c7c04914fbb6a73f796ec86436577 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Matrix_SSE/Matrix_AVX2: fix mapVectorPaul Lemire2019-08-204-16/+110
| | | | | | Change-Id: I4584d2c879a72eccbaf273d0e84b3b6f6bb55295 Task-number: QTBUG-77675 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Improve documentation of ObjectPickerJean-Michaël Celerier2019-08-071-0/+2
| | | | | | | Add a reference to Scene3D hoverEnabled Change-Id: I59e282a985ae5af30ff22d7caf433fb3b7cd821b Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix download test after removal of assetsMike Krus2019-08-071-1/+1
| | | | | Change-Id: Id7f37b014dec7f395bbf3d2c6c22ea59283257ec Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* GLTexture: glTexParam is not supported on multisampled texturesPaul Lemire2019-08-071-0/+7
| | | | | | | So try to avoid performing these calls on such texture Change-Id: I051fd6a0150d07656687a1f84756d8a3d506ec24 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* submissioncontext fix: devicePixelRatio is not an integerPaul Lemire2019-08-071-1/+1
| | | | | | | | Converting it to int would cause the viewport not to take the whole expected size as the interger conversion would essentially floor the value. Change-Id: Ic608b0e1a0910aadb8b98c3225f999cba6326535 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Improve SortPolicy documentationMichael Brasser2019-08-051-3/+16
| | | | | Change-Id: If7759ce872d26087d181eefe24504409aa779ea9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* ShaderData: don't call markDirty(AllDirty)Paul Lemire2019-07-241-1/+1
| | | | | | | | But only markDirty(ParametersDirty) as that's the only thing this is affecting. Change-Id: I450d013dc266ca70ca51cfa866b731a6e8b6499a Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Add QML documentation to QSkyboxEntityPaul Lemire2019-07-241-0/+45
| | | | | | Change-Id: Id82777c111827e8db8924d2d39b5844386344b69 Task-number: QTBUG-76767 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Provide more detail in *Light documentationMichael Brasser2019-07-234-0/+63
| | | | | Change-Id: I8d56836f1f075c7239b262454131062c10058026 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Silence warnings about null textures in uniformsMike Krus2019-07-221-0/+6
| | | | | | | It's common while textures are loading Change-Id: I360c88c72fbd0a034aff07451fd49be17b348d40 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Renderer: use last known good surface to reset render statesPaul Lemire2019-07-191-1/+1
| | | | | | | | | | | | | | | | | | | We were instead checking against the last surface used (which could be null) instead of the last known good surface to reset the render states. This could result in not resetting the render states and keeping dangling pointers around. To know if we can render, we check find the first non null surface in the list of RV. In most cases we can safelly assume that if first RV has a surface, all following ones will likely use the same surface. If we have no good surface we skip the rendering. However in the case you have a FG where the first RV has a surface but not the last one (which wouldn't really make sense but can happen if you mess up), we could end up in the above case where surface is nullptr though we have partially rendered something for the RV which had valid surfaces. Change-Id: I902b8c7a943ad2ca7e2f487873f73990cf8db433 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Align RenderView::buildComputeRenderCommands with buildDrawRenderCommandsPaul Lemire2019-07-191-3/+14
| | | | | | | State and parameter handling are the same between the two branches Change-Id: Ic8394a969184daead33253c9303c20ecf1a97484 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* RenderStates: fix override of nested RenderStatesPaul Lemire2019-07-1822-19/+894
| | | | | | | | | | | | | | When merging states, make sure we don't add several states of the same types with possibly different values. We should only add states with type we don't already have. Since the FG traversal is done from leaf to root, we know that the states we already contain should override any state that may have been specified higher up in the FG branch. Change-Id: I9bd1eadd37e8addf740a4b85b2318f9be269fedb Task-number: QTBUG-76766 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Document an example of how textureScale might be usedMichael Brasser2019-07-157-0/+51
| | | | | Change-Id: Iead857526a06b104080ab843b26c49efc22f05cc Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QRay3D: normalize the direction vector internallyPaul Lemire2019-07-152-22/+22
| | | | | | | | | It can be created with a non normalized dir vector but we should always perform the computations with a normalized dir vector for correct results. Change-Id: Ie9108de7ed2092f6b979a70ad9391267fe6c4696 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Take shortest path on quaternion slerpJuan Jose Casafranca2019-07-153-12/+38
| | | | | Change-Id: I4499e945481a22adfbafcc82198f7c411d04301b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Joints: remove removed joints from dirty listPaul Lemire2019-07-153-0/+8
| | | | | | | | | In case a joint is added and destroyed within the same loop of the event loop, we need to remove it from the list of dirty joints to process as this otherwise results in an assert. Change-Id: If2f4ece6e2d69a7801ce9c4ec2cb732f48895ad1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Expand documentation for CameraMichael Brasser2019-07-121-15/+88
| | | | | Change-Id: Id886decd4f2bd83a2319b4ad792a15b7280cb448 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Fix typo in property namePaul Wicking2019-07-101-1/+1
| | | | | | | | | colorbuffer -> colorBuffer Fixes: QTBUG-76342 Change-Id: Ic63ac9b333710ebab17aa7c4ccd9e864f10e6fcf Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Document unit for FrameAction::triggeredMichael Brasser2019-07-031-2/+2
| | | | | | Task-number: QTBUG-74165 Change-Id: I4d3de42cddd8f6e1e6729cc16a52e135ab7fa3b1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | Change-Id: I9e9da54e565ad7818e6ea8196a062af8b4931783
* Doc: Update code samples in 'Qt 3D Render Framegraph' documentationTopi Reinio2019-06-171-47/+81
| | | | | | | | | | | | The code snippets were outdated, referring to QML properties that do not exist. In particular, the Deferred Rendering section contains code that was based on an example that's since moved into tests. Adapt the code to match the updates done to that example and also mention where it originates from. Task-number: QTBUG-73024 Change-Id: I9ec750d05f8e853e5614f33dadcbe44a0b42e356 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Extend Qt3D documentationPaul Wicking2019-06-073-2/+56
| | | | | | | | | | | | | | | | This change adds missing C++ and/or QML documentation for: * enum QBuffer::AccessType * QBuffer::accessType() * QBuffer::dataAvailable() * ForwardRenderer::externalRenderTargetSize * enumeration Qt3D.Render.Light::type * Qt3D.Render.Light::color * Qt3D.Render.Light::intensity Fixes: QTBUG-73071 Change-Id: I48b13cb8001558b20bd801b6f96f5b5933144d82 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
|\
| * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
|/| | | | | | | Change-Id: I871b54c0af70d568a489416db859e827d865c273
| * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | Change-Id: I639e7fd3ee6df52b10195b2e183bb46c4380350d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Merge 5.12 into 5.12.4Frederik Gladhorn2019-05-273-2/+95
| |\ | | | | | | | | | Change-Id: I43d66c3533ee546f40c1a1373717721b48fcd23b
| * | Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | | | | | | | | | Change-Id: Ibfc879d78837fb297244384deef0bff699a3b105
* | | Fix removal of components when they are destroyedMike Krus2019-05-285-3/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic removal of components when they are destroyed is based on connecting to the destroyed() signal. This however means that by the time removeComponent() is called, the pointer is no longer a valid QComponent (just a QNode). While accessing member data of derived classes such as nodeId is fine, emitting signals from derived class does nothing, and in some cases asserts. Fix this by: - doing the QComponent clean up from it's destructor - implementing a separate method on QEntity to simply clear the now partly invalid pointer from the list. Change-Id: Id7632ee2ceaff6548c44c7a43ae40a0372febde9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Fix Parameter priority sortingPaul Lemire2019-05-242-3/+324
| | | | | | | | | | | | | | | | | | | | | Parameters defined on an effect have priority over those defined in a Technique. Change-Id: I49558a065b613d7ea9d1cbf0a64f6d5aad941cd3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Clean up warningsMike Krus2019-05-285-11/+13
| | | | | | | | | | | | | | | Change-Id: I1ddad305359586481021e85f6e4a470d3a6521b0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Remove assets that are no longer usedDmitry Shachnev2019-03-2366-25093/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Files chest.qrc, houseplants.qrc and metalbarrel.qrc which used these assets were removed in commit 74c06c02f896c6aba408cfd0857d317378572736. Change-Id: Idd8d5b9baedf4c8f608aff6e3b5dbfe1a4f5a25e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | QClearBuffers: fix wrong clearColor qml property name in docPaul Lemire2019-05-241-1/+1
| |/ |/| | | | | | | Change-Id: I22ee256f266cb3359d1666e831d37b804d80d55a Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Update Qt3D color handlingMichael Brasser2019-05-153-2/+95
|/ | | | | | | | | | | | | | There have been a number of updates to QtQuick color handing that were not similarly updated on the Qt3D side (for example the addition of hsl* and hsv* properties). This led to different behavior depending on the imports used, where the Qt3D behavior did not match the basic color documentation. [ChangeLog][Quick3D] Update Qt3D color handing to match QtQuick. Task-number: QTBUG-75551 Change-Id: I13d163c2ada39dd8941351cb0cfa991618333ee1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Register Qt3DCore::QNode also for Qt3D.AnimationUlf Hermann2019-05-171-0/+2
| | | | | | | | | It's not pretty, but it makes the properties added to QNode in revision 9 available to derived animation types registered for version 2.9. Fixes: QTBUG-61942 Change-Id: I118d4c508f3c201d61983d3224ceaf79edaf8ee6 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Doc: Add MetalRoughMaterial QML documentationPaul Wicking2019-05-161-1/+50
| | | | | | Fixes: QTBUG-73072 Change-Id: Ifea7152c77c4f6f1759e4872001336bae6d3d2c3 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Add TextureLoader QML documentationPaul Wicking2019-05-151-2/+14
| | | | | | Task-number: QTBUG-73072 Change-Id: I66da2ab446d34b4385b883d640640263c15ad205 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Fix missing code snippet in Scene3DTopi Reinio2019-05-151-1/+1
| | | | | | | | scene3ditem.cpp: (qdoc) warning: Missing '\endqml' Fixes: QTBUG-75805 Change-Id: I4c26465d49dc2203e79cc680c34a7e5c0ed25bfc Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Check if animation channel only have one component and shortcircuitJuan Jose Casafranca2019-05-141-3/+3
| | | | | Change-Id: I6f80d3378fe3002142e2d84d410bcbf356cb02ea Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix number of lightsMike Krus2019-05-131-1/+1
| | | | | | | | When an environment map is in use, no extra light is added and the count should be 0. Change-Id: Ieb14c48dd9627530b7b7b0682a20096237635d4d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QChannelMapping: only send const char *propertyName to backendPaul Lemire2019-05-109-62/+12
| | | | | | | | | | It was otherwise sending a QString property as well as the const char *propertyName. Given only propertyName is actually used, remove QString property from the backend to avoid useless confusion and stop sending the notification change. Change-Id: Ie26771e320e26d44d7fce3e0a864bad1d4df558f Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Restore ShaderBuilder unit testsPaul Lemire2019-05-101-1/+0
| | | | | Change-Id: I2a3a013078a71610cd5c61cf988f6bfa8d6159ac Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update ShaderBuilder tests following changes in QShaderGeneratorPaul Lemire2019-05-093-19/+3
| | | | | Change-Id: Ia047e79bcb2ecb7da3438c4cb4980377dc20744e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QScenePrivate: Fix compiler warning about initialization orderFriedemann Kleint2019-05-021-1/+1
| | | | | | | | | | | | | | Initialize m_postConstructorInit before m_rootNode, fixing warning: qscene.cpp: In constructor 'Qt3DCore::QScenePrivate::QScenePrivate(Qt3DCore::QAspectEngine*)': qscene.cpp:75:12: warning: 'Qt3DCore::QScenePrivate::m_rootNode' will be initialized after [-Wreorder] qscene.cpp:72:45: warning: 'QScopedPointer<Qt3DCore::NodePostConstructorInit> Qt3DCore::QScenePrivate::m_postConstructorInit' [-Wreorder] Amends 985a61921fbcb893b89b8dde6eeaab5cf8c5dc1c. Task-number: QTBUG-74106 Task-number: QTBUG-73905 Change-Id: I53ced159cf86325d577464e6f5873eb83d1b2038 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-251-0/+20
|\ | | | | | | Change-Id: Iea8a87a0da1b2143fa476ecb4d6184460d93e8a5
| * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-031-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + a075f064f0d8a0bb9d467a813ef2eacf39453ec2 Set OptimalParallelJobCount to at most 4 + 22c66fa9f7a460f077fede22f285c84276ce3883 Use slerp for animating rotation channels + f72c8abf5f9844214aab9b587bdd7e6921a3e272 Fix light attenuation for ES 2 + 4af8fcdc05d0198a569e7c39fa934614bbe31803 tests/auto/render/render.pro: Remove duplicate entry "scene2d" + 31aa763b0d1f4ec2439c6dc33b4a63b88c16369e Make slerping safer + a7e8df28c7f667a8f1e23ff865268e7f06d43328 Fix member overloads + e9868e157b56eea991e34712eace5962d14543e6 Don't reset texture units at every frame + eb337567713df9c23c0686d3c6b15b6780cf1f35 Expand Scene3D documentation + 7a0d24164afc1c7d2075c68260af21bfefd07021 Bump version + fa12f14b2b97249b68652ed9f5fd0df0c0c27be4 Scene3D: Call update on the item not the window + b79e4a8b2a8783fc9eeaaa36e710adf2fb8c7879 Revert "Scene3D: Call update on the item not the window" + e84d8d2a81eb81f9b1ea9f40d4da36d09a97b246 Dont play animations that are disabled Change-Id: I3badad7396927857bb4b5fedf46f1714dd992a27 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Fix slerp interpolation when two quats are equalJuan Jose Casafranca2019-04-221-4/+4
| | | | | | | | | | Change-Id: Ibcf668adfc3d701bf2b27f9f25626f819e2445b3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 23:25:40 +0000