summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix enabling CullFace renderstatev2.8.0-rcAntti Määttä2020-10-061-1/+1
| | | | | | | The enable state name is CullFace and not Culling. Change-Id: I9b5240639adcc805b4c34ac71547ac5afe524a43 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix crash when slide change occursAntti Määttä2020-10-0610-258/+211
| | | | | | | | | | The buffer manager needs to use resolved paths for each image loading function. Also convert to use QString to avoid unnecessary string conversions. Also fix image loading task to use resolved paths. Task-number: QT3DS-4177 Change-Id: I79fae56a8f49ccbdcaed1fa9eb9a9d875583d0dd Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Revert "Fix slide activity changes"Kaj Grönholm2020-10-051-5/+0
| | | | | | | | | This reverts commit 5f8471a92868a06298ef0e0f1047d20491ac7f46 as it causes issues with existing projects. Change-Id: I903b104c325323d1b6fb53c1313921ee593c156b Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix slide activity changesKaj Grönholm2020-10-021-0/+5
| | | | | | | | | | | When doing multiple slide switches at the same frame, activity (visibility) didn't update correctly because even empty elements caused activity changes. Task-number: QT3DS-4169 Change-Id: Ib2dec31ee6b33487261b73cf5550a090ce91513e Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Try to resolve images only onceKaj Grönholm2020-10-012-8/+24
| | | | | | | | Task-number: QT3DS-4176 Change-Id: Ib1bcdd201a973122a36550971d9ce16148ef8d28 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Fix incorrect data input behaviorTony Leinonen2020-09-283-3/+15
| | | | | | | | | | | | | | When attempting to change time check if the parent becomes active. If an object is inside a group or is a child object the parent is the one which becomes active. Remove the first activity check. This is already being checked once after. Checking too early doesnt allow moving objects and changing slide in the same frame. Task-number: QT3DS-4166 Change-Id: I5f64828605c11756e61026ffc60a3b73b3a1f197 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Prevent duplicates in searchPaths and reverse itTomi Korpipaa2020-09-282-7/+9
| | | | | | | | | | | | The first 3 paths in the searchPaths are for finding the other things we need to search for, the last ones are for source paths. Reversing the order drops the required search count in a usual case from 4 attempts to 1 or 2. Task-number: QT3DS-4172 Change-Id: I0d7665566be6b8a9d5e7b918f7596f70126ad958 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Fix signal autotest for LinuxTomi Korpipaa2020-09-281-0/+3
| | | | | | Change-Id: I03537c60337f8cdb4183ca8e50e9f68d7a7b8148 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Add signal objectv2.8.0-beta1Kaj Grönholm2020-09-256-9/+37
| | | | | | | | | | Add signal object type and use it instead of dummy group in activateactions autotest. Task-number: QT3DS-4165 Change-Id: Id10fcc95e3a8f9009db71e6c2d640a593e633d67 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Unify source path usage in runtimeAntti Määttä2020-09-2413-151/+336
| | | | | | | | | | | There are several fixes done to source paths before their usage, but they are done in different places. Put these all into function and call this function before using the source paths. Task-number: QT3DS-4162 Change-Id: I0d3e3fd2db0cb11c6e9cb28fb3054568884059db Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Remove unused codeAntti Määttä2020-09-211-4/+0
| | | | | | Change-Id: I686f6e333e2b1d918de111201c4a600dce1f9688 Reviewed-by: Tony Leinonen <tony.leinonen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove unused functionsAntti Määttä2020-09-211-22/+0
| | | | | | Change-Id: I9b57152d059b7e2ea8eed6ce3fbb47e4005e735a Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add support for onActivate and onDeactivate ActionsKaj Grönholm2020-09-2114-32/+178
| | | | | | | | | | | | | Add new Action types onActivate and onDeactivate. When assigned, these will get triggered at object timeline start and end times. Using these it is possible to trigger events at specific times during animation. Example and autotest case included. Task-number: QT3DS-4128 Change-Id: Ib973b479a1de47745089d41c5764c2a1747ec95e Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Ignore schema when comparing texture keysJanne Koskinen2020-09-141-0/+5
| | | | | | | | | | Use only filepath as the key for textures. Removes double loading of textures accessed in different style. Task-number: QT3DS-4154 Change-Id: I46dbfcef35944b61d74c821374d103a0d1b65134 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Try loading files outside of UIP/UIAJanne Koskinen2020-09-141-0/+14
| | | | | | | | | | Delayed loading ignores files not listed in UIP, try loading them if not found from the texture map. Task-number: QT3DS-4159 Change-Id: I32011390976493e9c43126b6d162516fa24bca6a Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix disable depth test and disable depth prepassTony Leinonen2020-09-142-3/+7
| | | | | | | | | | | | | | Disabling depth prepass in the editor never actually disabled the prepass. Flipping inEnableTransparentDepthWrite boolean corrects the if statement. Transparent objects were placed behind opaque objects when disable depth test was enabled in the editor. When disabling depth test objects are now drawn in a single pass with alpha test off. Task-number: QT3DS-4011 Change-Id: Ifb85520a3f9fd20d29e24c721623fd103b5b3797 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Bump version to 2.8Tomi Korpipaa2020-09-141-1/+1
| | | | | | Change-Id: I4364061173a1dfcb23922fd662a0c1d46883a37d Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Fix RGBE specular map shaderAntti Määttä2020-09-141-8/+19
| | | | | | | | | | When RGBE map is set into the specular reflection map, it needs to be read in shader as RGBE instead of RGBA. Task-number: QT3DS-4160 Change-Id: Ib4baf0cf775d779a5b679ff131f89b9c893bbec7 Reviewed-by: Tony Leinonen <tony.leinonen@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Fix function parametersTony Leinonen2020-09-091-4/+4
| | | | | | | | | | DepthWrite variables were in the wrong order which could cause unwanted behavior. Task-number: QT3DS-4158 Change-Id: I39ba2015dfeb3530d12af696d23ba0feab21ea21 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Disable alpha test for screen blend modeTony Leinonen2020-09-091-1/+2
| | | | | | | | | | | Transparent objects alpha test was set to true when its opacity was 100% which caused problems with screen blending mode. Task-number: QT3DS-4110 Change-Id: Ie12e36e442fb265cad6141022200e99b28a9c4cc Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix m_shaderCacheCompression typeKaj Grönholm2020-09-081-1/+1
| | | | | | | Task-number: QT3DS-4157 Change-Id: I4002368dd9b1f9267930e98319d31b3c8bb8b1fb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Support automatic detection of texture file extensionKaj Grönholm2020-09-042-5/+68
| | | | | | | | | | | | | | | When using setAttribute() it is now possible to give filename without the extension and engine automatically locates the most suitable existing file. If preferKTX is set, compressed texture formats (ktx, astc, dds) are preferred over non-compressed ones (e.g. png, jpg). The behavior is similar to Qt Quick Image automatic detection of file extension. Includes autotest to confirm the behavior. Task-number: QT3DS-4059 Change-Id: I1d4ab0d86b34f5deb704d450e5c36e86afde7d3b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix stereomode crashKaj Grönholm2020-08-251-0/+1
| | | | | | | | | Set correct parent node for left & right eye cameras. Task-number: QT3DS-4152 Change-Id: I08d80525360b9925c896320f17842bc4be486991 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix white flash in first frameAntti Määttä2020-08-171-2/+5
| | | | | | | | | | Run render tasks also before prepare step so that the images are loaded for it. The prepare step doesn't work properly if the images have not been loaded and generates wrong materials for first frame. Task-number: QT3DS-4131 Change-Id: I7a3f5fb08f915a31dd291c3c147d8f078ecee908 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix performance timers compilationJanne Koskinen2020-08-171-1/+1
| | | | | | | | Add back the name for the argument. Fixes: QT3DS-4153 Change-Id: Ifee13fe048069298aeeda519c2bfd8ef15ffc6f5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix stereoscopic rendering with subpresentationsKaj Grönholm2020-08-126-6/+18
| | | | | | | | | | Viewports of subpresentations should not be reduced in stereoscopic modes. Task-number: QT3DS-4141 Change-Id: Ie96ff296bec2d11b215f36e08df23911f18fbba2 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Allow getting texture id from subpresentation layerAntti Määttä2020-08-124-44/+59
| | | | | | | | | | | | | | | | | | The subpresentation layer textures are stored per instance basis so the getter needs to use the correct main presentation layer to get it. Getting the subresentation texture id from images already work by using "subpresentationId:elementPath" in the getter. For subpresentation layers the getter needs to specify also the main presentation layer using the subpresentation. The elementPath needs to be specified as elementPath::subpresentationId:elementPath. F.ex. "Scene.Layer2::subpres:Scene.Layer" Task-number: QT3DS-4127 Change-Id: Ifeb654838e6cc97ac8f95841e080e3c35fc76ad7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Scale QML stream item size up to nearest divisible-by-four sizeTomi Korpipaa2020-08-123-1/+18
| | | | | | | | Task-number: QT3DS-4144 Change-Id: Id1bd2387538a6cf865c59830730d80eb5f93652f Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Optimize runtime performanceAntti Määttä2020-08-117-66/+61
| | | | | | | | | | | - Reduce allocations by reducing std::pair usage. - Reduce allocations by not caching parents. - Some smaller optimizations Task-number: QT3DS-4151 Change-Id: I0bf770069b23ca4715f5f98ab3b35001156fe8fc Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Fix transparent objects in ordered groupsJere Tuliniemi2020-07-281-1/+0
| | | | | | | | | Transparent objects would always be rendered on top of opaque objects since their depth test was disabled in ordered groups. Task-number: QT3DS-4126 Change-Id: I3ddb1f14c97e4176f8a979a952aba3914e45171f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix slide rollback when setting timeline valueJere Tuliniemi2020-07-231-5/+3
| | | | | | | | | The slide has to be rolled back so that elements from the slide don't stick around in the next one. Task-number: QT3DS-4146 Change-Id: I18dbf2b974fb55d4fe22b014c06f54f37df02e13 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Merge branch '2.7'Antti Kokko2020-06-2538-121/+384
|\ | | | | | | Change-Id: I72499b82b0238c09486177f7c022f5d27896a2c8
| * Add support for MSVC2019 compilerv2.7.0-5.15.02.7Tomi Korpipää2020-06-161-0/+4
| | | | | | | | | | Change-Id: Iac363eb60ad2d046e61d1d6d05cf80e6faf7e634 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Also check target architecture for mips64Tomi Korpipaa2020-06-161-1/+1
| | | | | | | | | | | | Task-number: QT3DS-4134 Change-Id: I02c4e5e0cefc04c60a52bdc1ffaed9e567b84631 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Prevent compilation on mips64 architecturesTomi Korpipaa2020-06-161-1/+2
| | | | | | | | | | | | | | | | This will work if text mips64 is in the host architecture. Task-number: QT3DS-4134 Change-Id: I5024d12c8d79656d30c8e632be50843a5511ab86 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Remove duplicate include for AndroidTomi Korpipaa2020-06-161-1/+0
| | | | | | | | | | | | | | Fixes: QT3DS-4132 Change-Id: I40460d740dcc6fa9be0d53695b9860afead717f9 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
| * Update eastl submoduleTomi Korpipää2020-06-161-0/+0
| | | | | | | | | | | | Task-number: QT3DS-4129 Change-Id: Ic61a3d62cd6a831a93c42b9ead8675d529f6ea58 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix loading custom material textures with delayed loadingv2.7.0Antti Määttä2020-05-254-25/+49
| | | | | | | | | | | | | | | | | | | | | | There was no load point for these textures, so add force load flag, which forces loading textures, which are used by custom materials and effects. Task-number: QT3DS-4114 Change-Id: Ie4447c9a9bbb911d6e2e18ded7a039fb45ba459f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Properly fix editor loading custom material imagesAntti Määttä2020-05-201-16/+21
| | | | | | | | | | | | | | Task-number: QT3DS-4113 Change-Id: I476fc77f79149d6af3146f23679fea4b28f3c8da Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Fix data inputs with delayed loadingv2.7.0-rc2Jere Tuliniemi2020-05-083-0/+18
| | | | | | | | | | | | | | | | | | Initialize data inputs and outputs every time a presentation is loaded. Task-number: QT3DS-4105 Change-Id: If2e9a6d95cc40109cb48f4d4d8b5dc88f963fb74 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| * Fix editor loading custom material imagesAntti Määttä2020-05-071-6/+19
| | | | | | | | | | | | | | | | | | Add project path to the custom material image path and check if the image path contains ../. Change-Id: Iab436ffa304c94cdc8235dc9fbf06abd9c060e71 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Add ECT2_EAC to supported ktx formatsAntti Määttä2020-05-071-0/+2
| | | | | | | | | | | | Task-number: QT3DS-4102 Change-Id: I2dc4ab64715ffa3c2a13309b716ca4ffcdd51b3e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Fix studio viewport rendering when scene camera is visibleAntti Määttä2020-05-0712-46/+15
| | | | | | | | | | | | | | | | | | | | The runtime contains unused viewport parameters. Remove those and fix the editor by reading the scissor rect from render list instead of render context, which contains wrong scissor rect. Task-number: QT3DS-4103 Change-Id: I8b443c3a5e8d7ac84eb211633cea2afeed6da30b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Fix activating child elements when di activatingAntti Määttä2020-05-041-7/+12
| | | | | | | | | | | | | | | | | | | | Time-activation is not done for child elements in all cases. Add check for it in the activation handler. Task-number: QT3DS-4100 Change-Id: Ib34777afc35db7a0ce6748da01e6feec1de37f5e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
| * Add missing signal documentationTomi Korpipää2020-04-281-0/+16
| | | | | | | | | | Change-Id: Ie3dec5105059cbbfe1bf104dac4458020e75538b Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| * Don't try to load images with a subpresentation id as the pathJere Tuliniemi2020-04-271-1/+2
| | | | | | | | | | | | | | | | | | | | Custom materials using subpresentations would have their textures loaded as images and failing because of the invalid path. Task-number: QT3DS-4094 Change-Id: Iadcf5237dc26c5666c8b54cdee0fed3a01434d77 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Document QQuickImageProvider usageJere Tuliniemi2020-04-271-0/+24
| | | | | | | | | | | | | | Task-number: QT3DS-4049 Change-Id: I655de11b904a8828d7c428f91c0874e74106fdf5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Add default texture paths to source pathsAntti Määttä2020-04-242-5/+12
| | | | | | | | | | | | | | | | | | | | The custom material/effect default textures are added to the graph object attribute list so that they can be loaded when delayed loading is enabled. Task-number: QT3DS-4037 Change-Id: I88219b49a6d696de7ca45b900aa3628d48de701e Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Limit directional shadow map frustum to scene boundsJere Tuliniemi2020-04-241-31/+70
| | | | | | | | | | | | | | | | | | | | If using scene bounds creates a smaller shadow map camera frustum, use that. Task-number: QT3DS-3273 Change-Id: I87d8baac11610c03d70ec9207381aa8b96c62195 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Remove unnecessary INCLUDEPATH for macOSTomi Korpipaa2020-04-231-1/+0
| | | | | | | | | | | | Fixes: QT3DS-3906 Change-Id: I14d48ad5f18f1add83829290605a22e39a2d4e25 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 08:17:38 +0000