summaryrefslogtreecommitdiffstats
path: root/src/Viewer
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '2.1' into masterMiikka Heikkinen2018-09-2533-3576/+6
|\ | | | | | | Change-Id: Idfecbefcf5c1e279093f250a4a46d57f2a518d25
| * Switch on QMetaTypes instead of QVariant enumsJanne Kangas2018-09-101-5/+5
| | | | | | | | | | | | | | | | | | | | Silence compiler warnings by switching on QMetaTypes to avoid mixing QVariant and QMetaType enums. Task-ID: QT3DS-2293 Change-Id: Ibfe2fe794339711a7d57f33b17cb7dd403da8999 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Remove legacy viewerTomi Korpipaa2018-09-1032-3571/+1
| | | | | | | | | | | | Task-number: QT3DS-2291 Change-Id: I0a11dfc1d69e4844e67476b60bc40da99c6ad12a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Fix Android buildTomi Korpipaa2018-09-191-4/+0
|/ | | | | | | | | Remove other obsolete files at the same time. Task-number: QT3DS-2361 Change-Id: I5c8178d071aff212c46e50c5660af723197184bb Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove binary compiler and binary format handlingTomi Korpipaa2018-03-072-8/+5
| | | | | | Task-number: QT3DS-907 Change-Id: Id278db9a0179424f2d86d4ba9e91f76ebef41b46 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix qmlstreamer in rc2Määttä Antti2018-02-231-4/+2
| | | | | | | | | Remove duplicate import path. Task-number: QT3DS-1212 Change-Id: Iab288fa848e801de15b99187410409034f73f0a1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Fix remote deployment for main uipTomi Korpipaa2018-02-231-3/+15
| | | | | | Task-number: QT3DS-1194 Change-Id: I75c6fca664bfc43da400ec25bda201d5cb9a487a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix Qt3DViewer standalone buildTomi Korpipaa2018-02-065-4/+23
| | | | | | | Standalone build is needed to create Android apks, for example. Change-Id: I344fcf54e079375166861da4f6eb865f19095065 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Improve connection logic in viewerMiikka Heikkinen2018-02-065-12/+92
| | | | | | | | | | It is now more clear what is going on with the remote connection. Task-number: QT3DS-955 Change-Id: I687575589f734f6b355ee72c5dea74dd7d41ba1e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Treat all DataInput value sets as changesMiikka Heikkinen2018-02-021-4/+7
| | | | | | | | | | | Since the local value doesn't accurately reflect the actual value of the controlled value in the presentation, we treat all value sets on DataInputs as value changes and act accordingly. Change-Id: I96adc255263a5523fe951e0a4d67c51d6f0a7043 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Need to mark the next frame dirty otherwise we skip frames at startAdam Treat2018-02-021-0/+1
| | | | | | Task-number: QT3DS-878 Change-Id: Ia8bbe69e402b7d8000f672b9f6d890d07b3ac6f8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix missing initial value of DataInput qml elementMiikka Heikkinen2018-01-263-12/+19
| | | | | | | Change-Id: Ied050b032014ed311ceeb0e44da65e80872eef3b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Don't attempt to restore viewer window geometry to offscreen positionMiikka Heikkinen2018-01-261-1/+9
| | | | | | | | | Task-number: QT3DS-861 Change-Id: I58a7327e3204f26eaeb7eb04bb99de2f3d8cbf57 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add QML type and C++ class for data inputMiikka Heikkinen2018-01-2613-11/+421
| | | | | | | | QML type is DataInput. C++ class is Q3DSDataInput. Task-number: QT3DS-387 Change-Id: I7f871ae3e1149adee7859fdb8f844e8f90837264 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add new revision for Studio3D importTomi Korpipaa2018-01-251-0/+3
| | | | | | Task-number: QT3DS-414 Change-Id: I2ae42c5c32eaa70ea6b2b3be67c560ab4b587bed Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add presentationReady signal to Studio3DTomi Korpipaa2018-01-254-0/+8
| | | | | | | | | | | | The running property does not work if presentation is not visible, and neither does the Component.onCompleted for the Presentation element. This signal allows showing splashscreens while getting things ready. Task-number: QT3DS-414 Change-Id: Id6c633cc9d5def5375d85e8a11eb23f6b8b69aff Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Startup Viewer in connection mode by defaultMiikka Heikkinen2018-01-233-3/+8
| | | | | | | | | | Also fixes a couple of usability bugs related to IP entry 'dialog': - IP entry buttons now respond to mouse - Port is updated properly when accepting via mouse click Task-number: QT3DS-814 Change-Id: I7694fc2e3ef3e8f4673e4ea2bdfe389f23112362 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix viewer hotkeysMiikka Heikkinen2018-01-221-5/+24
| | | | | | | | | Related documentation was also fixed. Task-number: QT3DS-813 Change-Id: I387fd6c0eed7f11881dbfb55d87a61bc507c5127 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix viewer application on OpenGL Mesa systems on linux for instanceAdam Treat2018-01-221-0/+57
| | | | | | | | | This takes inspiration from very similar code in the new qt3d-runtime to fix finding a good surface format for linux based mesa systems. Change-Id: Ica2e6e1af171ddea8bb93e7dac2722e76958ed83 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add frameUpdated signal to surfaceviewerMäättä Antti2018-01-032-0/+3
| | | | | | | This enables benchmarking using the surface viewer. Change-Id: I2fcbde8e452307facff5f2db7b2f814987b73aa5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove obsolete Viewer.rcMiikka Heikkinen2018-01-021-54/+0
| | | | | Change-Id: Ic92d301d908224ee75793833a4d72757e40d7a7f Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix viewer commandline documentationMiikka Heikkinen2018-01-021-1/+1
| | | | | | Change-Id: I2acebd7ae9825d27c796c2a2a3425ec6105de760 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add more viewer command line parametersMiikka Heikkinen2017-12-153-36/+57
| | | | | | | | | | Added parameters for setting matte color, render stats, and scale mode. Task-number: QT3DS-701 Change-Id: I989c8fe63c402b7c59090b0e54a70110daf59b38 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Don't clear initial command queue on successful initializationMiikka Heikkinen2017-12-151-1/+2
| | | | | | Change-Id: Ifd6e60181a07feaa3454e44b1616e06c524b7ab1 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Ensure qml stream proxy gets created in main thread1.0Miikka Heikkinen2017-12-141-0/+3
| | | | | | | | | | Otherwise this will crash when trying to view presentations with qml streams in them when no sub-presentation settings have been set. Change-Id: I490eacc0669a4c68eef1c4d00de7da8593c353f7 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Remove widgets from viewerMiikka Heikkinen2017-12-1425-1299/+1570
| | | | | | | | | | | | | Also includes other improvements to viewer application. Task-number: QT3DS-75 Task-number: QT3DS-687 Task-number: QT3DS-689 Change-Id: I6a5054b4b821d652f536f2c7eaa1bb4c508250c3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix endless initialization loop when opening invalid presentationMiikka Heikkinen2017-12-141-0/+1
| | | | | | | | Command queue was never cleared if initialization failed, so source was always considered changed. Change-Id: I1ed85b85ab1031820c44ea672776110cc1b1a09d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix a number of documentation issuesTopi Reinio2017-12-051-4/+1
| | | | | | | | | | | | | | | | | | | | - Fix wrong version; docs pick up the MODULE_VERSION from qmake.conf. - Fix license documentation; qtattributionsscanner outputs to doc/, so 'sourcedirs' in qt3dstudio-project.qdocconf needs to include the root doc directory. - Remove doc build from src/Viewer/qmlviewer; this caused the documentation to be built twice. - Fix 'examplesinstallpath'. - Add sidebar (qt5-sidebar.html) with quick TOC links to online docs. Change-Id: Iafa9bee6cf34843d1355d3106adb1a3602fb61a5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add svg icons for viewer and studioTomi Korpipaa2017-12-041-0/+38
| | | | | | Task-number: QT3DS-627 Change-Id: If5122c62b27f6f240120679835b269df006c8b95 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make sure queued commands are not lost before processingv1.0.0Miikka Heikkinen2017-11-292-18/+23
| | | | | | | | | | | | | Sometimes synchronize would come twice before commands were processed, typically in cases where studio runtime's animation timer triggered the drawing rather than QML update. The second synchronize would overwrite command queue. Now synchronize only appends to command queue and it is cleared only when it is processed. Task-number: QT3DS-580 Change-Id: I252f89f76bc428eb5e0d577f20a2500b2a19f520 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix incorrect warning about duplicate ElementMiikka Heikkinen2017-11-291-15/+17
| | | | | | | | | Task-number: QT3DS-579 Change-Id: I82b0c90487edc9afdfd7b9559144d06d6d24e75c Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix viewer examples for macOSTomi Korpipää2017-11-291-11/+8
| | | | | | | | | Also update the surface format of all macOS viewers to 4.1. Task-number: QT3DS-581 Change-Id: I642bc9a145b225dd3ac71e6c66dbf8d096d4e538 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Fix connect dialog cancel functionalityTomi Korpipaa2017-11-213-1/+13
| | | | | | Task-number: QT3DS-498 Change-Id: I77c7bcd1c866527e79707d5d32833232cdc7656d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add application icons for macOSTomi Korpipää2017-11-162-0/+2
| | | | | | Task-number: QT3DS-454 Change-Id: I4e3c172d485f5ee9a8c07ce8a9023021582ae325 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix running property being false when signal is emittedMäättä Antti2017-11-091-1/+1
| | | | | | Task-number: QT3DS-412 Change-Id: I9f817e1110760e962eb7aadde295d75995e327eb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add QNX runtime buildJanne Koskinen2017-11-061-1/+1
| | | | | | | | Source and compiler options selection. Change-Id: I73e08cd49e898b7320626670b009a8b41655f3b9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix namespace buildJanne Koskinen2017-11-031-2/+6
| | | | | | | Fix build when configured with -qtnamespace Change-Id: Ie8509891872b6034d57f1fc6e09b24de969e7dcb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Android build fix for image sequence generatorTomi Korpipaa2017-11-022-0/+3
| | | | | Change-Id: I071b1aaa416fcbc799489b7e13d1f898e99cfd0b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Properly notify user when presentation file is invalid for sequenceMiikka Heikkinen2017-11-013-5/+23
| | | | | Change-Id: If0a9a4c5b51c9f17385823e5f3284543617c0b90 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix crash when loading corrupted uip with viewerMiikka Heikkinen2017-10-306-5/+84
| | | | | | | | | | | Also show an error message on viewer UI Task-number: QT3DS-198 Change-Id: I3e537876b31e3f9df13e4f6686f64fe29d0655d0 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Optimize the remote deployAdam Treat2017-10-254-14/+41
| | | | | | | | | | Only send files that have changed since the last update and fix some issues with state changes on reload. Task-number: QT3DS-30 Change-Id: I5ba73cedd1a4a279808c4949284eddc98fe4fb0f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename the rest of the UIC to Qt3DSMäättä Antti2017-10-243-3/+3
| | | | | | Task-number: QT3DS-18 Change-Id: Ia8141980f575565ee7dbfa33422f25f121da5fe1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename some types from UIC to Qt3DSMäättä Antti2017-10-2415-37/+37
| | | | | | Task-number: QT3DS-18 Change-Id: Icdfaeaced4aaffdd4b4500e75bba8b100998e709 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename UIC files to Qt3DS filesMäättä Antti2017-10-2412-13/+13
| | | | | | Task-number: QT3DS-18 Change-Id: Id29fa8761de5694bcca394df7be8448a23d901b9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Replace uic namespace with qt3ds namespaceMäättä Antti2017-10-243-4/+4
| | | | | | Task-number: QT3DS-18 Change-Id: I3a39265bb47930e4f4924aab4b098a40f15c5b0a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Create output path when generating image sequenceMiikka Heikkinen2017-10-196-28/+101
| | | | | | | | | | Now creates the output path if it doesn't exist Also, the UI is bit more informative. Task-number: BOUL-434 Change-Id: Id8287cdfa15972bda0c69024931b97949d5c2222 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update application and some other iconsTomi Korpipaa2017-10-198-3/+4
| | | | | | | Task-number: BOUL-711 Change-Id: Idcdbb723f03c4329df9efd752360e9e1958ef9b9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Move the rest of image resources to images folderTomi Korpipaa2017-10-182-5/+5
| | | | | | | | Unused images are deleted. Task-number: BOUL-711 Change-Id: I2e1eebc315354400d3966509bc3c7e18c39ff202 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Generate image sequences with Qt3DViewer with command line optionsMiikka Heikkinen2017-10-178-42/+541
| | | | | | | | | | | | | Added a new private class Q3DSImageSequenceGenerator to studio3d module. It will asynchronously generate an image sequence from a presentation. Added command line interface to Qt3DViewer to generate sequences. Task-number: BOUL-434 Change-Id: I01b5202477acaa2ac7a18e8d6858fb0fb0b5e472 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix Viewer progress statesTomi Korpipaa2017-10-162-5/+6
| | | | | | | Task-number: QT3DS-77 Change-Id: I246a04e819e123c050d2d950402d0c87c3a15801 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 14:04:59 +0000