diff options
author | Mike Krus <mike.krus@kdab.com> | 2020-02-09 08:54:07 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2020-02-11 12:50:13 +0000 |
commit | 83d81bc82eb7ca8d2ed113aac14f9a2d0a40a362 (patch) | |
tree | f75d87c176a18feefe7cedd89ddecd8f490893c3 /src/plugins/sceneparsers/gltfexport/gltfexporter.cpp | |
parent | c86ffa60f07d7ee77f835ad4d8383b599dd9886e (diff) |
Remove buffer functor API
Change-Id: I78cc60ff634f909111b891d5b9716e19cae35f3b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/plugins/sceneparsers/gltfexport/gltfexporter.cpp')
-rw-r--r-- | src/plugins/sceneparsers/gltfexport/gltfexporter.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp index 0f9a3bef9..9fced8e89 100644 --- a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp +++ b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp @@ -66,7 +66,6 @@ #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qattribute.h> #include <Qt3DRender/qbuffer.h> -#include <Qt3DRender/qbufferdatagenerator.h> #include <Qt3DRender/qmaterial.h> #include <Qt3DRender/qgraphicsapifilter.h> #include <Qt3DRender/qparameter.h> @@ -77,7 +76,6 @@ #include <Qt3DRender/qdirectionallight.h> #include <Qt3DRender/qgeometry.h> #include <Qt3DRender/qgeometryrenderer.h> -#include <Qt3DRender/qgeometryfactory.h> #include <Qt3DRender/qtechnique.h> #include <Qt3DRender/qalphacoverage.h> #include <Qt3DRender/qalphatest.h> @@ -779,15 +777,7 @@ void GLTFExporter::parseMeshes() } } else { meshInfo.meshComponent = nullptr; - QGeometry *meshGeometry = nullptr; - QGeometryFactoryPtr geometryFunctorPtr = mesh->geometryFactory(); - if (!geometryFunctorPtr.data()) { - meshGeometry = mesh->geometry(); - } else { - // Execute the geometry functor to get the geometry, if it is available. - // Functor gives us the latest data if geometry has changed. - meshGeometry = geometryFunctorPtr.data()->operator()(); - } + QGeometry *meshGeometry = mesh->geometry(); if (!meshGeometry) { qCWarning(GLTFExporterLog, "Ignoring mesh without geometry!"); |