summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Render/StudioRendererTranslation.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Hide manipulation widgets from inactive objectsMiikka Heikkinen2018-09-181-1/+9
| | | | | | | | | | | Manipulation widgets are hidden for items that are not currently active, i.e. their eyeball is off or playhead is outside their timeline bar. Bounding box is still shown also for hidden objects. Task-number: QT3DS-2341 Change-Id: Iaf0b7be158d76ddedb5e2216aa5f136d5a12c896 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix to object rotation using widgetMiikka Heikkinen2018-09-181-9/+11
| | | | | | | | | | | | | | Only check for plane coord values for validity if using rotation widget in 'angle' mode. If rotating in 'trackball' mode, they are recalculated, so validity check is unnecessary. Also fixed a regression caused by the previous rotation fix where 'angle' mode rotation would not work properly in orthographic views. Task-number: QT3DS-2332 Task-number: QT3DS-2343 Change-Id: I0ed57ff279e2212047af44b9b10ba82b4fc8dc70 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Properly initialize drag when dragging camera or lightsMiikka Heikkinen2018-09-181-2/+8
| | | | | | | Task-number: QT3DS-2294 Change-Id: I5f6d7f0a4d2a36e63103fd940c3bb67c5806242a Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix rotation when rotation plane is close to perpendicular to cameraMiikka Heikkinen2018-09-131-7/+11
| | | | | | | | | | The erroneous rotation happened when the mouse cursor projected on the rotation plane resulted in a point behind the camera. Task-number: QT3DS-2319 Change-Id: Ic043f8a6e48db2fa82590c6eb6797b38a35ccf54 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add fovhorizontal property to camerasMiikka Heikkinen2018-09-121-0/+1
| | | | | | | | | | | This is a boolean property. If it is true, the fov value will be interpreted as horizontal angle. Task-number: QT3DS-708 Change-Id: I5642c6cd2e32fb4d0872d0422b58077f0f8af2f7 Reviewed-by: Teemu Tamminen <teemu.tamminen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Fix camera manipulator toolsTomi Korpipaa2018-09-111-6/+8
| | | | | | | Task-number: QT3DS-2263 Change-Id: I247832b891bfbee3fae58b4d5658ef3355fce362 Reviewed-by: Teemu Tamminen <teemu.tamminen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove unused code pathMiikka Heikkinen2018-08-301-10/+5
| | | | | | | Change-Id: I7e369e438dc19cbbd6841813b41f4dee0b532e11 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix miscellaneous settings issuesMiikka Heikkinen2018-08-301-4/+1
| | | | | | | | | | | | | - Clearer values for timeline snap options - Clearer tooltip for legacy viewer - Removed edit view background color setting, it is no longer needed with the gradient background Task-number: QT3DS-2148 Change-Id: I7c4cebf49c339e7809023f0500116deff45e2f70 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix effect map pathTomi Korpipaa2018-08-151-3/+4
| | | | | | | | | Note: Runtime 2 will be fixed in a separate commit. Task-number: QT3DS-2027 Change-Id: I3248d2e5c90009d7945edd39e58944b80c3ffe93 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Fix preview view issuesMiikka Heikkinen2018-08-141-21/+73
| | | | | | | | | | | | | | | Dragging was inaccurate when preview view was shown due to incorrect translation being left after preview view was rendered. Changed the preview view to render first to a texture, which is then draw on top at the end of the regular view rendering pass. The viewport for camera was also incorrect for preview view. Task-number: QT3DS-2036 Change-Id: I3ed8f092c2a2a2f3806d5219ca8fb7718a8d4fe0 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Implement scene lighting toggleMäättä Antti2018-08-011-0/+1
| | | | | | | | Task-number: QT3DS-1653 Change-Id: I6b9f4c2461ae7371603d3e721a965f9c9cb520f0 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Implement scene view preview in edit modesMäättä Antti2018-08-011-147/+229
| | | | | | | | Task-number: QT3DS-250 Change-Id: Iaf7bf245ebf3de00339f5cbfb0f9fc2d4f099373 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Replace NVMin and NVMax with qMin and qMax in studioMäättä Antti2018-08-011-1/+1
| | | | | | | Change-Id: Icafb1c544c973f60d7a524c57dad8e1e2f584f74 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix bunch of compiler warningsMiikka Heikkinen2018-07-061-1/+1
| | | | | | | Change-Id: Ie383f6f72be3d2948fbd03a44ac4a48b1cc58302 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement preview of qml streamer content in studioMäättä Antti2018-06-191-2/+4
| | | | | | | Task-number: QT3DS-665 Change-Id: Ib8adeaa68e7116161bf898dd898215240a64f1ab Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Reset effect when user changes effect parametersJanne Kangas2018-06-181-0/+11
| | | | | | | | | | | | | | Fix resets the (corona) effect accumulation that would eventually paint the entire screen for Fade parameter 1.0. Now changing any parameters for the effect resets the effect and allows the user to see the actual impact of current parameters without carryover from previously rendered frames, for shader effects that accumulate. Task-ID: QT3DS-155 Change-Id: I01541ff7fbff018502e41c2a45f551c0a6647a4a Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Replace degToRad and radToReg with qt functionsMäättä Antti2018-06-181-18/+4
| | | | | Change-Id: I61287b6ed6dfe57a167da05f7323761806a1b8a5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Consolidate stdafx headers into Qt3DSCommonPrecompile.hMiikka Heikkinen2018-06-121-1/+1
| | | | | | | | | Task-number: QT3DS-256 Change-Id: I1ab44e93bf505f68690114f2a2c5f1a012e02af1 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add support for vertex colorsJere Tuliniemi2018-04-301-0/+1
| | | | | | | | | | | | Adds a check mark for vertex color use to the default material in the inspector. Adds vertex color parsing to the FBX and Collada importer. Changes default material shaders to use vertex colors if enabled. Task-number: QT3DS-1507 Change-Id: Ide4a9f0da1c4dabe4e9b573e4cb0a2aecf714398 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Implement camera and lights perspective modeMäättä Antti2018-04-271-24/+78
| | | | | | | | | | | | | Add visual representation for camera and lights. Add camera and light picking using billboards. Task-number: QT3DS-375 Task-number: QT3DS-376 Task-number: QT3DS-383 Change-Id: I36548a993aeeb44421a71d56248539687f2f3a68 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Disable manipulator tools for camera objectsTomi Korpipaa2018-04-231-1/+2
| | | | | | | | Task-number: QT3DS-1034 Change-Id: Ief6e1388dec758ff8f875fc71b48369c07910856 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix drag getting stuckMarianne Yrjänä2018-04-191-1/+7
| | | | | | | | | | In some cases when searching better angle for drag the object got moved further away from camera instead of bringing it closer. Task-number: QT3DS-66 Change-Id: I44d88da4b7000e122e1098f324c524908f298b6b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add roughness map to the standard materialJere Tuliniemi2018-04-161-0/+1
| | | | | | | | | | | The inspector for the standard material now has a selector for a roughness map and the shaders use the map for specular roughness. Task-number: QT3DS-1445 Change-Id: I0d31fb6d191583454ee5e20be683cf9ada093279 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Implement gradient backgroundMäättä Antti2018-04-111-1/+18
| | | | | | | | | | Gradient background is drawn always in other modes than scene view. The gradient is never drawn on scene view. Task-number: QT3DS-375 Change-Id: I41b32a0997e5620e9498b2090899912e9a2e0cc9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix light and camera manipulators in edit camera viewTomi Korpipaa2018-03-261-1/+5
| | | | | | Task-number: QT3DS-1374 Change-Id: I0bd57bce2ba62a9878d246cb796e5cbd84475dc4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow deselecting by clicking an empty spot in scene viewTomi Korpipaa2018-03-191-10/+4
| | | | | | | Task-number: QT3DS-374 Change-Id: I0a53bc9e774e94f46a7549d3243115d5cdadc290 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix manipulators in non-scene camera viewsTomi Korpipaa2018-03-131-11/+3
| | | | | | | | Task-number: QT3DS-621 Change-Id: Ia72de5b6faf906a9f1a0bd8a7f27afd4d922041e Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make 3D tool handles biggerTomi Korpipaa2018-03-081-1/+1
| | | | | | | | | | | | Replace x hardcoded values with just 2, that are centrally set in StudioPreferences file. A follow-up task has been done to make these values user-controllable from the preferences dialog. At the same time, fix warnings from files touched. Task-number: QT3DS-210 Change-Id: I8a9a01c94cd2ea4bbed7d8de7f6c74b08045bdde Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove old DataInput proto codeJanne Kangas2018-02-231-101/+4
| | | | | | | | | | | | | | | | Reverts some (not all) changes in commits: 935d8a983db25978b3e8f0dbe67323684ce4dd96 e3c6e9d38a5b6f729093fc0349784fa475af8f62 337aaa465ac78ac72ca748f0c2d4c3b6257829b8 0707c13c34653066c89d5b25abe60a779650ee27 c1fc5d13e3668a117b4f8470ecb87b77b145efb8 Task-ID: QT3DS-865 Change-Id: I6f2ce77b12e2930aee1ea3b62b34aabe10bc6d00 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix massive memory leak when dragging objectMäättä Antti2018-02-091-2/+7
| | | | | | | | | | | | Fix the memory leak that happens when object is dragged in view other than scene view. This is temporary fix since memory is still leaked if the active layer is changed while in view other than scene view. The core problem is in the engine, because it doesn't release allocated resources when the SEditCameraLayerTranslator is deallocated. Task-number: QT3DS-974 Change-Id: I70dc69ef6167027037b5c8e8d22360db350b0351 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove nudging with arrow keys functionalityMiikka Heikkinen2018-02-061-117/+0
| | | | | | | | | | | According to UX people, the nudge functionality is not desirable, so remove it. Task-number: QT3DS-954 Change-Id: Ie73ecec098c9d9215d95c7913ed153a6aaed2aa6 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* [DataInput] Add time control functionality and UI controlsJanne Kangas2018-02-021-1/+0
| | | | | | | | | | | | | | | | | | Adds possibility to set DataInput to control playhead in Editor. Time control adjusts scene playback time according to incoming values and timeto/from property values. Also updates selection dialog for binding DataInput to a controlled property. At the moment property control is restricted to Text element. User-visible datainput functionality is still disabled in Editor. Enable timeline control by uncommenting button in TimeLineToolbar.cpp and property control by setting text element textstring controllable="True" in MetaData.xml Task-ID: QT3DS-336 Change-Id: Ic7c687782f1680dc00e87ed74d9cfa6b55badc1b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix rendering the active layer in non-scene camera viewTomi Korpipaa2018-02-021-5/+5
| | | | | | | | | | Perspective, top, etc. cameras are designed to render only the active layer in the presentation. The logic that rebuilt the render graph was faulty, so the active layer could not be changed. Task-number: QT3DS-130 Change-Id: I6ff75964587f7ff4f64717d43e5752070a418d16 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add SetDataInputValue to IScriptBridgeMiikka Heikkinen2018-01-261-1/+0
| | | | | | | | | | | Data inputs and their linked attributes are collected into a map at presentation initialization time. Task-number: QT3DS-857 Change-Id: I6a22ddf16867e76b0fed1c1b5d7e6ab08153c024 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* [DataInput] Implement linking of Text element textstring to DataInputJanne Kangas2018-01-121-0/+39
| | | | | | | | | | | | | | | | | | Adds Text-element specific functionality that allows linking of text element(s) "textstring" property to DataInput. This link forwards any changes in DataInput valuestr property to linked element property. DataInput path is hardwired to "this.DataInput" in proto implementation. Future patches will integrate DataInput selection dialog that allows choosing controlling datainput from the ones currently in scene. User-visible DataInput functionality is still disabled from editor. Task-ID: QT3DS-338 Change-Id: I064c616f6cf651fc12f1e810c7b807ed5cc04555 Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add Datainput part 1Janne Kangas2017-12-181-5/+66
| | | | | | | | | | | | Implements Datainput as graph object that can be parsed from UIP files and fed data from QML. Adding Datainput object from studio UI is disabled intentionally as functionality will be fleshed out in the following patches. Task-ID: QT3DS-2 Change-Id: I449087aa968ae2331f203c4cb6e41b8ac6eef5cf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Replace SSize and SWindowDimensions with QSizeMäättä Antti2017-11-061-10/+10
| | | | | Change-Id: Ifae304781962fc623c389543fa35898fc9bde111 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* CFilePath is refactored to inherit from QFileInfoTomi Korpipaa2017-11-061-2/+2
| | | | | | | | | | | | | | The CFilePath class in NDD was the primary means of abstracting file path handling and manipulation in the authoring tool. The implementation is heavily windows idiosyncratic. This change completely refactors the class to rely upon Qt's file path handling abstractions: QFileInfo and QDir. The goal is to continue to shrink this class until it can be removed entirely and all call sites can use QFileInfo and friends directly. Task-number: QT3DS-221 Change-Id: I0e31c96982a3f3a9411346f6c1dd82a6d1fa00ca Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove Boost, part2Janne Koskinen2017-10-301-9/+13
| | | | | | | | Remove Boost dependency Change-Id: I2e3f8323fb352d4197c3812c986c3841d57b92cc 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-241-104/+104
| | | | | | Task-number: QT3DS-18 Change-Id: Ia8141980f575565ee7dbfa33422f25f121da5fe1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename CUICDM type names to Qt3DSDMMäättä Antti2017-10-241-4/+4
| | | | | | Task-number: QT3DS-18 Change-Id: Ia0ba2bb501f7d66b0088bd568bfad46a678ac078 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename UICDM and UICIMP to QT3DSMäättä Antti2017-10-241-2/+2
| | | | | | | Task-number: QT3DS-18 Change-Id: I3800cd72b449b033b0b42cf2dd9e9eccc4eb7f8f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename instance and property handles to Qt3DSMäättä Antti2017-10-241-103/+103
| | | | | | Task-number: QT3DS-18 Change-Id: Id93959e382dd9285590fdf979c71a459e7657e01 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename UIC macros and constants to QT3DSMäättä Antti2017-10-241-34/+34
| | | | | | Task-number: QT3DS-18 Change-Id: Iba01b0aa0b479e2487f447a9f3b479cee359614f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename UIC files to Qt3DS filesMäättä Antti2017-10-241-18/+18
| | | | | | Task-number: QT3DS-18 Change-Id: Id29fa8761de5694bcca394df7be8448a23d901b9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Replace UICDM namespace with qt3dsdm namespaceMäättä Antti2017-10-241-149/+149
| | | | | | Task-number: QT3DS-18 Change-Id: I8a76c6be45eee7285a21cdf87ac28b88c4522102 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Replace uic namespace with qt3ds namespaceMäättä Antti2017-10-241-111/+111
| | | | | | Task-number: QT3DS-18 Change-Id: I3a39265bb47930e4f4924aab4b098a40f15c5b0a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add shadow camera field of view propertyMiikka Heikkinen2017-10-191-0/+1
| | | | | | | | | | Also fixed attributehashes generator to generate more Qt-like code. Task-number: QT3DS-33 Change-Id: I8f98d25b0c058a29a0b1c912993041ff5aa5fb38 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash when undoing standard material to custom material changeMiikka Heikkinen2017-10-181-56/+68
| | | | | | | | | | | | | Custom materials can have properties that do not exist on standard material. Attempting to undo changes to those non-existent properties caused the crash. Now we check if the property exists before attempting to set it. Task-number: BOUL-696 Change-Id: Icb112c8e486ef9a90b58d02d9b4147b1b6f78374 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>
* Fix crash when trying to select items invisible in current edit cameraJanne Kangas2017-10-171-1/+6
| | | | | | | | | | | | Item position can still be changed if it is selected from timeline and dragged in the content window; even if it is not visible in the edit camera. Change-Id: I73e9db7f248062528a998f2eea08ff151e29baa3 Task-Id: QT3DS-55 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>