| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/render/backend/cameralens.cpp
src/render/backend/cameralens_p.h
src/render/jobs/pickboundingvolumejob.cpp
src/render/jobs/updatelevelofdetailjob.cpp
Change-Id: I5433dde8ace462d11f037742d45f555c87235ffe
|
| |
| |
| |
| |
| |
| |
| |
| | |
Bonus: also remove the binding loop on the matrix property that was being
reported.
Change-Id: I2489a1f7ac5f65b4061ce069796d5afeab1811de
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
| |
| |
| |
| |
| | |
Change-Id: I42d0091368914e0f3f8cb76c707d576227d7b5f2
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
| |
| |
| |
| |
| | |
Change-Id: I3e276e8cd7d754905ed41a80ace19b72eb50175f
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Remove extra QString(...) it's already a QString here. And use const'ref
Change-Id: Ia58cd3046b3b13ec52e196d93cba00fc2384a083
Reviewed-by: Andy Maloney <asmaloney@gmail.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Phong lighting now takes alpha into account to set this to 1.
Also add an explicit point light and properly use ambient and diffuse
components.
Change-Id: I252004c1a22bc3f43a527f79feef310b23279863
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This one reconfigures its graph layers and render states properly based
on it properties. As such it covers all the features coming from the
various phong materials we had in the past. That's why they are all
marked as deprecated.
Change-Id: I9a74639d4cff5170b496d475c8a74b1e4e163b03
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
src/render/backend/renderview.cpp
src/render/backend/renderview_p.h
Change-Id: I6c1122632f2c481da31a63e3abd42b760d1ff211
|
| |
| |
| |
| |
| |
| |
| | |
Use new version with commercial exception.
Change-Id: I09809579db277135edce1c6c1938ac3915600e11
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Swap ambient and diffuse colors in the logo material.
Task-number: QTBUG-63821
Change-Id: Ieecd08ac3845d6864f1da84817bae63685a37612
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ib412be382830b13d65167c36a6c2d918878504fa
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Makes it cleaner overall since the light structs were shared with the
metalrough includes and the gooch fragment shader but they didn't use
the functions in there.
Change-Id: I459ff0fc2d751a5be9296dc33dda0efcb06b917c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| | |
This way the use is more similar to the one for metal/rough.
Change-Id: I143df910f43e29ef622f24bd97a23c90a2c8ef68
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
All materials and examples are ported away from it. It was really not
related to normal mapping at all, somehow it was an implementation of
adsModel working in tangent space instead of world space.
Now we got it all in world space, just like for the metal/rough
implementation.
Change-Id: I3346277ce9b91328d70d914b319ac25f947fff0e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| | |
Change-Id: Idcbb8a42658c6525f852e2f226ce816d779ee9c7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-62321
Change-Id: I1df375c9a6a72049584eee118613bca72958e4f0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ife2a5c1906e9a66858fa1bf5b8a5bcff3cb61feb
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |
| |
| |
| |
| | |
Change-Id: I904e3f41a44dd549334c884c2dc96ff6fb928a45
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This allows to remove dependencies and reduce deployment size when a given
aspect is not required.
Change-Id: I5aa90e4825b375cd446c47727aa11d03c40703c9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|\ \ |
|
| |\|
| | |
| | |
| | | |
Change-Id: I4ceccd338a937a2ada231f568ed02c7a87bd6e80
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I9079849c54deffbb15449d042ec0440e795c305b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|/ /
| |
| |
| |
| |
| |
| | |
It's likely more accurate and may well be optimised, too.
Change-Id: Iba38b80be16ca97a5f818e3dbc880a821cd9900a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Use qmath.h's value for M_PI in shaders, rather than a value less
precise than even float holds.
Task-number: QTBUG-58083
Change-Id: I3cf30a0900216b1d7d6dc54d4c5676592ba503a0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
| |
Adds QCamera::viewAll(), QCamera::viewEntity() and QCamera::viewSphere()
to move and rotate the camera so that the view center is the center
of the sphere and the sphere fits inside the viewport
Only works in perspective projection.
Introduces a job to compute the bounding sphere of the scene
excluding the camera.
Change-Id: Id9d67787ea91c354009d5358d5db63a1c9480c70
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The texture files used were from a third party that didn't explicitly
allow their distribution. All of them have been replaced by textures
from NASA and another third party that do allow their distribution
and editing.
Task-number: QTBUG-57543
Change-Id: I69f1309424bba029cdce08689ea8670ed32d44ae
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
| |
Also add it to highlighted items.
Task-number: QTBUG-60287
Change-Id: I87a6074bed171970b287c6cd934e6550d86e27e0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
| |
Change-Id: Ibc78cc120ceed26c8521fa116e1794500b47c2dd
Task-number: QTBUG-60695
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
The setSurfaceFormat function calls QOpenGLContext::openGLModuleType
function which can only be called after QQuiApplication istance is
initiated.
Task-number: QTBUG-60617
Change-Id: I7cbf48f325de9c3cbbb5d8addb78bf55ae1b5d07
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
|
|
|
| |
Change-Id: I2d47b9224e4f26b342cd8a9bbe3c9c5a5e410dc1
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
|
|
|
|
|
| |
Change-Id: Ife2ead8fc2f0e0cb6dea18f8a74593847e25ff98
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-60287
Change-Id: Id167ddd190b7aa5468bc6590c9f9f4fea234430b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
| |
Rendered content has changed so change the example image to reflect that.
Task-number: QTBUG-60287
Change-Id: I5d06ed980ffddfec150b7e3914a79fb4c597cf73
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-60288
Change-Id: I320f787c3b245cc52df80d89c75f856aeacf649d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
| |
Change-Id: I9a4f1882805892248aa9f6a4cf8d83a49acaeb0b
Task-number: QTBUG-60288
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
|
|
|
|
|
|
| |
Change-Id: Ie55724be1872f98660093b0fd5cea54d7e0eae11
Task-number: QTBUG-60289
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
|
|
|
|
|
| |
Change-Id: I05b9965f93f2a0e5e4c8a4e38e4f52dce1fa2f3d
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
|
|
|
|
|
| |
Use BSD for all sources, and FDL for all documentation files.
Change-Id: Ifce7284d10947b4948be6ecf44fe3ff8be30f7f7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
| |
Shares the QML files with the scene3d example.
Task-number: QTBUG-52132
Change-Id: I076284b66a8dfdc3308171f11528851a7e20bbce
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: Ia71dcd616bc66e128250ae17a0ece7c9669209b7
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
|
|
|
|
|
| |
Change-Id: If98fe65a863ee09e82053ada70c1b19d26d8e1f4
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: Ia1a706888ca3bb1eedcac34903afe7da0c168462
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I6c5ae0e29960aaab2d0babfe325a9f6483729600
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
| |
Change-Id: I57ea393e3abc5de2230f464d612d36a8075fa979
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: Iee998ffe7ddb67a03ed260db053f541e0138b837
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
|
|
|
|
|
|
|
|
| |
Found this when building for iOS using a custom build
without widgets.
Change-Id: If50e2d388aafacf9f8b3cfea20752c790e1fbc1d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
| |
Command '\snippet (//! [2])' failed at end of file 'planets-qml/PlanetsMain.qml'
Change-Id: If30a8123aad2631de22731e5bbd51871166063c8
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
-rename QText3DGeometry to QExtrudedTextGeometry
-rename QText3DMesh to QExtrudedTextMesh
-rename the depth property to extrusionLength
-removed the edgeSplitAngle property
-updated the example
Task-number: QTBUG-58880
Change-Id: Ib2d1a58e62b34949db12b9245f1474baf9cf9b91
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
-rename barriertypes to waitOperation
-in QML introduce a waitFor property
-remove the Barrier suffix for the enum values
-rename BarrierType to Operation
Task-number: QTBUG-58878
Change-Id: Idc65f44b09e632509cd74286de26fea02e6b6dee
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/core/nodes/qnode.cpp
Change-Id: Id989bec6c54eee94651906d44ece752c10b7d0d1
|