diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-04-26 11:48:08 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-30 00:00:46 +0200 |
| commit | e644c1f8d0bc25f79ba0de09ab60f52ebcff5157 (patch) | |
| tree | df9c2365b6b351d8371eaee8ad4fe594d53f42dc /examples/simple-qml/simple-qml.qrc | |
| parent | 6ecbb75de9bc8c0d2e93d99ab6754a707499bd5f (diff) | |
Hookup Assimp scene loader
Assimp scene loadet hooked up.
Required a few changes to VAOManager and MeshDataManager.
MeshData aren't indexed by their sources any longer as a Mesh can set
its data either by having a source (obj scene file) or by a raw MeshData
(case of scene loaders). MeshData are now indexed by their frontend
Mesh's uuid.
The LoadMeshDataJobs and RenderSceneBuilder have been slightly modified
to incorporate those changes as well.
Note : VAOManager has to be a QArrayResourcesManager instead of a
QListResourcesManager.
Change-Id: Ia874e58871ab221636e0c5701d8a566642e663d2
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/simple-qml/simple-qml.qrc')
| -rw-r--r-- | examples/simple-qml/simple-qml.qrc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/simple-qml/simple-qml.qrc b/examples/simple-qml/simple-qml.qrc index b20d8aee6..846acc5c7 100644 --- a/examples/simple-qml/simple-qml.qrc +++ b/examples/simple-qml/simple-qml.qrc @@ -6,5 +6,6 @@ <file>AdsEffect.qml</file> <file>assets/ball.obj</file> <file>ForwardRenderer.qml</file> + <file>assets/test_scene.dae</file> </qresource> </RCC> |