summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* rename util/ => tools/Oswald Buddenhagen2012-07-0924-0/+2419
to fit generic naming convention Change-Id: I06c1f52bff24038bf4d211a33e0569cb2e214566 Reviewed-by: Danny Pope <daniel.pope@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 21:00:04 +0000