| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Since the variable is initialized right afterwards and code elsewhere
indicates that it is valid to do this check still, the initialization
should be moved to account for it.
Change-Id: Id1d48329c38a2061661404dfb73656bf201e552d
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
|
|
|
|
|
|
|
| |
increase number of sections in .obj files because of excessive size of
'IFCReaderGen*.obj' files for Debug builds using Windows ICC
Task-number: QTBUG-62339
Change-Id: Id1d93258a9bc69106a8918bf4ad5a1ebd83f3455
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
|
|
|
|
| |
Change-Id: I18e96aa4dfe3689d27f041dbdcad43556a61c889
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
|
|
|
|
|
|
| |
Fixes build with C++17 / XCode 9.3
Change-Id: Ic1c19cc4b86e54e72dd4cfe054ec6d66f64b5a07
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
| |
Change-Id: I43414f0cb882086bb2bbb85a875fc1045877cd64
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: Ibe0134eafa986e93e725fd4fc98177b69938b1df
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| | |
Change-Id: Id364046378fa3522bd9a282a07c23c50ce48c806
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: I50dc8a64cfbf292228a88a7e7356dd958d592b4c
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|/
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I2c75552f442f73c37426560227386a894a896f2c
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: Ic5b9447ef9ba54124553775b973d616af22b7032
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
| |
Change-Id: I39497c735abbf6207d38757ed6c10ff6049edcae
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: Iebbc9e272c3a3849bc9d1a1d0bcede412a11c900
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|\
| |
| |
| | |
Change-Id: Ie0fc178d3c0f818ea32aac0e98c97861d4c0f671
|
| |
| |
| |
| |
| |
| |
| |
| | |
Allows to build with mingw.
Task-number: QTBUG-52619
Change-Id: Ie5b3fc4a5d4ad13cdd93575b4dac9b466f475bbf
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
std::tuple<> apparently has a trivial constructor, so it really is
uninitialized.
Change-Id: Id75834dab9ed466e94c7ffff1444801e4bf0d7dc
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: Id75834dab9ed466e94c7ffff14447ec2379c5b17
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|/
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Task-number: QTBUG-48237
Change-Id: Ie70e815c5c16ff1992218ca0414833bd75600d58
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
this was an obsolete workaround for a bad include path.
Change-Id: Ica6919d4679291e07686d46118bfd52d8e80c61f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I1a85b0602c9e2729bab9582dc5325213f3598988
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Change-Id: I35320894a2cf79bb507aeda8aab5c84fd9e8975a
Task-number: QTBUG-48237
Task-number: QTBUG-48564
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
|
|
|
|
|
|
|
| |
Also record patch in 3rdparty/patches directory
Change-Id: I17516fc8f34dad7a99f536dc4b3cba47e7779d4b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: Ic8cdcdceb959030163b661f29011b825f28b2896
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
Since there are C sources included precompiled headers lead to various
linker errors.
Change-Id: I591dc16e608548544ab1d5b3e9088c776e0e560c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I89cb64d697ca9814ad23bf4673b581abfd9d4909
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I1c7a7cf4915680f32444a8ac557fa356e830875d
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: I2ef77231ce3cc13bdf8a046c902963fc3f718086
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: I6efacc0a4165109db2cd9418948622db3c15c7f5
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|