diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-15 10:32:03 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-15 10:40:38 +0300 |
| commit | a30c0c304e55ffe30545ab0838e4dbe11a99b8da (patch) | |
| tree | ce6ccc0e4de8e350aebec466ff0a70c0fd7710bc /src/datavisualization/engine/engine.qrc | |
| parent | 79646ac9664745701667104c19bbae8cba8fd2e3 (diff) | |
Add custom item support, part 1
Task-number: QTRD-2866
+ Added API for adding and removing custom items
+ Added custom data and custom render items
+ Added shaders for textured objects
+ Added custom item rendering draft to scatter
+ Fixed some shaders
- to be continued in part 2
Change-Id: I9735fd02fc9e86ae486cca4c06f6d7f2a4b0b7da
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/engine/engine.qrc')
| -rw-r--r-- | src/datavisualization/engine/engine.qrc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/datavisualization/engine/engine.qrc b/src/datavisualization/engine/engine.qrc index 18cba7fe..38a9e651 100644 --- a/src/datavisualization/engine/engine.qrc +++ b/src/datavisualization/engine/engine.qrc @@ -54,5 +54,7 @@ <file alias="fragmentSurfaceShadowNoTex">shaders/surfaceShadowNoTex.frag</file> <file alias="fragmentSurfaceShadowFlat">shaders/surfaceShadowFlat.frag</file> <file alias="vertexSurfaceShadowFlat">shaders/surfaceShadowFlat.vert</file> + <file alias="fragmentTexture">shaders/texture.frag</file> + <file alias="fragmentTextureES2">shaders/texture_ES2.frag</file> </qresource> </RCC> |