diff options
author | Tuomo Pelkonen <tuomo.pelkonen@gmail.com> | 2021-01-20 15:18:03 +0200 |
---|---|---|
committer | Tuomo Pelkonen <tuomo.pelkonen@gmail.com> | 2021-01-27 13:16:44 +0200 |
commit | e2e20c9f1180476193baa32cf7a50252f35f01f3 (patch) | |
tree | 54871adbc899181d149eed413570c79b13058074 /src/datavisualization/engine | |
parent | ff193e33d80a08ca0c21fdbccc2d63e6b7400d88 (diff) |
Add CMake build
Task-number: QTBUG-89299
Change-Id: I5becbf39605e566c3d32cb5e210d974df9de27da
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/datavisualization/engine')
-rw-r--r-- | src/datavisualization/engine/drawer.cpp | 3 | ||||
-rw-r--r-- | src/datavisualization/engine/engine.pri | 4 | ||||
-rw-r--r-- | src/datavisualization/engine/meshes.qrc | 33 | ||||
-rw-r--r-- | src/datavisualization/engine/shaders.qrc (renamed from src/datavisualization/engine/engine.qrc) | 31 |
4 files changed, 38 insertions, 33 deletions
diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp index 8d7cdf6e..4e5faada 100644 --- a/src/datavisualization/engine/drawer.cpp +++ b/src/datavisualization/engine/drawer.cpp @@ -44,7 +44,8 @@ class StaticLibInitializer public: StaticLibInitializer() { - Q_INIT_RESOURCE(engine); + Q_INIT_RESOURCE(shaders); + Q_INIT_RESOURCE(meshes); } }; StaticLibInitializer staticLibInitializer; diff --git a/src/datavisualization/engine/engine.pri b/src/datavisualization/engine/engine.pri index 60703e96..dd177151 100644 --- a/src/datavisualization/engine/engine.pri +++ b/src/datavisualization/engine/engine.pri @@ -54,7 +54,9 @@ SOURCES += $$PWD/qabstract3dgraph.cpp \ $$PWD/barseriesrendercache.cpp \ $$PWD/scatterseriesrendercache.cpp -RESOURCES += engine/engine.qrc +RESOURCES += \ + engine/meshes.qrc \ + engine/shaders.qrc OTHER_FILES += $$PWD/meshes/* $$PWD/shaders/* diff --git a/src/datavisualization/engine/meshes.qrc b/src/datavisualization/engine/meshes.qrc new file mode 100644 index 00000000..5cca4c41 --- /dev/null +++ b/src/datavisualization/engine/meshes.qrc @@ -0,0 +1,33 @@ +<RCC> + <qresource prefix="/defaultMeshes"> + <file alias="cone">meshes/coneFlat.obj</file> + <file alias="coneSmooth">meshes/coneSmooth.obj</file> + <file alias="pyramid">meshes/pyramidFlat.obj</file> + <file alias="pyramidSmooth">meshes/pyramidSmooth.obj</file> + <file alias="bar">meshes/cubeFlat.obj</file> + <file alias="barSmooth">meshes/cubeSmooth.obj</file> + <file alias="cylinder">meshes/cylinderFlat.obj</file> + <file alias="cylinderSmooth">meshes/cylinderSmooth.obj</file> + <file alias="background">meshes/background.obj</file> + <file alias="plane">meshes/plane.obj</file> + <file alias="sphere">meshes/sphere.obj</file> + <file alias="sphereSmooth">meshes/sphereSmooth.obj</file> + <file alias="bevelbar">meshes/barFlat.obj</file> + <file alias="bevelbarSmooth">meshes/barSmooth.obj</file> + <file alias="coneFull">meshes/coneFilledFlat.obj</file> + <file alias="coneSmoothFull">meshes/coneFilledSmooth.obj</file> + <file alias="cylinderFull">meshes/cylinderFilledFlat.obj</file> + <file alias="cylinderSmoothFull">meshes/cylinderFilledSmooth.obj</file> + <file alias="pyramidFull">meshes/pyramidFilledFlat.obj</file> + <file alias="pyramidSmoothFull">meshes/pyramidFilledSmooth.obj</file> + <file alias="bevelbarFull">meshes/barFilledFlat.obj</file> + <file alias="bevelbarSmoothFull">meshes/barFilledSmooth.obj</file> + <file alias="barFull">meshes/cubeFilledFlat.obj</file> + <file alias="barSmoothFull">meshes/cubeFilledSmooth.obj</file> + <file alias="backgroundNoFloor">meshes/backgroundNoFloor.obj</file> + <file alias="minimal">meshes/minimalFlat.obj</file> + <file alias="minimalSmooth">meshes/minimalSmooth.obj</file> + <file alias="arrow">meshes/arrowFlat.obj</file> + <file alias="arrowSmooth">meshes/arrowSmooth.obj</file> + </qresource> +</RCC> diff --git a/src/datavisualization/engine/engine.qrc b/src/datavisualization/engine/shaders.qrc index 0ef169c9..452f303e 100644 --- a/src/datavisualization/engine/engine.qrc +++ b/src/datavisualization/engine/shaders.qrc @@ -1,35 +1,4 @@ <RCC> - <qresource prefix="/defaultMeshes"> - <file alias="cone">meshes/coneFlat.obj</file> - <file alias="coneSmooth">meshes/coneSmooth.obj</file> - <file alias="pyramid">meshes/pyramidFlat.obj</file> - <file alias="pyramidSmooth">meshes/pyramidSmooth.obj</file> - <file alias="bar">meshes/cubeFlat.obj</file> - <file alias="barSmooth">meshes/cubeSmooth.obj</file> - <file alias="cylinder">meshes/cylinderFlat.obj</file> - <file alias="cylinderSmooth">meshes/cylinderSmooth.obj</file> - <file alias="background">meshes/background.obj</file> - <file alias="plane">meshes/plane.obj</file> - <file alias="sphere">meshes/sphere.obj</file> - <file alias="sphereSmooth">meshes/sphereSmooth.obj</file> - <file alias="bevelbar">meshes/barFlat.obj</file> - <file alias="bevelbarSmooth">meshes/barSmooth.obj</file> - <file alias="coneFull">meshes/coneFilledFlat.obj</file> - <file alias="coneSmoothFull">meshes/coneFilledSmooth.obj</file> - <file alias="cylinderFull">meshes/cylinderFilledFlat.obj</file> - <file alias="cylinderSmoothFull">meshes/cylinderFilledSmooth.obj</file> - <file alias="pyramidFull">meshes/pyramidFilledFlat.obj</file> - <file alias="pyramidSmoothFull">meshes/pyramidFilledSmooth.obj</file> - <file alias="bevelbarFull">meshes/barFilledFlat.obj</file> - <file alias="bevelbarSmoothFull">meshes/barFilledSmooth.obj</file> - <file alias="barFull">meshes/cubeFilledFlat.obj</file> - <file alias="barSmoothFull">meshes/cubeFilledSmooth.obj</file> - <file alias="backgroundNoFloor">meshes/backgroundNoFloor.obj</file> - <file alias="minimal">meshes/minimalFlat.obj</file> - <file alias="minimalSmooth">meshes/minimalSmooth.obj</file> - <file alias="arrow">meshes/arrowFlat.obj</file> - <file alias="arrowSmooth">meshes/arrowSmooth.obj</file> - </qresource> <qresource prefix="/shaders"> <file alias="fragment">shaders/default.frag</file> <file alias="vertex">shaders/default.vert</file> |