aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.6.2' in qt/qtquick3dv6.6.26.6.2Qt Submodule Update Bot2024-02-091-4/+4
| | | | | Change-Id: Idc5b7125d4a3a5fbcaf348c27eee34af6ab58d19 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6.2' in qt/qtquick3dQt Submodule Update Bot2024-01-311-4/+4
| | | | | Change-Id: I6eeaf1b1f5fbe22094ec1bf8d196ba85da06833d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6.2' in qt/qtquick3dQt Submodule Update Bot2024-01-301-4/+4
| | | | | Change-Id: I53cd5a5f9d13970897622d53ce102e7aa6a531dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6.2' in qt/qtquick3dQt Submodule Update Bot2024-01-271-4/+4
| | | | | Change-Id: Iebf07792c0116c5fadf6e2bb529d4967233a7d44 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Detach QQuick3DWindowAttachment from QQuickWindow in destructorInho Lee2024-01-271-0/+3
| | | | | | | | | | | | | | | While loading/unloading Quick3D repeatedly, a deleted windowAttachment can be accessed through QQuickWindow. Fixes: QTBUG-120424 Fixes: QTBUG-121390 Change-Id: If53e20c2468d4a1f7656087e1d58976760db6d90 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit 45bcf958b7f937c52c9f4efa52828820b86942d5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 203e7da8ed903c8304042605d5d464f8b55ad0a6) (cherry picked from commit 7c0ba71d67d453a958da954e7810cad8c3edb0d6)
* Update dependencies on '6.6.2' in qt/qtquick3dQt Submodule Update Bot2024-01-251-4/+4
| | | | | Change-Id: I2977e5c17b2cd8e7e41b7238fa5b104b27d4345e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6.2' in qt/qtquick3dQt Submodule Update Bot2024-01-241-4/+4
| | | | | Change-Id: I2c802c9b55cdb5eab04953f417f3f270a0cbb111 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dQt Submodule Update Bot2024-01-221-4/+4
| | | | | Change-Id: Ibcdd7ed0ec60da11ea2d1393390d35bbce79aad7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dQt Submodule Update Bot2024-01-181-4/+4
| | | | | Change-Id: Ibe9ce111310d367e359f826e6e57f8711cd3fbcc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Robustify lightmapper blendLine functionKristoffer Skau2024-01-181-3/+8
| | | | | | | | | | | | | | | | | QVector2D::operator/= asserts to avoid a division by zero, this is called during the post process step in the blendLine() function. This assert seems to be triggered in some cases, so far only on MSVC. This was reproducible consistently when Model source was set to the primitive types #Cone and #Cylinder. Changed from using the QVector2D overload to doing the division manually, but only in the case where it's valid to do so, to keep the current logic and output the same. Fixes: QTBUG-120629 Change-Id: Ic15c4f2a9523b83cb4bf256016aa78a49542c82b Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> (cherry picked from commit 58dc732e6e735be927f5eba65874a409bc1492fa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 8d5a56e44cbf847b861e8ada5686c0a5827731da)
* Add warning about using the DefaultMaterial in new codeChristian Strømme2024-01-171-0/+6
| | | | | | | | | | | | | | | | | | The DefaultMaterial type was only meant as compatibility material for converting applications to QtQuick3D 5.15 from the old 3D Studio projects, this is no longer relevant, but the unfortunate naming of the DefaultMaterial stuck around, which now can easily lead users into believing that the DefaultMaterial is what they should be defaulting to. The DefaultMaterial will therefore be marked as deprecated since 6.4 and warn user to use either the SpecularGlossyMaterial or the PrincipledMaterial in new code. Pick-to: 6.5 Change-Id: I0b0c8a6acfbf76487365e49d76096a838a86280b Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> (cherry picked from commit 276fa6a01fed4c16866037fe5aece2cf5513ad5c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 84ebce4563a7f514773eb48beb2b0bf19451b7ee)
* Update dependencies on '6.6' in qt/qtquick3dQt Submodule Update Bot2024-01-171-4/+4
| | | | | Change-Id: Idb8f20c2fc815f93846943a7a39e37d1539c97ac Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Adjust normal calculation to account for backend-specific dFdy behaviorAndy Nichols2024-01-151-1/+2
| | | | | | | | | | | | This commit addresses an issue where the dFdy function operates in screen space, leading to discrepancies in Y value orientation between OpenGL and other backends (Vulkan, Metal, D3D). Originally, our normal calculation logic, designed for OpenGL, failed to accommodate the top-vs-bottom Y value differences in these backends. This update introduces a necessary correction in our code for calculating normals, especially for cases where normals aren't inherently part of the geometry. This ensures compatibility and correct functionality across all mentioned graphical backends. Fixes: QTBUG-120431 Pick-to: 6.5 Change-Id: Ia5cb23e0d959f9308559065a0733f0a7efcf602e Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> (cherry picked from commit 44386f16a1ee0bfe06cf3de55b5ffb2bccc3d225) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 7d83383e56d0d6c39b0afc1e7dbf4b136f0a8302)
* Doc: Fix example category of Virtual Assistant exampleKai Köhne2024-01-101-1/+1
| | | | | | | | Change-Id: I0db268b7a55421ed65f5213c78e793f89431decc Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit 241b6390adaeb60eb41e7ff0ca3387f98d1674ee) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit c5f9e412ec6573a30c35204c1657de7071a57734)
* cmake: fix virtual assistant examples buildSamuli Piippo2024-01-101-5/+10
| | | | | | | | | | | | Make Qt Virtual Assistant example build behave as all the other examples: - minimum CMake required is the common 3.16 - install files to common examples path Change-Id: I14a43a235ca2938df52c56b1fb5322a27be7e106 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 69daf0032fb22ebaceac507d5799754b6f5d421b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 70ed32a6ee212f33242299cb7630ea56b64d9977)
* Doc: Fix ambiguous linksAndreas Eliasson2024-01-091-2/+2
| | | | | | | | | | Fixes: QTBUG-120579 Pick-to: 6.5 Change-Id: I67841087e39079eb69dbee9e71464bf7727d0f2d Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 936121d5d46d506cb8a32b2ef98dc686bccf0ddf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit e3660fce289ea8fb326cd180ef5da9ee2a63bb19)
* Update dependencies on '6.6' in qt/qtquick3dQt Submodule Update Bot2024-01-081-4/+4
| | | | | Change-Id: Id64ecadd0c7797142bb07faaed34eacbeb96e4d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dQt Submodule Update Bot2023-12-251-4/+4
| | | | | Change-Id: Ie34b5007f70dc3d990b63102e735afb81de52179 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 3D Virtual Assistant ExampleKamil Hajdukiewicz2023-12-2037-0/+7046
| | | | | | | | | | | Introduce new example that presents interactive 3D virtual assistant model. The model animations are created using Timelines and Keyframes. Change-Id: I21853f2c071b0482d183df05f874a68f10a84173 Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit 89e00ddbd09f1fec9e981df7de66ad48d7a409e5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 6875634f1223c4dcbf512959629699e635a302a9)
* Update dependencies on '6.6' in qt/qtquick3dQt Submodule Update Bot2023-12-191-4/+4
| | | | | Change-Id: Iac56f3105160b9be88ac8aa9985ee8b361ff6759 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dQt Submodule Update Bot2023-12-081-4/+4
| | | | | Change-Id: I50e88eea00fb48eb066bfb7d862cee6186473108 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Match code snippet with supportive text descriptionAndreas Eliasson2023-12-041-1/+1
| | | | | | | | | | | | The text describes changing the rotation by 60 degrees, but the supportive code snippet says 30. Fixes: QTBUG-119373 Pick-to: 6.5 Change-Id: I4b7235bfb5aa1ba07a03c9f740a10614199f726a Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 4d3bd171faa07f6bcd5be05bca35d6dd7e4257ff) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dQt Submodule Update Bot2023-12-011-4/+4
| | | | | Change-Id: I0ccc01628fd3517ac3cc968201607f75e8f2b109 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix 'volumeraycaster' installed binaryJonas Karlsson2023-11-291-1/+3
| | | | | | | | | | | | When trying to run the installed binary the following error happened: QQmlApplicationEngine failed to load component <Unknown File>: Module "VolumetricExample" contains no type named "Main" Change-Id: I052ccddee61553dc8bb188794ba02adfbfd8149d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 2f329479eacd9bf34fb331053651b9e11b17c4cc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dQt Submodule Update Bot2023-11-271-4/+4
| | | | | Change-Id: I7115dac5be77714e59c82dc1291a9597e5109f53 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Rename 'volumetric' example to avoid name clashJonas Karlsson2023-11-2326-21/+21
| | | | | | | | Change-Id: I56890659b87803ecaf674208dd399fe562bf264d Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit e9ac53cee2f2de71ee076a9a78f4c3883e24f6a5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix some depends statements in QML modulesFabian Vogt2023-11-232-2/+2
| | | | | | | | | | DEPENDENCIES refers to module identifiers, not CMake targets. Change-Id: If5769d9ef1ff4f1e0b58939641497e0f689f50bb Pick-to: 6.5 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 30d7a5833d213cd6aa1a60be1a60b26110165c60) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dQt Submodule Update Bot2023-11-211-4/+4
| | | | | Change-Id: I551dee1d51cde8b13245d00dbb0e4a3f9ae8e75f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add volume ray casting exampleJonas Karlsson2023-11-2027-0/+2172
| | | | | | | | | Pick-to: 6.5 Change-Id: Id723be71d6bf1b2cb8b4e84a4c00e5512e6cc5f0 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 91c8c6875f9afbbb1d28a5646c08ef02ec1c58f3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump version to 6.6.2Jani Heikkinen2023-11-171-1/+1
| | | | | Change-Id: Icbcb0ff6f5ee46bea1b76b6eee8cd9183ff49039 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.6' in qt/qtquick3dQt Submodule Update Bot2023-11-171-4/+4
| | | | | Change-Id: I84ef6d392b70b475a98ab1b3b13a422c5480607c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix some particles example animationsKaj Grönholm2023-11-164-0/+5
| | | | | | | | | | | | QML animations with syntax "NumberAnimation on [x]" run automatically, while plain NumberAnimations don't. Since changes made in f7cc7656e2 we need to set these animations running. Change-Id: I4df85f96f30be7520251911d0f8702118e1cf5c1 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit ec4ce11789eaafce091893246db59bfc4e6eb4b6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix lightmapper crash when castsShadow is falseKristoffer Skau2023-11-131-1/+4
| | | | | | | | | | | | | | | If a model has a BakedLightmap that is enabled, but castsShadows is false, the lightmapper crashes because of a missing check. Only models with castsShadows set to true gets their geometry committed to the RTCScene, which is when they get assigned a geomid. This change adds the missing check. Fixes: QTBUG-118773 Pick-to: 6.5 Change-Id: Ibe440d6a5068dca453053dc2eb22a0b3d51d8542 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit b65c17ed3136e555a92ba94a2bb0f0c8cb3805fe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add shader files to examples list of filesJonas Karlsson2023-11-131-0/+1
| | | | | | | | Pick-to: 6.5 6.2 5.15 Change-Id: I5763c6bfad4641f03f6e9bec865e0f26eec7be2e Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 4a76a105be3306e98015be6b2881ecf92f91488e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix minFilter & magFilter documentationJonas Karlsson2023-11-131-4/+4
| | | | | | | | | | | The documentation was identical for both properties. Pick-to: 6.5 Change-Id: I6b27711899048f704800825f8802c6931aee4675 Reviewed-by: Inho Lee <inho.lee@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 2f78ff5eeff7a8b83b2472b9355687d63ccf137b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add license headers to the shader library snippetsChristian Strømme2023-11-1028-12/+60
| | | | | | | | Pick-to: 6.5 6.2 5.15 Change-Id: I490a4a24041d79fe9120d43d4aed7a2d990faa73 Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> (cherry picked from commit 29aa09ae62a94da037a7d06cc815738061ee8544) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dQt Submodule Update Bot2023-11-101-4/+4
| | | | | Change-Id: I86221ed70baf3c603a80ce58fef7c3fc0f259118 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Qt Quick Styling improvments to SceneEffects ExampleAndy Nichols2023-11-105-1207/+1493
| | | | | | | Change-Id: Ia35be02bb7afbdc1acb3e73b534dc8292e5f1825 Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit 98babf49a2270f68eac6f025c29d6c7b3a934fb8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dQt Submodule Update Bot2023-11-081-4/+4
| | | | | Change-Id: I26cdbc564cb08934f0538ac6993ec7aca58a20a6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update lightmapper log messages for modelKristoffer Skau2023-11-071-29/+26
| | | | | | | | | | | | | | Currently using debugObjectName which, if not set, just says QQuick3DModel in the logs. It's now updated to just use the assigned key instead, as this value is required to be unique for all models in the scene that's part of the lightmap baking. Fixes: QTBUG-118775 Pick-to: 6.5 Change-Id: Ie3933b076b34910310384d6dce5b13db06a4fdc6 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit d42f82f83df25fcf8cdff5923a2e069e0ca5691b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix export functionality in the custom material editorChristian Strømme2023-11-061-1/+1
| | | | | | | | | | | | The export functionality didn't work on windows as the path for exporting the component was not resolved correctly. Fixes: QTBUG-118806 Pick-to: 6.5 Change-Id: I050c6dad23e4bd64fdba03814d961f6e49a683a7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 1e209e583c87324ee87be4821991b43c6836d893) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix proceduraltexture example not launchingJonas Karlsson2023-11-061-1/+1
| | | | | | | | | | Error is 'Main.qml:88:17: ArrayBuffer is not a type'. Fixes: QTBUG-118659 Change-Id: Ic880699965fa8847cc64432f13ed0e990dcfecce Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit b3e937411ff8c60eded3719a1b39b160afcfc242) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dQt Submodule Update Bot2023-11-031-4/+4
| | | | | Change-Id: I87ff37b92735f3044ebcfa840fec425cf9572e0d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dQt Submodule Update Bot2023-11-021-4/+4
| | | | | Change-Id: I32b16c9060c3aed0bbeca198934c3a9257802ac3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add license headers to the shader filesChristian Strømme2023-11-0244-1/+130
| | | | | | | | | | Adds license headers to the shaders used by tests and examples Pick-to: 6.5 6.2 5.15 Change-Id: Ie7d54c31e0d3e21d214adb1d672b1c253f70a545 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 481fc40db41cc45f00580c878c6bec9c975ba441) Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* QQuick3DParticleEmitter:: Fix nullptr connectJonas Karlsson2023-11-021-3/+3
| | | | | | | | | | | | | When setting the particle for the first time m_particle is nullptr so the depthBiasChanged signal is connected to a nullptr object. This commit moves the connect so it only connect to non-nullptr particles. Pick-to: 6.5 Change-Id: Ief4e6a2cbc07b7bbce9b87e4668689f5ad8f61d1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Antti Määttä <antti.maatta@qt.io> (cherry picked from commit 551f4a84a79cc7c4beaeef0f65b5773b38acff38) Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
* Clarify the TextureInput warningLaszlo Agocs2023-11-011-1/+1
| | | | | | | | | | | | The message printed when creating a TextureInput without an ancestor that is either a CustomMaterial or an Effect is incomprehensible. Make it clear it is about a TextureInput. Pick-to: 6.5 Change-Id: I99d6de9d64497417de727f0c20b5829598ee9382 Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit 4e2138446f5316a950cc8bbdeba74193d0a4b9bc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dQt Submodule Update Bot2023-10-301-4/+4
| | | | | Change-Id: Ia7f739bd0e7032809d0573685395630fe8d2e58a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add license headers to the shader filesChristian Strømme2023-10-2735-0/+105
| | | | | | | | | | The shader files needs to contain the license header as well Pick-to: 6.5 6.2 5.15 Change-Id: Ie5f301961eef1000db7ca2959ebefdd461919bd6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 67232a0d7867d700ad7df2c3eea6520e5242cff3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Modify copyright format in qt_attribution.jsonLucie Gérard2023-10-272-4/+4
| | | | | | | | | | | Multiline copyright entries are entered via string array. Task-number: QTBUG-111873 Pick-to: 6.5 Change-Id: I385d592744471c2c0828f09ca0f85302341a5969 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 4319a9ed80c61b708695f1fae8a24019a70853f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 14:42:14 +0000