summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/exampleresources
Commit message (Collapse)AuthorAgeFilesLines
* Remove assets that are no longer usedDmitry Shachnev2019-03-2366-25093/+0
| | | | | | | | | Files chest.qrc, houseplants.qrc and metalbarrel.qrc which used these assets were removed in commit 74c06c02f896c6aba408cfd0857d317378572736. Change-Id: Idd8d5b9baedf4c8f608aff6e3b5dbfe1a4f5a25e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Fix various documentation warningsTopi Reinio2018-11-071-1/+1
| | | | | Change-Id: I3eecd06bba9438b5aa472f3ba7ecaecdeda985e2 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Document third party asset 'miramar'Kai Koehne2018-09-241-0/+14
| | | | | | | | | | | | | The files got added in commit f49cabe35cbd. However, the original sources from the linked url are in .tga format, so I assume they got converted before importing. We should probably add a 'Modifications' entry to highlight such conversions in the future. https://opengameart.org/content/miramar-skybox categorises the license as CC-BY 3.0, but the upload was done not by the author. Change-Id: I312a871716104507434eb6d12a547c3752da51af Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Document third party asset 'wine'Kai Koehne2018-08-142-0/+48
| | | | | | | | | | The code was originally imported in commit 2a9a67d1b179, and then updated in to upstream version 0.8 in commit 473bd13ed37. LICENSE.md is from upstream repository. Change-Id: I20f97d46125abc4f1c7d54c52b891acc50336ac5 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Doc: Remove non-existent license file from qt_attribution.jsonTopi Reinio2018-04-241-1/+0
| | | | | | | | This caused the output to be malformed and conflict with other attribution docs. Change-Id: Id82a5e1780d14963e0905316827b4c1d9df04057 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add replacement materials examplev5.11.0-beta3Sean Harmer2018-04-0447-93/+211953
| | | | | | | | | | | | | | All texture assets were made by KDAB under the CLA. The material "sphere" mesh is from Allegorithmic and published under the Creative Commons 4 license. See paragraph 1.2 of https://www.allegorithmic.com/legal/substance-share Task-number: QTBUG-61415 Change-Id: I23d61723bbac561e22e11fa57105b29148c01699 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit 74c06c02f896c6aba408cfd0857d317378572736)
* Replace the toyplane mesh with one created by KDABSean Harmer2018-04-041-50969/+13227
| | | | | | | | Task-number: QTBUG-61415 Change-Id: I4557959c3c1068be5ef977d05a9e0443545ae919 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit 07053f8424cbb3fffd89a9774bd5aba737d07f08)
* Extend skinned mesh example to show a simple model tooSean Harmer2017-08-103-0/+541
| | | | | Change-Id: Ife2a5c1906e9a66858fa1bf5b8a5bcff3cb61feb Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add manual test for skinned mesh renderingSean Harmer2017-08-086-0/+2739
| | | | | Change-Id: I904e3f41a44dd549334c884c2dc96ff6fb928a45 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Revert "Temporarily invert the cubemap images"Paul Lemire2016-11-2312-0/+0
| | | | | | | | | | | The mirror property on QTextureImage should now be used instead. This was a temporarily fix for 5.7. This reverts commit 5dc4c77408ff040dc4a50c3837f4b2a29e927cb8. Change-Id: Id98d139a747669b722ff8a1185659015808960a8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Temporarily invert the cubemap imagesSean Harmer2016-08-0512-0/+0
| | | | | | | | | | | As a result of 44f1a92338859f1cc043ec22e0142037b5f87936 the cubemap texture images get mirrored. As we cannot add the api to control this until Qt 5.8, for now we temporarily mirror the textures on disk. We should revert this in 5.8 once the mirrored property is in. Task-number: QTBUG-54881 Change-Id: I675f4dc1576e076c63f8c592cdbc51707afb4cb7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Temporarily expose window to QML contextSean Harmer2016-01-181-0/+2
| | | | | | | | | Allows to restore most of the QML examples using this approach until a more permanent solution can be developed (I have an idea on how to do this and will try it today). Change-Id: I9b9bb86a5323140be3ed2456cdfa91b1f93187b1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add obj file to resources in wireframe exampleSean Harmer2016-01-171-1/+2
| | | | | | | Not sure how this got removed from this and other examples. Change-Id: I0ecf88d48052d63dfe5bbac0767ace8e13e9b662 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Link examples against static libPaul Lemire2016-01-161-4/+4
| | | | | | | | | | | | | Contains: Qt3DWindow Qt3DQuickWindow QFirstPersonCameraController FirstPersonCameraController.qml This will allow to get rid of the Camera configuration hack Change-Id: I55c5634aa4c162f9dd2852d3258073a6352b426c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Purge spurious execute permissions.Edward Welbourne2015-09-295-0/+0
| | | | | | | | Graphics, XML and text descriptions of objects don't need it. Change-Id: Ie01908ef848e09fcc4e08bc1f508496dbd85de29 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Always Flip UV Coordinates in ObjloaderAndy Nichols2015-08-2015-0/+0
| | | | | | | | | | | | | | | | | | | Currently if you use a QMesh that has its geometry loaded from an obj file, the UV coordinates are such that the default loading behavior for textures is inversed over the Y axis, and now any textures provide must be preprocessed to be inversed over the Y axis as well. This is not consistent with the behavior of our scene loaders which allow for Textures to be loaded normally (right-side-up) and still get sampled correctly. This is because the scene loaders make sure to flip the UV coordinates when loading the asset. To be consistent, we now the UV coordinates when loading QMesh geometry with the Objloader. [ChangeLog][Qt3DRenderer][Objloader] UV Coordinates are now always flipped when loading QMesh Geometry from an obj source. Task-number: QTBUG-46815 Change-Id: I8c3ee5de5c8bbaf5967ef81059ed97eb85901ac2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add support for loading scenes from glTF 0.8 filesAndy Nichols2015-08-0813-552/+860
| | | | | | | | | | | | | | | This patch includes a new scene parser plugin which enables the loading of glTF files (using the 0.8 spec) into Qt3D scenes. The gltf example has been updated to work with the current APIs and the asset files it used have been updated to match the glTF 0.8 spec requrements. Previously an unused copy of the GLTF scene parser was located in render/io. It was being built, but not used as only plugin based sceneloaders were loaded by the renderer. Now it should be usable and always available. Change-Id: Ic2e31e2b63a871559aad9bad90ec2820988a1571 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Examples: added license filesLiang Qi2015-06-052-0/+38
| | | | | | | | | | | | gltf/LICENSE.md is from 4fb289da, https://github.com/KhronosGroup/glTF/blob/master/LICENSE.md (excluding third-party licenses - only glTF graphical assets are used in the examples). Task-number: QTBUG-45612 Change-Id: I66c7d7d3ef2ae8ad10feb74a1e7be41d6ac281ad Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Examples: Remove shared resource library.Friedemann Kleint2015-05-2012-198/+76
| | | | | | | | | | Split example-assets.qrc into smaller resource files per directory and add those to the examples as required. Task-number: QTBUG-45990 Change-Id: I0a5a6cee64dc23560e9e093f272ff0d90a6e2e97 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move the examples under a qt3d subdirLaszlo Agocs2015-03-04104-0/+114293
Modules cannot have their examples in the top-level examples directory because in the pre-built packages all modules' examples are merged together. Change-Id: I80fdbb8f1ec6f3d8fd793e4d856e705000237127 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 08:33:56 +0000