summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken link in html sidebarMats Honkamaa2019-06-261-1/+1
| | | | | Change-Id: I60c713eb3a82a2853cd35956c29633903652e115 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add Vector4 support to QML engine data input initializationv2.4.0Jari Karppinen2019-06-251-0/+44
| | | | | | | | | Task-number: QT3DS-3704 Change-Id: I18ef605f6abbf92cfa6c00957e1616e755b0aef9 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add documentation for presentation signalsMats Honkamaa2019-06-251-7/+52
| | | | | | | | | | Added documentation for the last signals missing documentation. Mainly copy and paste from Qt3D Runtime but some re-writing. Task-number: QT3DS-3562 Change-Id: I7f2c19a88921f47ea6d1ede3577595522a2c2b88 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add Q3DSStudio3D::viewerSettings() documentationMats Honkamaa2019-06-251-1/+4
| | | | | | | Task-number: QT3DS-3566 Change-Id: Ibac69008d5d8cc1f495d71cedcdc61af1aaa7bf7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Remove obsolete commentMats Honkamaa2019-06-251-2/+0
| | | | | | | | Removing todo comment which is already done. Task-number: QT3DS-3534 Change-Id: Id76547b872e1635f39a26f238e2d667c05447c59 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Add runtime build instructions to docsMats Honkamaa2019-06-2417-0/+360
| | | | | | | | Task-number: QT3DS-3691 Change-Id: Ib1239fd53f6b48963109c6e9d5b7a10e1c075795 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Fix memory leak when adding data inputs to dynamic elementsv2.4.0-rcMiikka Heikkinen2019-06-241-36/+43
| | | | | | | | | | | | | Removed dataoutput matching for datainputs when dynamic elements were added as datainput targets. Since the dataoutputs are working only on the last added element/property for each dataoutput, allowing dynamic elements to change this would break any existing bindings. Task-number: QT3DS-3690 Change-Id: I63096f9f22f137dddb5133d986537f29906cc836 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Add GPL3 license files to ogl-runtime modulePasi Keränen2019-06-242-0/+1378
| | | | | | Task-number: QT3DS-3695 Change-Id: I1ae5dfbc70ff15731c1bcbd52003433e40b1bd74 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Doc: Update OpenGL runtime project nameTopi Reinio2019-06-215-26/+24
| | | | | | | | | .qch generation fails unless the project name matches with the target directory name. Change-Id: I391c386afd253dfaf81c2a888d9f0931dff93a83 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Premultiply clear color before clearAntti Määttä2019-06-203-5/+36
| | | | | | | | | | | | The framebuffer holds premultiplied colors so the clear color must be premultiplied before clearing. Task-number: QT3DS-3689 Change-Id: I5064321d2cacd21bcf9939b7ae195804938859aa Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Add matteEnabled to viewer settingsAntti Määttä2019-06-2013-17/+91
| | | | | | | | | | | | | The flag is required to disable clearing to black in qml applications, which support transparency. Task-number: QT3DS-3689 Task-number: QT3DS-3542 Change-Id: I27b1e07a394be30f0fb4841c69555dde5697a5cf Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Fix memory leak from showRenderStatsMiikka Heikkinen2019-06-202-10/+11
| | | | | | | | | | | | Use new dynamic strings instead of registering strings to regular string table, and don't use the conversion function of the string table, as that registers the string. Task-number: QT3DS-3680 Change-Id: I930eb013538c819eac6acc06be86d287c3dfc0c9 Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Fix string type data inputs and setAttribute leaking memoryMiikka Heikkinen2019-06-206-10/+93
| | | | | | | | | | | | Two leaks were fixed: 1 - String table now uses separate storage for dynamic strings 2 - Glyph cache is deleted if not used for current frame Task-number: QT3DS-3686 Change-Id: Ib4cf2c61c5301a030039fef51b6d00b06d988c45 Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Ignore start time in time graph node if it hasn't been setJari Karppinen2019-06-191-1/+4
| | | | | | | | | | | | Animated custom materials only have the endtime attribute in .uip files. This causes the start time in time graph nodes not to be updated. The value is left as the default QT3DS_MAX_U32 which causes the element to be excluded from animation. Task-number: QT3DS-3682 Change-Id: I6eec94ea222d4d830d4e793429c37888e9f097e5 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Initial OpenGL runtime documentation structureMats Honkamaa2019-06-1933-239/+1942
| | | | | | | | | | Copied from Qt3D runtime docs with some modifications. Task-number: QT3DS-3561 Change-Id: I67fc9bc59290b34e788cf4a79676c9e04e634979 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix preload/unloadSlide component elementPathv2.4.0-beta4Antti Määttä2019-06-181-2/+4
| | | | | | | | | | | Use the existing helper to resolve elementPath to the component rather than just use the name of a child element. This way the function behaves the same as goToSlide. Change-Id: I87114071d3f8aed8d18307557dfb05b40150c94c Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Do not build distance field shaders if they are not usedAntti Määttä2019-06-172-1/+3
| | | | | | Task-number: QT3DS-3665 Change-Id: I6c826ff8d562fa7884431832ad6e6967876e2ee4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix launching viewer without having to install it during developmentMiikka Heikkinen2019-06-141-0/+3
| | | | | | | | Task-number: QT3DS-3661 Change-Id: Ida7f6850cca45eb82602dd01fe7ba477238724a8 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix assert when creating distance field meshAntti Määttä2019-06-171-2/+2
| | | | | | | | Use stack variables for entries. Task-number: QT3DS-3677 Change-Id: I6e0eb96b02904cb1e1ebec6325e7628a65b80bdc Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Exclude image instances from timegraphJanne Kangas2019-06-171-2/+8
| | | | | | | | | | Make images explicitly not participate in timegraph. Materials are assumed to exist always so start/end time is not relevant, but default values still overrode parent start/end times. Change-Id: I38a593bfb4383195965a3aa09df9f53accb4d045 Task-id: QT3DS-3669 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix component visibility changeAntti Määttä2019-06-171-2/+11
| | | | | | | | | | We also need to update the parent time context when component becomes active. Task-number: QT3DS-3656 Change-Id: I9c2872561b950dc2b1ea215148399083ca6f8844 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix eyeball using setAttributeAntti Määttä2019-06-175-39/+47
| | | | | | | | | | | Do not create dynamic property for the eyeball, but use the explicit set flag instead, which is also used by the slide system. Task-number: QT3DS-3655 Change-Id: I9390c8a9b8b20a55596b948d394a74aa66da98c6 Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Dynamic element creation exampleJari Karppinen2019-06-1716-1/+3850
| | | | | | | | Task-number: QT3DS-3621 Change-Id: I5e842fa7b26b484d2a0981f0236a2fac4d92ec06 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove reloadable texture callback when deleting materialMiikka Heikkinen2019-06-131-0/+4
| | | | | | | | | | | | | | | Callbacks would accumulate over time, leading to a memory leak and probably inefficiency as well, as unnecessary callbacks would be called. Task-number: QT3DS-3632 Change-Id: Ide6854e50df5eb9d4dfb9b61424f2922d99b85bf Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Add Q3DSGeometry documentationMiikka Heikkinen2019-06-131-0/+212
| | | | | | | | | | | Task-number: QT3DS-3615 Change-Id: If742735c28ab07426819951620c571f59fe17a76 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove datainput control bindings from map on deleteElementJanne Kangas2019-06-143-1/+37
| | | | | | | | | | | Update internal datainput control map when dynamically created elements are deleted. This avoids leaving invalid entries to performance-critical map lookups. Also fix typo in test code. Change-Id: I2b6490bf6de607d303fe0f94496b5b0cfff4c463 Task-id: QT3DS-3635 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove duplicate documentation from datainputJanne Kangas2019-06-141-44/+27
| | | | | | | Change-Id: Ie23dbee91d129a983d7bfd2700a5fa5a851be641 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Update EASTL submoduleMiikka Heikkinen2019-06-141-0/+0
| | | | | | Change-Id: Id04757205724abc3aa49ff15be2908fd2a469df6 Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Enable QNX in CIPasi Keränen2019-06-141-4/+1
| | | | | | | Task-number: QT3DS-3652 Change-Id: I72629a4d0eaf64c48ad5d00185ec35f824040db3 Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix integrity dir checkv2.4.0-beta3Antti Määttä2019-06-121-2/+4
| | | | | | Change-Id: Id9d1138530e12f6c3ceb80ae7acd7957aa8abf7b Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
* Fix regex in ogl-runtime target check for INTEGRITY_DIRJari Karppinen2019-06-122-3/+5
| | | | | | | Also temporarily disable tests. Change-Id: I5abd1702542368fda81a683326816b9fe2cd16ff Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Recycle autogenerated ids when creating new elementsMiikka Heikkinen2019-06-112-13/+74
| | | | | | | | | | | This will significantly reduce the stringtable bloat when creating and deleting elements. Task-number: QT3DS-3637 Change-Id: Iadca2c186ec6c144f528705669fc998b1cef669b Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Move autotests into ogl-runtime repositoryKaj Grönholm2019-06-1196-14/+13186
| | | | | | | | | | | | Move all autotests into ogl-runtime as they are testing runtime and not qt3dstudio. Adjust to build on new structure, but keep tests disabled by default until making sure CI can build & run them. Task-number: QT3DS-3627 Change-Id: I8abb87424ee5d89d05017235cdf15bd6c0f6d490 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Fix editor build on mingwAntti Määttä2019-06-117-27/+38
| | | | | | Task-number: QT3DS-3659 Change-Id: Ie3f4f9fd6712f858942e9c294a49af2b561bbd77 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add .gitignore fileMiikka Heikkinen2019-06-111-0/+21
| | | | | Change-Id: I5d28085ef2b37d0fc5c98f64c036bd2fcbfaa689 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix kria-cluster-demo slowness with delayed loadingAntti Määttä2019-06-111-2/+6
| | | | | | | | | Empty load sets after they have began processing. Task-number: QT3DS-3662 Change-Id: Ic73f062f65500b8d1f349d98376fb1d22e32b06b Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make datainput metadata keys constant Q_PROPERTYJanne Kangas2019-06-113-13/+15
| | | | | | | | | | Remove invokable datainputKeys and make it a datainput property instead. In OpenGL RT this is a constant property as metadata is read-only property. Also update qmldatainput example. Change-Id: Ic9037f831b4072481ad5b2fac78ecc68db6808b2 Task-id: QT3DS-3625 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Pass QML engine to stream proxyJari Karppinen2019-06-111-1/+3
| | | | | | | | | | | QML stream proxy creates a new QML engine if it has not been set one. This loses QML import paths that have been added on startup, and breaks QML imports in QML streams. Task-number: QT3DS-3597 Change-Id: I13def4b6f0f9078d9d63eb0010f0a50ce4dac7ce Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Only disable Integrity 11.44 targetPasi Keränen2019-06-111-12/+4
| | | | | | | | | Integrity 11.44 is 32-bit and has too old compiler for ogl-runtime to support. As it's default target in Qt CI it needs to be hand picked and exluded. Task-number: QT3DS-3645 Change-Id: I689a670e986acd3cb2614071ebe12ecff6a53141 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Align configure.json's module name with sync.profilePasi Keränen2019-06-101-1/+1
| | | | | | Task-number: QT3DS-3654 Change-Id: Ifa9f6129ba4010f73996ebae40968b1e23082de5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove commonplatform.pri inclusion from qt3dstudioPasi Keränen2019-06-101-5/+0
| | | | | | | | | Including commonplatform.pri from qt3dstudio when building as part of it makes the configuration needlessly complex. Task-number: QT3DS-3654 Change-Id: Iefdd93f1fe0c87188f589ca0404b9277bdcfb563 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Long live the slayer!Pasi Keränen2019-06-071465-0/+317085
| | | | | | | | | | Initial commit of OpenGL Runtime to repository. Based on SHA1 61823aaccc6510699a54b34a2fe3f7523dab3b4e of qt3dstudio repository. Task-number: QT3DS-3600 Change-Id: Iaeb80237399f0e5656a19ebec9d1ab3a681d8832 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Initial empty repositoryJukka Jokiniva2019-05-210-0/+0