summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine
Commit message (Collapse)AuthorAgeFilesLines
* Remove Qt<5.12 workaroundOlivier Goffart2018-04-101-2/+0
| | | | | | | This change partly reverts commit da3c5925d546282e99f13b450a674c7024fde9ed. Change-Id: Ifd09b63a56d5f2e8837e461ca6048d80fcb8c916 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Use Qt::Alignment instead of the AlignmentFlag enum to represent flagsOlivier Goffart2018-04-105-9/+11
| | | | | | | | | | | | | Because from Qt 5.12, the the right operator| is found in the Qt namespace instead of in the global namespace. One must still add the 'using' statement so this patch can be integrated using a previous qtbase. But the statement can be removed once qtbase is updated. Task-number: QTBUG-67582 Change-Id: Ib79c4623e858988bb55a87ad4fb0c1e0ceee81cf Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-205-3/+10
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie7a50a1cc66ddffe04933f77323d03941e0d7acd
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-185-3/+10
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4e39ad733fec72e2233cd16fc50c96ca96280782
| | * Fix mixing of vec3 and vec2 for coords_mdlMika Salmela2017-12-212-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Vec3 used on fragment shader when vec2 used on vertex shader. On surfaceTextureFlat coords_mdl not used at all, so remove it. Change-Id: I7898db37e7967a7cb9933fe1a05f42a332c06130 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * Render custom items at insertion orderMika Salmela2017-11-163-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the rendering order of custom items to insertion order. Task-number: QTBUG-64312 Change-Id: I1ce865a3492c145ffa269cd12baa15ffff8d6a59 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-201-2/+6
|\| | | | | | | | | | | Change-Id: Iea700ac85da7205933622b61e1c43f774c82e45a
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-301-2/+6
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibd0e0140e7055c7819a65e661a96095648de6fcd
| | * Set clamp to edge wrap modes for surface texturesMika Salmela2017-09-051-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | By default surface textures had wrong wrap modes making the color bleed on edges. This patch changes the texture wrap modes to clamp to edge. Task-number: QTBUG-62996 Change-Id: Iebee66b01a78db6036cb0c833f39237f8e98b6b7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-268-8/+8
|/ / | | | | | | | | Change-Id: Idc9a7a0ebcc986c8def79ac56f7defceea1e4432 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* / Use qRadiansToDegrees() and qDegreesToRadians() more widelyEdward Welbourne2017-06-141-1/+1
|/ | | | | | | | | These document what the arithmetic is actually doing; and save us an ad-hoc use of an approximate value for pi while we're about it. Task-number: QTBUG-58083 Change-Id: I82c5502af724b33ec598c5a9da76537f93a95eac Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix build for -no-feature-wheeleventStephan Binner2017-04-244-0/+8
| | | | | Change-Id: I0a436ec2606fe6d76665ef147667c7d8ea5c59e4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix warning about member initialization out of orderThiago Macieira2017-04-031-1/+1
| | | | | | | | | | | Instead of fixing the order in the constructor, let's fix the order of the declarations to follow the rule of thumb to avoid padding holes. q3dlight.cpp:107:5: warning: field 'q_ptr' will be initialized after field 'm_automaticLight' [-Wreorder] Change-Id: I27b55fdf514247549455fffd14b17abe78cbad28 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Enable transparency for wallsMika Salmela2017-03-103-48/+106
| | | | | | | | | | When alpha value for wall is below 1.0, enable blending for walls. Rearrange code so that solid objects are drawn first and then possible tranparent objects. Task-number: QTBUG-59140 Change-Id: I5087a664a59ecdb4516b17e8fac1f8ff48ad1c16 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix \brief and \return commands (Q3dSurface)Leena Miettinen2017-03-021-27/+41
| | | | | | | | Remove property getter docs, because they do not add any info, and move setter docs to separate entries. Change-Id: I78a0dab0ec9652b58b319f09dc5266e36d12e85a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands to property docs (Q3dCamera)Leena Miettinen2017-03-021-54/+63
| | | | | Change-Id: If73980ebc6b34ebae2c362f90837e62910477d37 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands for property docs (QAbstract3dGraph)Leena Miettinen2017-03-021-91/+136
| | | | | Change-Id: I076eafb31ab9710f59eb47287cf91882a56bb8e7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands to property docs (Q3dScene)Leena Miettinen2017-02-271-63/+83
| | | | | | Change-Id: I1124ecce8a81256916e4936dc952ea619082a272 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix QDoc commands (Q3dBars)Leena Miettinen2017-02-271-32/+62
| | | | | Change-Id: I75cb18ad5ea6b7c88c940d52ccb82753fcc0c7c7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix \brief and \return commands (Q3dScatter)Leena Miettinen2017-02-271-16/+31
| | | | | Change-Id: I45c048acffc57b56205b694dd4fcb4b89917b5a3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief command to property docs (Q3dLight)Leena Miettinen2017-02-271-6/+6
| | | | | Change-Id: Iae596f33b2f263452206cbb7d5728d6d4798738e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Edit 3D object class and type docsLeena Miettinen2017-02-271-14/+16
| | | | | | | Fix grammar and QDoc command usage. Change-Id: I5d9c3f40b9a2fa83bce42ff3978c27b5358fb87a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-241-1/+1
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I10b221188c4306563f3b150f048d5f99aefc9fb1
| * Fix warning about change of signThiago Macieira2016-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | setSelectionIdRange takes uint as parameters, so pass unsigneds. engine/surface3drenderer.cpp(2445): warning #68: integer conversion resulted in a change of sign Change-Id: Idc347fbb462f4122b044fffd14905eea36583259 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-123-5/+20
|\| | | | | | | | | | | | | | | Conflicts: tests/auto/cpptest/q3dscene/tst_scene.cpp tests/auto/qmltest/scene3d/tst_scene.qml Change-Id: I0aef5e7d8fe202e7f4c7565922938d1627ab8124
| * Handle data proxy change on the controllerMika Salmela2016-11-293-3/+18
| | | | | | | | | | | | | | | | Adds a connection to controllers to react dataProxyChange signal. Task-number: QTBUG-57291 Change-Id: Ia9ad6880418ec861381e1a5363ce38f8d0bda2e8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Ensure that the formatter is respected for zero and negative valuesTomi Korpipää2016-11-142-2/+2
| | | | | | | | | | | | | | | | This also ensures that INF and NaN numbers are also handled correctly Task-number: QTBUG-57075 Change-Id: I8db693cb28303bc13f936c818147fe31b7ee1199 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Allow light position modification by userTomi Korpipää2016-11-186-12/+88
| | | | | | | | | | | | Change-Id: I7efd56754bae16990fd11081493da0a37698f76b Task-number: QTRD-1803 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Check if we got OpenGL2.1 functions before trying to use themTomi Korpipää2016-11-171-1/+5
| | | | | | | | | | | | Change-Id: Ia8b4a25094d4a608d3a20b808fd14c3941ae2dff Task-number: QTRD-2116 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Fixed inability to set subviewportsTomi Korpipää2016-11-142-49/+114
|/ | | | | | Change-Id: I7966292cca04fe990a2fa6a5b4233bf89e77c553 Task-number: QTRD-1807 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-088-8/+8
|\ | | | | | | | | | | | | Conflicts: src/datavisualization/utils/qutils.h Change-Id: Ic882590b5386697fb4af068e435704849ed5405c
| * Add explicit and make public headers compile with ↵Marc Mutz2016-03-038-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Change-Id: I579e8714f94884dc555b673c9f85508f17cdc99d Task-number: QTBUG-45291 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Copyright file update to GPLMiikka Heikkinen2016-01-1254-486/+918
| | | | | | | | | | Change-Id: Ib264fe1f2cd1589e2ba1ef2dc7d8f3951e125708 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* | Add a method for checking if context was successfully createdMiikka Heikkinen2015-12-306-8/+46
|/ | | | | | | | | | Now it is possible to check after graph construction if the graph is actually usable in environments where the OpenGL support might not be sufficient. Task-number: QTRD-3748 Change-Id: Ia68b4e51386859f6d0c7b09cb44e50a74730ca55 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
* Fix the leaking framebuffer on graph resizeMiikka Heikkinen2015-10-291-0/+2
| | | | | Change-Id: I97e32b56a81afe22aa237055ff6d7db2399b70d3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* OpenGL warning fixTomi Korpipää2015-10-271-1/+1
| | | | | Change-Id: I296a28c2dd105fdd7df6c9fe1ccf30186541e64d Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Fix issues with COIN buildsMiikka Heikkinen2015-10-226-1/+28
| | | | | | | | | | | | -Fix miscellaneous compile errors -Move manual tests to manual folder and enable export of autotests -Added widgets requirement -Fixed autotests -Fixed renderer and controller synchronization in QML case -Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL Change-Id: If6619733725d079e339bef16262e5ea1450ab20f Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Update license headersMiikka Heikkinen2015-10-2054-594/+756
| | | | | Change-Id: I0581aefcf9dabc64b05eb8c97b5b92da1fb26299 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
* Fix compilation with namespaced Qt.Friedemann Kleint2015-09-215-3/+7
| | | | | | Task-number: QTRD-3655 Change-Id: Id68e9cec8d1093fe1557b07a148ae04a27656284 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix building against 5.6Miikka Heikkinen2015-06-1718-22/+22
| | | | | | | | Apparently Qt modules are now required to use Q_SIGNALS and Q_SLOTS macros instead of 'signals' and 'slots' in headers. Change-Id: I4140b1fff4386d74bb371176919234366965e887 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Copyright header changesMika Salmela2015-04-1454-162/+162
| | | | | | | Copyright header changes for 5.5. Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix flickering in android on some examples when zooming.Miikka Heikkinen2014-11-211-0/+5
| | | | | Change-Id: I3c9de6801430dc74c97fb6563ded6114befc6968 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix incorrect shader initialization for static optimized es2Miikka Heikkinen2014-11-211-2/+2
| | | | | | Change-Id: I8fdacfde272ace4c25c74c316de514cd4275da74 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Support larger custom meshes.Miikka Heikkinen2014-11-184-9/+8
| | | | | | | | | | Vertex index was limited to unsigned short, meaning even slightly complex meshes couldn't be used. Changed to unsigned int. Also removed unused vertex indexer methods. Change-Id: Iebe62bd3a501dc79ee2857cca28ac0d05bd4a55e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Change copyright headers.Miikka Heikkinen2014-11-0754-378/+378
| | | | | | Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Use QOffscreenSurface instead of QWindow for dummy surfaces.Miikka Heikkinen2014-10-302-5/+4
| | | | | | | | | Android doesn't like creating extra QWindows, so changed dummy surfaces used to do static initialization and cleanup to use QOffscreenSurface. Change-Id: Ia42e288a05ef49524252c457f3a3494677e3fc63 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Support for dynamic opengl builds.Miikka Heikkinen2014-10-2914-821/+739
| | | | | | Task-number: QTRD-3392 Change-Id: I786bbf5ee9252b92d43d02d6b88ed9b986b4a5eb Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Mac touchpad support addedTomi Korpipää2014-10-271-0/+12
| | | | | | Task-number: QTRD-2286 Change-Id: Ibe211caedab231e908af900af65d4075b926a875 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Surface shadow improvementMika Salmela2014-10-227-13/+80
| | | | | | | | | Not allowing bias go below 0.001 prevents the shadow acne. Faulty formula for lighning direction. Task-number: QTRD-3382 Change-Id: Ided8bf423a961744ace8bef32ae18d6fa2c443ef Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix shadows when viewing directly from above.Miikka Heikkinen2014-10-211-8/+21
| | | | | | | | | | | Fudge the camera y-angle so that it's never looking directly from above or below. The actual problem is that eye vector is paraller to up vector if viewing directly from above, which results in invalid view matrix. Task-number: QTRD-2789 Change-Id: Ia79b8bb4b8317c6aaf6ac4c70a6bb70c24b5309e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 10:53:29 +0000