| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Ibd0e0140e7055c7819a65e661a96095648de6fcd
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|/
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I0a436ec2606fe6d76665ef147667c7d8ea5c59e4
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: If73980ebc6b34ebae2c362f90837e62910477d37
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
| |
Change-Id: I076eafb31ab9710f59eb47287cf91882a56bb8e7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
| |
Change-Id: I1124ecce8a81256916e4936dc952ea619082a272
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
| |
Change-Id: I75cb18ad5ea6b7c88c940d52ccb82753fcc0c7c7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
| |
Change-Id: I45c048acffc57b56205b694dd4fcb4b89917b5a3
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
| |
Change-Id: Iae596f33b2f263452206cbb7d5728d6d4798738e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
| |
Fix grammar and QDoc command usage.
Change-Id: I5d9c3f40b9a2fa83bce42ff3978c27b5358fb87a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I10b221188c4306563f3b150f048d5f99aefc9fb1
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/cpptest/q3dscene/tst_scene.cpp
tests/auto/qmltest/scene3d/tst_scene.qml
Change-Id: I0aef5e7d8fe202e7f4c7565922938d1627ab8124
|
| |
| |
| |
| |
| |
| |
| |
| | |
Adds a connection to controllers to react dataProxyChange signal.
Task-number: QTBUG-57291
Change-Id: Ia9ad6880418ec861381e1a5363ce38f8d0bda2e8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I7efd56754bae16990fd11081493da0a37698f76b
Task-number: QTRD-1803
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ia8b4a25094d4a608d3a20b808fd14c3941ae2dff
Task-number: QTRD-2116
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|/
|
|
|
|
| |
Change-Id: I7966292cca04fe990a2fa6a5b4233bf89e77c553
Task-number: QTRD-1807
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/datavisualization/utils/qutils.h
Change-Id: Ic882590b5386697fb4af068e435704849ed5405c
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
-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>
|
| |
| |
| |
| |
| | |
Change-Id: Ib264fe1f2cd1589e2ba1ef2dc7d8f3951e125708
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
|
|/
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I97e32b56a81afe22aa237055ff6d7db2399b70d3
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I296a28c2dd105fdd7df6c9fe1ccf30186541e64d
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
-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>
|
|
|
|
|
| |
Change-Id: I0581aefcf9dabc64b05eb8c97b5b92da1fb26299
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
|
|
|
|
|
|
| |
Task-number: QTRD-3655
Change-Id: Id68e9cec8d1093fe1557b07a148ae04a27656284
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
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 changes for 5.5.
Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I3c9de6801430dc74c97fb6563ded6114befc6968
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
| |
Change-Id: I8fdacfde272ace4c25c74c316de514cd4275da74
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
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-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Task-number: QTRD-3392
Change-Id: I786bbf5ee9252b92d43d02d6b88ed9b986b4a5eb
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
| |
Task-number: QTRD-2286
Change-Id: Ibe211caedab231e908af900af65d4075b926a875
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
OpenGL ES2 and/or 32bit environments can have relatively low maximum
supported vertex counts per draw call, so large surfaces and static
scatters may not get rendered.
Task-number: QTRD-3364
Change-Id: I7fd024b0428548ac7e2ca043a06d01d2442dd226
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
| |
Autosizing only accounted for freshly changed series when
calculating the total item count visible in the graph.
Change-Id: I7c0990123d3e3827c3518713f5389fedf91aca92
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
| |
It's not enough to just clear the label items upon axis cache
destruction, they need to be deleted, too.
Change-Id: I63bdd01f9b328491107292f42cca6aa2ba7b4434
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
| |
Unnecessary modelMatrix multiplications removed. Intentional whitespace
removal.
Change-Id: I78b8e6f984d44baf7015c9551701b04cb869fc8b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the context exists at renderer deletion, it is possible that
it no longer has valid surface, which means it won't be possible
to set it back to current if we change context for deletion cleanup.
Since the current context will be one of our shared contexts anyway,
there is no need to do a dummy context for cleanup unless the current
context is null.
Change-Id: Ibabe081742beb975ee848ccb3690703ef5b027a9
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
| |
Change-Id: I3a1595530a976b73144109cf2eef72a188831a10
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Context was not getting properly cleaned up in cases where
render thread stopped before the cleanup took place.
Now we ensure that required cleanup is done before context
thread terminates.
Change-Id: I1489914dafec928eebb69bac737f6f858ff49432
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Use the same depth texture for the backwall and the surfaces. No need
to any culled texture.
Task-number: QTRD-3160
Change-Id: I7a4e8aa61b98d5264a92173174e911e50af8d52a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
|