summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Remove 3 obsolete Text propsMahmoud Badri2019-05-172-5/+1
| | | | | | Task-number: QT3DS-2903 Change-Id: I0674abbdcd11395869cdc7c196c9c1aef3b484f3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update MetaData.xmlv2.3.0-beta2Miikka Heikkinen2019-03-011-78/+94
| | | | | | | | | Materials no longer have name property, the default value is obtained from MaterialBase. Changed the property parsing logic accordingly. Change-Id: I40653eeefcbeb1c4e293b75b328ebc4a66f2b2de Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix default material fresnel calculationsMäättä Antti2018-10-223-46/+2
| | | | | | Task-number: QT3DS-2526 Change-Id: Ia46bfbcbd4f50bcaf3e27c3e116d0e117105dcb2 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Use no lod bump map shaders alwaysJere Tuliniemi2018-09-141-0/+52
| | | | | | | | | | The bump map shader used Lod functions even though mipmapping is not enabled. Use no lod version instead. Texture size was also 1x1 always, so the size had to be fetched with Q3DSImageManager. Task-number: QT3DS-2284 Change-Id: I5c49911dc13738797428491f107b4fedd37535c1 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Add fovhorizontal property to camerasMiikka Heikkinen2018-09-121-27/+30
| | | | | | | | | | | | | | This is a boolean property. If it is true, the fov value will be interpreted as horizontal angle. Since there were change to MetaData.xml, it was was updated to match editor version. Task-number: QT3DS-708 Change-Id: I68ac43c497a344a1f7bfcf25505f0dc4eb4cd6b5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Use a branchless diffuse functionJere Tuliniemi2018-07-271-0/+5
| | | | | | | | | | | Roughness is never used for the diffuse so the Oren-Nayar function with branching is not needed. Task-number: QT3DS-2010 Change-Id: I8d81adabbf254cb5af4d7ae6d6aec9da8ad89bc5 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Move Remote Deployment code into the runtimeAndy Nichols2018-07-262-0/+44
| | | | | | | | I want to be able to set this code up in runtimes other than the viewer, so it makes sense to move this into the runtime library. Change-Id: Idd66d852b597d34b3de9faebbeacc2c9923fd562 Reviewed-by: Laszlo Agocs <laszlo.agocs@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>
* 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>
* Fix text rendering!Andy Nichols2018-05-301-159/+120
| | | | | | | | | | | | 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>
* Use defaultMaterialFresnelNoDvn on ES2Andy Nichols2018-05-291-0/+0
| | | | | Change-Id: I410c57e52659e7ee7875be127d01837a56992c3a Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Provide the max lights from the shader generatorLaszlo Agocs2018-05-254-9/+0
| | | | | Change-Id: I1ab6cc51f1cf1eddd2f0d197b300a1719960d795 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Shorten property name so it is not cut on macOSTomi Korpipaa2018-05-251-2/+2
| | | | | | | Task-number: QT3DS-670 Change-Id: Idef2a0a2a23df5213cee3da5a23d9203a5393324 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Remove the use of f for floats in shadersJere Tuliniemi2018-05-2324-127/+127
| | | | | | Task-number: QT3DS-1765 Change-Id: If398f95fba9ed409761602937c49fc2d93fe46f6 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Fix custom material area light directionMäättä Antti2018-05-181-3/+3
| | | | | | | Task-number: QT3DS-1714 Change-Id: I6e54bd90756276ce01f30254f7f8b3721366adec Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Use uniform name qLights instead of lights to avoid overlap with Qt3DAndy Nichols2018-04-194-4/+4
| | | | | | | | | The builtin lights for Qt3D use the uniform lights[], which is the same name as what we use by default. We can avoid Qt3D trying to overwrite our parameter values by using a slightly differnt name. Change-Id: Ie5c1a36ec3c13ad63ed515b8f78a4edd3528d97e Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Add opengl es 2 supportMäättä Antti2018-04-1911-0/+1308
| | | | | | | Adds effectlib changes from 1.1 runtime. Change-Id: I1314974d03af37d0c8d78c5832812915e1d45884 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Post-processing effect plumbingLaszlo Agocs2018-01-101-10/+6
| | | | | | | | Can run (no animation yet) simple single-pass effects like sepia. Task-number: QT3DS-793 Change-Id: I7eae7ee4c4f43363a54141a1b3bbb61126ec6e54 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Sync effectlib changes from Qt 3D StudioAndy Nichols2017-12-0780-254/+2463
| | | | | | | | | | | There were not too many differences, but some notable ones are: Copyright headers are back. UIC -> QT3DS renames Removal of (f) from float literals (which was not valid GLSL) Task-number: QT3DS-367 Change-Id: Ieb21f0e5a46c9513f166d8fe3944af3271770acd Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Integrate Custom Material + Shader GeneratorsAndy Nichols2017-12-071-0/+43
| | | | | Change-Id: I15290541bfb58bb194d70cfe9004af1033bb8fb2 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Support recreating the shadow framegraph subtree on the flyLaszlo Agocs2017-11-181-1/+1
| | | | | | | | | | | | | | | | | | Shadow map resolution is the only property that can cause this in practice and that value unlikely to change (esp. since now we mark it as non-animatable to follow 3DS1) Nonetheless the logic is more straightforward this way. Fix also the depth-stencil buffer logic. Lights can reuse the same buffer only when the desired size is the same. They need their own otherwise. There are also some important lessons & patterns in here when it comes to parenting QNodes. Task-number: QT3DS-428 Change-Id: I7cfec5a8ee6c065b10b2dc6b37b89afa46ace020 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Follow ShadowMapResolution changesLaszlo Agocs2017-11-131-1/+1
| | | | | | | | | | | | | Add the missing default to the metadata xml as well. Likely an oversight on the application side. While we are at it, add default values in C++ too for lights, like we do for other classes. This is not really necessary for fields that have a default value in the metadata, but as we see the defaults can come and go, potentially leading to uninitialized variables. Better avoid this. Task-number: QT3DS-299 Change-Id: I4253a5d0bd2d6120fd7c627d072459cc8c0dec28 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Add shadow map FoV propertyLaszlo Agocs2017-11-101-15/+6
| | | | | | | | | Plus take the always-show changes for shadow properties from 3DS1 (not that it matters for the runtime). Task-number: QT3DS-300 Change-Id: I46eec1b2e03475e3ba0343b97909f904c54d5fd8 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Long Live Dragon3!Laszlo Agocs2017-10-0494-0/+10377
A.k.a. Qt 3D Studio Runtime 2.0 Change-Id: I459564fe47dc3d4b294346a42b1b387c21bb4088 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 00:49:08 +0000