summaryrefslogtreecommitdiffstats
path: root/src/Runtime/res
Commit message (Collapse)AuthorAgeFilesLines
* Copy distance field shader changes to OpenGL runtimeJere Tuliniemi2019-05-208-98/+96
| | | | | | | | | | | Also fixes the OpenGL runtime to use alpha channel for the glyph texture when using ES2. Task-number: QT3DS-3343 Change-Id: Ia37c341802e504da21ebeaff6f3f1f5b50bd1bfe Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Increment UIP versionMahmoud Badri2019-05-161-4/+0
| | | | | | | | | | | | - increment UIP version and show a warning if a UIP version is lower - remove 3 obsolete text shadow props - small update to checking for material container in the timeline - few cleanups Task-number: QT3DS-3366 Task-number: QT3DS-2903 Change-Id: Ib4d8c33e786001d0e5a18037a52303449630adf5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Support variants tags on Text objectsMahmoud Badri2019-05-141-4/+7
| | | | | | Task-number: QT3DS-3415 Change-Id: I6897133273a0c43fade6f564f4ea8d2e0347138d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement fixes to the distance field rendererJere Tuliniemi2019-05-066-10/+6
| | | | | | | | | | | | | | - Change modelView matrix to mvp for sharper texts - Support global opacity from parents - Allow changing alpha from the text color picker - Change shadow color to be the same as the text color Task-number: QT3DS-3343 Task-number: QT3DS-3363 Change-Id: I37178abe6c9239619a3f9de440d2b9245a138a82 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Support alpha channel initial workMahmoud Badri2019-05-021-14/+14
| | | | | | | | | | | In this initial work, all (almost) color properties are converted into a new type (float4) to support an alpha channel. Alpha channel option is shown in the color dialog for Layer and Scene background properties only. The following is remaining: - Scene background alpha doesn't work in the editor (works in the viewer RT1) Task-number: QT3DS-3128 Change-Id: Ib5540ebc8e2ff68709473451e4a92bf66ddb8ad2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix distance field shaders for ES3.2Tomi Korpipää2019-04-252-2/+2
| | | | | | | Task-number: QT3DS-3352 Change-Id: Ic0d2e7910079a6c263f6e59b81ef0588a6455654 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Add distance field rendering to OpenGL runtimeJere Tuliniemi2019-04-168-0/+329
| | | | | | | | | | | | | | The old text rendering remains in the background and is used to render clipped text, since that feature is not yet implemented for distance field fonts. Building the runtime with Qt version older than 5.12.2 also causes a fallback to the old text rendering. Depth pass rendering also needs to be redone in the future to avoid another full render pass. Task-number: QT3DS-3210 Change-Id: Ib7666c437d23ae25e1872682f010df3721476a14 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* clean up and format MetaData.xmlMahmoud Badri2019-04-111-242/+275
| | | | | | | | | | | | | | Also: - Fix a crash when setting a standard material. - remove visible property from materials. - add an inspector group "camera properties" to the camera and move the orthogonal setting there. Task-number: QT3DS-3319 Change-Id: I5830248b4e610231124a6c588a2563c757b066c1 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>
* Support variants property on componentsMahmoud Badri2019-04-111-10/+25
| | | | | | | | | | | | | | | Also the following tasks are done in this commit: - show active root component properties in the inspector. - fix a crash when opening the light scope drop down. - remove a lot of dynamic casts and useless code and cleanups, mainly from the inspector classes. There is still more dynamic casts and memory leaks that should be tackled in another commit. - move a method to more appropriate place. Change-Id: I5bec3858ba34d307ab6236ee665f1474302c1f57 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Support variants property on Group typesMahmoud Badri2019-04-081-8/+23
| | | | | | | | | Also few usual cleanups. Task-number: QT3DS-3234 Change-Id: I4624aeac27ee512cdbe62677bb9469e2748cc58b Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement variants support for ModelsMahmoud Badri2019-04-051-11/+18
| | | | | | | | Also some relevant tweaks here and there. Next: supporting variants on Groups, then Components. Task-number: QT3DS-3234 Change-Id: I3943baef1118cecbcd4211b6eefca3d54b21a89e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add support for selecting shadow castersTomi Korpipaa2019-04-041-4/+11
| | | | | | | | | | Editor and OpenGL runtime implementation. Qt3D runtime implementation is done in a separate commit. Task-number: QT3DS-3269 Change-Id: I26e2aa3041acaaef36cc103cc4039a0c4ea1df73 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix property categoriesMiikka Heikkinen2019-03-261-11/+11
| | | | | | | | | | Some properties were missing from the inspector due to missing category attribute. Task-number: QT3DS-3217 Change-Id: I110375a41e1282fcfd8e98d00692115cd38b39b3 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove unused Layer basic properties from inspectorMahmoud Badri2019-03-221-9/+18
| | | | | | | | | | Fix a regression caused by: commit (7e468f5d90c942da45724f06396349b271db0302) that caused Layers to show unused basic properties (move, rotate, scale, etc) Task-number: QT3DS-3214 Change-Id: Ic1ece4e84f389673824ecdc6db6505b97ea67f2d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add inspector groups for Text and LightMahmoud Badri2019-03-201-462/+470
| | | | | | | | | Text: basic properties, format, and shadow Light: basic properties, light properties, and shadow Also removed the double indentation of the metadata file lines. Change-Id: Ibc065a7418905ddb7917fc3436c0e40c7542fd39 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement variants tags inspector workMahmoud Badri2019-02-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Implemented features: - UI for the variants tags in the inspector. - adding, renaming, and deleting tags. - adding, renaming, and deleting tag groups. - adding, renaming tags/groups is checked for name uniqueness across project. - deleting tags/groups checked for in-use across the project. - toggling tags state. - tags are synced with the UIA/UIP. - changing group color. - the variants property in saved in the <Graph> part of the UIP. Remaining tasks: - implement import and export. - issue: renaming a selected tag, toggle it unselected till next project load. - issue: update the property after deleting a group that is in-use in the property in the currently open doc but not saved. - thorough test and tweaking. Task-no: QT3DS-2983 Change-Id: Iecbb6c854a00ec75864de5dd0f31f6ca3721c8ec Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Enable collapsing inspector groupsMahmoud Badri2019-02-011-51/+54
| | | | | | | | | | Also divided Layer inspector properties into some groups. Task-number: QT3DS-2972 Change-Id: I17ce5276bb1b6c16432775b2470a468ff6cc46cd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Convert text elide property to enumTomi Korpipaa2019-01-301-1/+1
| | | | | | | | | | Elide has option for None, Left, Middle, and Right. Converting the original boolean to support those. Task-number: QT3DS-2707 Change-Id: I82afd0da38fd3f59a70d1c09e79fc99e0351eb5b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove ? from Cast Shadows?Tomi Korpipaa2019-01-221-1/+1
| | | | | | | Task-number: QT3DS-2941 Change-Id: I34245823c6fd005b06dbdadd6916701158ab281d Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add horizontal and vertical offsets for text drop shadowsTomi Korpipaa2019-01-161-1/+4
| | | | | | | | | Keep support for old style offset until UIP version is updated next time. This change is not critical enough to update the UIP version. Task-number: QT3DS-2755 Change-Id: I10085862df5a851ed75bc39a58f497ed096f18f7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add elide property for text in EditorTomi Korpipaa2019-01-151-0/+1
| | | | | | Task-number: QT3DS-2707 Change-Id: I7a4e4161dbbf8b8e9f6d239f90221c51b269e48a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add support for fixed size text areasTomi Korpipaa2018-11-261-0/+2
| | | | | | | Task-number: QT3DS-2110 Change-Id: I5383303b089d5c6572120a4e4f7731d0c9b35ded Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add drop-shadow support to text elementsTomi Korpipaa2018-11-151-0/+5
| | | | | | | | | Task-number: QT3DS-2644 Change-Id: Ia2dbb52eb556bc8533b9b69862ea7b4c2432f225 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Set animatable properties as controllable by defaultJanne Kangas2018-11-081-19/+20
| | | | | | | | | | | Properties that are animatable are also controllable by datainput, by default. Additionally, subpresentation property for Layer is also controllable with String DI type to facilitate deferred loading via datainput control. (Note: texture subpresentation is not controllable.) Change-Id: Ie236e01168e91ffad7465d96f4cc39f052bd8e3b Task-id: QT3DS-2600 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Hide tessellation settings and wireframe modeTomi Korpipaa2018-11-021-2/+2
| | | | | | | | | | | Runtime 2 does not support tessellation, so hide the settings and wireframe mode from UI to avoid confusion. Task-number: QT3DS-2595 Change-Id: If3b6b95dba3f79fdb0f47de975ea8861118ef143 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix default material fresnel calculationsMäättä Antti2018-10-223-46/+2
| | | | | | | | Task-number: QT3DS-2526 Change-Id: Ic295cc14b2b27b717b94c6927a2c7ad325139c80 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Hide visibility (eyeball) inspector control for scene elementJanne Kangas2018-09-281-0/+1
| | | | | | | Change-Id: I15ed8e5fb969c3a4585da272d5ef31706daea9d1 Task-id: QT3DS-2394 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Use no lod bump map shaders alwaysJere Tuliniemi2018-09-141-0/+52
| | | | | | | | | | | Textures don't have mipmapping so makes no sense to use Lod functions in shaders. This caused bump maps to render incorrectly. Task-number: QT3DS-2284 Change-Id: I1585fa3cab388ba568d90aaa2060120c4f685072 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>
* Add fovhorizontal property to camerasMiikka Heikkinen2018-09-121-0/+3
| | | | | | | | | | | 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>
* Add Basic Properties to Material inspectorTomi Korpipaa2018-09-111-7/+4
| | | | | | | Task-number: QT3DS-2256 Change-Id: I8105f5554894c381db6dc52b2c9b22caf5bf34c5 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make Name and Visible properties show up first in InspectorJanne Kangas2018-08-171-10/+12
| | | | | | | | | | | | Rearrange metadata.xml so that whenever applicable, show Name and Visible properties always first. Hide one or both properties for object types for which they do not make sense (referenced material, images f.ex). Change-Id: I0ec61061bf800dd4ec59b104f87fba3b3c036675 Task-Id: QT3DS-2083 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add editable field for object name in inspector panelJanne Kangas2018-08-031-24/+25
| | | | | | | | | | | Also, add pure String type to metadata and use proper handler for it in QML. Add tooltip descriptions to Name and Eyeblla (Visibility) attributes. Task-ID: QT3DS-1865 Task-ID: QT3DS-2012 Change-Id: Id7403b98fe4e8d81a26ea61f648d53ea885080bb Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Enable object visibility control with Boolean DatainputJanne Kangas2018-07-311-7/+4
| | | | | | | | | | | | | Add "Visible" toggle to inspector panel with associated datainput selector, to allow choosing boolean type datainput as controller for "eyeball" property. Visibility control is indicated in both timeline and inspector panel. Change-Id: Id419c416323d0c71437599203dd9aab63df0134b Task-Id: QT3DS-2009 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@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 runtime side for results to match. Task-ID: QT3DS-154 Change-Id: I917f4f1897e59294aa369933fc9b10ae849952e6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Hide shadow map FOV controlTomi Korpipaa2018-06-071-1/+1
| | | | | | | | Task-number: QT3DS-1891 Change-Id: Idff2c8650f32b03c7537396f33a2513edf2f104c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Shorten property name so it is not cut on macOSTomi Korpipaa2018-05-251-2/+2
| | | | | | | Task-number: QT3DS-670 Change-Id: Ibebbb5698e88affadba2676f822f05fa4e47c2f9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Fix custom material area light directionMäättä Antti2018-05-181-3/+3
| | | | | | | | | Set the direction the same way for default and custom materials and change the shaders to handle the difference. Task-number: QT3DS-1714 Change-Id: Ied09f14f23de4a63297280cff7c4459409445753 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Increase default text element font sizeTomi Korpipaa2018-05-181-1/+1
| | | | | | | | Also add larger font sizes to the combobox. Task-number: QT3DS-1590 Change-Id: I5db325e126eace444a80eb2bf1b76e1588d8330d 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>
* 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>
* Expand datainput exampleJanne Kangas2018-04-031-1/+1
| | | | | | | | | | Also, add controlledproperty attribute to Material so diffuse color can be controlled in the example. Change-Id: Icbb696f478a4907cfe0933f46a92ff63c6cc1820 Task-Id: QT3DS-1328 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add support for new datainput datatypes in RuntimeJanne Kangas2018-04-031-16/+16
| | | | | | | | | | | Adds Float, Boolean, Vector3 and Variant. Activates control toggle for selected properties (position, rotation, scale, pivot etc) on Editor side. Change-Id: I4813d58e7925c52a0284818938409434e800fd4c Task-id: QT3DS-1329 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Make too long tooltips multi-lineTomi Korpipaa2018-02-191-86/+86
| | | | | | Task-number: QT3DS-1154 Change-Id: I691667d1f7ffd709ee9537e4ad35bcf129c91fe6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* [DataInput] Enable editor-side timeline and property control buttonsJanne Kangas2018-02-051-3/+1
| | | | | Change-Id: I4f05ed10b55845888e9af498eece5787c5a5d270 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* [DataInput] Implement linking of Text element textstring to DataInputJanne Kangas2018-01-121-0/+2
| | | | | | | | | | | | | | | | | | 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>
* Improve custom material GLES2 supportMäättä Antti2018-01-1027-128/+485
| | | | | | | | | | Implement light shader property setting for custom materials when constant buffers are not supported. Remove floating point .f from glsllib. Task-number: QT3DS-36 Change-Id: I30df0ef8841daaa166910c2384613a1c9f4e6b46 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* [DataInput] Add inspector control to datainput propertyJanne Kangas2018-01-021-3/+3
| | | | | | | | Also, save datainput properties to correct UIP file section ("Graph"). Change-Id: I7ac1ccead2fc60a5260e903df69aeec1d692a56f Task-Id: QT3DS-2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add Datainput part 1Janne Kangas2017-12-181-0/+6
| | | | | | | | | | | | 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>
* 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>
* Remove play sound handler from action paletteMäättä Antti2017-11-211-3/+0
| | | | | | Task-number: QT3DS-460 Change-Id: I10a5d1d99562fdf34934b0dad38be157b2aa3c50 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 16:34:07 +0000