summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Coding convention fix for Src/importscore, importsextras,5.8Robert Brock2017-04-0117-129/+135
| | | | | | | | | importsinput, importsrender, importsscene3d Reordering the header includes to comply with Qt coding conventions Task-number: QTBUG-56185 Change-Id: I3b2b3ee60e397772bbcebac09b07c059fbd922db Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixes includes to comply with coding conventions for Src/sceneRobert Brock2017-04-016-45/+43
| | | | | | Task-number: QTBUG-56185 Change-Id: Ie52778260f5d2b82e79207bc8f7a77c9f9082935 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Coding convention fix for Src/ExtrasRobert Brock2017-04-0146-80/+115
| | | | | | | | Reordering the header includes to comply with Qt coding conventions Task-number: QTBUG-56185 Change-Id: I76f4eeb93b02b20f1d85d745f39253fd22327ef7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Coding convention fix for Src/Quick3DRobert Brock2017-04-0175-145/+182
| | | | | | | | Reordering the header includes to comply with Qt coding conventions Task-number: QTBUG-56185 Change-Id: I60008858a4975621b9159d909908b6bba2f98f14 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixes includes to comply with coding conventions for Src/CoreRobert Brock2017-03-31112-288/+358
| | | | | | | | Reordering the header includes to comply with Qt coding conventions Task-number: QTBUG-56185 Change-Id: I3943678c183c4ef46d403e0fff878c3cad964dfa Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Coding convention fix for Src/inputRobert Brock2017-03-16105-208/+307
| | | | | | | | Reordering the header includes to comply with Qt coding conventions Task-number: QTBUG-56185 Change-Id: I1d1b61c2fac42505f85a1c4421e1292259270568 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Unroll loops in ES2 shadersMauro Persano2017-03-161-83/+173
| | | | | | | | | | | | | | | | The GLSL ES specification (up to at least 3.0) does not mandate support of dynamic indexing of uniform block arrays. It is supported by some implementations (Tegra, Adreno 5xx) but we can't count on it being supported in general. Unfortunately some mobile drivers don't seem to be smart enough to automatically unroll loops at compile time when the condition is constant. Task-number: QTBUG-54994 Change-Id: I44e7fa18dc46f0a11204cf98e3c7b4f3ed446327 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Oleg Evseev <ev.mipt@gmail.com>
* assimp: Don't use -Wno-reorder on C compilerKevin Funk2017-03-021-2/+2
| | | | | | | | | Fixes warning: cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C Change-Id: I0892d07ec15d40a361b728fd05dcf0234b69292f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Coding convention fix for Src/logicRobert Brock2017-03-0210-22/+33
| | | | | | | | Reordering the header includes to comply with Qt coding conventions Task-number: QTBUG-56185 Change-Id: I900997e93ba0e25351e74a91d4d43c5123431b97 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: added doc for parameters QPaintedTextureImageNico Vertriest2017-02-151-25/+13
| | | | | | | Undocumented parameter h,size,w,rect in Qt3DRender::QPaintedTextureImage::setHeight() Change-Id: I7108b71ac84928b37db4f01218b83e908860e200 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Enable blitFramebuffer with ES2 when it is supportedAntti Määttä2017-02-083-22/+24
| | | | | | Task-number: QTBUG-57573 Change-Id: Ie1be0282fbab6e4346a81f37eff7597b932da07e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix deprecation warningSean Harmer2017-02-082-7/+15
| | | | | Change-Id: I64bd08889fcd95dd41724652b84b34e8b9497ad3 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix -Wreorder warningsSean Harmer2017-02-081-2/+2
| | | | | Change-Id: I53e040b84fa9fcc8ecec34c85d93da780b0e97ae Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix warning about set but not used variableSean Harmer2017-02-081-6/+0
| | | | | Change-Id: Ic36141a63988a3070f7de453a8b6a3c0088866c8 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add QBackendNode wizard templateDavid Morgan2017-02-076-11/+72
| | | | | Change-Id: I0cca7a6037c4c599cc953c0d5d293c77f09216a0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add .qmake.stash to .gitignoreSean Harmer2017-02-061-0/+1
| | | | | Change-Id: If44d04450ca971ebefbdb767ef0e722ae893de3b Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix onDemand rendering idle loop CPU burningJanne Koskinen2017-02-061-0/+1
| | | | | | | | | | | Sleep render aspect if there are no jobs to create. Task-number: QTBUG-55109 Change-Id: I52ce90ab781d6986321ae0cd72a14cca09098180 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Make sure not to reference already deleted VAOsWieland Hagen2017-02-021-1/+1
| | | | | Change-Id: I112100da22885b8f3868f235b44ea649e35755e9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove unneeded setAspectRatioWieland Hagen2017-02-021-1/+0
| | | | | | | | | will get updated in Qt3DWindow::resizeEvent() Task-number: QTBUG-58327 Change-Id: I9464ba193a225af17cc4638902d0c68e82640d41 Reviewed-by: Guillermo A. Amaral <gamaral@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix node de-registration from scene on deletion/reparentingWieland Hagen2017-02-022-7/+73
| | | | | | | | | | | | | QNodePrivate::unsetSceneHelper() used to be broken, in that it set the m_scene of the the item that the NodeVisitor functor was executed on. Subsequent calls for child nodes would then have a m_scene == nullptr, and could thus not be de-registered. This patch fixes this behavior by treating each node's m_scene separately Task-number: QTBUG-57571 Change-Id: I779caadd6957a97514fd105cd16935c3edc9f41f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Delete abandoned VAOs after each frameWieland Hagen2017-02-015-37/+79
| | | | | | | | | | | | Use a job to traverse all active VAO handles to check if the geometry and shader objects used to identify the VAO do stil exist. If not, let the renderer dispose the VAOs. Make sure to synchronize access to VAO state and hide state changes behind member functions. Change-Id: Ib77be67d55daa61885cd914af8d9cfc622cae940 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* OpenGLVertexArrayObject: require cleanupWieland Hagen2017-02-013-5/+15
| | | | | Change-Id: I65d7e85abd707aea0554652694803bfdc52b8632 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Free VAOs in Renderer::releaseGraphicsResources()Wieland Hagen2017-02-011-0/+7
| | | | | | Change-Id: I7dc349dc2b91078cda3cb97fa061a7362aa36ddc Task-number: QTBUG-55489 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Enable point sprites for GL2Harald Vistnes2017-01-311-9/+5
| | | | | | | | | | | Call glEnable(GL_POINT_SPRITE) if PointSize renderstate is used with GL2. If the point size is programmable, also enable GL_VERTEX_PROGRAM_POINT_SIZE. If not, call glPointSize with the given value. Task-number: QTBUG-58346 Change-Id: Ic2fb33a45c0efb87d031838dd3141fa8ada7f63b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rename Texture::DirtyGenerators to DirtyImageGeneratorsWieland Hagen2017-01-264-7/+7
| | | | | | | To distinguish clearly from DirtyDataGenerator Change-Id: Ib170529c027f24bf848a25f99dd34352a1d1030e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix updating of texture generatorWieland Hagen2017-01-266-18/+58
| | | | | Change-Id: I9cecfb7ec366b51f1a9c99f9d8297b41dda05ead Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: corrected several qdoc errors qt3dNico Vertriest2017-01-252-11/+5
| | | | | | | | qaxisaccumulator.cpp:182: warning: QML property documented multiple times: 'real Qt3D.Input::AxisAccumulator::value' Errors on \return Change-Id: Ibff02113e1a4ac3cfc79d23960812345cba513cb Reviewed-by: Martin Smith <martin.smith@qt.io>
* Doc: minor spelling mistakeNico Vertriest2017-01-251-1/+1
| | | | | Change-Id: I7b2675400a7111bdb1f9817d52a96706942c2f1d Reviewed-by: Martin Smith <martin.smith@qt.io>
* Doc: added doc for parameter \a otherNico Vertriest2017-01-251-1/+2
| | | | | | | Undocumented parameter 'other' in Qt3DRender::QBufferDataGenerator::operator==() Change-Id: Iadeeec3316df86bb3681e707051e43683b7e9bbb Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Send further pick events to initial object pickerMike Krus2017-01-2310-7/+503
| | | | | | | | | | | | | | | | | | | | Once an object picker receives a press event, all further events will be sent to it until the mouse is released. This enables interactive with objects that move behind other pickable objects. In that case, the pick event will be sent to the active object picker. This behavior is disabled if all pick events are requested (which works as before). Included an example where a cylinder is dragged to control the radius of a cone (like a slider) and moves behind another pickable object (while remaining interactive). Task-number: QTBUG-55495 Change-Id: I4e3b8466d01ca1d08ef48c1fa6f6abd5b5404980 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Picking: restore early checksMike Krus2017-01-216-59/+89
| | | | | | | | | | | | | | | | | | | 5.8.0 removed early checks because it broke hover. Restoring early checks by looking for at least one enabled object picker that requires hover support. Added a flag to job that can be set by pickers when they are created, deleted or some property changed. This is used to lazily update the state flags for the early termination checks. Also removed the dirty flag handling as it was not used and never cleared. Task-number: QTBUG-57611 Change-Id: Ib5c60290ee016d8c1fd3f24f7ebacff412fec239 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Keep the existence of renderer and nodes in syncMike Krus2017-01-201-1/+5
| | | | | | | | | | | | | | | | | | | | Create and delete the node manager along with the renderer. This is require because backend node have a pointer to the renderer so should not outlive it. Note that unregistering the render aspect is probably not safe since the frame advance service used in the aspect manager is owned by the renderer (which gets destroyed when render aspect is unregistered). Also re-registering the render aspect does not cause the backend nodes to be recreated since startup is not called then. Change-Id: I9d301d1b49528133bf28e3ae9ee5acf469c449ae Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Texture: small coding style cleanupMauro Persano2017-01-201-24/+12
| | | | | Change-Id: Ibff4bec011e8be18c44b2b9c91478aaa249c4dfc Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Accept DDS files with extra data at the endMauro Persano2017-01-201-3/+9
| | | | | | Task-number: QTBUG-57998 Change-Id: I84b3bb01452eddd493856cb01236f23baec76dc5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* remove obsolete host build declarations from subdirs projectsOswald Buddenhagen2017-01-181-1/+0
| | | | | | | follows up qtbase/4eb2feb2. Change-Id: I9af28a8f050d9fe1a9c45f5e677e609b68e6b421 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* ObjLoader: actually check for the indices' valuesGiuseppe D'Angelo2017-01-131-7/+7
| | | | | | | | | | The decision whether we can use ushort instead of uint for the entries in the index buffer depends on the value of each entry, not on how many entries (indices) we have. Clean up the related code. Task-number: QTBUG-44089 Change-Id: Id8e1cb422c1bd3a84f8964864a41cc4784edce61 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Ignore textures which don't have their texture data yetWieland Hagen2017-01-122-3/+7
| | | | | Change-Id: Iac5441808ea98a56b6e6890519f62b2b2178f2cc Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix compile warningPaul Lemire2017-01-121-3/+2
| | | | | Change-Id: Ib2d06eb1b7013f30e17e78d1946c28fc7593c7c3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Prevent copying of QAbstractFunctorVolker Krause2017-01-121-0/+3
| | | | | | | | It's a polymorphic class, so copying risks slicing. Found by clazy in application code. Change-Id: I2f3c03e2a0aa847c35a3192f3e5a4fbd8beae0cd Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* BasicShapes: use Entity::setEnabled instead of a parent changePaul Lemire2017-01-111-6/+6
| | | | | | Task-number: QTBUG-58057 Change-Id: Id078ad5f83a627112718a51ba85c5789bcae718d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add some basic debug output for texture and texture image managersSean Harmer2017-01-113-0/+30
| | | | | | | And call it from the dumpInfo() helper. Change-Id: Ic8d766b01380ded46662331d5966516300fa6ddb Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update the creator template files to follow latest APISean Harmer2017-01-113-11/+19
| | | | | Change-Id: I8d6144a25963390b78ed9273a02b65b8e9cb37c4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Skybox: add documentation about issues with frustum cullingPaul Lemire2017-01-113-2/+7
| | | | | | | | Also fix the examples to not perform frustum culling Task-number: QTBUG-57989 Change-Id: If3755cad71158b62fffebdaeba41ba32e2b1d1ff Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Use QTextureLoader for textures in GLTF filesMauro Persano2017-01-101-10/+3
| | | | | | | | | This allows us to handle GLTF files with compressed texture formats such as DDS. Task-number: QTBUG-57998 Change-Id: If64309b6597d536b9a9772951e1becdfae011035 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QPaintedTextureImage: documentationWieland Hagen2017-01-101-0/+66
| | | | | | Change-Id: If2bf137d971d9d208fb70d30c7ff018bab4fe7d0 Task-number: QTBUG-58020 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix race in QAspectManager when shutting downPaul Lemire2017-01-102-1/+19
| | | | | | | | | | Happened when trying to shutdown immediately after creation by not giving a chance to properly complete initialization. Added a semaphore to force initialization to be completed prior to doing anything else. Task-number: QTBUG-56573 Change-Id: Ia1ecbf0bb8e156e6dc0e8667ee031baf31e0ecc6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Free buffers in Renderer::releaseGraphicsResources()Wieland Hagen2017-01-101-1/+6
| | | | | | Change-Id: Ic5e48d4b7290de94110f7cb815516b2841d02341 Task-number: QTBUG-55489 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Make sure not to update same buffer twiceWieland Hagen2017-01-101-1/+1
| | | | | | | | | m_dirtyBuffers may contain the same buffer twice. This way we avoid uploading data twice to the GPU Change-Id: I75befcbf81d784e731f3e1447405b9462ae5c8f9 Task-number: QTBUG-55489 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: corrected description of parameterNico Vertriest2017-01-101-2/+1
| | | | | | | qpickingsettings.cpp:191: warning: Undocumented parameter 'faceOrientationPickingMode' Change-Id: If2a0ec5ed772d420df683ffb313330b0c929f948 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Fix some framegraph docs issuesAntti Määttä2017-01-105-32/+95
| | | | | | | Change-Id: I09f3ef3c2681dbaacf0a37acda3a3831e0a6a667 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 19:59:34 +0000