summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add Qt3DExtras::QAbstractCameraControllerv5.10.0-beta1Andy Maloney2017-10-0310-843/+810
* Extend skinned mesh manual test to use an animatorSean Harmer2017-10-038-5/+4722
* Update render aspect skeleton's local posesSean Harmer2017-10-031-1/+6
* Initialize callback to nullptr in MappingData structSean Harmer2017-10-031-1/+1
* Clear channel component indices for those not present in animationSean Harmer2017-10-033-3/+10
* Update the local poses of the skeleton in the animation aspectSean Harmer2017-10-036-1/+85
* Extend buildPropertyMappings to support skeleton mapping use caseSean Harmer2017-10-035-61/+216
* Merge branch '5.9' into 5.10Sean Harmer2017-09-3022-188/+548
|\
| * Remove unused buildPropertyMappings() overload and testsSean Harmer2017-09-293-133/+1
| * Move the non-blended animation codepath closer to the blended oneSean Harmer2017-09-294-15/+39
| * Add unit test for FindRunningClipAnimatorsJobSean Harmer2017-09-296-2/+349
| * Add convenience function to ChannelMapper to return list of MappingsSean Harmer2017-09-273-2/+66
| * Ensure meshName gets used in the functorSean Harmer2017-09-272-2/+32
| * Actually get matching clip indices for componentsSean Harmer2017-09-262-15/+14
| * Avoid deep copy in loopSean Harmer2017-09-261-1/+1
| * Fix gathering clip value node idsSean Harmer2017-09-264-5/+19
| * Copy size and pixelRatio when switching activeFrameGraphAnders Hafreager2017-09-241-1/+4
| * Don't crash objgeometryloader on ill-formed face, just ignoreWieland Hagen2017-09-221-1/+1
| * Clear TextureData flag after texture uploadWieland Hagen2017-09-151-0/+1
* | Doc: add doc to class AssimpImporterNico Vertriest2017-09-291-3/+3
* | Doc: add doc to classes GLTFImporter and GLTFExporterNico Vertriest2017-09-292-4/+54
* | Since the ES2 includes use FP make sure it is definedKevin Ottens2017-09-273-0/+6
* | ES2 has gl_FragColor and not gl_fragColorKevin Ottens2017-09-271-1/+1
* | Add phongFunction to the nodes prototypesKevin Ottens2017-09-271-0/+34
* | Add ES2 rules for the worldSpaceToTangentSpaceMatrix node prototypeKevin Ottens2017-09-271-0/+9
* | Move phongFunction in its own include fileKevin Ottens2017-09-2721-271/+425
* | Add textureScale to MetalRoughMaterialKevin Ottens2017-09-273-0/+35
* | Move most vertex shaders into a unified oneKevin Ottens2017-09-2717-186/+105
* | Fix clock sync for the blendedclipanimatorJuan José Casafranca2017-09-271-0/+2
* | Remove the *alpha.frag from extrasKevin Ottens2017-09-277-120/+4
* | PhongAlpha: encode the alpha in kdKevin Ottens2017-09-275-26/+23
* | Wrap adsModel into phongFunctionKevin Ottens2017-09-2523-148/+149
* | Base PerVertexColorMaterial on adsModelKevin Ottens2017-09-255-161/+8
* | Get rid of adsModelNormalMappedKevin Ottens2017-09-2217-308/+189
* | Add an aspectRatio standard uniformKevin Ottens2017-09-222-0/+4
* | Port away from QBuffer::typeKevin Ottens2017-09-2210-18/+18
* | Deprecate QBuffer::typeKevin Ottens2017-09-227-38/+21
* | Rely on the attribute type for the binding pointKevin Ottens2017-09-222-16/+8
* | Explicitly pass binding point on buffer creationKevin Ottens2017-09-223-13/+13
* | Hardcode a binding point for buffer downloadsKevin Ottens2017-09-221-1/+1
* | Hardcode a binding point for buffer uploadsKevin Ottens2017-09-221-3/+2
* | Add a simple example showing all phong variantsKevin Ottens2017-09-226-1/+322
* | Fix a typo in 'metalrough.frag.json'Renato Araujo Oliveira Filho2017-09-191-1/+1
* | Fix planets-qml example for Qt 5.10Tomi Korpipaa2017-09-192-3/+8
* | Merge branch '5.9' into 5.10Sean Harmer2017-09-1259-1788/+543
|\|
| * Fix crash on surface selector unit testMike Krus2017-09-121-2/+2
| * Fix bounding sphere pickingMike Krus2017-09-124-8/+195
| * Get rid of the AllocationPolicy template argument in the ResourceManagerLars Knoll2017-09-1115-98/+32
| * Get rid of the HandleManager classLars Knoll2017-09-1111-701/+88
| * Remove ArrayPreallocationPolicyLars Knoll2017-09-115-526/+13