summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge 5.12 into 5.12.1Kari Oikarinen2019-01-0815-37/+94
|\ | | | | | | Change-Id: If10a4fd620a4573be795ed8ffe1b8ed522976db7
| * Recompute bounding volumes when buffer changesPaul Lemire2019-01-071-1/+2
| | | | | | | | | | | | | | | | | | | | Right now the bounding volumes would be computed only when a geometry is marked dirty, which essentially means only when the geometry is first loaded. However, if a geometry buffer were to change, we need to recompute the bounding volume. Change-Id: Ie3fb83d1cc11a3bbfbe2b9828e9f8d7c302d175b Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * Picking: viewport contains check needs to use pos in GL coordinatePaul Lemire2019-01-071-3/+8
| | | | | | | | | | | | | | | | | | | | The viewport rect is computed in GL coordinates. Therefore we need to check if the mouse is contained with the position in GL coordinates. The error is not noticeable unless you are using non full height viewport. Change-Id: I1c39ff91da4a3649288826b939071a298c83c723 Task-number: QTBUG-72856 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * QRenderCapture: Prevent crash on shutdown when replies are pendingChristian Andersen2019-01-061-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | When a QRenderCapture is deleted its destructor runs, then the QFrameGraphNode destructor, then the QNode destructor and finally the QObject destructor. The QObject destructor deletes its QObjectPrivate member, which destructs QRenderCapturePrivate. At that point the QRenderCapturePrivate tries to disconnect on an invalid pointer to the QRenderCapture (which was already deleted). Change-Id: Ib5835e3f86a282b963220b0dab656258111a61ab Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * configure: adjust to qbase changesOswald Buddenhagen2018-12-311-13/+9
| | | | | | | | | | | | | | call functions to resolve/verify the determined parameters. Change-Id: I1d0773b47e048a8b017c12216bd03625651921e4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * configure: don't add system default library locations to fbxOswald Buddenhagen2018-12-311-6/+0
| | | | | | | | | | | | | | | | | | it's rather pointless. Change-Id: I7fe3fbd402cadb60d81f778fd30760c49dfe8c29 Reviewed-by: Svenn-Arne Dragly <svenn-arne.dragly@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Fix loading of animation aspect on iOSMike Krus2018-12-203-1/+15
| | | | | | | | | | | | | | | | | | | | | | 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>
| * QEnvironmentLight: add uniforms for envmaps sizePaul Lemire2018-12-203-6/+49
| | | | | | | | | | | | | | | | | | This makes future ES2 PBR implementation possible as textureSize() is not available on ES2 Change-Id: Ibf2b36240778a3f30f4316a67819f9052e46bdf1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| * QEnvironmentLight: fix wrong getter callPaul Lemire2018-12-191-1/+1
| | | | | | | | | | | | | | | | Which resulted in incorrect specular texture bookkeeping. Change-Id: Iceed7e44e791f373f04c35f1a46f5c9ba97d012d Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| * Texture: initialize internal format to NoFormatPaul Lemire2018-12-194-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format was initialized to RGBA8_UNorm on TextureProperties. This had the side effect that if you created a TextureLoader entry with no source yet set, the backend would try to load and return early since no texture data had yet been generated. Yet it would still send a notification change with the format (which was RGBA8_UNorm instead of NoFormat) back to the frontend QTextureLoader. This would prevent the QTextureLoader from later being loaded correctly with the format actually read from the image file. Also updated QTextureData/QTextureImageData/QTextureFromSourceLoader for consistency. Change-Id: I23e2287fac297b9b8901476715b1bc1e78c6342b Task-number: QTBUG-72651 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| * QTexture: DDS handle uncompressed floating point format texturesPaul Lemire2018-12-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | These textures have a FourCC flag set but havign a fourCC flag doesn't mean the content is actually compressed. Adjust supported formats accordingly. Change-Id: Ided96d64acb6b5ad2f13cfaa9445bbc83c7bb93d Task-number: QTBUG-72650 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| * Fix unfinished commentThiago Macieira2018-12-121-0/+1
| | | | | | | | | | | | | | | | Found by ICC. Change-Id: I4ac1156702324f0fb814fffd156f815f33110f71 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | Fix sourceComponent property of EntityLoaderFriedemann Kleint2019-01-031-1/+1
|/ | | | | | | | | | Add the accessor to the property macro, fixing warning: Property declaration sourceComponent has no READ accessor function or associated MEMBER variable. The property will be invalid. Amends 4030e1796ca10c0eeab4fcb6cc6000b5bdb08028. Change-Id: Icc5048d34ecae4f7d0648002727362eaa97614a8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Enable ES3 rendering of MetalRoughMaterialMichael Brasser2018-12-052-1/+32
| | | | | | Change-Id: I1cc6700c9d16db1ad3e17f63a89d65c02bd8a202 Task-number: QTBUG-64390 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add missing precision specifiers for ES3Michael Brasser2018-12-052-11/+11
| | | | | Change-Id: I008d42f09b587c0a6317ddb583b640b15e3b32ba Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Use the correct coordinatesystem include for ES3Michael Brasser2018-12-051-0/+9
| | | | | Change-Id: Ibb45e3daf0712d87ebfdab5376d60db93abe006e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Update QML import versions in "Qt3D QML Types"Kai Koehne2018-12-051-13/+13
| | | | | | | | Follow the example of qtdeclarative and always use the minor Qt version as import. Change-Id: I0adb53a793ddf6a4a9706e2ec1a147799a941e6a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-052-2/+22
|\ | | | | | | Change-Id: I03355d00bd7219180e70345940855499be488d83
| * Doc: Add QT3D_REGISTER_ASPECT macro documentationPaul Wicking2018-11-062-2/+22
| | | | | | | | | | | | | | | | Also remove two '*' that ended up in the generated docs. Task-number: QTBUG-65413 Change-Id: Ia0870405f73166dbb73ee09e34e7625c51486b41 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-043-6/+12
|\ \ | | | | | | | | | Change-Id: I9f4dd807f0179d7bd95a5263e57c37198e7432f4
| * | Reset last selected picker when releasing out of viewportPaul Lemire2018-11-301-1/+7
| | | | | | | | | | | | | | | | | | Change-Id: Iec70e84024caf879358183fee34638def5038aef Task-number: QTBUG-72160 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * | Renderer: drawArraysInstancedBaseInstance parameters were swappedPaul Lemire2018-11-282-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | FirstVertex and FirstInstance parameters were swapped making any draw call that requires baseInstance or baseVertex unusable. Change-Id: Icf52f96981d8868bec4c6888bd129ed6e43d39e9 Task-number: QTBUG-71994 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Add ES3-specific coordinate systems shader fragmentMauro Persano2018-11-082-0/+74
| | | | | | | | | | | | | | | Change-Id: Ie7f469278b0a74b4c059ad99ad182059c6752cd8 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | | Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into ↵Liang Qi2018-11-082-5/+7
|\ \ \ | | | | | | | | | | | | refs/staging/5.12
| * | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-082-5/+7
| |\| | | | | | | | | | | | | | Change-Id: Ia208586ec402c9ce29bafc9085804d8b1a62b155
| | * | Renderer::doRender scene3dBlocking fixesPaul Lemire2018-11-051-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Reorder sleep and locks -Properly protect isFrameQueueComplete lookup -Reread queueIsEmpty which could have been updated Change-Id: I2b5a52284bbb3ddb48483c5bf73779e335c8bdda Task-number: QTBUG-71294 Reviewed-by: Christian Andersen <csandersen3@gmail.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | * | GLTexture: do not set layers when target is Texture3DPaul Lemire2018-11-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because Texture3D doesn't support layers and that results in a warning being added to the console. Change-Id: I54d34ccccc2bc1f022814689b97aaaf624026249 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | | Add documentation for QText2DEntityMike Krus2018-11-083-11/+88
|/ / / | | | | | | | | | | | | | | | | | | | | | Also fix the shaders to work on macOS Change-Id: If1fb183741c21b284474c9d747c8dd4c70b9d779 Reviewed-by: Wieland Hagen <wieland.hagen@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Documentation: Get rid of QT_INSTALL_HEADERS in documentation configTopi Reinio2018-11-073-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Doc: Fix various documentation warningsTopi Reinio2018-11-075-2/+6
| | | | | | | | | | | | | | | Change-Id: I3eecd06bba9438b5aa472f3ba7ecaecdeda985e2 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | Qt3DWindow: Redraw scene on expose events when using OnDemand renderingChristian Andersen2018-11-063-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an InvalidateFrame QNodeCommand in QRenderSettings that is sent to the RenderSettings backend node. The command will mark the current frame as dirty. This ensures that whenever an expose event is received, a redraw happens some time in the future. Task-number: QTBUG-70885 Fixes: QTBUG-59785 Change-Id: I9fd2e19dbc282300479131d95ff8320269f95f24 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Make floating point precision explicit in ES3 MetalRough shaderMauro Persano2018-11-051-92/+94
| | | | | | | | | | | | | | | Change-Id: Ibd59dd30e31ded3cbf169fa583d537a7d67fee96 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Doc: Add doc to undocumented methodsNico Vertriest2018-11-017-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - qcomponent.cpp - qbackendnode.cpp - qjoint.cpp - qskeletonloader.cpp - qframeaction.cpp - qscene2d.h - qrenderaspect.cpp Change-Id: I25881dee19d2d01f948bfaf4a156a97f6caaea73 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | Doc: Add doc to undocumented methods and properties qt3dNico Vertriest2018-11-011-3/+71
| |/ |/| | | | | | | | | | | | | Adds doc for undocumented methods in qnode.h and qnodecommand.h Task-number: QTBUG-36985 Change-Id: I1eb28916ba8862a414dccd58a3c56b84a89f99d0 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12.0v5.12.0-beta4Liang Qi2018-10-301-0/+3
|\| | | | | | | Change-Id: I5499524c9f4553342d192d554d4455fd7933eaa9
| * Fix crash due to racecondition in renderer on shutdownChristian Andersen2018-10-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Protects access to m_renderQueue using the m_renderQueue mutex on shutdown. When a Qt3DWindow is deleted it signals the aspect thread to do early cleanup, the aspect thread calls Renderer::shutdown which in turn resets m_renderQueue. Meanwhile the render thread may be working on m_renderQueue, this leads to a double free of the front render view in m_renderQueue (and potentially other stuff). Fixes: QTBUG-69877 Change-Id: Ifd018597dbdb2f1538494932c907c63e8db9c715 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Don't trigger Q_UNREACHABLE if passed invalid render buffer formatsChristian Andersen2018-10-222-3/+9
| | | | | | | | | | | | | | | | | | | | | | Adds warning printout of the format that triggered the error. The graphics card may produce a proper image, but readFrameBuffer doesn't know how to interpret it. Additionally adds printout of the format when the code doesn't know the equivalent OpenGL ES 2.0 format. Fixes: QTBUG-66515 Change-Id: I65559f7d397a9297521ae0b1ebaf120629be3873 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Doc: Fix external link errorNico Vertriest2018-10-221-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-70910 Change-Id: Id4976cd860f824b1a73ddc8561f1709c76dc4466 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Doc: fix broken links in qanimationcallback.cpp and qframegraphnode.cppv5.12.0-beta3Nico Vertriest2018-10-182-1/+2
| | | | | | | | | | | | | | | | | | | | qframegraphnode.cpp:217: Cannot tie this documentation to anything qcallbackmapping.cpp:104: Can't link to 'QAnimationCallback::onValueChanged()' Change-Id: I20fb3a5688c16e86c2a62201991d30f735358d76 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Doc: Minor corrections overview pageNico Vertriest2018-10-151-11/+11
| | | | | | | | | | | | | | | | - added links - minor syntax correction Change-Id: I68f43b5a5091f402488b656a30d5fec40deae8cd Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-131-0/+1
|\| | | | | | | Change-Id: If9d27bf336dd4d22a06662a5e189ca18b2ba2e76
| * Fix notifications for QClipAnimator::clip propertyJim Albamont2018-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | Qt3DAnimation::QAbstractAnimationClip was not registered as metatype resulting in the following error when calling QClipAnimator::setClip: QMetaProperty::read: Unable to handle unregistered datatype 'Qt3DAnimation::QAbstractAnimationClip*' for property 'Qt3DAnimation::QClipAnimator::clip Change-Id: If92d781fdab5be06ce11ec88f0b3921cfbd557ff Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Update plugins.qmltypesv5.12.0-beta2Kai Koehne2018-10-0915-894/+1632
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by running for path in `find . -name "Makefile*" -print`; do pushd `dirname $path`; make -f `basename $path` qmltypes; popd; done in the build directory. Fixes: QTBUG-64035 Fixes: QTBUG-69259 Task-number: QTBUG-70264 Change-Id: Ib36a8e66121c310dee28b84953ca381e231139cf Reviewed-by: Christian Stromme <christian.stromme@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-0526-43/+617
|\| | | | | | | Change-Id: I2a92242b0d6be4f4e7f07f0f020fa6751ada9bc3
| * Fix normal calculation in MorphPhongMaterialJoni Poikelin2018-10-052-2/+2
| | | | | | | | | | Change-Id: Iad160f2d454633b558bee91b1e01c287d4202451 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| * Fix compilation with -qt3d-profile-jobs on AndroidPaul Lemire2018-10-051-0/+5
| | | | | | | | | | Change-Id: Id6dc461bbc61712f59484898c54a85d07fd8fc22 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * Further complete missing functions on ES3 helpersPaul Lemire2018-10-044-0/+23
| | | | | | | | | | | | Change-Id: I62e83c360619a2e096401330a61a6f2602b743d2 Task-number: QTBUG-70660 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Fix leak with VAOManagerPaul Lemire2018-10-033-1/+8
| | | | | | | | | | | | | | Change-Id: I09f15de230c571adb580bdbb3250405f562f255b Task-number: QTBUG-70892 Reviewed-by: Juan José Casafranca <juan.casafranca@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * QChangeArbiter: fix leakPaul Lemire2018-10-031-2/+5
| | | | | | | | | | | | | | | | | | | | When all observers for a node have been removed, we should also remove its entry in m_nodeObservations hash. Change-Id: I56762bb345e6a3eba74d5174b225dc86acd17e8f Task-number: QTBUG-70892 Reviewed-by: Juan José Casafranca <juan.casafranca@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Fix QMorphPhongMaterialMäättä Antti2018-10-012-6/+23
| | | | | | | | | | | | | | | | Replace the removed phong.frag with graph-based fragment shader. Task-number: QTBUG-69751 Change-Id: I196be25aff656d6934d6179e4f082430b109b2a1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 02:37:00 +0000