summaryrefslogtreecommitdiffstats
path: root/src/core/qt3dcore_global.h
Commit message (Collapse)AuthorAgeFilesLines
* Allow to disable aspects at configure timePaul Lemire2017-08-021-0/+1
| | | | | | | | | This allows to remove dependencies and reduce deployment size when a given aspect is not required. Change-Id: I5aa90e4825b375cd446c47727aa11d03c40703c9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Namespace ray casting classesMike Krus2017-01-201-0/+7
| | | | | | | | | | Main usage to namespace QBoundingVolume, QBoundingSphere for future use. Renamed QBoundingSphere to BoundingSphere to avoid clashes in file names. Change-Id: I0adcb3c3a5f1b8134653773a8e21490ecf61bae4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* PickBoundingVolumeJob: small refactoringPaul Lemire2016-10-131-0/+6
| | | | | | | | | | - Split into two files (pickboundingvolumeutils.cpp and pickboundingvolumejob.cpp) to make unit testing easier. - Remove tight coupling to Renderer - Separate whole logic in smaller functions Change-Id: Ibb463e9bac161b666956d3503301fd1e2e1e8b75 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix compilation on MSVC2013Sean Harmer2016-05-101-1/+1
| | | | | | | | | A CI misconfiguration allowed a small mistake in a macro to slip through that actually broke compilation on MSVC 2013. Task-number: QTBUG-53250 Change-Id: I19dd04b0fb059dcb1e2483ec70c6f2c3ed96aa59 Reviewed-by: Volker Krause <volker.krause@kdab.com>
* Introduce local macros for declaring types as movable/primitive/sharedMarc Mutz2016-05-051-0/+19
| | | | | | | | | | | | | | | The QtCore macros aren't really suited to a namespaced library like Qt3D. In particular, the use of Q_DECLARE_SHARED is wrong, because it places the free swap() function in the Qt's namespace when it should be in the same (inner) namespace the type is in. Q_DECLARE_TYPEINFO, otoh, is just inconvenient to use because it requires exiting and later re-entering of the Qt3D namespace(s). The new macros do this implicitly. Change-Id: Ic91f447656f08ed59c118ce09cb5ac90ad212955 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge branch '5.6' into 5.7Sean Harmer2016-04-161-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * rely on the automatically defined QT_BUILD_*_LIBOswald Buddenhagen2016-02-251-1/+1
| | | | | | | | | | Change-Id: Ib4667e1d11309e76f60150eb4e474dbc1b4191ce Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Unify license header usageAntti Kokko2016-01-261-11/+14
|/ | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I8eac0cd6bbc276a56df487249cc459c0d4fab165 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Copyright header change.Mika Salmela2015-02-091-19/+14
| | | | | | | | As for preparation for Qt5.5 release the copyright header is updated to correspond the current license requirements. Change-Id: I36632918b66f455539453b42c369689fb11298ec Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix static buildsGiuseppe D'Angelo2015-01-271-3/+7
| | | | | Change-Id: I3731706ea9aba29a422699f1a38bc48e3c1fdcf3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fixed syncqt warningsPaul Lemire2014-04-041-0/+4
| | | | | Change-Id: Ib9cf181a766f5ee31485c61e8cd6ae08185720af Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Initial import of Qt3DCore and Renderer aspectSean Harmer2014-02-101-0/+53
For now the renderer aspect is still compiled into the Qt3DCore library. This needs to be split out into a plugin so it can be loaded dynamically along with other future aspects. Change-Id: Iba8402b35c7ebc1c503d438c87aad77f5fef2261 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>