summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Document version of assimp libraryKai Koehne2017-05-121-0/+1
| | | | | Change-Id: I43414f0cb882086bb2bbb85a875fc1045877cd64 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix qmake warning caused by incorrect capitalizationSean Harmer2017-04-021-1/+1
| | | | | Change-Id: Ibe0134eafa986e93e725fd4fc98177b69938b1df Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update assimp lib to 3.3.1Andy Maloney2017-03-14485-113427/+133229
| | | | | | | | The currently included assimp lib is v3.0 from 2012. This updates assimp lib to the latest released version (3.3.1). Change-Id: I15a60e3150c0b268422f23137107b34e4c5c4342 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-101-2/+2
|\ | | | | | | Change-Id: Id364046378fa3522bd9a282a07c23c50ce48c806
| * assimp: Don't use -Wno-reorder on C compilerKevin Funk2017-03-021-2/+2
| | | | | | | | | | | | | | | | | | Fixes warning: cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C Change-Id: I0892d07ec15d40a361b728fd05dcf0234b69292f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Silence warning 4828 in assimp on MSVCSean Harmer2017-02-121-1/+3
| | | | | | | | | | Change-Id: I50dc8a64cfbf292228a88a7e7356dd958d592b4c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Morph animation loading support for ColladaAntti Määttä2017-01-2710-293/+2359
|/ | | | | | | | | Add morph animation support for collada and morph target loading. Change-Id: I291cf1ff5e575729d0136cf0880e9ef780ac1600 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Document 3rdparty assimp libraryKai Koehne2016-10-281-0/+13
| | | | | Change-Id: I2c75552f442f73c37426560227386a894a896f2c Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Convert qt3d to the new configure systemLars Knoll2016-10-281-8/+3
| | | | | | | | | Remove some duplicated code between the assimp test and assimp_dependency.pri and do all pkg-config related tests during config time. Change-Id: If97c4cf53cd0356e7ee4e618a8d645ea697b3dfc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Adjust to qtConfig() changes in qtbaseLiang Qi2016-08-212-6/+4
| | | | | Change-Id: Ic5b9447ef9ba54124553775b973d616af22b7032 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Silence a bunch of warnings when building assimp with msvcSean Harmer2016-08-091-0/+8
| | | | | Change-Id: I39497c735abbf6207d38757ed6c10ff6049edcae Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Silience -Wunused-private-field warnings on clang for assimpSean Harmer2016-08-041-0/+5
| | | | | Change-Id: Iebbc9e272c3a3849bc9d1a1d0bcede412a11c900 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge branch '5.6' into 5.7Sean Harmer2016-05-191-1/+1
|\ | | | | | | Change-Id: Ie0fc178d3c0f818ea32aac0e98c97861d4c0f671
| * Enable rtti for assimpSean Harmer2016-04-191-1/+1
| | | | | | | | | | | | | | | | Allows to build with mingw. Task-number: QTBUG-52619 Change-Id: Ie5b3fc4a5d4ad13cdd93575b4dac9b466f475bbf Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge branch '5.6' into 5.7Sean Harmer2016-04-162-6/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ICC warning about variable used uninitializedThiago Macieira2016-04-121-1/+1
| | | | | | | | | | | | | | | | std::tuple<> apparently has a trivial constructor, so it really is uninitialized. Change-Id: Id75834dab9ed466e94c7ffff1444801e4bf0d7dc Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Ignore ICC warning about change of sign in AssimpThiago Macieira2016-04-121-4/+9
| | | | | | | | | | | | | | | | | | | | You can't assign -1 to an unsigned and expect it to retain the sign. Assimp has a lot of those and should be fixed (it's not portable to assume -1 becomes ~0). But since this is a third-party library, it's not worth my time to submit a patch. Change-Id: Id75834dab9ed466e94c7ffff14448010fe7e0c90 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Fix icc warnings: "else" was missingThiago Macieira2016-04-121-1/+1
| | | | | | | | | | Change-Id: Id75834dab9ed466e94c7ffff14447ec2379c5b17 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | assimp: Fix build FBXConverter.Anton Kudryavtsev2016-03-212-1/+36
| | | | | | | | | | | | | | | | | | | | | | If you compile according to https://wiki.qt.io/Qt5ForAndroidBuilding with NDK v11.b, you get such warning and the compilation stops: FBXConverter.cpp:1262:19: warning: ‘count’ may be used uninitialized in this function [-Wmaybe-uninitialized] unsigned int count; Change-Id: Ieff61e6302800a22080f837267982fd2ea3129e6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QGeometryRenderer API changesMike Krus2016-03-131-1/+1
|/ | | | | | | | | | | | - primitiveCount -> vertexCount - baseInstance -> firstInstance - restartIndex -> restartIndexValue - primitiveRestart -> primitiveRestartEnabled - baseVertex -> indexOffset Task-number: QTBUG-51515 Change-Id: I95e1e04e08b6441fcf8721db382f8f0c457f6faa Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* centralize + fix use of system assimpOswald Buddenhagen2016-01-141-0/+11
| | | | | | | | | | | | 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>
* make use of the new QtZlib moduleOswald Buddenhagen2015-12-011-4/+1
| | | | | | Task-number: QTBUG-48237 Change-Id: Ie70e815c5c16ff1992218ca0414833bd75600d58 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* fix condition for using qtcore's built-in zlibOswald Buddenhagen2015-12-011-1/+1
| | | | | | | | | | | 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>
* remove bogus defineOswald Buddenhagen2015-12-011-4/+0
| | | | | | | this was an obsolete workaround for a bad include path. Change-Id: Ica6919d4679291e07686d46118bfd52d8e80c61f Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* qgltf: Do not use system-zlib for host toolsAndy Nichols2015-11-061-1/+5
| | | | | | | | | | | | 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>
* assimp: Use std namespace for most cmath functionsAndy Nichols2015-11-0535-168/+1449
| | | | | | | | This also fixes a couple of cases where the int version of abs was used when it should be the float version. Change-Id: Id5063545e5a6e659e95262177217be98766794b0 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* assimp: Remove usage of deprecated keyword registerAndy Nichols2015-11-0421-30/+412
| | | | | Change-Id: I1a85b0602c9e2729bab9582dc5325213f3598988 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* assimp: Fix building with mingw older than 4.9Andy Nichols2015-10-284-1863/+12093
| | | | | | | | | | | | | On Windows when building with mingw versions older than 4.9 the assembly of IFCReaderGen.o fails because it reaches the section limit. Normally we would use the -mbig-obj flag to the assembler, but older versions of GNU as don't have support for this. So to work around this IFCReaderGen.cpp is split into two separate files, which keeps the sections below the limit for each object file. Task-number: QTBUG-48902 Change-Id: If0cae29c10a50e3a5edf85fe21b8d2528971eb83 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix building from source archive on WindowsPaul Lemire2015-10-141-3/+6
| | | | | | | Change-Id: I35320894a2cf79bb507aeda8aab5c84fd9e8975a Task-number: QTBUG-48237 Task-number: QTBUG-48564 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Fix ambiguous if else in assimpSean Harmer2015-10-132-0/+33
| | | | | | | Also record patch in 3rdparty/patches directory Change-Id: I17516fc8f34dad7a99f536dc4b3cba47e7779d4b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Suppress a bunch of warnings in assimp with gcc and clangSean Harmer2015-10-131-4/+9
| | | | | Change-Id: Ic8cdcdceb959030163b661f29011b825f28b2896 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Re-add libassimp 3.1.1 to 3rd partyAndy Nichols2015-08-02416-0/+160735
| | | | | | | | | | | | | | | | | Previously the assimp library was a dependency that was always built, but it is possible to use an external system version if one is available. It is however non- trivial to provide the dependency on platforms other than Linux, so now we provide a copy of libassimp for use when it is not already available. This commit is a combination of reverting commit 672b3e47299f6ba0034f73b252d0436b55fb3085 which removed assimp and introduced the scene parser, and adding the logic to use the system version when available. Change-Id: Ia05f9a92b8d82f19a0db3588b2bbeafe71404386 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Removes ThreadWeaver code from Qt3DMika Salmela2015-02-1990-11365/+0
| | | | | | | | | Qt3D will be published with commercial licenses and there can't be 3rd party LGPL code. This task will remove the ThreadWeaver code and places the adaptation code inside configuration. Change-Id: I316f23087cdd8fed0afafbb1a3d78e3ff159585a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Optimize: Do not allocate the state name every time.Milian Wolff2014-12-091-0/+4
| | | | | | | | | | | | The compiler is not smart enough to get rid of this call, even when the debug() function is not doing anything. Upstream should be fixed to use categorized logging instead, which would not have this problem. Change-Id: I70ed344cce0dc2130d3aa96f3873ffc4799f6d60 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Assimp external dependencyPaul Lemire2014-08-19416-160679/+0
| | | | | | | | The AssimpParser is now a SceneParser plugin that is build if config tests for assimp succeed. Change-Id: I0e3f6a6ce2a43298b71b0261084f6c79521f214d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Ignore the ICC warning about K&R-style parameters in CThiago Macieira2014-08-171-0/+3
| | | | | | | | It's 2014. There are still people using this? Change-Id: Ie53cd86e9794a98919579fe1dbe1502e7e9ea3d9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* ICC doesn't have -Wno-ignored-qualifiersThiago Macieira2014-08-171-1/+2
| | | | | | | | | | | It prints an annoying warning for every .cpp icpc: command line warning #10006: ignoring unknown option '-Wno-ignored-qualifiers' It has its own option for the same warning. Let's use it. Change-Id: Ia540dc8836873d8386f8db092a29af41530c7c21 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Disable precompiled headers.Louai Al-Khanji2014-08-151-0/+2
| | | | | | | | Since there are C sources included precompiled headers lead to various linker errors. Change-Id: I591dc16e608548544ab1d5b3e9088c776e0e560c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Added DEFINES to make assimp compile on gcc 4.6Paul Lemire2014-07-251-1/+1
| | | | | Change-Id: I89cb64d697ca9814ad23bf4673b581abfd9d4909 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Upgrade to Assimp 3.1.1Paul Lemire2014-07-1756-3059/+5025
| | | | | | | | | | | | | | | https://github.com/assimp/assimp/releases/tag/v3.1.1 This commit imports assimp 3.1.1, including CHANGES, CREDITS, LICENSE, README, Readme.md, and code, contrib, include directories. contrib/zlib, contrib/cppunit-1.12.1/, contrib/cppunit_note.txt were excluded in this change. assimp.pri was also updated. revision.h was generated from revision.h.in. Change-Id: I7c0597eae9eee7f06a1170968b5fef6fd46b6f0d Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Stop clang complaining about 3rd party assimpSean Harmer2014-06-281-0/+2
| | | | | Change-Id: I1c7a7cf4915680f32444a8ac557fa356e830875d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Removed repetition of (void) in Assimp's unzip crypth.h and ioapi.cPaul Lemire2014-06-272-8/+0
| | | | | | | | | This is likely the result of the merge with the Assimp 3.1 upgrade. gcc doesn't issue any warning at all. On the other hand this causes errors on Windows. Change-Id: I7bd4bdd0915ac0c225e85268aa9d8c7834e7a65a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Removed warnings from assimpPaul Lemire2014-06-0621-40/+58
| | | | | | Change-Id: I2ef77231ce3cc13bdf8a046c902963fc3f718086 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Upgrade to Assimp 3.1Paul Lemire2014-06-04247-20160/+27793
| | | | | | | | | | | | | | | | https://github.com/assimp/assimp/releases/tag/v3.1 This commit imports assimp 3.1, including CHANGES, CREDITS, LICENSE, README, Readme.md, revision.h and code, contrib, include directories. contrib/zlib was excluded. assimp.pri was also updated. Uses zlib from system or qt instead of contrib/zlib. Task-number: QTBUG-39251 Change-Id: Ia0b446dcd9bc867d65897b9e2b157f6544ccaeac Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Let assimp compile on windows since MSVC only supports C90 specSean Harmer2014-06-024-39/+19
| | | | | | | | | All variables must be declared at start of function before any statements. What year is this? Change-Id: I48a17b29c54843d99abb1dd8600ddf5a4ed41bc1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* [assimp] Silence compiler warnings in assimpSean Harmer2014-04-0311-21/+29
| | | | | | Change-Id: I6efacc0a4165109db2cd9418948622db3c15c7f5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix builds with namespaced QtSean Harmer2014-04-022-0/+4
| | | | | | Change-Id: I15a4a472f5283c56c8185b05699e33368c45ddb0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixing compile errors on Mac 10.8/Qt 5.3 beta.Pasi Keranen2014-03-282-21/+21
| | | | | | | | | On Mac you need to use the module name when including files from other modules. Change-Id: I7a70cdeaaa039bd90e3db277eace016fae1efafe Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rendering Aspect to dedicated Qt3D module library.Paul Lemire2014-03-251-2/+0
| | | | | | | | | | | | | | | | | | | Aspects are now independent Qt3D modules. This allows aspects to expose classes that can be reused by other aspects. Unlike plugins however, aspect modules have to be registered to the QAspectManager when the Qt3D window is created. At the moment there is only a single aspect : RendererAspect To load the RendererAspect QT += 3drenderer Examples updated to work with the changes. QML components defined in the RendererAspect are accessible by importing Qt3D.Render 2.0. Examples have been updated accordingly. Change-Id: I1281b1ffc1a633292b394c7d0460f1e16b34b488 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Updated Assimp library to the latest version 1270Paul Lemire2014-03-25406-78262/+110873
| | | | | | | | | SVNRevision 1270 assimp--3.0.1270-source-only.zip Change-Id: I332efb5fd0d086f24aca0a5fe9d396d549e531fa Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 03:36:55 +0000