summaryrefslogtreecommitdiffstats
path: root/src/plugins/sceneparsers/gltf
Commit message (Expand)AuthorAgeFilesLines
* Add support to load data from memory for scene loadersMike Krus2017-05-212-15/+31
* Merge branch '5.9' into devSean Harmer2017-05-211-1/+1
|\
| * Remove unneeded temporary container (clazy reports)Mike Krus2017-05-021-2/+2
| * Add missing reference in range-for with non trivial type (clazy reports)Mike Krus2017-05-021-2/+2
* | Merge branch '5.9' into devSean Harmer2017-04-033-4/+1592
|\|
| * Merge branch '5.8' into 5.9Sean Harmer2017-04-022-3/+1591
| |\
| | * Fixes includes to comply with coding conventions for Src/sceneRobert Brock2017-04-012-22/+18
| | * Use QTextureLoader for textures in GLTF filesMauro Persano2017-01-101-10/+3
| * | Don't explicitly disable the Qt3D category loggingLaszlo Agocs2017-03-311-1/+1
* | | Don't allocate temporary containers while iteratingSergio Martins2017-04-021-1/+1
|/ /
* | GLTF Export QCamera properlyMiikka Heikkinen2017-01-182-8/+20
* | QGLTF exporting basic mesh typesMiikka Heikkinen2016-12-131-68/+128
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-121-0/+1560
|\|
| * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-251-0/+1560
| |\
| | * GLTFIO: check return value of QFile::open()Marc Mutz2016-10-051-6/+4
* | | GLTF exporting materials with custom shadersMiikka Heikkinen2016-12-092-290/+570
* | | Fix GLTFImporter crash on loading second sceneMiikka Heikkinen2016-11-161-2/+2
* | | GLTF Scene export pluginMiikka Heikkinen2016-11-162-126/+318
* | | Renaming Scene IO classes to scene import classesOtto Ryynänen2016-10-104-110/+110
|/ /
* | GLTFIO: fix mem leak and invalid QEntity tree constructionMarc Mutz2016-06-081-0/+1
* | Fix crash when a referenced shader program isn't found in a gltf file.Volker Krause2016-05-281-3/+3
* | Enable QT_NO_FOREACH for all Qt3D libraries and pluginsMarc Mutz2016-05-141-0/+3
* | GLTFIO: claim copyright for the substantial recent changesMarc Mutz2016-05-051-1/+1
* | GLTFIO: move QFile::readAll() into resolveLocalData()Marc Mutz2016-05-052-10/+7
* | GLTFIO: replace QMap with QHashMarc Mutz2016-05-051-11/+11
* | GLTFIO: includemocsMarc Mutz2016-05-051-0/+2
* | GLTFIO: use printf-style qWarning/qDebug where possibleMarc Mutz2016-05-051-58/+81
* | GLTFIO: wrap remaining qWarning()s in Q_UNLIKELYMarc Mutz2016-05-051-27/+27
* | GLTFIO: replace static const QLatin1Strings with #definesMarc Mutz2016-05-051-69/+69
* | GLTFIO: brush up ctors of nested structsMarc Mutz2016-05-052-19/+16
* | GLTFIO: avoid some hidden detachesMarc Mutz2016-05-051-2/+2
* | GLTFIO: remove {QMap,QMultiHash}::remove() callsMarc Mutz2016-05-051-4/+6
* | GLTFIO: eradicate remaining Q_FOREACH loopsMarc Mutz2016-05-051-12/+14
* | GLTFIO: remove {QMap,QMultiHash}::contains() callsMarc Mutz2016-05-051-38/+53
* | GLTFIO: fix leak of QShaderProgram in processJSONProgram()Marc Mutz2016-05-051-3/+2
* | GLTFIO: don't iterate over QMap::values()Marc Mutz2016-05-051-20/+15
* | GLTFIO: don't iterate over QMap::keys()Marc Mutz2016-05-051-6/+6
* | GLTFIO: don't iterate over QJsonObject::keys()Marc Mutz2016-05-051-57/+52
* | GLTFIO: replace QStringLiteral and C literals with QLatin1Strings in comparisonsMarc Mutz2016-05-051-36/+36
* | GLTFIO: the standard uniform name isn't actually neededMarc Mutz2016-05-052-32/+26
* | GLTFIO: use QLatin1String instead of QStringLiteralMarc Mutz2016-05-051-73/+69
* | GLTFIO: remove QJsonObject::contains() callsMarc Mutz2016-05-051-47/+62
* | Make QSceneIOPlugin private for the time beingKevin Ottens2016-05-031-1/+1
* | Fix CLANG reported warningsMike Krus2016-05-021-5/+5
* | Rename QSceneParserPlugin to QSceneIOPluginFranck Arrecot2016-05-024-109/+108
* | Q_NULLPTR -> nullptrSean Harmer2016-05-011-46/+46
* | Move defaults and geometries out of Qt3DRender and into Qt3DExtrasPaul Lemire2016-04-233-13/+14
* | Merge branch '5.6' into 5.7Sean Harmer2016-04-161-4/+5
|\|
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-4/+5
* | Removed QBlendStateSeparateWieland Hagen2016-04-071-7/+7