summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Change MODULE_VERSION to 2.0.12.0.1Laszlo Agocs2018-06-181-1/+1
| | | | | | Task-number: QT3DS-1930 Change-Id: Ib9583f1673d9b17458c2cba1543885c240b4da08 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix directory separator in qmlstreamlayer.uipv2.0.0-rc2v2.0.0Christian Strømme2018-06-121-1/+1
| | | | | Change-Id: Icb65a8ff58cdce49a1bb4247c312d7a25cc2afaa Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Fix broken logic in post-processing of layers with sub-presentationsChristian Strømme2018-06-121-2/+7
| | | | | | | | | | We were disabling the layer that contained the sub-presentations as well as all it's nodes, this should of course not happen and was causing the layer to not be shown. Task-number: QT3DS-1912 Change-Id: I7112797ba539532f8dbc50c8ea6dd1837e368cf0 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Restore some of the effects data when deactivating itChristian Strømme2018-06-081-3/+12
| | | | | | | | We need to restore the visibility tag and the entity or the updateEffects function will eventually crash. Change-Id: Ia2e994c7302dc4d7c097e50bf937c8b80e1cde29 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Add some more visibility checksChristian Strømme2018-06-081-4/+4
| | | | | | | | | Check both the active (eyeball) property and the visibility tag. The exception is in buildLayerQuadEntity we now only look at the active flag, as the visibility tag is irrelevant at that point. Change-Id: Id1237e1f6af495c3c32a2ba54172d2abae8fe401 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Generate custom material shadow map uniforms correctlyLaszlo Agocs2018-06-088-21/+521
| | | | | | | | | | | | | Send uNumShadowCubes, uNumShadowMaps, shadowMaps[], shadowCubes[] and set up shadowIdx correctly. Problem is, this won't actually fix the bug but at least we now generate the correct uniforms from our side. It also trades one FIXME for another one. Task-number: QT3DS-1840 Change-Id: I64ce5a841912f98616e558763a8360c8830741e5 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Fix visibility updatesChristian Strømme2018-06-083-43/+48
| | | | | | Task-number: QT3DS-1866 Change-Id: I3ce33b60f20994d87e76367e697c73a68c4ddad6 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Avoid text scaling on high dpi screensLaszlo Agocs2018-06-083-10/+60
| | | | | | | | Only active for Qt 5.11.1 and newer. Task-number: QT3DS-1839 Change-Id: I7a10a14b58e2931ca75e5aee21aef88ed1d63fee Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Fix image probe FOV calculationJanne Kangas2018-06-071-3/+9
| | | | | | | | | | | | | | | | | Fix FOV equations. Also, fix case for FOV of 180 degrees where image lighting map was used in wrong orientation. With this fix, the negative z axis passes through the center of the lighting map, with edges of the image wrapped around the scene, i.e. with default camera settings the center of image is in the direction of camera. This holds true for both cases of FOV = 180 and FOV < 180 degrees. This fix must be replicated on editor side for results to match. Task-ID: QT3DS-154 Change-Id: Idb8071dcd74cc3d5b17c964239bec9a52b4fe6b8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Fix shader compilation on some ES GLSL compilersJanne Koskinen2018-06-071-2/+2
| | | | | | | | Move standard derivatives extension to ES 2.0 path. Task-number: QT3DS-1896 Change-Id: I08763071bd825788a885685cf5f0a8fc888a34ac Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Prevent erroneous progress indicationsTomi Korpipaa2018-06-071-1/+6
| | | | | | Task-number: QT3DS-1893 Change-Id: I6057973e57e3784d20aaaf3d191455e79c47cfb4 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Hide shadow map FOV controlTomi Korpipaa2018-06-071-1/+1
| | | | | | | Task-number: QT3DS-1891 Change-Id: Ife6fb61b7f0f319366bde9f1e270de44e1bfa7f5 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Sync the slide time from the parent with its component playersChristian Strømme2018-06-062-3/+10
| | | | | | | | This is needed to make sure the components objects are hidden at correctly at the right time. Change-Id: Id3898d1f4a90bd23386ff7b687c2bce743411653 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Fix mode setting on component playersChristian Strømme2018-06-062-12/+21
| | | | | | | | | Make sure we go through all component and their players, also just set the parent mode directly in the constructor for component players as we shouldn't need to go through the whole list each time. Change-Id: Iea0817fe540499d684fe0e15a415476c424558dc Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Fix visibility check for componentsChristian Strømme2018-06-062-4/+7
| | | | | | | | In the time update for component players we need to check if the component is visible in parent. Change-Id: I66d00e4f1cd0bdf56dbe8cd6e79068b2179a9cad Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Delete slide animatorChristian Strømme2018-06-061-0/+3
| | | | | | | | This is a partial revert of b9b13f7c0a6, as just removing the animator from the entity doesn't seem to be sufficient. Change-Id: I56f9e572bf77d53e1f5befea256973e251bbc1ef Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Update receiving status in viewer remote connection modeTomi Korpipaa2018-06-064-0/+12
| | | | | | Task-number: QT3DS-1878 Change-Id: I2fe86c7cc127819cad0c5ea9e169ce886f2cdaa5 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Throttle Viewer refreshes to once per secondAndy Nichols2018-06-052-1/+16
| | | | | | | | | | | Qt3D can still have issues in the renderer aspect when rapidly rebuilding scenes. To prevent this issue from crashing the viewer we need to prevent scene reloads from occurring too quickly. In the future this will not be necessary. Task-number: QT3DS-1863 Change-Id: Ib15e83873a5d7896e68fadccf6e7192a6dcba9ee Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Add a proper About dialog for the ViewerAndy Nichols2018-06-059-3/+964
| | | | | | | | | | Reused the about dialog from Qt 3D Studio. Also added the stylesheet from Qt 3D Studio to get the same style for both the viewer and about dialog Task-number: QT3DS-1854 Change-Id: Id3c1991bdc8239c2f3d34b195c995bc18fb048f0 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Hide menu bar when Viewer app is in fullscreen modeAndy Nichols2018-06-051-12/+31
| | | | | | | | | | This required a bit of extra plumbing because shortcuts are tied to the menubar's visibility, so those QActions are on both the menubar and mainwindow now. Task-number: QT3DS-1854 Change-Id: Ib0e38062b6f06d933be9d2f9d2906c9bab9b21b7 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* It's not necessary to explicitly disconnect on exitAndy Nichols2018-06-051-1/+0
| | | | | | | | | | Doing so here will lead to a crash because we will try and reopen the conneciton info scene. Instead the sever will disconnect in its own destructor. Task-number: QT3DS-1862 Change-Id: I0c6454b5abdad811dcbd6dcbd7eae996f06e18f3 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Differentiate goToTime called from actionsChristian Strømme2018-06-052-3/+15
| | | | | | | | | | | goToTime from actions has an extra property regarding the playing state after the new time is set, which is different from e.g., data inputs. Since we called into the same function in all cases, the default pause value was applied when it shouldn't, causing animations to automatically start. Change-Id: I017aa94483f72ab8f8db5a2a1b3232bb2d794827 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Improve visibility updates and add effective visibility trackingv2.0.0-rcChristian Strømme2018-06-017-114/+129
| | | | | | | Fixes visibility for effects and layers. Change-Id: Ib0ed0f28145680171e3e78c49a68cc58332dad3b Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Set player mode on componentsChristian Stromme2018-06-011-0/+25
| | | | | | | | | Component players inherits the player mode from its parent player, and if the mode changes after creating, then that change should be applied to all component players as well. Change-Id: I8058f8afc97913d2b953b8a6468b44747346ce70 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Move the slide position callback out of the animation classChristian Strømme2018-06-013-89/+92
| | | | | | | | | The callback for the time updates belongs to the slideplayer and also deserves a better name the "DummyCallback", so moved it into the slideplayer's source file and renamed it to Q3DSSlidePositionCallback. Change-Id: I073dfd59ef4f95f0c03b73205069ed5af7fb912b Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Don't re-create the slide animator unless it changesChristian Strømme2018-06-011-20/+20
| | | | | Change-Id: I7b01f5b23bbdf206829f23b609264cb6f901c527 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Add property changes for implicitly set start and end timesChristian Strømme2018-06-013-0/+69
| | | | | | | | | We were not generating property changes implicit start and end times on slide or components slides. This change adds a post-processing function in the parser to generate those. Change-Id: Ifa0592e159d4d33c13923f7b3806540bd5bb3be6 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Make sure we apply the property changes before notifyingChristian Strømme2018-06-011-1/+1
| | | | | | | | This has no know consequences right now, but could lead to interesting issues down the road. Change-Id: I4d0fdd26941626599e6e9f668638a1fe8858241d Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Fix an issue where looping animations stopped themselvesAndy Nichols2018-06-011-3/+11
| | | | | | | | | Now we use a fuzzy compare to see if we are within 0.1 ms of the end of a slide, as we don't receive another position update if we are already so close to the end. Change-Id: Ie2c021be00d5a7bdac5fa632c39969bb45c0a2d5 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Fix inputmgr ignoring pressesLaszlo Agocs2018-06-017-35/+104
| | | | | | | | | | | | | Also adds a new logging category, disabled by default unless Q3DS_DEBUG=1 (or higher) is set. However this now highlights the fact that the raycasting thing just does not return hits half the time. Task-number: QT3DS-1588 Task-number: QT3DS-1785 Change-Id: Ib493510e14d32878168e7094cb0b0b059415e662 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Remote Viewer UX improvmentsAndy Nichols2018-05-313-15/+35
| | | | | | | | | | | | Mostly about making sure that we return to the Connection Info screen when necessary. I also made it where the remote project loading screen has to be shown a minimum of 1 second. Task-number: QT3DS-983 Change-Id: Ia9768b11c79c11cf72cd046cba6e48815ed6855a Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Remove two unnecessary (and problematic) dpr multiplicationsLaszlo Agocs2018-05-311-2/+2
| | | | | Change-Id: I08681157d34f0c9f7816cc3f41a6764017d08565 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Fix text rendering even more!Laszlo Agocs2018-05-301-0/+4
| | | | | | | Now with beautiful smooth edges. Change-Id: I2fdd5ccd65163c2a45b3307f78d0e2cdce802c6a Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Fix text rendering!Andy Nichols2018-05-306-165/+141
| | | | | | | | | | | | Text still might not look smooth, but at least now it will be unsmooth in the correct location. Also I updated the MetaData.xml file to match Q3DS1 since they changed the default text size from 24 -> 36 Task-number: QT3DS-1823 Change-Id: Ibfe62a60a39ac6597462937c930fdf74f577b3c4 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Studio3D: emit presentationReady on the first frame action onlyLaszlo Agocs2018-05-302-2/+25
| | | | | | | | | | | | | | | ...and add presentationLoaded that resembles how presentationReady worked before. This is also good for API symmetry since Q3DSWidget and Q3DSSurfaceViewer have presentationLoaded already (and no presentationReady). We also get a presentationReady that's closer to what's there in 1.1. This way the HomeAutomation demo, already relying on presentationReady for its splash screen, behaves much nicer on startup. Task-number: QT3DS-1830 Change-Id: I7047d5347b5d8bf9f77faa7ea24648a964c4cc3a Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Clarify docs for the running propertyLaszlo Agocs2018-05-303-12/+12
| | | | | | | | | The meaning of running and presentationReady or presentationLoaded is basically the same in 2.0. Task-number: QT3DS-413 Change-Id: I97bfd585fce673ed9d7d470bda8a5a3d80c0b2f1 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* viewer: move surfaceformat stuff to after processing cmdlineLaszlo Agocs2018-05-301-1/+2
| | | | | | | ...to avoid doing OpenGL stuff when just invoked --help for example. Change-Id: Ia60ef4964fda3874d0db0ef331f63d3c3a0517b8 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Default to ScaleModeCenter in the viewerLaszlo Agocs2018-05-301-0/+1
| | | | | | | | The API keeps ScaleModeFill as the default however since this is what most applications will need. Change-Id: Iae12e43116379cb56530dd820485d3990d90a859 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Update ViewerSettings docsLaszlo Agocs2018-05-301-14/+62
| | | | | Change-Id: Idf66c99c7c1efb25d235eadcec6225c2a0179fcc Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Update example presentations to new UIP versionTomi Korpipaa2018-05-308-7/+7
| | | | | | | | Task-number: QT3DS-1820 Change-Id: I5c7d13572385617f698ed08c33b5acc0636aaa49 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Use defaultMaterialFresnelNoDvn on ES2Andy Nichols2018-05-292-0/+1
| | | | | Change-Id: I410c57e52659e7ee7875be127d01837a56992c3a Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Add enabled/disabled state to the graph objectsChristian Strømme2018-05-295-9/+41
| | | | | | | | | | If a layer has sub-presentation set, mark all objects in the layer as disabled to avoid those from being processed. Task-number: QT3DS-1731 Change-Id: I672ba567837bc0e5ec2c9d1773216a9b80385fb2 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Update UIP version checkTomi Korpipaa2018-05-291-3/+6
| | | | | | Task-number: QT3DS-1790 Change-Id: If02350724689d69efad57677d40a84a017e7196d Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Change "Toggle Full Screen" to "Full Screen"Laszlo Agocs2018-05-291-1/+1
| | | | | | | | as is the custom in other apps, e.g. Qt Creator Task-number: QT3DS-1745 Change-Id: I16c5e521f0ab79c471a0b193f54ca004ec8d01ba Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Tentative fix for adv.blend mode layers with center/fit scale modeLaszlo Agocs2018-05-291-8/+12
| | | | | | | | Problem is, it is still slightly off with certain window sizes. Task-number: QT3DS-1801 Change-Id: I10bf8db388c191efb2115284ca51d812f7fa946a Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* When no part in model mesh with sub-meshes use last instead of firstAndy Nichols2018-05-283-2/+12
| | | | | | | | | | | | | | | This resolves an issue with .mesh files generated by older versions of Q3DS that stored revisions in the .mesh file. The models did not explicitly specify a part number for the latest revision, so the oldest revision would be used instead because that was part #1. Now when a mesh source has no part number, we will by default use the last mesh in the mesh list. This will still typically be #1 because non- submesh meshes still will only have 1 part entry. Task-number: QT3DS-1791 Change-Id: I8c9633c545c2f4f1fa325d9b0a28ab5981acd3b6 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Viewer: Add command line options to set mattecolor and scalemodeAndy Nichols2018-05-252-4/+35
| | | | | | | Matte is enabled by default (as it was in previous viewer) Change-Id: Id4c090f7974548b3f0a07df5ad776540b7c18c42 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Add support for using Q3DSViewerSettings in Q3DSEngineAndy Nichols2018-05-2513-44/+303
| | | | | | | | | | | | Q3DSEngine has a reference to the Q3DSViewerSettings for usage in generating the viewport for the main presentation. This is used to make sure that the scene is rendered with the correct scale mode and matte if requested on the main presentation. Adds Menu items for scale modes and matte to Q3DSViewer Change-Id: I9f468c42fe846be8170dac01fcdf6d692aae19ab Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* profileui: show more from gfxlimitsLaszlo Agocs2018-05-251-2/+8
| | | | | | | ...as some of these can be relevant for the quality of rendering. Change-Id: Iaf5e6ee5d5fc5f2062f99df29edd4e645ba24503 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Force max lights per layer to 2 on Vivante GLES 3.0 (i.MX6)Laszlo Agocs2018-05-251-3/+10
| | | | | | | | | We have no means to figure out what's going on in the GLES implementation. Using 3 already triggers something weird in the driver and uniform values will not be read correctly. So stick to 2. Change-Id: Icefa4237178bdee2b545c9bd47f1e74c80b25c04 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 05:58:48 +0000