summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Disable automatic precompiled headers for Qt3Dbaserock/v5.0.0-beta1-81-gbdb98baThiago Macieira2014-05-181-0/+1
| | | | | | | Qt3D has C sources, so we can't use <Qt3DDepends> as the header. Change-Id: Id05f4adf3653647efb0b8b1d96d515bffb73867f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix missing cosf, sinf and asinf symbols.Alex Blasche2014-03-252-0/+4
| | | | | Change-Id: I3f7041b84db03ad901372c5e520d7b9c82bcd770 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix missing cosf symbol on winCEAlex Blasche2014-03-241-0/+2
| | | | | | | | It is part of the cmath header. Change-Id: Ib5b280890629c66b7b7325ed53028a387640a284 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix Qt3D buildFabian Bumberger2014-03-071-1/+1
| | | | | Change-Id: I2264b3261d202748aca29bab552dd8896bae25e5 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Mark tst_QVectorArray as insignificant on LinuxSergio Ahumada2014-03-071-0/+2
| | | | | | Task-number: QTBUG-37334 Change-Id: I231de24945f611bb421cc7fafc83dcd81417171d Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Fix assimp build on uncommon architecturesRobin Burchell2014-01-092-46/+30
| | | | | | | | | | | | | | | This adapts patch d5bd7009a609a52ced576917d24e09fd336e389c from upstream. The build should not error out when it encounters an architecture that has not been explicitly included. The truly annoying part of the error was that it *only* affected how a debug string was constructed. Using the byte order as provided by the build system is much nicer and hopefully cleaner. Change-Id: I62c0e77934cc37ea9f60c8b3175bac79529088fa Done-with: Mika Boström <mika.bostrom@nomovok.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix compilation with ICC 14Thiago Macieira2013-12-161-1/+2
| | | | | | | | | | | ICC didn't like passing a char array to std::find: MD3Loader.cpp(847): error: invalid type conversion: "const char *" to "const char (&)[64]" skins.textures.begin(), skins.textures.end(), pcSurfaces->NAME ); ^ Change-Id: I65a624c749263b8a28e9d37464ce80df02996354 Reviewed-by: Andy Maloney <asmaloney@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Bump qt3d version to 5.3.0Thiago Macieira2013-09-241-1/+1
| | | | | Change-Id: Id802cd36fcf1ca4a4ba3d3ed520e82583b52986b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove unnecessary dependency to qtjsbackend from sync.profileSergio Ahumada2013-09-231-1/+0
| | | | | Change-Id: If71df520815e42b1b6749676cb8b0fd0f23f746c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix viewport update when using DirecRender modeFabian Bumberger2013-09-161-3/+9
| | | | | | | | Currently the viewport is not updated when using direct render mode. Change-Id: I1ad8c6456ed4c18041aff4f258466ed2b344764d Reviewed-by: Thomas Senyk <thomas.senyk@pelagicore.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix segfault if GL_OES_mapbuffer extension is missing.Albin Olsson2013-08-121-1/+3
| | | | | | | | | | | QOpenGLBuffer::map() returns an invalid pointer if GL_OES_mapbuffer extension is missing. Adding check for extension before calling this function. Change-Id: I126733b05a7ee66343362f12283219aabb506bc5 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix GCC warning about non-virtual destructor on virtual classThiago Macieira2013-08-061-1/+1
| | | | | | | warning: deleting object of polymorphic class type ‘QGLTextureCubePrivate’ which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor] Change-Id: I738eb6a83925148e06b9ada467fdce2a65e49a60 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove C-style casts from public headersThiago Macieira2013-08-062-5/+5
| | | | | | | Task-number: QTBUG-32735 Change-Id: I861e3c6b277a0a2c99f388800932dceb26bab021 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Cherry pick OBJ fixes from current Assimp (3.x)Andy Maloney2013-08-054-39/+112
| | | | | | | | Fixes multiple issues, add consts, better error output, and allow spaces in names Change-Id: I9084ec7861ad0c71977c765da7c132ba75bbc46b Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: James Turner <james.turner@kdab.com>
* Bugfixes and cleanups for the picking codeFabian Bumberger2013-07-317-63/+279
| | | | | | | | | - Removed the pickRegistry and related code, because it is not needed - Fixed picking when navigation is turned off - Introduced a new autotest for picking Change-Id: Ib43789383760902f42542b45cfe49342f4ffa090 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix loader and mesh warningsAndy Maloney2013-07-112-6/+6
| | | | | | | Args were not being applied to strings properly, so the outputs had %1 in them Change-Id: Ifcca47c5f3a32324e189e65c367b4e2b74a6bd8e Reviewed-by: Alex <alexander.blasche@digia.com>
* Introducing a property for antialiasingFabian Bumberger2013-06-172-0/+30
| | | | | | | | | With this property antialiasing can be enabled and disabled on the viewport when renderMode() == BufferedRender. Change-Id: If811f3141d032103a2495e7624386991cb500cfd Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Don't build qt3d without opengl moduleAlex Blasche2013-06-131-4/+3
| | | | | | | This is required to fix CI build of qt3d and subsequently qtlocation. Change-Id: Iec836a88941329f773e785502a1fa528cc358415 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Do not render if viewport is not visibleFabian Bumberger2013-06-101-0/+3
| | | | | | | This is already implemented for DirectRender but missing in BufferedRender Change-Id: I59c6f8fa8f61977cd8f869ebff761f2cc38c66c7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Viewport: handle the situation when Scenegraph is already initialized.Evgeny Grablyk2013-05-301-2/+8
| | | | | | | | | | | Presently, Viewport waits for the QQuickWindow::sceneGraphInitialized() signal to initialize, which only fires once on application start. Viewports constructed later miss the signal and thus do not initialize. So we first check if QQuickWindow::openglContext() is not NULL, which indicates that the Scenegraph is ready, and initialize right away. Change-Id: Ib83479621ad8911896d1792aa807d39a517c1a49 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Replaced Nokia copyrights in headerTeemu Kaukoranta2013-05-306-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Replaced old Nokia copyrights with Digia copyrights. Removed "All rights reserved" strings without leading copyrights were removed (for example, 'Copyright SomeCompany, all rights reserved remain untouched). Did NOT touch contact details, will change them later. Excluded folders that have '3rdparty' in path. Used command: find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E '.*Copyright.*Nokia.*' {} \; | tee >(xargs sed -i -r '1,10 s/([ \t#*]*)(.*Copyright.*Nokia.*)/ \1Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I') >(xargs sed -i -r '1,10 s/(^[ \t#*]*)(all rights reserved.*)/\1/I') This excludes binary files and retains whitespace and #* characters in the beginning of the edited lines. Change-Id: Idbe2a510335385929a282bd70606b8841dff36a8 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Update qmldir filesLiang Qi2013-05-302-0/+3
| | | | | | Change-Id: Ia2b8797c0f47752acd255f8cde8a6febf1b70251 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Update all plugins.qmltypes filesLiang Qi2013-05-302-391/+354
| | | | | | | | Task-number: QTBUG-31388 Change-Id: Ib9e895ca6300f444d2a424273b95088868c91355 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Merge of quick3d/qquickitem3d.cpp with master QTBUG-27444Paul Lemire2013-04-191-12/+23
| | | | | | Change-Id: Iaf101cfa888bb2c4eab504b0df6b0986c58ad9e2 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Generate the cmake module tests, instead of having them outdated.Stephen Kelly2013-04-184-82/+5
| | | | | Change-Id: I89f8d11d84db06b4fd90a8fb5e77f469e619a45f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove dummy includes that break module header in namespaced buildsSean Harmer2013-04-182-134/+0
| | | | | Change-Id: I6ed0eaa474dc1574332e104fcc8e7bd37586de61 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Link to QtOpenGL to get QGLPixelBufferThiago Macieira2013-04-171-1/+1
| | | | | | | | qglpixelbuffersurface.h:47:26: fatal error: QGLPixelBuffer: No such file or directory Change-Id: Ie6f806efba4ea3e2a0c8031584e4af92acd2cd56 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Tidy up the scene_ai headers to stop libassimp leaking to public headersSean Harmer2013-04-1714-30/+34
| | | | | Change-Id: I5f5415bdab164e5530caa6976755349479d19ea4 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove the bad API for the distance unit of the rayLaszlo Papp2013-04-173-8/+8
| | | | | | | | | | | | | | | It is a bad API because of the following reasons: 1) fromPoint does not imply if it is a distance, direction, or something else from the point. 2) More importantly, it reads as a static method converting a point to a ray at first glance according to the other Qt API occurrences around. Change-Id: If92f6642138821916cda43dc33a8c3e84267c626 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Simplify the API for the distance from the pointLaszlo Papp2013-04-177-21/+21
| | | | | Change-Id: Ic5a27f11a8fe628d7b0d9b8566c113ea48e799f1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Temporarily mark the cmake test as insignificantSean Harmer2013-04-171-0/+1
| | | | | | | | | | | | This is required to be able to commit a couple of changes that 1) Tidy up the headers to stop libassimp API leaking through 2) Links against QtOpenGL for QGLPixelBuffer This can be re-enabled once those changes are merged Change-Id: Id2e8b26209d854723d3c885662ec1e6ddf5313af Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Fix warnings in qt3d found by GCC 4.8Thiago Macieira2013-04-082-2/+2
| | | | | | | | shaderprogram.cpp:465:5: warning: case value ‘38’ not in enumerated type ‘QVariant::Type’ [-Wswitch] qglcolladafxeffectfactory.h:90:129: error: ‘QString::QString(const char*)’ is private Change-Id: I1c5618bca011cbfa06731e9ae03e3ec45d9fb625 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Use quotes for the error stringsLaszlo Papp2013-03-231-2/+2
| | | | | Change-Id: Ibff2e3ff56d457864e8e86bac27ac686a5e30041 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix winding on quad strips that make up spheresSamuel Rødal2013-03-192-2/+2
| | | | | | | | | | | The winding was incorrect, which caused the QGLSphere to disappear when back-face culling was enabled. Task-number: QTBUG-17822 (cherry picked from commit dde93f2bdbc0b0918f0fd6608c83cb6e2f1fe2b7) Change-Id: I1e06103b0c84fcd87e6066693f06003ab2cf723d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* define MODULE_VERSIONOswald Buddenhagen2013-03-051-0/+2
| | | | | | | | | 5.2 is the expected release version, so set it already. Task-number: QTBUG-29838 Change-Id: I7ad63b97503e411696fa025805ef31b3cb90d34e Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Qt3D header check: fix shadowing declarationsThiago Macieira2013-03-0523-319/+324
| | | | | | | | | | | | There are two types of shadowing: parameters shadowing members of 'this' and new virtual overrides hiding previous members. qcolor4ub.h:107:68: error: declaration of ‘xxxx’ shadows a member of 'this' [-Werror=shadow] qareaallocator.h:81:26: error: ‘virtual QList<QRect> QAreaAllocator::allocate(const QList<QSize>&)’ was hidden [-Werror=overloaded-virtual] [and a lot more] Change-Id: Iae93b013602d7349c3c19dc05a6054d6b4823b16 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Use qmake for package dependency resolution in cmake tests.Stephen Kelly2013-02-261-0/+2
| | | | | | | This allows us to remove hardcoded depends information. Change-Id: I15f6bf0b000ab6a7fc742b19e2132295f5583b69 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* HTCPCP/1.0 418 I'm a teapotThiago Macieira2013-02-241-1/+1
| | | | | | | | | Fix compilation: teapot.h:61:1: error: ‘Cube’ was not declared in this scope Change-Id: I072bf56ffcb61127d76874f8a3d23a5502c0e198 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Qt3D header check: compile in pedantic modeThiago Macieira2013-02-247-9/+9
| | | | | | | | qglnamespace.h:150:2: error: extra ';' [-pedantic] Change-Id: I48f1935e8dddee63255250c21227cf6e8d3f40f7 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Qt3D header check: compile with QT_NO_KEYWORDSThiago Macieira2013-02-244-4/+4
| | | | | | Change-Id: I5232eafa9689b47db7d1ebcaac6cd633daa2c083 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add a virtual destructor to QQuickViewportThiago Macieira2013-02-242-0/+8
| | | | | | | | | This class has virtual methods, so let's add the virtual destructor before it's too late. Change-Id: I962a25aab177b945efc0d6662f0e10685f7e7712 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Match the documentation license file exactly as requestedLaszlo Papp2013-02-141-9/+9
| | | | | | Change-Id: I7aa12627e03e08bf12f3ba36e739cf5c17cea925 Reviewed-by: Jason McDonald <macadder1@gmail.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add and modify the mandatory license file to be consistent and properLaszlo Papp2013-02-143-10/+684
| | | | | | | | | See the following mailing list thread for further details: http://lists.qt-project.org/pipermail/development/2013-February/009810.html Change-Id: I6b79b634124014cbd43a6e491490d94add69c36d Reviewed-by: Timo Jyrinki <timo.jyrinki@iki.fi> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixed QTriangle3D::contains() being too strict for large triangles.Samuel Rødal2013-02-081-1/+1
| | | | | | | | | | The scale of the triangle should not determine whether a given point is deemed to lie on the triangle's plane or not. Task-number: QTBUG-29158 Change-Id: I035718063c3e46ddd28ced233ecf901270fb2dbb Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix a few typos found while reading the documentationLaszlo Papp2013-02-074-4/+4
| | | | | Change-Id: I985dc4a3f3ed270a1d6d05fec95b5e81b5753e4f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixed QTriangle3D::intersects().Samuel Rødal2013-02-071-9/+13
| | | | | | | | | | | We already know the point is in the triangle's plane, and should only consider the u-v coordinates, otherwise we might reject points due to floating point inaccuracies. Task-number: QTBUG-29158 Change-Id: Ic8952b8240d158ee89651cb9584326e662287a71 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove use of QT_{BEGIN,END}_HEADER macros.Aaron McCarthy2013-02-06103-412/+0
| | | | | | | | | These macros were removed from Qt Core and they are no longer defined causing Qt3d to fail to build. Change-Id: Ife6a9a5079a4481605c582a4b590691d27ad81f0 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Remove the use of QT_MODULE()Sergio Ahumada2013-01-1059-118/+0
| | | | | Change-Id: I50a068e0d18cc51f55c4f07cc192e165cc830f83 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Fix a typo in the documentation of the QRay3D classLaszlo Papp2013-01-101-1/+1
| | | | | Change-Id: Ife8592b5ef653bbb931bda942eedbbba33f0773a Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-098-9/+9
| | | | | | | | 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>
View Lorry Controller Status