| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
will get updated in Qt3DWindow::resizeEvent()
Task-number: QTBUG-58327
Change-Id: I9464ba193a225af17cc4638902d0c68e82640d41
Reviewed-by: Guillermo A. Amaral <gamaral@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Could be useful to have it around in an example still, so that people
get an idea on how to make their own framegraph in QML from scratch.
Some other examples have QML framegraphs too, but this one is simpler.
Change-Id: I9065af920b1233d3f06cfee71c59afe98359cb7e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We remove the qml implementation of materials in extras that were also
implemented in C++. Note this is an API change for the materials having
texture properties. The QML ones had mistakenly a string property
instead of a texture one. This move also fixes this API issue on the QML
end.
Change-Id: Ibed14288cd7b8c5ab9615b74b949c6a73ac29329
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| | |
Make the synchronization explicit rather than relying on luck.
Change-Id: I4291fd70701e784c70b3ad6d178d6fc9cc4ce0a5
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/sceneparsers/gltf/gltfio.cpp
src/render/io/objloader.cpp
Change-Id: I094c9310d56657ab19b4722b946c60d8cb490191
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-58057
Change-Id: Id078ad5f83a627112718a51ba85c5789bcae718d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Allows to extrude a 3D mesh from a text string
- Added 3d-text example
Triangulation fixes provided by Remi Faitout
Task-number: QTBUG-19234
Change-Id: I767ffa11092d30945e3fc19f90f72a5965f5a776
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/render/render.pro
Change-Id: I3d0463dabae4fc78f334afc8f90d2d321ab71e03
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/input/backend/updateaxisactionjob.cpp
src/render/renderstates/qalphacoverage.cpp
src/render/renderstates/qclipplane.cpp
src/render/renderstates/qdithering.cpp
src/render/renderstates/qseamlesscubemap.cpp
src/render/renderstates/qstenciltest.cpp
Change-Id: I5b279d30bbbb06af5e8ee9fc47e9794b78a567f5
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
deferred-renderer-cpp example has been moved under tests/manual/,
but old example was not completely removed.
Task-number: QTBUG-55659
Change-Id: Ic8e934092879b05c4e04c5f70f0f3632cc8c3ec3
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The mirror property on QTextureImage should now be used instead. This was a
temporarily fix for 5.7.
This reverts commit 5dc4c77408ff040dc4a50c3837f4b2a29e927cb8.
Change-Id: Id98d139a747669b722ff8a1185659015808960a8
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
assimpio.cpp:72: warning: Can't link to 'GLTFPIO'
qpicktriangleevent.cpp:66: warning: Can't link to 'QPickSettings'
qpicktriangleevent.cpp:76: warning: Can't link to 'PickSettings'
shadow-map-qml.qdoc:28: warning: Can't link to 'RendererSettings'
shadow-map-qml.qdoc:28: warning: Can't link to 'Techniques'
Change-Id: I039a4134d18e2b2472554215a69e971650b29b64
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I68a5e66f04403991288937cf239bb4c5f4321367
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This allows to see in a web browser that a command succeeded,
for example, rather than reporting that the server dropped the
connection.
Change-Id: Ib6d34f8261112dd8c76d13dece542a6da229de03
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I937f8ff83565f48da5d35055add794c607bb52e4
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|/ /
| |
| |
| |
| | |
Change-Id: I254cbc1643fcb5b67af8338c0b7adc8c25829f9d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/input/input.pro
Change-Id: I591202f144aeec915e18611dfce358d4f15faff6
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Due to 44f1a92338859f1cc043ec22e0142037b5f87936 we need to correct
the orientation of the textures applied to the plane meshes in this
example. There is a variety of ways to do this including:
* Adapting the texture coordinates
* Rotate plane other direction about x axis and swap face culling mode
* Flip textures on disk
This patch goes for the 3rd option. This can be reverted in 5.8 when we
get new API to control whether texture images are flipped upon loading.
None of these are ideal but is an intermediate step in getting to a
fully consistent usage with 5.8. This follows the same approach as was
used with the anaglph-rendering example skybox textures.
Change-Id: I7fda41204625d7b30ac295ef789b6dea6018c2b8
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Mika Salmela <mika.salmela@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ia5a7dfb860317b3fa4b5a56ad6e9351ddb979b3b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/render/framegraph/qrendersurfaceselector.cpp
src/render/frontend/qrendersettings.cpp
src/render/jobs/renderviewjobutils_p.h
tests/auto/render/render.pro
Change-Id: Ibe9eb962e3990e07f01a5608a2d60c79bc4c160f
|
| |
| |
| |
| |
| | |
Change-Id: I64f815587947ad2f63462bb38027c533c7aa4bdc
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |
| |
| |
| |
| | |
Change-Id: Idf3c40274ff60ff3c856c2e61a0d782a916e0e19
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
| |
If we convert a mat4 matrix to a mat3 matrix, then back to a mat4, this
removes the translation component from it. Making the skybox shaders use that
property allows to remove references to the camera translation in
QSkyboxEntity.
This makes using a skybox neater as we don't need to care about the Camera
position anymore. This also allows to render the same skybox with different
cameras which required to have duplicate QSkyboxEntity previously.
Change-Id: I1adddd17d151e4d26d0f19b048df88dbf738042b
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
For coherency with other function names. This kind of API change is allowed
since Qt3DWindow is in the Extras module which is still in tech preview for
5.7
Change-Id: Ic67f96cfb2dfcb3b2d724c97f2cf472bfaf40a07
Task-number: QTBUG-54841
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
As a result of 44f1a92338859f1cc043ec22e0142037b5f87936 the cubemap
texture images get mirrored. As we cannot add the api to control this
until Qt 5.8, for now we temporarily mirror the textures on disk. We
should revert this in 5.8 once the mirrored property is in.
Task-number: QTBUG-54881
Change-Id: I675f4dc1576e076c63f8c592cdbc51707afb4cb7
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
Since vec3-vec4 padding is not always correctly implemented in all OpenGL GPU
implementations, use vec4 in the struct declaration.
Also slightly improve readibility of the buffer construction code.
Change-Id: I9dfbeb2bcdc0a713e1e0a872f6a5e8cfe50c52a3
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Looks like QML doesn't like animating only a single element of a 3d
vector. It seems to default the non-animating elements to 0. Instead
use a Vector3DAnimation.
Also added another animation to the transformation to make the
spotlight move back and forth in addition to sweeping it's local
direction angle.
Change-Id: Ief490752107b2b618dcf8500cb87561b3baea0bb
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: I51d8068d9f910981db89fc26e4bd29b928faad56
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
| |
Useful for testing more of the lighting shader code paths.
Change-Id: Iae1403bbe8562cfc8a0d22784069080a421153f5
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: I88344e2eabeb4a9598338d50b4a1874aeed6d522
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
| |
Without this change Qt Creator tags this example "broken"
and hides it from the Examples tab in the Welcome mode.
Change-Id: I276ddb3ea50f05695a6afa7fa34de682bdc944c2
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
| |
Without this change Qt Creator tags this example "broken"
and hides it from the Examples tab in the Welcome mode.
Change-Id: I4f0faa6b18c3f1ec2de673e3f6ced7e23b46c094
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
| |
Without this fix, Qt Creator tags the example as "broken"
and hides it in the Examples tag in the Welcome screen.
Change-Id: Ifebc926b17a7161abb49c61a2369f8c485532156
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
| |
- Add a brief (needed by Qt Creator)
- Add an image (needed by Qt Creator)
- Add a standard include file about building and running
examples
- Copy instructions from the rendering overview (as applicable)
Change-Id: I5342a7ad644acf97ecd247d47725d5978e5c6fb4
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Without this fix, Qt Creator tags these examples "broken"
and hides them in the Examples tab in the Welcome mode.
More documentation should be added later.
Change-Id: Iddfb78a8df30e38482e89e7a9ac87a5ef83966a3
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
| |
Without this fix, Qt Creator tags the example "broken"
and hides it in the Examples tag in the Welcome mode.
Change-Id: I96916d11327e066be10b15422d944d805a2ed988
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
| |
Change-Id: Icc1e688ffb44431841054324fddecb2b6402d94b
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* The shadow light was using the undefined matrix property which
resulted in a matrix full of NaN's in the shader. This caused
everything to be fully in shadows for the inner planets. Fixed
to use the correct viewMatrix property.
* After fixing the above, it became clear that the inner planets
were being shadowed with lots of artifacts. The only shadow
casters are the planets Saturn and Uranus and their rings. In
this configuration it makes no sense to try to shadow the other
planets as this leads to bad shadow acne due to the huge
distances involved vs the limited precision of the shadow
depth texture. Fixed these artifacts by only applying shadows
to Saturn and Uranus.
Task-number: QTBUG-53751
Change-Id: I96ab08117c9988c40f083a1345ec7f7d1b0f7ce6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
| |
Also removed duplicate code and made some rearrangements in entities.
Change-Id: I7f588672a1694fc440318f66bcfbe33d5ebcf0ab
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
| |
In the absence of the ParameterMapper type (removed) we need to
directly specify the correct uniform names.
Task-number: QTBUG-53737
Change-Id: I678ac6f5fab968ee2105f45c8e2d9db66da78293
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: I4ded0d2497175648b16dd95337826138c362ec26
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I3a79b809477c27b13f25fb579beef3d6fc4c856f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: Ibcdbf91fc35659c21346147462b426f16b6f376e
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
|
|\
| |
| |
| | |
Change-Id: Ie0fc178d3c0f818ea32aac0e98c97861d4c0f671
|
| |
| |
| |
| |
| | |
Change-Id: Ib5819aa0f90bbb418fce29ff91a29969fd69c682
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |
| |
| |
| |
| |
| |
| | |
Part of an examples cleanup
Change-Id: I1abf679795f7cdc23922880e598a742e58d9aa0a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| | |
Part of an examples cleanup
Change-Id: Iaa7fd720fd4f16e15186d529cde32991e50a559d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| | |
Part of an examples cleanup
Change-Id: I44b7a843a7b32ef03857df9b19fde71d990785d8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| | |
Part of an examples cleanup
Change-Id: Ie142144a848bfec271fa9a0779e07a022fe79911
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| | |
Part of an examples cleanup
Change-Id: I80f5927b91a31f86ac92cf357604783948c34a30
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|