summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/assimp/code
Commit message (Collapse)AuthorAgeFilesLines
* Update assimp lib to 3.3.1Andy Maloney2017-03-14370-94646/+110971
| | | | | | | | 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>
* Morph animation loading support for ColladaAntti Määttä2017-01-276-285/+751
| | | | | | | | | 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>
* Merge branch '5.6' into 5.7Sean Harmer2016-04-161-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | assimp: Fix build FBXConverter.Anton Kudryavtsev2016-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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>
* assimp: Use std namespace for most cmath functionsAndy Nichols2015-11-0526-123/+123
| | | | | | | | 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-0419-29/+29
| | | | | Change-Id: I1a85b0602c9e2729bab9582dc5325213f3598988 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* assimp: Fix building with mingw older than 4.9Andy Nichols2015-10-282-1862/+1917
| | | | | | | | | | | | | 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>
* Re-add libassimp 3.1.1 to 3rd partyAndy Nichols2015-08-02330-0/+133718
| | | | | | | | | | | | | | | | | 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>
* Assimp external dependencyPaul Lemire2014-08-19330-133714/+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>
* Upgrade to Assimp 3.1.1Paul Lemire2014-07-1742-3722/+4946
| | | | | | | | | | | | | | | 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>
* Removed warnings from assimpPaul Lemire2014-06-0617-38/+40
| | | | | | 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-04175-9115/+26048
| | | | | | | | | | | | | | | | 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-022-0/+3
| | | | | | | | | 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-038-17/+17
| | | | | | Change-Id: I6efacc0a4165109db2cd9418948622db3c15c7f5 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>
* Updated Assimp library to the latest version 1270Paul Lemire2014-03-25298-66238/+90308
| | | | | | | | | 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>
* Moved Assimp to src/3rdpartyPaul Lemire2014-03-21250-0/+91482
Change-Id: Ic813285c2ee6a36d0e8e6dc6807d6d55f7ec1df4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 04:17:00 +0000