diff options
author | Heikkinen Miikka <miikka.heikkinen@digia.com> | 2013-05-17 12:21:40 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-05-17 12:37:26 +0300 |
commit | 3dafad59b97532e8e68c0b7abca796f3a9527a6e (patch) | |
tree | 6dcb5bf6edc5aee39490b35db11202a20929d858 /src | |
parent | 5963d52c1923cf2468c1fa4738e04a175196cc7d (diff) |
Added datavis3d back under src
Change-Id: I209e8b3228b2ce0085c897db6fb2ea78e93afa67
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/datavis3d/Doxyfile (renamed from src/Doxyfile) | 0 | ||||
-rw-r--r-- | src/datavis3d/Mainpage.dox (renamed from src/Mainpage.dox) | 0 | ||||
-rw-r--r-- | src/datavis3d/common.pri (renamed from src/common.pri) | 0 | ||||
-rw-r--r-- | src/datavis3d/datavis3d.pro | 22 | ||||
-rw-r--r-- | src/datavis3d/doc/qtdatavis3d.qdocconf (renamed from src/doc/qtdatavis3d.qdocconf) | 0 | ||||
-rw-r--r-- | src/datavis3d/documentationGroups.dox (renamed from src/documentationGroups.dox) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/drawer.cpp (renamed from src/engine/drawer.cpp) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/drawer_p.h (renamed from src/engine/drawer_p.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/engine.pri (renamed from src/engine/engine.pri) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/engine.qrc (renamed from src/engine/engine.qrc) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/labelitem.cpp (renamed from src/engine/labelitem.cpp) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/labelitem_p.h (renamed from src/engine/labelitem_p.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/meshes/backgroudFlat.obj (renamed from src/engine/meshes/backgroudFlat.obj) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/meshes/backgroudSmooth.obj (renamed from src/engine/meshes/backgroudSmooth.obj) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/meshes/coneFlat.obj (renamed from src/engine/meshes/coneFlat.obj) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/meshes/coneSmooth.obj (renamed from src/engine/meshes/coneSmooth.obj) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/meshes/cubeFlat.obj (renamed from src/engine/meshes/cubeFlat.obj) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/meshes/cubeSmooth.obj (renamed from src/engine/meshes/cubeSmooth.obj) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/meshes/cylinderFlat.obj (renamed from src/engine/meshes/cylinderFlat.obj) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/meshes/cylinderSmooth.obj (renamed from src/engine/meshes/cylinderSmooth.obj) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/meshes/plane.obj (renamed from src/engine/meshes/plane.obj) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/meshes/pyramidFlat.obj (renamed from src/engine/meshes/pyramidFlat.obj) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/meshes/pyramidSmooth.obj (renamed from src/engine/meshes/pyramidSmooth.obj) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/meshes/sphere.obj (renamed from src/engine/meshes/sphere.obj) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/meshes/sphereSmooth.obj (renamed from src/engine/meshes/sphereSmooth.obj) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/q3dbars.cpp (renamed from src/engine/q3dbars.cpp) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/q3dbars.h (renamed from src/engine/q3dbars.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/q3dbars_p.h (renamed from src/engine/q3dbars_p.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/q3dmaps.cpp (renamed from src/engine/q3dmaps.cpp) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/q3dmaps.h (renamed from src/engine/q3dmaps.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/q3dmaps_p.h (renamed from src/engine/q3dmaps_p.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/q3dwindow.cpp (renamed from src/engine/q3dwindow.cpp) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/q3dwindow.h (renamed from src/engine/q3dwindow.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/q3dwindow_p.h (renamed from src/engine/q3dwindow_p.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/qdataitem.cpp (renamed from src/engine/qdataitem.cpp) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/qdataitem.h (renamed from src/engine/qdataitem.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/qdataitem_p.h (renamed from src/engine/qdataitem_p.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/qdatarow.cpp (renamed from src/engine/qdatarow.cpp) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/qdatarow.h (renamed from src/engine/qdatarow.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/qdatarow_p.h (renamed from src/engine/qdatarow_p.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/qdataset.cpp (renamed from src/engine/qdataset.cpp) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/qdataset.h (renamed from src/engine/qdataset.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/qdataset_p.h (renamed from src/engine/qdataset_p.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/fragmentDepthTest (renamed from src/engine/shaders/fragmentDepthTest) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/fragmentShader (renamed from src/engine/shaders/fragmentShader) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/fragmentShaderAmbient (renamed from src/engine/shaders/fragmentShaderAmbient) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/fragmentShaderColorOnY (renamed from src/engine/shaders/fragmentShaderColorOnY) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/fragmentShaderDepth (renamed from src/engine/shaders/fragmentShaderDepth) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/fragmentShaderLabel (renamed from src/engine/shaders/fragmentShaderLabel) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/fragmentShaderSelection (renamed from src/engine/shaders/fragmentShaderSelection) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/fragmentShaderTexture (renamed from src/engine/shaders/fragmentShaderTexture) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/fragmentShadow (renamed from src/engine/shaders/fragmentShadow) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/fragmentShadowNoTex (renamed from src/engine/shaders/fragmentShadowNoTex) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/fragmentShadowNoTexColorOnY (renamed from src/engine/shaders/fragmentShadowNoTexColorOnY) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/vertexDepthTest (renamed from src/engine/shaders/vertexDepthTest) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/vertexShader (renamed from src/engine/shaders/vertexShader) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/vertexShaderDepth (renamed from src/engine/shaders/vertexShaderDepth) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/vertexShaderLabel (renamed from src/engine/shaders/vertexShaderLabel) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/vertexShaderSelection (renamed from src/engine/shaders/vertexShaderSelection) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/vertexShaderTexture (renamed from src/engine/shaders/vertexShaderTexture) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/shaders/vertexShadow (renamed from src/engine/shaders/vertexShadow) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/theme.cpp (renamed from src/engine/theme.cpp) | 0 | ||||
-rw-r--r-- | src/datavis3d/engine/theme_p.h (renamed from src/engine/theme_p.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/global/global.pri (renamed from src/global/global.pri) | 0 | ||||
-rw-r--r-- | src/datavis3d/global/qdatavis3dglobal.h (renamed from src/global/qdatavis3dglobal.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/global/qdatavis3namespace.h (renamed from src/global/qdatavis3namespace.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/utils/camerahelper.cpp (renamed from src/utils/camerahelper.cpp) | 0 | ||||
-rw-r--r-- | src/datavis3d/utils/camerahelper_p.h (renamed from src/utils/camerahelper_p.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/utils/meshloader.cpp (renamed from src/utils/meshloader.cpp) | 0 | ||||
-rw-r--r-- | src/datavis3d/utils/meshloader_p.h (renamed from src/utils/meshloader_p.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/utils/objecthelper.cpp (renamed from src/utils/objecthelper.cpp) | 0 | ||||
-rw-r--r-- | src/datavis3d/utils/objecthelper_p.h (renamed from src/utils/objecthelper_p.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/utils/shaderhelper.cpp (renamed from src/utils/shaderhelper.cpp) | 0 | ||||
-rw-r--r-- | src/datavis3d/utils/shaderhelper_p.h (renamed from src/utils/shaderhelper_p.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/utils/texturehelper.cpp (renamed from src/utils/texturehelper.cpp) | 0 | ||||
-rw-r--r-- | src/datavis3d/utils/texturehelper_p.h (renamed from src/utils/texturehelper_p.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/utils/utils.cpp (renamed from src/utils/utils.cpp) | 0 | ||||
-rw-r--r-- | src/datavis3d/utils/utils.pri (renamed from src/utils/utils.pri) | 0 | ||||
-rw-r--r-- | src/datavis3d/utils/utils_p.h (renamed from src/utils/utils_p.h) | 0 | ||||
-rw-r--r-- | src/datavis3d/utils/vertexindexer.cpp (renamed from src/utils/vertexindexer.cpp) | 0 | ||||
-rw-r--r-- | src/datavis3d/utils/vertexindexer_p.h (renamed from src/utils/vertexindexer_p.h) | 0 | ||||
-rw-r--r-- | src/src.pro | 24 |
82 files changed, 24 insertions, 22 deletions
diff --git a/src/Doxyfile b/src/datavis3d/Doxyfile index e5d78895..e5d78895 100644 --- a/src/Doxyfile +++ b/src/datavis3d/Doxyfile diff --git a/src/Mainpage.dox b/src/datavis3d/Mainpage.dox index 973bc46f..973bc46f 100644 --- a/src/Mainpage.dox +++ b/src/datavis3d/Mainpage.dox diff --git a/src/common.pri b/src/datavis3d/common.pri index 8532fc77..8532fc77 100644 --- a/src/common.pri +++ b/src/datavis3d/common.pri diff --git a/src/datavis3d/datavis3d.pro b/src/datavis3d/datavis3d.pro new file mode 100644 index 00000000..b4169c4e --- /dev/null +++ b/src/datavis3d/datavis3d.pro @@ -0,0 +1,22 @@ +TARGET = QtDataVis3D +QT = core gui opengl #qml + +DEFINES += QTCOMMERCIALDATAVIS3D_LIBRARY + +QMAKE_DOCS = $$PWD/doc/qtdatavis3d.qdocconf + +load(qt_module) + +include($$PWD/common.pri) +include($$PWD/engine/engine.pri) +include($$PWD/global/global.pri) +include($$PWD/utils/utils.pri) + +wince* { + # The Microsoft MIPS compiler crashes if /Og is specified. + # -O2/1 expands to /Og plus additional arguments. + contains(DEFINES, MIPS) { + QMAKE_CXXFLAGS_RELEASE ~= s/-O2/-Oi -Ot -Oy -Ob2/ + QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/ + } +} diff --git a/src/doc/qtdatavis3d.qdocconf b/src/datavis3d/doc/qtdatavis3d.qdocconf index c2c084b3..c2c084b3 100644 --- a/src/doc/qtdatavis3d.qdocconf +++ b/src/datavis3d/doc/qtdatavis3d.qdocconf diff --git a/src/documentationGroups.dox b/src/datavis3d/documentationGroups.dox index ed9c3f1c..ed9c3f1c 100644 --- a/src/documentationGroups.dox +++ b/src/datavis3d/documentationGroups.dox diff --git a/src/engine/drawer.cpp b/src/datavis3d/engine/drawer.cpp index 722a54b8..722a54b8 100644 --- a/src/engine/drawer.cpp +++ b/src/datavis3d/engine/drawer.cpp diff --git a/src/engine/drawer_p.h b/src/datavis3d/engine/drawer_p.h index 3b6a2c49..3b6a2c49 100644 --- a/src/engine/drawer_p.h +++ b/src/datavis3d/engine/drawer_p.h diff --git a/src/engine/engine.pri b/src/datavis3d/engine/engine.pri index ba063186..ba063186 100644 --- a/src/engine/engine.pri +++ b/src/datavis3d/engine/engine.pri diff --git a/src/engine/engine.qrc b/src/datavis3d/engine/engine.qrc index beff232d..beff232d 100644 --- a/src/engine/engine.qrc +++ b/src/datavis3d/engine/engine.qrc diff --git a/src/engine/labelitem.cpp b/src/datavis3d/engine/labelitem.cpp index 6ce0663c..6ce0663c 100644 --- a/src/engine/labelitem.cpp +++ b/src/datavis3d/engine/labelitem.cpp diff --git a/src/engine/labelitem_p.h b/src/datavis3d/engine/labelitem_p.h index 49693631..49693631 100644 --- a/src/engine/labelitem_p.h +++ b/src/datavis3d/engine/labelitem_p.h diff --git a/src/engine/meshes/backgroudFlat.obj b/src/datavis3d/engine/meshes/backgroudFlat.obj index cf4d10a5..cf4d10a5 100644 --- a/src/engine/meshes/backgroudFlat.obj +++ b/src/datavis3d/engine/meshes/backgroudFlat.obj diff --git a/src/engine/meshes/backgroudSmooth.obj b/src/datavis3d/engine/meshes/backgroudSmooth.obj index ad16d904..ad16d904 100644 --- a/src/engine/meshes/backgroudSmooth.obj +++ b/src/datavis3d/engine/meshes/backgroudSmooth.obj diff --git a/src/engine/meshes/coneFlat.obj b/src/datavis3d/engine/meshes/coneFlat.obj index 51c3821e..51c3821e 100644 --- a/src/engine/meshes/coneFlat.obj +++ b/src/datavis3d/engine/meshes/coneFlat.obj diff --git a/src/engine/meshes/coneSmooth.obj b/src/datavis3d/engine/meshes/coneSmooth.obj index 48c48ba8..48c48ba8 100644 --- a/src/engine/meshes/coneSmooth.obj +++ b/src/datavis3d/engine/meshes/coneSmooth.obj diff --git a/src/engine/meshes/cubeFlat.obj b/src/datavis3d/engine/meshes/cubeFlat.obj index 3c8d6d0a..3c8d6d0a 100644 --- a/src/engine/meshes/cubeFlat.obj +++ b/src/datavis3d/engine/meshes/cubeFlat.obj diff --git a/src/engine/meshes/cubeSmooth.obj b/src/datavis3d/engine/meshes/cubeSmooth.obj index 9d147bfd..9d147bfd 100644 --- a/src/engine/meshes/cubeSmooth.obj +++ b/src/datavis3d/engine/meshes/cubeSmooth.obj diff --git a/src/engine/meshes/cylinderFlat.obj b/src/datavis3d/engine/meshes/cylinderFlat.obj index 2b7e3e5e..2b7e3e5e 100644 --- a/src/engine/meshes/cylinderFlat.obj +++ b/src/datavis3d/engine/meshes/cylinderFlat.obj diff --git a/src/engine/meshes/cylinderSmooth.obj b/src/datavis3d/engine/meshes/cylinderSmooth.obj index 6ccbb286..6ccbb286 100644 --- a/src/engine/meshes/cylinderSmooth.obj +++ b/src/datavis3d/engine/meshes/cylinderSmooth.obj diff --git a/src/engine/meshes/plane.obj b/src/datavis3d/engine/meshes/plane.obj index 96ac0dd7..96ac0dd7 100644 --- a/src/engine/meshes/plane.obj +++ b/src/datavis3d/engine/meshes/plane.obj diff --git a/src/engine/meshes/pyramidFlat.obj b/src/datavis3d/engine/meshes/pyramidFlat.obj index 35edb477..35edb477 100644 --- a/src/engine/meshes/pyramidFlat.obj +++ b/src/datavis3d/engine/meshes/pyramidFlat.obj diff --git a/src/engine/meshes/pyramidSmooth.obj b/src/datavis3d/engine/meshes/pyramidSmooth.obj index b11c8750..b11c8750 100644 --- a/src/engine/meshes/pyramidSmooth.obj +++ b/src/datavis3d/engine/meshes/pyramidSmooth.obj diff --git a/src/engine/meshes/sphere.obj b/src/datavis3d/engine/meshes/sphere.obj index 671a7bcc..671a7bcc 100644 --- a/src/engine/meshes/sphere.obj +++ b/src/datavis3d/engine/meshes/sphere.obj diff --git a/src/engine/meshes/sphereSmooth.obj b/src/datavis3d/engine/meshes/sphereSmooth.obj index 3c5b1299..3c5b1299 100644 --- a/src/engine/meshes/sphereSmooth.obj +++ b/src/datavis3d/engine/meshes/sphereSmooth.obj diff --git a/src/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp index c991cd4b..c991cd4b 100644 --- a/src/engine/q3dbars.cpp +++ b/src/datavis3d/engine/q3dbars.cpp diff --git a/src/engine/q3dbars.h b/src/datavis3d/engine/q3dbars.h index 3e490144..3e490144 100644 --- a/src/engine/q3dbars.h +++ b/src/datavis3d/engine/q3dbars.h diff --git a/src/engine/q3dbars_p.h b/src/datavis3d/engine/q3dbars_p.h index 30cdb6da..30cdb6da 100644 --- a/src/engine/q3dbars_p.h +++ b/src/datavis3d/engine/q3dbars_p.h diff --git a/src/engine/q3dmaps.cpp b/src/datavis3d/engine/q3dmaps.cpp index 9ac43daa..9ac43daa 100644 --- a/src/engine/q3dmaps.cpp +++ b/src/datavis3d/engine/q3dmaps.cpp diff --git a/src/engine/q3dmaps.h b/src/datavis3d/engine/q3dmaps.h index 37bf08e7..37bf08e7 100644 --- a/src/engine/q3dmaps.h +++ b/src/datavis3d/engine/q3dmaps.h diff --git a/src/engine/q3dmaps_p.h b/src/datavis3d/engine/q3dmaps_p.h index f02ebc36..f02ebc36 100644 --- a/src/engine/q3dmaps_p.h +++ b/src/datavis3d/engine/q3dmaps_p.h diff --git a/src/engine/q3dwindow.cpp b/src/datavis3d/engine/q3dwindow.cpp index a172e7b6..a172e7b6 100644 --- a/src/engine/q3dwindow.cpp +++ b/src/datavis3d/engine/q3dwindow.cpp diff --git a/src/engine/q3dwindow.h b/src/datavis3d/engine/q3dwindow.h index 9958f7d9..9958f7d9 100644 --- a/src/engine/q3dwindow.h +++ b/src/datavis3d/engine/q3dwindow.h diff --git a/src/engine/q3dwindow_p.h b/src/datavis3d/engine/q3dwindow_p.h index ef786fb3..ef786fb3 100644 --- a/src/engine/q3dwindow_p.h +++ b/src/datavis3d/engine/q3dwindow_p.h diff --git a/src/engine/qdataitem.cpp b/src/datavis3d/engine/qdataitem.cpp index 14d6c85f..14d6c85f 100644 --- a/src/engine/qdataitem.cpp +++ b/src/datavis3d/engine/qdataitem.cpp diff --git a/src/engine/qdataitem.h b/src/datavis3d/engine/qdataitem.h index 88d54faf..88d54faf 100644 --- a/src/engine/qdataitem.h +++ b/src/datavis3d/engine/qdataitem.h diff --git a/src/engine/qdataitem_p.h b/src/datavis3d/engine/qdataitem_p.h index f14fe175..f14fe175 100644 --- a/src/engine/qdataitem_p.h +++ b/src/datavis3d/engine/qdataitem_p.h diff --git a/src/engine/qdatarow.cpp b/src/datavis3d/engine/qdatarow.cpp index f4a9e984..f4a9e984 100644 --- a/src/engine/qdatarow.cpp +++ b/src/datavis3d/engine/qdatarow.cpp diff --git a/src/engine/qdatarow.h b/src/datavis3d/engine/qdatarow.h index 766ae541..766ae541 100644 --- a/src/engine/qdatarow.h +++ b/src/datavis3d/engine/qdatarow.h diff --git a/src/engine/qdatarow_p.h b/src/datavis3d/engine/qdatarow_p.h index 3a1adeee..3a1adeee 100644 --- a/src/engine/qdatarow_p.h +++ b/src/datavis3d/engine/qdatarow_p.h diff --git a/src/engine/qdataset.cpp b/src/datavis3d/engine/qdataset.cpp index 5af920d2..5af920d2 100644 --- a/src/engine/qdataset.cpp +++ b/src/datavis3d/engine/qdataset.cpp diff --git a/src/engine/qdataset.h b/src/datavis3d/engine/qdataset.h index 118d3df9..118d3df9 100644 --- a/src/engine/qdataset.h +++ b/src/datavis3d/engine/qdataset.h diff --git a/src/engine/qdataset_p.h b/src/datavis3d/engine/qdataset_p.h index 90dc5329..90dc5329 100644 --- a/src/engine/qdataset_p.h +++ b/src/datavis3d/engine/qdataset_p.h diff --git a/src/engine/shaders/fragmentDepthTest b/src/datavis3d/engine/shaders/fragmentDepthTest index d6c502e1..d6c502e1 100644 --- a/src/engine/shaders/fragmentDepthTest +++ b/src/datavis3d/engine/shaders/fragmentDepthTest diff --git a/src/engine/shaders/fragmentShader b/src/datavis3d/engine/shaders/fragmentShader index 5bf9c654..5bf9c654 100644 --- a/src/engine/shaders/fragmentShader +++ b/src/datavis3d/engine/shaders/fragmentShader diff --git a/src/engine/shaders/fragmentShaderAmbient b/src/datavis3d/engine/shaders/fragmentShaderAmbient index 88f850f3..88f850f3 100644 --- a/src/engine/shaders/fragmentShaderAmbient +++ b/src/datavis3d/engine/shaders/fragmentShaderAmbient diff --git a/src/engine/shaders/fragmentShaderColorOnY b/src/datavis3d/engine/shaders/fragmentShaderColorOnY index ee57e8e5..ee57e8e5 100644 --- a/src/engine/shaders/fragmentShaderColorOnY +++ b/src/datavis3d/engine/shaders/fragmentShaderColorOnY diff --git a/src/engine/shaders/fragmentShaderDepth b/src/datavis3d/engine/shaders/fragmentShaderDepth index 5cfd4b10..5cfd4b10 100644 --- a/src/engine/shaders/fragmentShaderDepth +++ b/src/datavis3d/engine/shaders/fragmentShaderDepth diff --git a/src/engine/shaders/fragmentShaderLabel b/src/datavis3d/engine/shaders/fragmentShaderLabel index 86021410..86021410 100644 --- a/src/engine/shaders/fragmentShaderLabel +++ b/src/datavis3d/engine/shaders/fragmentShaderLabel diff --git a/src/engine/shaders/fragmentShaderSelection b/src/datavis3d/engine/shaders/fragmentShaderSelection index 66370224..66370224 100644 --- a/src/engine/shaders/fragmentShaderSelection +++ b/src/datavis3d/engine/shaders/fragmentShaderSelection diff --git a/src/engine/shaders/fragmentShaderTexture b/src/datavis3d/engine/shaders/fragmentShaderTexture index d271f985..d271f985 100644 --- a/src/engine/shaders/fragmentShaderTexture +++ b/src/datavis3d/engine/shaders/fragmentShaderTexture diff --git a/src/engine/shaders/fragmentShadow b/src/datavis3d/engine/shaders/fragmentShadow index 3a6ffc5a..3a6ffc5a 100644 --- a/src/engine/shaders/fragmentShadow +++ b/src/datavis3d/engine/shaders/fragmentShadow diff --git a/src/engine/shaders/fragmentShadowNoTex b/src/datavis3d/engine/shaders/fragmentShadowNoTex index a08b6b40..a08b6b40 100644 --- a/src/engine/shaders/fragmentShadowNoTex +++ b/src/datavis3d/engine/shaders/fragmentShadowNoTex diff --git a/src/engine/shaders/fragmentShadowNoTexColorOnY b/src/datavis3d/engine/shaders/fragmentShadowNoTexColorOnY index d208c5fd..d208c5fd 100644 --- a/src/engine/shaders/fragmentShadowNoTexColorOnY +++ b/src/datavis3d/engine/shaders/fragmentShadowNoTexColorOnY diff --git a/src/engine/shaders/vertexDepthTest b/src/datavis3d/engine/shaders/vertexDepthTest index d62f1aa7..d62f1aa7 100644 --- a/src/engine/shaders/vertexDepthTest +++ b/src/datavis3d/engine/shaders/vertexDepthTest diff --git a/src/engine/shaders/vertexShader b/src/datavis3d/engine/shaders/vertexShader index 14f77773..14f77773 100644 --- a/src/engine/shaders/vertexShader +++ b/src/datavis3d/engine/shaders/vertexShader diff --git a/src/engine/shaders/vertexShaderDepth b/src/datavis3d/engine/shaders/vertexShaderDepth index 9fe5a193..9fe5a193 100644 --- a/src/engine/shaders/vertexShaderDepth +++ b/src/datavis3d/engine/shaders/vertexShaderDepth diff --git a/src/engine/shaders/vertexShaderLabel b/src/datavis3d/engine/shaders/vertexShaderLabel index b4debe53..b4debe53 100644 --- a/src/engine/shaders/vertexShaderLabel +++ b/src/datavis3d/engine/shaders/vertexShaderLabel diff --git a/src/engine/shaders/vertexShaderSelection b/src/datavis3d/engine/shaders/vertexShaderSelection index 64d17e15..64d17e15 100644 --- a/src/engine/shaders/vertexShaderSelection +++ b/src/datavis3d/engine/shaders/vertexShaderSelection diff --git a/src/engine/shaders/vertexShaderTexture b/src/datavis3d/engine/shaders/vertexShaderTexture index 01f922e0..01f922e0 100644 --- a/src/engine/shaders/vertexShaderTexture +++ b/src/datavis3d/engine/shaders/vertexShaderTexture diff --git a/src/engine/shaders/vertexShadow b/src/datavis3d/engine/shaders/vertexShadow index e29a8a30..e29a8a30 100644 --- a/src/engine/shaders/vertexShadow +++ b/src/datavis3d/engine/shaders/vertexShadow diff --git a/src/engine/theme.cpp b/src/datavis3d/engine/theme.cpp index a9032e25..a9032e25 100644 --- a/src/engine/theme.cpp +++ b/src/datavis3d/engine/theme.cpp diff --git a/src/engine/theme_p.h b/src/datavis3d/engine/theme_p.h index d55e9a33..d55e9a33 100644 --- a/src/engine/theme_p.h +++ b/src/datavis3d/engine/theme_p.h diff --git a/src/global/global.pri b/src/datavis3d/global/global.pri index 56cb9f8f..56cb9f8f 100644 --- a/src/global/global.pri +++ b/src/datavis3d/global/global.pri diff --git a/src/global/qdatavis3dglobal.h b/src/datavis3d/global/qdatavis3dglobal.h index 528180b3..528180b3 100644 --- a/src/global/qdatavis3dglobal.h +++ b/src/datavis3d/global/qdatavis3dglobal.h diff --git a/src/global/qdatavis3namespace.h b/src/datavis3d/global/qdatavis3namespace.h index b75bce29..b75bce29 100644 --- a/src/global/qdatavis3namespace.h +++ b/src/datavis3d/global/qdatavis3namespace.h diff --git a/src/utils/camerahelper.cpp b/src/datavis3d/utils/camerahelper.cpp index 2e868cac..2e868cac 100644 --- a/src/utils/camerahelper.cpp +++ b/src/datavis3d/utils/camerahelper.cpp diff --git a/src/utils/camerahelper_p.h b/src/datavis3d/utils/camerahelper_p.h index 68e7e5a2..68e7e5a2 100644 --- a/src/utils/camerahelper_p.h +++ b/src/datavis3d/utils/camerahelper_p.h diff --git a/src/utils/meshloader.cpp b/src/datavis3d/utils/meshloader.cpp index 0e818a92..0e818a92 100644 --- a/src/utils/meshloader.cpp +++ b/src/datavis3d/utils/meshloader.cpp diff --git a/src/utils/meshloader_p.h b/src/datavis3d/utils/meshloader_p.h index 514ae5c6..514ae5c6 100644 --- a/src/utils/meshloader_p.h +++ b/src/datavis3d/utils/meshloader_p.h diff --git a/src/utils/objecthelper.cpp b/src/datavis3d/utils/objecthelper.cpp index 6659a187..6659a187 100644 --- a/src/utils/objecthelper.cpp +++ b/src/datavis3d/utils/objecthelper.cpp diff --git a/src/utils/objecthelper_p.h b/src/datavis3d/utils/objecthelper_p.h index f3e342ba..f3e342ba 100644 --- a/src/utils/objecthelper_p.h +++ b/src/datavis3d/utils/objecthelper_p.h diff --git a/src/utils/shaderhelper.cpp b/src/datavis3d/utils/shaderhelper.cpp index a66b6a00..a66b6a00 100644 --- a/src/utils/shaderhelper.cpp +++ b/src/datavis3d/utils/shaderhelper.cpp diff --git a/src/utils/shaderhelper_p.h b/src/datavis3d/utils/shaderhelper_p.h index 83e8b981..83e8b981 100644 --- a/src/utils/shaderhelper_p.h +++ b/src/datavis3d/utils/shaderhelper_p.h diff --git a/src/utils/texturehelper.cpp b/src/datavis3d/utils/texturehelper.cpp index c0083b15..c0083b15 100644 --- a/src/utils/texturehelper.cpp +++ b/src/datavis3d/utils/texturehelper.cpp diff --git a/src/utils/texturehelper_p.h b/src/datavis3d/utils/texturehelper_p.h index 4b420fa4..4b420fa4 100644 --- a/src/utils/texturehelper_p.h +++ b/src/datavis3d/utils/texturehelper_p.h diff --git a/src/utils/utils.cpp b/src/datavis3d/utils/utils.cpp index 7b4cb6f6..7b4cb6f6 100644 --- a/src/utils/utils.cpp +++ b/src/datavis3d/utils/utils.cpp diff --git a/src/utils/utils.pri b/src/datavis3d/utils/utils.pri index 566af55f..566af55f 100644 --- a/src/utils/utils.pri +++ b/src/datavis3d/utils/utils.pri diff --git a/src/utils/utils_p.h b/src/datavis3d/utils/utils_p.h index 1668ac40..1668ac40 100644 --- a/src/utils/utils_p.h +++ b/src/datavis3d/utils/utils_p.h diff --git a/src/utils/vertexindexer.cpp b/src/datavis3d/utils/vertexindexer.cpp index 7e5a863f..7e5a863f 100644 --- a/src/utils/vertexindexer.cpp +++ b/src/datavis3d/utils/vertexindexer.cpp diff --git a/src/utils/vertexindexer_p.h b/src/datavis3d/utils/vertexindexer_p.h index 3ee908af..3ee908af 100644 --- a/src/utils/vertexindexer_p.h +++ b/src/datavis3d/utils/vertexindexer_p.h diff --git a/src/src.pro b/src/src.pro index b4169c4e..b9b7be46 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,22 +1,2 @@ -TARGET = QtDataVis3D -QT = core gui opengl #qml - -DEFINES += QTCOMMERCIALDATAVIS3D_LIBRARY - -QMAKE_DOCS = $$PWD/doc/qtdatavis3d.qdocconf - -load(qt_module) - -include($$PWD/common.pri) -include($$PWD/engine/engine.pri) -include($$PWD/global/global.pri) -include($$PWD/utils/utils.pri) - -wince* { - # The Microsoft MIPS compiler crashes if /Og is specified. - # -O2/1 expands to /Og plus additional arguments. - contains(DEFINES, MIPS) { - QMAKE_CXXFLAGS_RELEASE ~= s/-O2/-Oi -Ot -Oy -Ob2/ - QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/ - } -} +TEMPLATE = subdirs +SUBDIRS += datavis3d |