summaryrefslogtreecommitdiffstats
path: root/src/render/texture
Commit message (Collapse)AuthorAgeFilesLines
* Unify license header usageAntti Kokko2016-01-2623-253/+322
| | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I8eac0cd6bbc276a56df487249cc459c0d4fab165 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Support for DDS texturesMauro Persano2016-01-1612-96/+954
| | | | | | | | | | | This commit adds support for DDS textures. It also adds QTextureLoader, a generic texture provider without a texture target. The actual texture target will be based on the properties of the texture loaded from its "source" property. Change-Id: If89cce7a55b3d82355f2da35588a091b7188f36c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Android: handle image from assetsBogDan Vatra2016-01-111-1/+5
| | | | | | Task-number: QTBUG-46866 Change-Id: I0f7f8bcb3afe528e9a00270025ed42e950221800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix dynamic texture provider property handlingLaszlo Agocs2016-01-061-0/+2
| | | | | | | | The Q_PROPERTY has to include the namespace, otherwise setting properties via QObject::setProperty() will fail. Change-Id: Ifdf7012fd8b670710bac38eb0e5ce8eab057e719 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix target type for Texture3DSean Harmer2016-01-041-1/+1
| | | | | | | Task-number: QTBUG-50214 Change-Id: I11b18e8559b4625137874286afaa40917ea35472 Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Added parameters to signals and made setters Q_SLOTSTomi Korpipää2015-12-098-73/+69
| | | | | | Change-Id: Icec2f9f207221e35ffdeeb594bb9b4dc6ef890f1 Task-number: QTBUG-49797 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move core/io content to render/geometry and ioKevin Ottens2015-12-021-2/+2
| | | | | Change-Id: I79e0b0d62e07a269ebfce99edff56d30da28494c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Turns out QAbstractFunctor is specific to Qt3DRenderKevin Ottens2015-12-021-2/+2
| | | | | Change-Id: Ida4d78d7ccd3c64eeedd38a3cba40ca099a2ecab Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Fix QDoc warnings and do further cleanupTopi Reinio2015-11-235-30/+29
| | | | | | | | | Fix the documentation issues that still remained broken after renaming the namespaces/QML modules. Do further cleanup and minor doc editing. Change-Id: Iff38c8c1b99e7f712dc3f9ad07ecd37a747b3a26 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Remove some uncessary QOpenGL* includesAndy Nichols2015-11-031-1/+0
| | | | | | | These includes seem to be left over from previous iterations. Change-Id: I58945b72c354bfa8ebbe687d52d3eb146f021f70 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QAspectManager: Explicitly mark as private APIAndy Nichols2015-10-301-1/+0
| | | | | | | Also remove some unnecessary includes. Change-Id: I35539566e530f7800bbbe7884be65a93a7ee91eb Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* d-pointer classes, private/public changesTomi Korpipää2015-10-3012-72/+237
| | | | | | Change-Id: I4ca133aebad0c088296ab293f95f0a6d76d18395 Task-number: QTBUG-39946 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Updated the docs for the namespace changesVenugopal Shivashankar2015-10-272-4/+4
| | | | | | | | | | | | | | | | Each of the submodules now have there own namespace so the following changes are required to adapt: - Added \namespace docs for the new namespaces. - Updated all the \class and \instantiates entries to use the appropriate namespace qualifier. - Changed the \module and \qmlmodule names for Qt 3D Core and Qt 3D Render modules. - Added the missing \module and \qmlmodule pages for the Qt 3D Collision module. Change-Id: Ibc5bf30e4f50aecb6a3b24bc8536f17ed19d681d Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Rename Renderer -> Render throughoutSean Harmer2015-10-1915-50/+50
| | | | | | | | This is for consistency between the C++ namespaces and QML imports and with the other aspects. Change-Id: I73392f138b4e519b12888f52530123e3d0ba445e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move Qt3DCore into Qt3DCore namespaceSean Harmer2015-10-1315-77/+77
| | | | | | | Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add "We mean it" warnings to private headersSean Harmer2015-10-135-0/+55
| | | | | Change-Id: Ic4a69123255c33990765ea3601e01914c2d8cb70 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Final batch of file moves for nowSean Harmer2015-10-133-0/+228
| | | | | Change-Id: I0c9e83e3142e6b083feb2cbcabcc4279de64b95b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move texture classes to their own directorySean Harmer2015-10-1320-0/+3700
Change-Id: I026cad678b06d8d785f7652f42d1dccc2fede88a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>