summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-1426-1299/+1584
| | | | | | | | | | | | | 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>
* Update default layoutTomi Korpipaa2017-12-1419-55/+102
| | | | | | | | | Default layout is now mostly done in percentages of the main window size. Task-number: QT3DS-544 Change-Id: Ia09eab021da2667afba0dfdfb1e22e18755914a5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Convert Tabs -> Spaces and Removed trailing whitespace from effectlibAndy Nichols2017-12-1444-1335/+1335
| | | | | | | | | | | This was done to make syncing the effectlib shaders in 3D Studio with the effectlib shaders in the 2.0 runtime where they had already been sanitized. This makes the diffing process easier, and will also bring things into line with the Qt coding standard. Change-Id: I0c45dcb7110cc31a24cce24d72b53e1d451b701b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix shadow map camera projectionJere Tuliniemi2017-12-141-27/+54
| | | | | | | | | | | The previous way had the shadows disappear with certain camera angles and settings. The new way should keep the scene inside the shadow map always. The resolution still depends on the camera far clip plane. Task-number: QT3DS-655 Change-Id: Id2ac8d6163d99ed02fcc7c7c07cd68a31c55fc93 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Show qmlstreamer 'preview' content in viewerMiikka Heikkinen2017-12-141-2/+2
| | | | | | | | | | | | | QUrl::setScheme already adds two slashes, so adding two more just makes the URL parse incorrectly by QML engine. Apparently this has not been a problem with qrc: URLs but it is with file: URLs, which are used in previews. Task-number: QT3DS-671 Change-Id: I5d46282e94f816db8c0986be501038f80f63d972 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix undo not setting modified flag to docMiikka Heikkinen2017-12-141-1/+0
| | | | | | | | | | | | | | The undo stack has SDocTransactionCommands in it, but executing those commands didn't set modified flag to doc, resulting in undos never setting the modified flag. Changed SDocTransactionCommand to set the modified flag. This will now result it modified flag being set at least twice when the transaction is executed for the first time, but that shouldn't cause problems. Task-number: QT3DS-597 Change-Id: Ib5183636cfee63f23aee4ae78fd7dcc96f201abc Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@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>
* Unify color dialogsTomi Korpipaa2017-12-1411-39/+82
| | | | | | | | | Force Qt style to all color dialogs. In addition, add previewing the color change immediately. Task-number: QT3DS-643 Change-Id: I6b6671390c8a5456e7050f9ac2a00043c299052d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Unify file dialogsTomi Korpipaa2017-12-143-3/+7
| | | | | | Task-number: QT3DS-644 Change-Id: Ie280c2cc2577ad8ec2cc9209a1107848ae110c25 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QNX compile fixesAdam Treat2017-12-132-2/+3
| | | | | | | Change-Id: I9eb2e661666b24907bdd01e64cafc508453ced7d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Use the OES extension for depth stencil supportAdam Treat2017-12-131-1/+1
| | | | | | Change-Id: I90532b6a6ddbe9f278ca76e54faa9bd6943233fc Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Doc: Fix a number of documentation issuesTopi Reinio2017-12-054-8/+25
| | | | | | | | | | | | | | | | | | | | - 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-042-0/+64
| | | | | | Task-number: QT3DS-627 Change-Id: If5122c62b27f6f240120679835b269df006c8b95 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Disallow wrong file type for sub-presentationTomi Korpipaa2017-12-011-0/+8
| | | | | | Task-number: QT3DS-608 Change-Id: Ie591187d0f911fedec022089f33cc6f97d33a060 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash when deleting several objects with parent-descendant relationJanne Kangas2017-12-011-2/+8
| | | | | | | Task-ID: QT3DS-542 Change-Id: Ife1c148a3cc8f36d81de642de8f914da4ff93533 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix import error when adding behaviorsJere Tuliniemi2017-12-012-4/+2
| | | | | | | | | | | The studio now also registers the Q3DSQmlBehavior type so that the error checking works correctly. Task-number: QT3DS-594 Change-Id: Ifd84440ed6c3216ec1d44fa350efb27bd3c1b208 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix other ObjectRefs changing after switching oneJere Tuliniemi2017-12-011-1/+1
| | | | | | | | | Disconnect with only one parameter doesn't handle the parameter as the sender. Previously all the ObjectRefs remained connected. Task-number: QT3DS-596 Change-Id: I3aff7654c873fbfdf9e570dc75a7d9413a90ee97 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash at shutdown in debug buildMäättä Antti2017-12-015-0/+18
| | | | | | | | | | Correct context is not set when doing the shutdown sequence for the renderer so cleanup code asserts when trying to delete framebuffer objects. Task-number: QT3DS-609 Change-Id: I96cba87636e9e360fa49ef3edbeede2e9a3abf86 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Don't allow empty file for sub-presentationTomi Korpipaa2017-12-012-0/+14
| | | | | | | | | If sub-presentation type is presentation, a file must be selected. Disable "Ok" button if not. Task-number: QT3DS-400 Change-Id: I925861f20ebf3d18495822e45eded70e8e5e952f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove references to LUA in warnings and errorsTomi Korpipaa2017-12-012-0/+0
| | | | | | Task-number: QT3DS-595 Change-Id: Idd74f719a3c1d0493ada36c613c33aa586ccb94a 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 macOS crash with 2x and 4x multisamplingTomi Korpipaa2017-11-291-0/+8
| | | | | | | | | Note: This is a temporary fix for the problem. Actual one should be made for 1.0.1 (or 1.1) Task-number: QT3DS-590 Change-Id: If577d8e004ed74cb0e1ed84a566459dc1644dbae Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix property slider integer value minimum limit handlingMäättä Antti2017-11-291-5/+17
| | | | | | | | | | | Add minimum integer value handling so that the user can not enter values which are too small to the text field. Task-number: QT3DS-168 Change-Id: I49f7fe1268bccdb01740d64cd94897c9798543a4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix alias object creation and referenceMäättä Antti2017-11-297-8/+57
| | | | | | | | | | | Disallow adding alias objects to nodes, which do not make sense. Also disable alias referencing to other aliases and objects that can not be made to alias. Task-number: QT3DS-185 Change-Id: I1a179409eacba916857a9a50ad9b7bc4a7187da8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update ColladaDOM submoduleJanne Koskinen2017-11-291-0/+0
| | | | | | | Submodule update. Change-Id: Ie25e9934838b6ebea6fb86898f31c7e9d800d4ab Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix qml examples for macOSTomi Korpipaa2017-11-292-0/+24
| | | | | | Task-number: QT3DS-583 Change-Id: If51b8caf3cf5c3f8422cf17fa45fdfece10f2668 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix sample project crash for macOSTomi Korpipaa2017-11-291-2/+2
| | | | | | | Task-number: QT3DS-582 Change-Id: Ic9819db98901a31784551d0a8df93cc358094c8e Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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-294-27/+45
| | | | | | | | | 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 viewer scaling in macOSTomi Korpipaa2017-11-282-2/+16
| | | | | | Task-number: QT3DS-497 Change-Id: Id1ece6334a123960c796a4b7be238c680f2690e0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add docs for qmldynamickeyframes and qmlstreamer examplesMäättä Antti2017-11-288-10/+176
| | | | | | | | Task-number: QT3DS-521 Change-Id: Id3d54f1c7a2bf955d73e95548ead5fef675f7a81 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix float slider stepsMäättä Antti2017-11-281-1/+5
| | | | | | | | Calculate it based on the range instead of fixed value. Task-number: QT3DS-559 Change-Id: Ibbfc80bea6907ff484662dfdaceda2bda5beed42 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update sub-presentation dialogTomi Korpipaa2017-11-2816-278/+656
| | | | | | | | | Task-number: QT3DS-505 Change-Id: Id6529d65f83dddb7ce31be657986b9b25331092e 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> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add changes filePasi Keränen2017-11-281-0/+21
| | | | | | | | Add changes file with links to online pages, no changes in 1.0. Task-number: QT3DS-524 Change-Id: Ib2dfb3d9aa19625d52c54506e5d164bdeca3acee Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix open sample project default locationTomi Korpipaa2017-11-282-13/+27
| | | | | | | | Task-number: QT3DS-463 Change-Id: Iaac905687dfca4410c17d26cf75b869a9a272535 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Add sample project to Qt 3D StudioMats Honkamaa2017-11-2812-0/+435
| | | | | | | | | Adding a simple sample project to Qt 3D Studio. Task-number: QT3DS-569 Task-number: QT3DS-572 Change-Id: I11677ee355882d354855feb3e5f1b2044f91cf82 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix moving CPropertyGraphKeyframesMiikka Heikkinen2017-11-281-0/+1
| | | | | | | | | | CCmdDataModelSetKeyframeValue command was never finalized, causing corruption of the application state. Task-number: QT3DS-95 Change-Id: I88f57b08e6fdbd7927f3360fdd2976b14b1b4609 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Make property graph keyframes bit largerMiikka Heikkinen2017-11-281-1/+1
| | | | | | | | | | Larger keyframes are easier to grab with mouse and also now they won't ever get completely obscured by animation keyframes. Change-Id: I4dad6147c2da64557233948eb82d04d7a5975c88 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 startup and welcome screen positionMiikka Heikkinen2017-11-283-9/+20
| | | | | | | | | | Now startup dialog is always centered on the main window, and the welcome screen is always centered on the screen of the main window. Task-number: QT3DS-396 Change-Id: I11c3760f987d384d9489d4a012cc034ed62a74e5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Enable setPresentationActive() for inactive presentationsJanne Kangas2017-11-281-2/+6
| | | | | | | | | | | | | | Allow updating active property for presentations that are currently inactive, to avoid inactivated presentation being unresponsive to commands forever. We still block update of animations when presentation is inactive, but process post-update events that include changing active state. Task-ID: QT3DS-534 Change-Id: I93b1d1c1482befd75673d9c48e054ba5e6570289 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Disable QML caching for studioMiikka Heikkinen2017-11-241-0/+3
| | | | | | | | | | | This is temporary workaround for issue QT3DS-556 and should be removed once that is fixed. Task-number: QT3DS-561 Change-Id: I9e475d681dac9e3d0fc0d0fff0df710e16bfec2b Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Replace old icons with new and restructure of index pageMats Honkamaa2017-11-243-15/+22
| | | | | | | | | | | Replaced old Studio and Viewer icons on the index page with new ones. Additionally restructured the page to display Viewer and Studio side by side. Also removed incorrect OS related content on the index page. Task-number: QT3DS-495 Change-Id: I50a6e5d86ec374ee1879203864f0c538a6b1c592 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash when undoing and redoing adding new slide at the end of listMiikka Heikkinen2017-11-231-3/+1
| | | | | | | | | | | | | | | | | | | | Adding a slide as the last slide automatically sets the playthrough property to 'previous' instead of its default value of 'next'. This creates a HashMapSwapTransaction item for this property value. When the redo of create slide happens, it appears to have lost this property from the transaction's hash map of slide properties. These properties are passed as a non-const reference, so I'm guessing they get cleared during the undo to their default state. Presumably missing properties from the hash map isn't a fatal error, since after the assert the code simply inserts the missing property into the map and things work fine. Task-number: QT3DS-535 Change-Id: Ibc4607faee05e07ce055f63bec9da3e6d43b086d Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix slide selection after slide removalMiikka Heikkinen2017-11-231-4/+4
| | | | | | Change-Id: I86dbefc8630e8d35d5bcc52f90c80b9fb3d4b3aa Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix crash when camera x/y/z scale is set to zeroJanne Kangas2017-11-231-0/+16
| | | | | | | | | | | | Resets the scale value to original if the target object is camera. Fix was done in InspectorControlModel in order to be able to also immediately update the reset value in inspector window, as opposed to silently discarding invalid value later in the stack. Change-Id: I1433c7397efb470e724593d3d85f05372bd31db0 Task-Id: QT3DS-384 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Save preferences and do not crash on exitAndras Mantia2017-11-231-1/+1
| | | | | | | | | If the preferences directory was not there, GetDirectory() would return an empty path due to canonicalPath usage inside, so the whole check after fails. Change-Id: I8f3469965e6e8c473f36b2f4c863ebc857c9b5ab Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix keypad input of comma ',' in input boxesMäättä Antti2017-11-232-0/+16
| | | | | | | Task-number: QT3DS-395 Change-Id: Ief92ea87a8f0ae575c98504f2bf2d9e9f98269c3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Rename Qt3DSBehavior to BehaviorMäättä Antti2017-11-236-30/+31
| | | | | | | Change-Id: I03591ac08b41772f11dd3d32bba4bdaa20d47ce7 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix slide manipulation undo/redoMiikka Heikkinen2017-11-235-48/+197
| | | | | | | | | Now slide add, delete, rearrange, duplicate, and rename can be undone and redone. Task-number: QT3DS-480 Change-Id: I1256c954b0a478e095d3431c8b61e9c41aed5895 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 10:42:32 +0000