summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-251-1/+0
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/core/resources/qframeallocator.cpp src/plugins/sceneparsers/gltf/gltfparser.cpp src/render/frontend/qrenderaspect.cpp tests/auto/render/renderqueue/tst_renderqueue.cpp Change-Id: Icdc2be2c80e7de6135a09e2f370ee004e395f514
| * remove pointless load(qt_build_paths)Oswald Buddenhagen2016-10-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | all .prf files that need the variables it sets actually load it by themselves. This reverts commit 3ec11e4d94d57678f4dd1162185beef62e43da12. Change-Id: Ia662f252b8215f83e090391748947a8579566885 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | qgltf: eradicate all Q_FOREACH loopsMarc Mutz2016-09-272-50/+65
| | | | | | | | | | | | | | | | | | | | | | | | ... and mark qgltf as Q_FOREACH-free, using QT_NO_FOREACH. In writeShaders(), also port two indexed loops to range-for. Saves almost 6KiB in text size on optimized GCC 6.0 Linux AMD64 builds. Change-Id: Id281b077159f461c01c23600f6cb301a6aa34b9e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | qgltf: replace some QStringLiteral with QLatin1StringMarc Mutz2016-09-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The first two lines are implicated in a compile error in a follow-up commit that introduces C++11 ranged for loops, so take another shot in the dark and remove the lambda expression embedded in the QStringLiteral macro by using QLatin1String instead, which, this being in a QStringBuilder expression, is even a desirable change in itself. Change-Id: I1ccd8d2e3c23cefdd50e7bc71f3f95dbeac78b72 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | qgltf: mark types movable/complexMarc Mutz2016-05-191-0/+19
| | | | | | | | | | | | | | | | | | | | All structs are Q_MOVABLE_TYPE, except Node, whose address is used as its identity, so by definition it is not trivially relocatable. Therefore explicitly marked as Q_COMPLEX_TYPE. Change-Id: I338491a57cc0f70b3971dec34b7dd9d913a92462 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | qgltf: fix GCC 6 warning about misleading indentionMarc Mutz2016-05-081-1/+2
| | | | | | | | | | | | | | | | It's even a true positive. Braces were missing. Change-Id: Ie807c46659ad4085751bc78b86408ce1001e1daf Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Q_NULLPTR -> nullptrSean Harmer2016-05-011-7/+7
| | | | | | | | | | | | Task-number: QTBUG-52736 Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge branch '5.6' into 5.7Sean Harmer2016-04-161-6/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix build in C++98 mode: template typenames must not be localThiago Macieira2016-03-031-6/+8
| | | | | | | | | | | | | | qgltf.cpp:1990:38: error: template argument for ‘template<class Key, class T> class QHash’ uses local type ‘GltfExporter::exportTechniques(QJsonObject&, const QString&)::ProgramNames’ Change-Id: Ic747cc2ab45e4dc6bb70ffff143844dc7120e571 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-261-7/+6
|\| | | | | | | | | | | | | | | | | Conflicts: src/doc/src/qt3dcollision-module.qdoc src/render/frontend/qcamera.cpp src/render/frontend/qcameralens.cpp Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d
| * Fix potential crash due to taking iterator from temporary containerSergio Martins2016-01-231-7/+6
| | | | | | | | | | | | | | constBegin() would belong to a different container than constEnd() Change-Id: I5094d6a6ee9c2167bb69274556f568538c77cf6f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Unify license header usageAntti Kokko2016-01-261-18/+10
| | | | | | | | | | | | | | | | Updated license headers to use new GPL-EXCEPT header instead of LGPL3 one (in those files which will be under GPL 3 with exceptions) Change-Id: I930c6234bfe720d38c596bbc3d1f39be75a7328b Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Fix typo in creator template and adjust whitespaceSean Harmer2016-01-173-1/+3
|/ | | | | Change-Id: I4bee133d1babf86612e584f938938d59de7f422b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* remove workaround for framework buildsOswald Buddenhagen2016-01-141-10/+0
| | | | | | | the bootstrap library is supposed to work out of the box now. Change-Id: Ida1d181b55a37dc9f1b049bc2586aca5a9d9dc9c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* centralize + fix use of system assimpOswald Buddenhagen2016-01-141-10/+3
| | | | | | | | | | | | follow the foo.pri & foo_dependency.pri pattern found in qtbase to de-duplicate the code (and thus implicitly make it consistent) and synchronize the conditionals in the configure test. also document why we still can't enable the assimp sceneparser in all configurations. Change-Id: I3bdc30e077b6c9c7027a9311195c08a6c5f1fcf4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* qgltf: Add a short description to the helpLaszlo Agocs2016-01-131-0/+12
| | | | | Change-Id: I978127436e197c714f7ad43c86c1c7896b94d9cd Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* qgltf: Do not output the unused, dummy light blockLaszlo Agocs2016-01-071-10/+0
| | | | | Change-Id: Ie6de66a4150a1ebc8a4a6b555618282b7e756658 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* qgltf: Add an option to suppress techniques completelyLaszlo Agocs2016-01-071-7/+17
| | | | | | | | | | Due to the KHR_materials_common block Qt 3D is able to load the generated scenes without the presence of shaders, programs and techniques blocks. Add an option to skip outputting these, in order to reduce the size and speed of parsing. Change-Id: I212e4e66197489c107ee47dcbc33d6f5b6b40156 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* qgltf: Fix not including image files in the qrcLaszlo Agocs2016-01-071-6/+6
| | | | | | | | | Once again, the problem surfaces: when not specifying an output directory, image files are not added to the resource list. Change it to go through the external texture list always. Change-Id: Ic3da5d7f8b1da958c6453f18650f2e50c70a0d1f Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* qgltf: Promote rgb to rgba for common material valuesLaszlo Agocs2016-01-071-0/+20
| | | | | | | | | | The spec uses FLOAT_VEC4 for colors. This means that while in the custom material case we can use vec3 since we provide the type information, the common materials path needs to promote all colors to RGBA. Change-Id: I1ac403807d0d6f0e9dfe14ea704c7f4a325495fa Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Use .qgltf extension for qgltf-generated glTF filesLaszlo Agocs2016-01-071-3/+3
| | | | | | | | | | Let's avoid future confusion by using a custom extension for the main JSON document. In case assimp gets upgraded to a future version supporting glTF files for example, confusion can arise due to the conflicting file extensions in the scene parser plugins. Change-Id: I370cc45cc399cae4f425d86574ccea9cd6c59d4f Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* qgltf: Output a KHR_materials_common blockLaszlo Agocs2016-01-071-1/+30
| | | | | | | | | | | | | | Unless disabled by a command-line switch. The spec is insufficient to support normal maps, the "normalmap" value is our own extension to the extension for now. Also, the common technique name is always PHONG. The correct material can be chosen based on the presence and type of the value list entries. Task-number: QTBUG-49384 Change-Id: I4f2e5848ad8019c44e9392416501655ab1163d7c Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Add template for QtCreator to create subclasses of some Qt3D typesSean Harmer2016-01-015-0/+278
| | | | | | Change-Id: I050e45a8b2e884ec9ee805fa9ddcbafe705802c3 Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* fix condition for using qtcore's built-in zlibOswald Buddenhagen2015-12-011-1/+0
| | | | | | | | | | | when we're not cross-building, even a host build may use the system zlib. this also makes the force_bootstrap workaround in qgltf superfluous. Change-Id: Ic0a8b872ac602b1f268a1c6f8dcd5b400d641ff5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix shadow builds on windowsSean Harmer2015-11-261-0/+1
| | | | | | | Seems to work on Windows, Linux and OS X. Change-Id: Ie0a00c4abf12c3dc7451019fc4d53a15094d558a Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Allow to link on systems with another Qt installed in /usr/libSean Harmer2015-11-201-1/+1
| | | | | | | | | | | | | | | Without this commit, the link line for qgltf tries to search in /usr/lib before the qtbase/lib dir of the Qt currently being built. In doing so it found the system installed QtCore which is not what we want. In my case it failed because of missing symbols as I'm using a namespaced build but in other cases it may lead to more subtle errors. Using PKGCONFIG_PRIVATE puts the /usr/lib search path from pkgconfig at the end rather than the beginning of the search path list. Change-Id: I0f715564c3255100a42d6e9c12b1d10168cd05bb Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* qglTf: Update to use glTF 1.0draft specAndy Nichols2015-11-131-46/+12
| | | | | Change-Id: I137b5b67e89930a055360e3017ce9f0c0ceb6d6b Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Rename varyings that clash with three.js' glTFLoaderLaszlo Agocs2015-11-131-24/+24
| | | | | | | Task-number: QTBUG-49343 Change-Id: Ice78fc0a689251ddd27f1b4cfe9b5ba2a4db0f0f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* qgltf: Fix not putting textures into the qrc when no copying occursLaszlo Agocs2015-11-131-1/+1
| | | | | | | | | | | | | Now that the qmake rule uses "." as the default output directory for the generated files, external assets like textures are often not copied as they are in the same place already. However, we still need to list everything in the generated .qrc file. This should fix not having textures in many cases with the simplified prf. Change-Id: I2b593adf9ac9dddf32bf1e411bd9443025727f8f Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* qgltf: Do not use system-zlib for host toolsAndy Nichols2015-11-061-2/+12
| | | | | | | | | | | | It was wrong of us to assume that a QT_CONFIG containing system-zlib meant that we could use zlib for a host_build. There are cases where the host does not have zlib, but the target does (cross compilation). It also breaks the rules for host_build tools. Fortunately the bootstrap library does provide the zlib symbols, so we just need to make sure we include that. Change-Id: Ibe25a22676c47909d95a83df46e311bd486fc9f7 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Prefer to build qgltf with the system libassimpAlexander Volkov2015-11-051-1/+10
| | | | | | | | | | This is a host tool, so we can't use the system library from the target system when cross-compliing. Otherwise build with the system library when it's available. Change-Id: Id78ba938bda578dc891e2931ced5cf710b0ab7ce Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* assimp: Fix warnings about FileSize() const Q_DECL_OVERRIDEAndy Nichols2015-11-041-1/+1
| | | | | Change-Id: I1d7241ba8177c664b5d4df4ec50afd2a7c830ff2 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* qgltf: Remove qmake feature fileAndy Nichols2015-10-262-37/+0
| | | | | | | | | | It isn't yet possible to install qmake features from modules, so it has been moved into qtbase. This make it actually possible to use the qgltf feature on any platform now (not just places where you ran 'make install'). Change-Id: I562ff98f71562c8f023437905be3e8725953fc7e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Compile from git using shadow build on windowsSean Harmer2015-10-221-2/+1
| | | | | | | | | Call load(qt_tool) before including the assimp.pri so it can find the zlib headers in the install dir. Change-Id: Icb463a83d08d93e93490b68320ab85aa43769d94 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* qgltf: get rid of degenerate polygonsLaszlo Agocs2015-08-271-1/+2
| | | | | Change-Id: I450e55536e8cc234bcec827fea441a8194b19345 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix MSVC2015/64 compiler warnings in qgltf.Friedemann Kleint2015-08-211-5/+5
| | | | | | | | | | | qgltf.cpp(2125): warning C4267: '=': conversion from 'size_t' to 'uint', possible loss of data qgltf.cpp(2135): warning C4267: '=': conversion from 'size_t' to 'uint', possible loss of data qgltf.cpp(2152): warning C4267: '=': conversion from 'size_t' to 'uint', possible loss of data qgltf.cpp(2170): warning C4267: '=': conversion from 'size_t' to 'uint', possible loss of data qgltf.cpp(2201): warning C4267: '=': conversion from 'size_t' to 'uint', possible loss of data Change-Id: I7d0f9054bd2736698ec6d13f6eff20180c3262cb Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* qgltf: Generate a non-mipmapped sampler for compressed texturesLaszlo Agocs2015-08-201-3/+9
| | | | | | | | This will cause the loader not to enable automatic mipmap generation which is good because that would fail with GLES. Change-Id: Ie3d0ea473e28bddc9144aa629019d4331b505829 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* qgltf: Set the correct internal format for ETC1 texturesLaszlo Agocs2015-08-201-2/+2
| | | | | Change-Id: Ic4615231f93ed53b67ed6091497cfd90e8a20cbc Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Fix qgltf tool invocationLaszlo Agocs2015-08-181-1/+3
| | | | | | | | | When the installed bin directory is not in PATH, the tool was not found. The correct approach is to use qtPrepareTool(). Change-Id: I5f51a950975bc9372eac9e401bd3b89205a9ccd0 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rename tools directory backLaszlo Agocs2015-08-184-0/+2554
| | | | | | | | | | | | And remove force_bootstrap that breaks non-cross-compiled builds. In true cross-compiled builds cross_compile (that is set during configure) will trigger force_bootstrap so we don't have to set that manually for tools outside qtbase. Change-Id: Ie3bc6fc105ea7686a3098c6afd631561755aa01b Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Removing old 1.0 stuff from project root.Pasi Keranen2014-04-0324-2427/+0
| | | | | | | | If needed we can fetch stuff back from master branch. Change-Id: Ic35f989de4a59d2c0a18ca6b18f0c0aca64d5046 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Disable demos, examples, tests, tools temporarilySean Harmer2014-02-101-0/+0
| | | | | Change-Id: Id7240632c7a4d6e59666488858b23a3fead389cd Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-091-1/+1
| | | | | | | | Change-Id: I53de6de78a982968c31a9c8d17628d1cddb63a14 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Build qglinfo as release mode for -debug-and-release configYuchen Deng2012-10-131-0/+1
| | | | | Change-Id: I4882e2d9fa270e39958a84c698681b938510c05f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2312-288/+288
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ib09067b91869c2840710bffee104bc63c76b0bf7 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Use float throughout the Qt3D module for consistency and performanceSean Harmer2012-09-161-4/+4
| | | | | | | | | | This commit changes the API of all classes in this module to use float rather than qreal. This makes the API consistent across platforms and improves floating point performance. Change-Id: I95ae65cb31428748e066d5efca059ce24087fafa Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Sarah Jane Smith <sez@storybridge.org>
* unconditionally define QT_NO_EGLOswald Buddenhagen2012-09-111-1/+3
| | | | | | | the recent enabling of EGL for desktop triggered this obsolete path. Change-Id: Ib290c35b48db3b270047b54fe9dc28bbe3c39ea3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* remove pointless include of pkg.priOswald Buddenhagen2012-07-131-1/+0
| | | | | | | there is nothing to install/package in subdirs projects Change-Id: I5647914cdfc8231def4386dc9c3946fee4049743 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* fix build with qt in namespaceOswald Buddenhagen2012-07-103-0/+6
| | | | | Change-Id: Id6277973e42597d446dfe8f4ce935611a7351c29 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* fix compile after numerous reshufflings in qtbaseOswald Buddenhagen2012-07-103-4/+4
| | | | | Change-Id: I62f3d32f326fbab483362ec2a2aad146314570fa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 10:46:07 +0000