From dc679500fac0e8a6466059678c76d6c965037ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Thu, 14 Nov 2013 21:46:47 +0100 Subject: [PATCH] Renaming editing -> interface/desktop --- .gitignore | 1 - Makefile | 11 ++- src/common.pri | 2 +- src/definition/definition_global.h | 1 + .../desktop}/baseform.cpp | 5 -- src/{editing => interface/desktop}/baseform.h | 17 ++-- .../desktop}/baseformlayer.cpp | 0 .../desktop}/baseformlayer.h | 0 .../desktop}/baseinput.cpp | 0 .../desktop}/baseinput.h | 8 ++ .../desktop}/common/freeformhelper.cpp | 0 .../desktop}/common/freeformhelper.h | 2 +- .../desktop}/common/freelayerhelper.cpp | 0 .../desktop}/common/freelayerhelper.h | 0 .../desktop}/common/mainwindow.cpp | 0 .../desktop}/common/mainwindow.h | 12 +-- .../desktop}/common/mainwindow.ui | 0 .../common/widgetglobalformbuttons.cpp | 0 .../desktop}/common/widgetglobalformbuttons.h | 0 .../common/widgetglobalformbuttons.ui | 0 .../desktop}/common/widgetsliderdecimal.cpp | 0 .../desktop}/common/widgetsliderdecimal.h | 0 .../desktop/desktop.pro} | 78 +++++++++---------- .../desktop/desktop_global.h} | 9 +++ .../desktop}/dialogcolorgradation.cpp | 0 .../desktop}/dialogcolorgradation.h | 0 .../desktop}/dialogcurve.cpp | 0 .../desktop}/dialogcurve.h | 0 .../desktop}/dialogexplorer.cpp | 0 .../desktop}/dialogexplorer.h | 2 +- .../desktop}/dialoglayers.cpp | 0 .../desktop}/dialoglayers.h | 0 .../desktop}/dialognoise.cpp | 0 .../desktop}/dialognoise.h | 2 +- .../desktop}/dialogrender.cpp | 0 .../desktop}/dialogrender.h | 0 .../desktop}/formatmosphere.cpp | 0 .../desktop}/formatmosphere.h | 2 +- .../desktop}/formclouds.cpp | 0 .../desktop}/formclouds.h | 2 +- .../desktop}/formrender.cpp | 0 .../desktop}/formrender.h | 0 .../desktop}/formtextures.cpp | 0 .../desktop}/formtextures.h | 2 +- .../desktop}/formwater.cpp | 0 .../desktop}/formwater.h | 2 +- .../desktop}/inputboolean.cpp | 0 .../desktop}/inputboolean.h | 0 .../desktop}/inputcamera.cpp | 0 .../desktop}/inputcamera.h | 6 +- .../desktop}/inputcolor.cpp | 0 .../desktop}/inputcolor.h | 0 .../desktop}/inputcolorgradation.cpp | 0 .../desktop}/inputcolorgradation.h | 0 .../desktop}/inputcurve.cpp | 0 .../desktop}/inputcurve.h | 0 .../desktop}/inputdouble.cpp | 0 .../desktop}/inputdouble.h | 0 .../desktop}/inputenum.cpp | 0 .../desktop}/inputenum.h | 0 .../desktop}/inputint.cpp | 0 src/{editing => interface/desktop}/inputint.h | 0 .../desktop}/inputlayers.cpp | 0 .../desktop}/inputlayers.h | 0 .../desktop}/inputmaterial.cpp | 0 .../desktop}/inputmaterial.h | 0 .../desktop}/inputnoise.cpp | 0 .../desktop}/inputnoise.h | 10 +-- .../lighting/DialogMaterialEditor.cpp | 0 .../desktop}/lighting/DialogMaterialEditor.h | 0 .../desktop}/lighting/DialogMaterialEditor.ui | 0 .../desktop}/lighting/SmallPreviewColor.cpp | 0 .../desktop}/lighting/SmallPreviewColor.h | 0 .../desktop}/lighting/SmallPreviewHues.cpp | 0 .../desktop}/lighting/SmallPreviewHues.h | 0 .../desktop}/previewcolorgradation.cpp | 0 .../desktop}/previewcolorgradation.h | 0 .../desktop}/previewmaterial.cpp | 0 .../desktop}/previewmaterial.h | 3 +- .../terrain/dialogbaseterrainnoise.cpp | 0 .../desktop}/terrain/dialogbaseterrainnoise.h | 2 +- .../terrain/dialogbaseterrainnoise.ui | 0 .../terrain/dialogterrainpainting.cpp | 0 .../desktop}/terrain/dialogterrainpainting.h | 0 .../desktop}/terrain/dialogterrainpainting.ui | 0 .../desktop}/terrain/mainterrainform.cpp | 0 .../desktop}/terrain/mainterrainform.h | 2 +- .../desktop}/terrain/mainterrainform.ui | 0 .../desktop}/terrain/paintingbrush.cpp | 0 .../desktop}/terrain/paintingbrush.h | 0 .../desktop}/terrain/previewterrainshape.cpp | 0 .../desktop}/terrain/previewterrainshape.h | 2 +- .../desktop}/terrain/widgetheightmap.cpp | 0 .../desktop}/terrain/widgetheightmap.h | 0 .../terrain/widgetterrainbasenoisepreview.cpp | 0 .../terrain/widgetterrainbasenoisepreview.h | 2 +- .../desktop}/textures/DialogTexturesLayer.cpp | 0 .../desktop}/textures/DialogTexturesLayer.h | 0 .../desktop}/textures/DialogTexturesLayer.ui | 0 .../desktop}/textures/PreviewCumul.cpp | 0 .../desktop}/textures/PreviewCumul.h | 2 +- .../textures/PreviewLayerCoverage.cpp | 0 .../desktop}/textures/PreviewLayerCoverage.h | 2 +- .../desktop}/textures/PreviewLayerLook.cpp | 0 .../desktop}/textures/PreviewLayerLook.h | 2 +- .../desktop}/textures/maintexturesform.cpp | 0 .../desktop}/textures/maintexturesform.h | 0 .../desktop}/textures/maintexturesform.ui | 0 src/{editing => interface/desktop}/tools.cpp | 0 src/{editing => interface/desktop}/tools.h | 0 .../desktop}/widgetcurveeditor.cpp | 0 .../desktop}/widgetcurveeditor.h | 0 src/paysages.pro | 2 +- src/render/opengl/OpenGLRenderer.cpp | 11 +-- src/render/opengl/OpenGLRenderer.h | 11 +-- 115 files changed, 105 insertions(+), 110 deletions(-) rename src/{editing => interface/desktop}/baseform.cpp (98%) rename src/{editing => interface/desktop}/baseform.h (91%) rename src/{editing => interface/desktop}/baseformlayer.cpp (100%) rename src/{editing => interface/desktop}/baseformlayer.h (100%) rename src/{editing => interface/desktop}/baseinput.cpp (100%) rename src/{editing => interface/desktop}/baseinput.h (92%) rename src/{editing => interface/desktop}/common/freeformhelper.cpp (100%) rename src/{editing => interface/desktop}/common/freeformhelper.h (98%) rename src/{editing => interface/desktop}/common/freelayerhelper.cpp (100%) rename src/{editing => interface/desktop}/common/freelayerhelper.h (100%) rename src/{editing => interface/desktop}/common/mainwindow.cpp (100%) rename src/{editing => interface/desktop}/common/mainwindow.h (90%) rename src/{editing => interface/desktop}/common/mainwindow.ui (100%) rename src/{editing => interface/desktop}/common/widgetglobalformbuttons.cpp (100%) rename src/{editing => interface/desktop}/common/widgetglobalformbuttons.h (100%) rename src/{editing => interface/desktop}/common/widgetglobalformbuttons.ui (100%) rename src/{editing => interface/desktop}/common/widgetsliderdecimal.cpp (100%) rename src/{editing => interface/desktop}/common/widgetsliderdecimal.h (100%) rename src/{editing/editing.pro => interface/desktop/desktop.pro} (61%) rename src/{editing/editing_global.h => interface/desktop/desktop_global.h} (61%) rename src/{editing => interface/desktop}/dialogcolorgradation.cpp (100%) rename src/{editing => interface/desktop}/dialogcolorgradation.h (100%) rename src/{editing => interface/desktop}/dialogcurve.cpp (100%) rename src/{editing => interface/desktop}/dialogcurve.h (100%) rename src/{editing => interface/desktop}/dialogexplorer.cpp (100%) rename src/{editing => interface/desktop}/dialogexplorer.h (93%) rename src/{editing => interface/desktop}/dialoglayers.cpp (100%) rename src/{editing => interface/desktop}/dialoglayers.h (100%) rename src/{editing => interface/desktop}/dialognoise.cpp (100%) rename src/{editing => interface/desktop}/dialognoise.h (97%) rename src/{editing => interface/desktop}/dialogrender.cpp (100%) rename src/{editing => interface/desktop}/dialogrender.h (100%) rename src/{editing => interface/desktop}/formatmosphere.cpp (100%) rename src/{editing => interface/desktop}/formatmosphere.h (95%) rename src/{editing => interface/desktop}/formclouds.cpp (100%) rename src/{editing => interface/desktop}/formclouds.h (96%) rename src/{editing => interface/desktop}/formrender.cpp (100%) rename src/{editing => interface/desktop}/formrender.h (100%) rename src/{editing => interface/desktop}/formtextures.cpp (100%) rename src/{editing => interface/desktop}/formtextures.h (96%) rename src/{editing => interface/desktop}/formwater.cpp (100%) rename src/{editing => interface/desktop}/formwater.h (94%) rename src/{editing => interface/desktop}/inputboolean.cpp (100%) rename src/{editing => interface/desktop}/inputboolean.h (100%) rename src/{editing => interface/desktop}/inputcamera.cpp (100%) rename src/{editing => interface/desktop}/inputcamera.h (87%) rename src/{editing => interface/desktop}/inputcolor.cpp (100%) rename src/{editing => interface/desktop}/inputcolor.h (100%) rename src/{editing => interface/desktop}/inputcolorgradation.cpp (100%) rename src/{editing => interface/desktop}/inputcolorgradation.h (100%) rename src/{editing => interface/desktop}/inputcurve.cpp (100%) rename src/{editing => interface/desktop}/inputcurve.h (100%) rename src/{editing => interface/desktop}/inputdouble.cpp (100%) rename src/{editing => interface/desktop}/inputdouble.h (100%) rename src/{editing => interface/desktop}/inputenum.cpp (100%) rename src/{editing => interface/desktop}/inputenum.h (100%) rename src/{editing => interface/desktop}/inputint.cpp (100%) rename src/{editing => interface/desktop}/inputint.h (100%) rename src/{editing => interface/desktop}/inputlayers.cpp (100%) rename src/{editing => interface/desktop}/inputlayers.h (100%) rename src/{editing => interface/desktop}/inputmaterial.cpp (100%) rename src/{editing => interface/desktop}/inputmaterial.h (100%) rename src/{editing => interface/desktop}/inputnoise.cpp (100%) rename src/{editing => interface/desktop}/inputnoise.h (78%) rename src/{editing => interface/desktop}/lighting/DialogMaterialEditor.cpp (100%) rename src/{editing => interface/desktop}/lighting/DialogMaterialEditor.h (100%) rename src/{editing => interface/desktop}/lighting/DialogMaterialEditor.ui (100%) rename src/{editing => interface/desktop}/lighting/SmallPreviewColor.cpp (100%) rename src/{editing => interface/desktop}/lighting/SmallPreviewColor.h (100%) rename src/{editing => interface/desktop}/lighting/SmallPreviewHues.cpp (100%) rename src/{editing => interface/desktop}/lighting/SmallPreviewHues.h (100%) rename src/{editing => interface/desktop}/previewcolorgradation.cpp (100%) rename src/{editing => interface/desktop}/previewcolorgradation.h (100%) rename src/{editing => interface/desktop}/previewmaterial.cpp (100%) rename src/{editing => interface/desktop}/previewmaterial.h (94%) rename src/{editing => interface/desktop}/terrain/dialogbaseterrainnoise.cpp (100%) rename src/{editing => interface/desktop}/terrain/dialogbaseterrainnoise.h (95%) rename src/{editing => interface/desktop}/terrain/dialogbaseterrainnoise.ui (100%) rename src/{editing => interface/desktop}/terrain/dialogterrainpainting.cpp (100%) rename src/{editing => interface/desktop}/terrain/dialogterrainpainting.h (100%) rename src/{editing => interface/desktop}/terrain/dialogterrainpainting.ui (100%) rename src/{editing => interface/desktop}/terrain/mainterrainform.cpp (100%) rename src/{editing => interface/desktop}/terrain/mainterrainform.h (96%) rename src/{editing => interface/desktop}/terrain/mainterrainform.ui (100%) rename src/{editing => interface/desktop}/terrain/paintingbrush.cpp (100%) rename src/{editing => interface/desktop}/terrain/paintingbrush.h (100%) rename src/{editing => interface/desktop}/terrain/previewterrainshape.cpp (100%) rename src/{editing => interface/desktop}/terrain/previewterrainshape.h (95%) rename src/{editing => interface/desktop}/terrain/widgetheightmap.cpp (100%) rename src/{editing => interface/desktop}/terrain/widgetheightmap.h (100%) rename src/{editing => interface/desktop}/terrain/widgetterrainbasenoisepreview.cpp (100%) rename src/{editing => interface/desktop}/terrain/widgetterrainbasenoisepreview.h (94%) rename src/{editing => interface/desktop}/textures/DialogTexturesLayer.cpp (100%) rename src/{editing => interface/desktop}/textures/DialogTexturesLayer.h (100%) rename src/{editing => interface/desktop}/textures/DialogTexturesLayer.ui (100%) rename src/{editing => interface/desktop}/textures/PreviewCumul.cpp (100%) rename src/{editing => interface/desktop}/textures/PreviewCumul.h (95%) rename src/{editing => interface/desktop}/textures/PreviewLayerCoverage.cpp (100%) rename src/{editing => interface/desktop}/textures/PreviewLayerCoverage.h (95%) rename src/{editing => interface/desktop}/textures/PreviewLayerLook.cpp (100%) rename src/{editing => interface/desktop}/textures/PreviewLayerLook.h (95%) rename src/{editing => interface/desktop}/textures/maintexturesform.cpp (100%) rename src/{editing => interface/desktop}/textures/maintexturesform.h (100%) rename src/{editing => interface/desktop}/textures/maintexturesform.ui (100%) rename src/{editing => interface/desktop}/tools.cpp (100%) rename src/{editing => interface/desktop}/tools.h (100%) rename src/{editing => interface/desktop}/widgetcurveeditor.cpp (100%) rename src/{editing => interface/desktop}/widgetcurveeditor.h (100%) diff --git a/.gitignore b/.gitignore index 25585bb..78daa57 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ /gmon.out /nbproject/ /output/ -/src/*/Makefile *.pro.user *.pro.user.* qrc_*.cpp diff --git a/Makefile b/Makefile index ea77449..dba2b30 100644 --- a/Makefile +++ b/Makefile @@ -40,17 +40,17 @@ else endif run_cli:build - LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/controlling/paysages-cli + LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/interface/commandline/paysages-cli run:build - LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/editing/paysages-gui + LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/interface/desktop/paysages-gui profile:debug - LD_LIBRARY_PATH=build/debug/rendering:build/debug/exploring perf record -g fp ./build/debug/paysages-gui + LD_LIBRARY_PATH=${LIBRARY_PATH} perf record -g fp ${BUILDPATH}/interface/desktop/paysages-gui perf report -g profile_cli:debug - LD_LIBRARY_PATH=build/debug/rendering perf record -g fp ./build/debug/paysages-cli + LD_LIBRARY_PATH=${LIBRARY_PATH} perf record -g fp ${BUILDPATH}/interface/commandline/paysages-cli perf report -g package:release @@ -65,8 +65,7 @@ package:release cp $(BUILDPATH)/render/software/libpaysages_render_software.so* paysages3d-linux/lib/ cp $(BUILDPATH)/render/opengl/libpaysages_render_opengl.so* paysages3d-linux/lib/ cp $(BUILDPATH)/rendering/libpaysages_rendering.so* paysages3d-linux/lib/ - cp $(BUILDPATH)/exploring/libpaysages_exploring.so* paysages3d-linux/lib/ - cp $(BUILDPATH)/editing/paysages-gui paysages3d-linux/lib/ + cp $(BUILDPATH)/interface/desktop/paysages-gui paysages3d-linux/lib/ chmod +x paysages3d-linux/lib/paysages-gui cp -r data paysages3d-linux/ cp -r cache/*.cache paysages3d-linux/cache/ diff --git a/src/common.pri b/src/common.pri index db8cca7..131b6dd 100644 --- a/src/common.pri +++ b/src/common.pri @@ -1,3 +1,3 @@ -CONFIG(release, debug|release): DEFINES += NDEBUG +CONFIG(release, debug|release): DEFINES += NDEBUG QT_NO_DEBUG_OUTPUT QMAKE_CXXFLAGS += -std=c++11 diff --git a/src/definition/definition_global.h b/src/definition/definition_global.h index 9d21c96..ad6fe32 100644 --- a/src/definition/definition_global.h +++ b/src/definition/definition_global.h @@ -16,6 +16,7 @@ namespace definition { class CameraDefinition; class SurfaceMaterial; class WaterDefinition; + class Layers; } } using namespace paysages::definition; diff --git a/src/editing/baseform.cpp b/src/interface/desktop/baseform.cpp similarity index 98% rename from src/editing/baseform.cpp rename to src/interface/desktop/baseform.cpp index 1248829..7a3ba7d 100644 --- a/src/editing/baseform.cpp +++ b/src/interface/desktop/baseform.cpp @@ -464,11 +464,6 @@ BaseInput* BaseForm::addInputEnum(QString label, int* value, const QStringList& return addInput(new InputEnum(_form, label, value, values)); } -BaseInput* BaseForm::addInputLayers(QString label, Layers* value, FormLayerBuilder form_builder) -{ - return addInput(new InputLayers(_form, label, value, form_builder)); -} - void BaseForm::updatePreviews() { for (int i = 0; i < _previews_list.size(); i++) diff --git a/src/editing/baseform.h b/src/interface/desktop/baseform.h similarity index 91% rename from src/editing/baseform.h rename to src/interface/desktop/baseform.h index f0b440e..001d7dc 100644 --- a/src/editing/baseform.h +++ b/src/interface/desktop/baseform.h @@ -1,19 +1,18 @@ #ifndef _PAYSAGES_QT_BASEFORM_H_ #define _PAYSAGES_QT_BASEFORM_H_ -#include "editing_global.h" +#include "desktop_global.h" #include #include -#include "baseinput.h" -#include "dialoglayers.h" -#include "shared/types.h" -#include "tools/curve.h" -#include "tools/color.h" -#include "tools/lighting.h" class QPushButton; class QComboBox; +class ColorGradation; +class Curve; + +namespace paysages { +namespace desktop { class BaseForm : public QWidget { @@ -60,7 +59,6 @@ protected: BaseInput* addInputCurve(QString label, Curve* value, double xmin, double xmax, double ymin, double ymax, QString xlabel, QString ylabel); BaseInput* addInputMaterial(QString label, SurfaceMaterial* material); BaseInput* addInputEnum(QString label, int* value, const QStringList& values); - BaseInput* addInputLayers(QString label, Layers* value, FormLayerBuilder form_builder); void updatePreviews(); void disablePreviewsUpdate(); @@ -104,4 +102,7 @@ private: QPushButton* _layer_rename; }; +} +} + #endif diff --git a/src/editing/baseformlayer.cpp b/src/interface/desktop/baseformlayer.cpp similarity index 100% rename from src/editing/baseformlayer.cpp rename to src/interface/desktop/baseformlayer.cpp diff --git a/src/editing/baseformlayer.h b/src/interface/desktop/baseformlayer.h similarity index 100% rename from src/editing/baseformlayer.h rename to src/interface/desktop/baseformlayer.h diff --git a/src/editing/baseinput.cpp b/src/interface/desktop/baseinput.cpp similarity index 100% rename from src/editing/baseinput.cpp rename to src/interface/desktop/baseinput.cpp diff --git a/src/editing/baseinput.h b/src/interface/desktop/baseinput.h similarity index 92% rename from src/editing/baseinput.h rename to src/interface/desktop/baseinput.h index 54040b6..c107f83 100644 --- a/src/editing/baseinput.h +++ b/src/interface/desktop/baseinput.h @@ -1,10 +1,15 @@ #ifndef _PAYSAGES_QT_BASEINPUT_H_ #define _PAYSAGES_QT_BASEINPUT_H_ +#include "desktop_global.h" + #include class QWidget; class QLabel; +namespace paysages { +namespace desktop { + class BaseInput:public QObject { Q_OBJECT @@ -38,4 +43,7 @@ protected: bool _enabled; }; +} +} + #endif diff --git a/src/editing/common/freeformhelper.cpp b/src/interface/desktop/common/freeformhelper.cpp similarity index 100% rename from src/editing/common/freeformhelper.cpp rename to src/interface/desktop/common/freeformhelper.cpp diff --git a/src/editing/common/freeformhelper.h b/src/interface/desktop/common/freeformhelper.h similarity index 98% rename from src/editing/common/freeformhelper.h rename to src/interface/desktop/common/freeformhelper.h index 7bca5eb..a4a1f57 100644 --- a/src/editing/common/freeformhelper.h +++ b/src/interface/desktop/common/freeformhelper.h @@ -1,7 +1,7 @@ #ifndef FREEFORMHELPER_H #define FREEFORMHELPER_H -#include "editing_global.h" +#include "desktop_global.h" #include #include diff --git a/src/editing/common/freelayerhelper.cpp b/src/interface/desktop/common/freelayerhelper.cpp similarity index 100% rename from src/editing/common/freelayerhelper.cpp rename to src/interface/desktop/common/freelayerhelper.cpp diff --git a/src/editing/common/freelayerhelper.h b/src/interface/desktop/common/freelayerhelper.h similarity index 100% rename from src/editing/common/freelayerhelper.h rename to src/interface/desktop/common/freelayerhelper.h diff --git a/src/editing/common/mainwindow.cpp b/src/interface/desktop/common/mainwindow.cpp similarity index 100% rename from src/editing/common/mainwindow.cpp rename to src/interface/desktop/common/mainwindow.cpp diff --git a/src/editing/common/mainwindow.h b/src/interface/desktop/common/mainwindow.h similarity index 90% rename from src/editing/common/mainwindow.h rename to src/interface/desktop/common/mainwindow.h index 6380b7e..ebe48ab 100644 --- a/src/editing/common/mainwindow.h +++ b/src/interface/desktop/common/mainwindow.h @@ -1,19 +1,13 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include "editing_global.h" +#include "desktop_global.h" + #include + #include - -class BaseForm; class FormRender; -namespace paysages { -namespace system { -class PackStream; -} -} - namespace Ui { class MainWindow; } diff --git a/src/editing/common/mainwindow.ui b/src/interface/desktop/common/mainwindow.ui similarity index 100% rename from src/editing/common/mainwindow.ui rename to src/interface/desktop/common/mainwindow.ui diff --git a/src/editing/common/widgetglobalformbuttons.cpp b/src/interface/desktop/common/widgetglobalformbuttons.cpp similarity index 100% rename from src/editing/common/widgetglobalformbuttons.cpp rename to src/interface/desktop/common/widgetglobalformbuttons.cpp diff --git a/src/editing/common/widgetglobalformbuttons.h b/src/interface/desktop/common/widgetglobalformbuttons.h similarity index 100% rename from src/editing/common/widgetglobalformbuttons.h rename to src/interface/desktop/common/widgetglobalformbuttons.h diff --git a/src/editing/common/widgetglobalformbuttons.ui b/src/interface/desktop/common/widgetglobalformbuttons.ui similarity index 100% rename from src/editing/common/widgetglobalformbuttons.ui rename to src/interface/desktop/common/widgetglobalformbuttons.ui diff --git a/src/editing/common/widgetsliderdecimal.cpp b/src/interface/desktop/common/widgetsliderdecimal.cpp similarity index 100% rename from src/editing/common/widgetsliderdecimal.cpp rename to src/interface/desktop/common/widgetsliderdecimal.cpp diff --git a/src/editing/common/widgetsliderdecimal.h b/src/interface/desktop/common/widgetsliderdecimal.h similarity index 100% rename from src/editing/common/widgetsliderdecimal.h rename to src/interface/desktop/common/widgetsliderdecimal.h diff --git a/src/editing/editing.pro b/src/interface/desktop/desktop.pro similarity index 61% rename from src/editing/editing.pro rename to src/interface/desktop/desktop.pro index 100b0a0..eecae4d 100644 --- a/src/editing/editing.pro +++ b/src/interface/desktop/desktop.pro @@ -7,7 +7,7 @@ TARGET = paysages-gui unix:LIBS += -lGLU -include(../common.pri) +include(../../common.pri) HEADERS += \ terrain/widgetheightmap.h \ @@ -59,7 +59,7 @@ HEADERS += \ textures/PreviewLayerLook.h \ textures/PreviewCumul.h \ textures/DialogTexturesLayer.h \ - editing_global.h + desktop_global.h SOURCES += \ terrain/widgetheightmap.cpp \ @@ -123,48 +123,48 @@ FORMS += \ textures/DialogTexturesLayer.ui RESOURCES += \ - ../../data/ui_pictures.qrc + ../../../data/ui_pictures.qrc -TRANSLATIONS = ../../data/i18n/paysages_fr.ts +TRANSLATIONS = ../../../data/i18n/paysages_fr.ts -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../system/release/ -lpaysages_system -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../system/debug/ -lpaysages_system -else:unix: LIBS += -L$$OUT_PWD/../system/ -lpaysages_system -INCLUDEPATH += $$PWD/../system -DEPENDPATH += $$PWD/../system +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../system/release/ -lpaysages_system +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../system/debug/ -lpaysages_system +else:unix: LIBS += -L$$OUT_PWD/../../system/ -lpaysages_system +INCLUDEPATH += $$PWD/../../system +DEPENDPATH += $$PWD/../../system -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../basics/release/ -lpaysages_basics -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../basics/debug/ -lpaysages_basics -else:unix: LIBS += -L$$OUT_PWD/../basics/ -lpaysages_basics -INCLUDEPATH += $$PWD/../basics -DEPENDPATH += $$PWD/../basics +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../basics/release/ -lpaysages_basics +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../basics/debug/ -lpaysages_basics +else:unix: LIBS += -L$$OUT_PWD/../../basics/ -lpaysages_basics +INCLUDEPATH += $$PWD/../../basics +DEPENDPATH += $$PWD/../../basics -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../rendering/release/ -lpaysages_rendering -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../rendering/debug/ -lpaysages_rendering -else:unix: LIBS += -L$$OUT_PWD/../rendering/ -lpaysages_rendering -INCLUDEPATH += $$PWD/../rendering -DEPENDPATH += $$PWD/../rendering +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../rendering/release/ -lpaysages_rendering +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../rendering/debug/ -lpaysages_rendering +else:unix: LIBS += -L$$OUT_PWD/../../rendering/ -lpaysages_rendering +INCLUDEPATH += $$PWD/../../rendering +DEPENDPATH += $$PWD/../../rendering -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../definition/release/ -lpaysages_definition -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../definition/debug/ -lpaysages_definition -else:unix: LIBS += -L$$OUT_PWD/../definition/ -lpaysages_definition -INCLUDEPATH += $$PWD/../definition -DEPENDPATH += $$PWD/../definition +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../definition/release/ -lpaysages_definition +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../definition/debug/ -lpaysages_definition +else:unix: LIBS += -L$$OUT_PWD/../../definition/ -lpaysages_definition +INCLUDEPATH += $$PWD/../../definition +DEPENDPATH += $$PWD/../../definition -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../render/software/release/ -lpaysages_render_software -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../render/software/debug/ -lpaysages_render_software -else:unix: LIBS += -L$$OUT_PWD/../render/software/ -lpaysages_render_software -INCLUDEPATH += $$PWD/../render/software -DEPENDPATH += $$PWD/../render/software +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../render/software/release/ -lpaysages_render_software +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../render/software/debug/ -lpaysages_render_software +else:unix: LIBS += -L$$OUT_PWD/../../render/software/ -lpaysages_render_software +INCLUDEPATH += $$PWD/../../render/software +DEPENDPATH += $$PWD/../../render/software -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../render/preview/release/ -lpaysages_render_preview -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../render/preview/debug/ -lpaysages_render_preview -else:unix: LIBS += -L$$OUT_PWD/../render/preview/ -lpaysages_render_preview -INCLUDEPATH += $$PWD/../render/preview -DEPENDPATH += $$PWD/../render/preview +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../render/preview/release/ -lpaysages_render_preview +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../render/preview/debug/ -lpaysages_render_preview +else:unix: LIBS += -L$$OUT_PWD/../../render/preview/ -lpaysages_render_preview +INCLUDEPATH += $$PWD/../../render/preview +DEPENDPATH += $$PWD/../../render/preview -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../render/opengl/release/ -lpaysages_render_opengl -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../render/opengl/debug/ -lpaysages_render_opengl -else:unix: LIBS += -L$$OUT_PWD/../render/opengl/ -lpaysages_render_opengl -INCLUDEPATH += $$PWD/../render/opengl -DEPENDPATH += $$PWD/../render/opengl +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../render/opengl/release/ -lpaysages_render_opengl +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../render/opengl/debug/ -lpaysages_render_opengl +else:unix: LIBS += -L$$OUT_PWD/../../render/opengl/ -lpaysages_render_opengl +INCLUDEPATH += $$PWD/../../render/opengl +DEPENDPATH += $$PWD/../../render/opengl diff --git a/src/editing/editing_global.h b/src/interface/desktop/desktop_global.h similarity index 61% rename from src/editing/editing_global.h rename to src/interface/desktop/desktop_global.h index 18d9b83..da63022 100644 --- a/src/editing/editing_global.h +++ b/src/interface/desktop/desktop_global.h @@ -6,4 +6,13 @@ #include "opengl_global.h" #include "preview_global.h" +namespace paysages { +namespace desktop { + class BaseInput; + class BaseForm; +} +} + +using namespace paysages::desktop; + #endif // EDITING_GLOBAL_H diff --git a/src/editing/dialogcolorgradation.cpp b/src/interface/desktop/dialogcolorgradation.cpp similarity index 100% rename from src/editing/dialogcolorgradation.cpp rename to src/interface/desktop/dialogcolorgradation.cpp diff --git a/src/editing/dialogcolorgradation.h b/src/interface/desktop/dialogcolorgradation.h similarity index 100% rename from src/editing/dialogcolorgradation.h rename to src/interface/desktop/dialogcolorgradation.h diff --git a/src/editing/dialogcurve.cpp b/src/interface/desktop/dialogcurve.cpp similarity index 100% rename from src/editing/dialogcurve.cpp rename to src/interface/desktop/dialogcurve.cpp diff --git a/src/editing/dialogcurve.h b/src/interface/desktop/dialogcurve.h similarity index 100% rename from src/editing/dialogcurve.h rename to src/interface/desktop/dialogcurve.h diff --git a/src/editing/dialogexplorer.cpp b/src/interface/desktop/dialogexplorer.cpp similarity index 100% rename from src/editing/dialogexplorer.cpp rename to src/interface/desktop/dialogexplorer.cpp diff --git a/src/editing/dialogexplorer.h b/src/interface/desktop/dialogexplorer.h similarity index 93% rename from src/editing/dialogexplorer.h rename to src/interface/desktop/dialogexplorer.h index 363ee64..dbc43fc 100644 --- a/src/editing/dialogexplorer.h +++ b/src/interface/desktop/dialogexplorer.h @@ -1,7 +1,7 @@ #ifndef _PAYSAGES_QT_DIALOGEXPLORER_H_ #define _PAYSAGES_QT_DIALOGEXPLORER_H_ -#include "editing_global.h" +#include "desktop_global.h" #include diff --git a/src/editing/dialoglayers.cpp b/src/interface/desktop/dialoglayers.cpp similarity index 100% rename from src/editing/dialoglayers.cpp rename to src/interface/desktop/dialoglayers.cpp diff --git a/src/editing/dialoglayers.h b/src/interface/desktop/dialoglayers.h similarity index 100% rename from src/editing/dialoglayers.h rename to src/interface/desktop/dialoglayers.h diff --git a/src/editing/dialognoise.cpp b/src/interface/desktop/dialognoise.cpp similarity index 100% rename from src/editing/dialognoise.cpp rename to src/interface/desktop/dialognoise.cpp diff --git a/src/editing/dialognoise.h b/src/interface/desktop/dialognoise.h similarity index 97% rename from src/editing/dialognoise.h rename to src/interface/desktop/dialognoise.h index bc27dc4..ea4bee9 100644 --- a/src/editing/dialognoise.h +++ b/src/interface/desktop/dialognoise.h @@ -1,7 +1,7 @@ #ifndef _PAYSAGES_QT_DIALOGNOISE_H_ #define _PAYSAGES_QT_DIALOGNOISE_H_ -#include "editing_global.h" +#include "desktop_global.h" #include #include diff --git a/src/editing/dialogrender.cpp b/src/interface/desktop/dialogrender.cpp similarity index 100% rename from src/editing/dialogrender.cpp rename to src/interface/desktop/dialogrender.cpp diff --git a/src/editing/dialogrender.h b/src/interface/desktop/dialogrender.h similarity index 100% rename from src/editing/dialogrender.h rename to src/interface/desktop/dialogrender.h diff --git a/src/editing/formatmosphere.cpp b/src/interface/desktop/formatmosphere.cpp similarity index 100% rename from src/editing/formatmosphere.cpp rename to src/interface/desktop/formatmosphere.cpp diff --git a/src/editing/formatmosphere.h b/src/interface/desktop/formatmosphere.h similarity index 95% rename from src/editing/formatmosphere.h rename to src/interface/desktop/formatmosphere.h index 203543b..f053ea8 100644 --- a/src/editing/formatmosphere.h +++ b/src/interface/desktop/formatmosphere.h @@ -1,7 +1,7 @@ #ifndef _PAYSAGES_QT_FORMATMOSPHERE_H_ #define _PAYSAGES_QT_FORMATMOSPHERE_H_ -#include "editing_global.h" +#include "desktop_global.h" #include "baseform.h" class QWidget; diff --git a/src/editing/formclouds.cpp b/src/interface/desktop/formclouds.cpp similarity index 100% rename from src/editing/formclouds.cpp rename to src/interface/desktop/formclouds.cpp diff --git a/src/editing/formclouds.h b/src/interface/desktop/formclouds.h similarity index 96% rename from src/editing/formclouds.h rename to src/interface/desktop/formclouds.h index 3ed69ee..2821971 100644 --- a/src/editing/formclouds.h +++ b/src/interface/desktop/formclouds.h @@ -1,7 +1,7 @@ #ifndef _PAYSAGES_QT_FORMCLOUDS_H_ #define _PAYSAGES_QT_FORMCLOUDS_H_ -#include "editing_global.h" +#include "desktop_global.h" #include "baseformlayer.h" #include "clouds/public.h" diff --git a/src/editing/formrender.cpp b/src/interface/desktop/formrender.cpp similarity index 100% rename from src/editing/formrender.cpp rename to src/interface/desktop/formrender.cpp diff --git a/src/editing/formrender.h b/src/interface/desktop/formrender.h similarity index 100% rename from src/editing/formrender.h rename to src/interface/desktop/formrender.h diff --git a/src/editing/formtextures.cpp b/src/interface/desktop/formtextures.cpp similarity index 100% rename from src/editing/formtextures.cpp rename to src/interface/desktop/formtextures.cpp diff --git a/src/editing/formtextures.h b/src/interface/desktop/formtextures.h similarity index 96% rename from src/editing/formtextures.h rename to src/interface/desktop/formtextures.h index 1d64000..37efb3f 100644 --- a/src/editing/formtextures.h +++ b/src/interface/desktop/formtextures.h @@ -1,7 +1,7 @@ #ifndef _PAYSAGES_QT_FORMTEXTURES_H_ #define _PAYSAGES_QT_FORMTEXTURES_H_ -#include "editing_global.h" +#include "desktop_global.h" #include "baseformlayer.h" #include "textures/public.h" diff --git a/src/editing/formwater.cpp b/src/interface/desktop/formwater.cpp similarity index 100% rename from src/editing/formwater.cpp rename to src/interface/desktop/formwater.cpp diff --git a/src/editing/formwater.h b/src/interface/desktop/formwater.h similarity index 94% rename from src/editing/formwater.h rename to src/interface/desktop/formwater.h index b436eb9..c8f3b3f 100644 --- a/src/editing/formwater.h +++ b/src/interface/desktop/formwater.h @@ -1,7 +1,7 @@ #ifndef _PAYSAGES_QT_FORMWATER_H_ #define _PAYSAGES_QT_FORMWATER_H_ -#include "editing_global.h" +#include "desktop_global.h" #include "baseform.h" class QWidget; diff --git a/src/editing/inputboolean.cpp b/src/interface/desktop/inputboolean.cpp similarity index 100% rename from src/editing/inputboolean.cpp rename to src/interface/desktop/inputboolean.cpp diff --git a/src/editing/inputboolean.h b/src/interface/desktop/inputboolean.h similarity index 100% rename from src/editing/inputboolean.h rename to src/interface/desktop/inputboolean.h diff --git a/src/editing/inputcamera.cpp b/src/interface/desktop/inputcamera.cpp similarity index 100% rename from src/editing/inputcamera.cpp rename to src/interface/desktop/inputcamera.cpp diff --git a/src/editing/inputcamera.h b/src/interface/desktop/inputcamera.h similarity index 87% rename from src/editing/inputcamera.h rename to src/interface/desktop/inputcamera.h index 8b52adf..f159456 100644 --- a/src/editing/inputcamera.h +++ b/src/interface/desktop/inputcamera.h @@ -1,10 +1,12 @@ #ifndef _PAYSAGES_QT_INPUTCAMERA_H_ #define _PAYSAGES_QT_INPUTCAMERA_H_ -#include "editing_global.h" +#include "desktop_global.h" -#include #include "baseinput.h" +#include + +class QWidget; class InputCamera:public BaseInput { diff --git a/src/editing/inputcolor.cpp b/src/interface/desktop/inputcolor.cpp similarity index 100% rename from src/editing/inputcolor.cpp rename to src/interface/desktop/inputcolor.cpp diff --git a/src/editing/inputcolor.h b/src/interface/desktop/inputcolor.h similarity index 100% rename from src/editing/inputcolor.h rename to src/interface/desktop/inputcolor.h diff --git a/src/editing/inputcolorgradation.cpp b/src/interface/desktop/inputcolorgradation.cpp similarity index 100% rename from src/editing/inputcolorgradation.cpp rename to src/interface/desktop/inputcolorgradation.cpp diff --git a/src/editing/inputcolorgradation.h b/src/interface/desktop/inputcolorgradation.h similarity index 100% rename from src/editing/inputcolorgradation.h rename to src/interface/desktop/inputcolorgradation.h diff --git a/src/editing/inputcurve.cpp b/src/interface/desktop/inputcurve.cpp similarity index 100% rename from src/editing/inputcurve.cpp rename to src/interface/desktop/inputcurve.cpp diff --git a/src/editing/inputcurve.h b/src/interface/desktop/inputcurve.h similarity index 100% rename from src/editing/inputcurve.h rename to src/interface/desktop/inputcurve.h diff --git a/src/editing/inputdouble.cpp b/src/interface/desktop/inputdouble.cpp similarity index 100% rename from src/editing/inputdouble.cpp rename to src/interface/desktop/inputdouble.cpp diff --git a/src/editing/inputdouble.h b/src/interface/desktop/inputdouble.h similarity index 100% rename from src/editing/inputdouble.h rename to src/interface/desktop/inputdouble.h diff --git a/src/editing/inputenum.cpp b/src/interface/desktop/inputenum.cpp similarity index 100% rename from src/editing/inputenum.cpp rename to src/interface/desktop/inputenum.cpp diff --git a/src/editing/inputenum.h b/src/interface/desktop/inputenum.h similarity index 100% rename from src/editing/inputenum.h rename to src/interface/desktop/inputenum.h diff --git a/src/editing/inputint.cpp b/src/interface/desktop/inputint.cpp similarity index 100% rename from src/editing/inputint.cpp rename to src/interface/desktop/inputint.cpp diff --git a/src/editing/inputint.h b/src/interface/desktop/inputint.h similarity index 100% rename from src/editing/inputint.h rename to src/interface/desktop/inputint.h diff --git a/src/editing/inputlayers.cpp b/src/interface/desktop/inputlayers.cpp similarity index 100% rename from src/editing/inputlayers.cpp rename to src/interface/desktop/inputlayers.cpp diff --git a/src/editing/inputlayers.h b/src/interface/desktop/inputlayers.h similarity index 100% rename from src/editing/inputlayers.h rename to src/interface/desktop/inputlayers.h diff --git a/src/editing/inputmaterial.cpp b/src/interface/desktop/inputmaterial.cpp similarity index 100% rename from src/editing/inputmaterial.cpp rename to src/interface/desktop/inputmaterial.cpp diff --git a/src/editing/inputmaterial.h b/src/interface/desktop/inputmaterial.h similarity index 100% rename from src/editing/inputmaterial.h rename to src/interface/desktop/inputmaterial.h diff --git a/src/editing/inputnoise.cpp b/src/interface/desktop/inputnoise.cpp similarity index 100% rename from src/editing/inputnoise.cpp rename to src/interface/desktop/inputnoise.cpp diff --git a/src/editing/inputnoise.h b/src/interface/desktop/inputnoise.h similarity index 78% rename from src/editing/inputnoise.h rename to src/interface/desktop/inputnoise.h index e965b57..b071615 100644 --- a/src/editing/inputnoise.h +++ b/src/interface/desktop/inputnoise.h @@ -1,16 +1,12 @@ #ifndef _PAYSAGES_QT_INPUTNOISE_H_ #define _PAYSAGES_QT_INPUTNOISE_H_ -#include "editing_global.h" +#include "desktop_global.h" -#include #include "baseinput.h" -namespace paysages { -namespace basics { - class NoiseGenerator; -} -} +#include +class QWidget; class InputNoise:public BaseInput { diff --git a/src/editing/lighting/DialogMaterialEditor.cpp b/src/interface/desktop/lighting/DialogMaterialEditor.cpp similarity index 100% rename from src/editing/lighting/DialogMaterialEditor.cpp rename to src/interface/desktop/lighting/DialogMaterialEditor.cpp diff --git a/src/editing/lighting/DialogMaterialEditor.h b/src/interface/desktop/lighting/DialogMaterialEditor.h similarity index 100% rename from src/editing/lighting/DialogMaterialEditor.h rename to src/interface/desktop/lighting/DialogMaterialEditor.h diff --git a/src/editing/lighting/DialogMaterialEditor.ui b/src/interface/desktop/lighting/DialogMaterialEditor.ui similarity index 100% rename from src/editing/lighting/DialogMaterialEditor.ui rename to src/interface/desktop/lighting/DialogMaterialEditor.ui diff --git a/src/editing/lighting/SmallPreviewColor.cpp b/src/interface/desktop/lighting/SmallPreviewColor.cpp similarity index 100% rename from src/editing/lighting/SmallPreviewColor.cpp rename to src/interface/desktop/lighting/SmallPreviewColor.cpp diff --git a/src/editing/lighting/SmallPreviewColor.h b/src/interface/desktop/lighting/SmallPreviewColor.h similarity index 100% rename from src/editing/lighting/SmallPreviewColor.h rename to src/interface/desktop/lighting/SmallPreviewColor.h diff --git a/src/editing/lighting/SmallPreviewHues.cpp b/src/interface/desktop/lighting/SmallPreviewHues.cpp similarity index 100% rename from src/editing/lighting/SmallPreviewHues.cpp rename to src/interface/desktop/lighting/SmallPreviewHues.cpp diff --git a/src/editing/lighting/SmallPreviewHues.h b/src/interface/desktop/lighting/SmallPreviewHues.h similarity index 100% rename from src/editing/lighting/SmallPreviewHues.h rename to src/interface/desktop/lighting/SmallPreviewHues.h diff --git a/src/editing/previewcolorgradation.cpp b/src/interface/desktop/previewcolorgradation.cpp similarity index 100% rename from src/editing/previewcolorgradation.cpp rename to src/interface/desktop/previewcolorgradation.cpp diff --git a/src/editing/previewcolorgradation.h b/src/interface/desktop/previewcolorgradation.h similarity index 100% rename from src/editing/previewcolorgradation.h rename to src/interface/desktop/previewcolorgradation.h diff --git a/src/editing/previewmaterial.cpp b/src/interface/desktop/previewmaterial.cpp similarity index 100% rename from src/editing/previewmaterial.cpp rename to src/interface/desktop/previewmaterial.cpp diff --git a/src/editing/previewmaterial.h b/src/interface/desktop/previewmaterial.h similarity index 94% rename from src/editing/previewmaterial.h rename to src/interface/desktop/previewmaterial.h index 7571a63..e44762a 100644 --- a/src/editing/previewmaterial.h +++ b/src/interface/desktop/previewmaterial.h @@ -1,13 +1,12 @@ #ifndef _PAYSAGES_QT_PREVIEWMATERIAL_H_ #define _PAYSAGES_QT_PREVIEWMATERIAL_H_ -#include "editing_global.h" +#include "desktop_global.h" #include "Base2dPreviewRenderer.h" #include #include "tools/lighting.h" -#include "renderer.h" class MaterialPreviewRenderer:public Base2dPreviewRenderer { public: diff --git a/src/editing/terrain/dialogbaseterrainnoise.cpp b/src/interface/desktop/terrain/dialogbaseterrainnoise.cpp similarity index 100% rename from src/editing/terrain/dialogbaseterrainnoise.cpp rename to src/interface/desktop/terrain/dialogbaseterrainnoise.cpp diff --git a/src/editing/terrain/dialogbaseterrainnoise.h b/src/interface/desktop/terrain/dialogbaseterrainnoise.h similarity index 95% rename from src/editing/terrain/dialogbaseterrainnoise.h rename to src/interface/desktop/terrain/dialogbaseterrainnoise.h index 416f1c4..51d9c7c 100644 --- a/src/editing/terrain/dialogbaseterrainnoise.h +++ b/src/interface/desktop/terrain/dialogbaseterrainnoise.h @@ -1,7 +1,7 @@ #ifndef DIALOGBASETERRAINNOISE_H #define DIALOGBASETERRAINNOISE_H -#include "editing_global.h" +#include "desktop_global.h" #include namespace paysages { diff --git a/src/editing/terrain/dialogbaseterrainnoise.ui b/src/interface/desktop/terrain/dialogbaseterrainnoise.ui similarity index 100% rename from src/editing/terrain/dialogbaseterrainnoise.ui rename to src/interface/desktop/terrain/dialogbaseterrainnoise.ui diff --git a/src/editing/terrain/dialogterrainpainting.cpp b/src/interface/desktop/terrain/dialogterrainpainting.cpp similarity index 100% rename from src/editing/terrain/dialogterrainpainting.cpp rename to src/interface/desktop/terrain/dialogterrainpainting.cpp diff --git a/src/editing/terrain/dialogterrainpainting.h b/src/interface/desktop/terrain/dialogterrainpainting.h similarity index 100% rename from src/editing/terrain/dialogterrainpainting.h rename to src/interface/desktop/terrain/dialogterrainpainting.h diff --git a/src/editing/terrain/dialogterrainpainting.ui b/src/interface/desktop/terrain/dialogterrainpainting.ui similarity index 100% rename from src/editing/terrain/dialogterrainpainting.ui rename to src/interface/desktop/terrain/dialogterrainpainting.ui diff --git a/src/editing/terrain/mainterrainform.cpp b/src/interface/desktop/terrain/mainterrainform.cpp similarity index 100% rename from src/editing/terrain/mainterrainform.cpp rename to src/interface/desktop/terrain/mainterrainform.cpp diff --git a/src/editing/terrain/mainterrainform.h b/src/interface/desktop/terrain/mainterrainform.h similarity index 96% rename from src/editing/terrain/mainterrainform.h rename to src/interface/desktop/terrain/mainterrainform.h index dbc9022..d280f10 100644 --- a/src/editing/terrain/mainterrainform.h +++ b/src/interface/desktop/terrain/mainterrainform.h @@ -1,7 +1,7 @@ #ifndef MAINTERRAINFORM_H #define MAINTERRAINFORM_H -#include "editing_global.h" +#include "desktop_global.h" #include diff --git a/src/editing/terrain/mainterrainform.ui b/src/interface/desktop/terrain/mainterrainform.ui similarity index 100% rename from src/editing/terrain/mainterrainform.ui rename to src/interface/desktop/terrain/mainterrainform.ui diff --git a/src/editing/terrain/paintingbrush.cpp b/src/interface/desktop/terrain/paintingbrush.cpp similarity index 100% rename from src/editing/terrain/paintingbrush.cpp rename to src/interface/desktop/terrain/paintingbrush.cpp diff --git a/src/editing/terrain/paintingbrush.h b/src/interface/desktop/terrain/paintingbrush.h similarity index 100% rename from src/editing/terrain/paintingbrush.h rename to src/interface/desktop/terrain/paintingbrush.h diff --git a/src/editing/terrain/previewterrainshape.cpp b/src/interface/desktop/terrain/previewterrainshape.cpp similarity index 100% rename from src/editing/terrain/previewterrainshape.cpp rename to src/interface/desktop/terrain/previewterrainshape.cpp diff --git a/src/editing/terrain/previewterrainshape.h b/src/interface/desktop/terrain/previewterrainshape.h similarity index 95% rename from src/editing/terrain/previewterrainshape.h rename to src/interface/desktop/terrain/previewterrainshape.h index 5ff9458..c90dbd9 100644 --- a/src/editing/terrain/previewterrainshape.h +++ b/src/interface/desktop/terrain/previewterrainshape.h @@ -1,7 +1,7 @@ #ifndef PREVIEWTERRAINSHAPE_H #define PREVIEWTERRAINSHAPE_H -#include "editing_global.h" +#include "desktop_global.h" #include "Base2dPreviewRenderer.h" #include "terrain/public.h" diff --git a/src/editing/terrain/widgetheightmap.cpp b/src/interface/desktop/terrain/widgetheightmap.cpp similarity index 100% rename from src/editing/terrain/widgetheightmap.cpp rename to src/interface/desktop/terrain/widgetheightmap.cpp diff --git a/src/editing/terrain/widgetheightmap.h b/src/interface/desktop/terrain/widgetheightmap.h similarity index 100% rename from src/editing/terrain/widgetheightmap.h rename to src/interface/desktop/terrain/widgetheightmap.h diff --git a/src/editing/terrain/widgetterrainbasenoisepreview.cpp b/src/interface/desktop/terrain/widgetterrainbasenoisepreview.cpp similarity index 100% rename from src/editing/terrain/widgetterrainbasenoisepreview.cpp rename to src/interface/desktop/terrain/widgetterrainbasenoisepreview.cpp diff --git a/src/editing/terrain/widgetterrainbasenoisepreview.h b/src/interface/desktop/terrain/widgetterrainbasenoisepreview.h similarity index 94% rename from src/editing/terrain/widgetterrainbasenoisepreview.h rename to src/interface/desktop/terrain/widgetterrainbasenoisepreview.h index 06f760b..e8f9b02 100644 --- a/src/editing/terrain/widgetterrainbasenoisepreview.h +++ b/src/interface/desktop/terrain/widgetterrainbasenoisepreview.h @@ -1,7 +1,7 @@ #ifndef _PAYSAGES_EDITING_TERRAIN_WIDGETTERRAINBASENOISEPREVIEW_H_ #define _PAYSAGES_EDITING_TERRAIN_WIDGETTERRAINBASENOISEPREVIEW_H_ -#include "editing_global.h" +#include "desktop_global.h" #include "DrawingWidget.h" class QPainter; diff --git a/src/editing/textures/DialogTexturesLayer.cpp b/src/interface/desktop/textures/DialogTexturesLayer.cpp similarity index 100% rename from src/editing/textures/DialogTexturesLayer.cpp rename to src/interface/desktop/textures/DialogTexturesLayer.cpp diff --git a/src/editing/textures/DialogTexturesLayer.h b/src/interface/desktop/textures/DialogTexturesLayer.h similarity index 100% rename from src/editing/textures/DialogTexturesLayer.h rename to src/interface/desktop/textures/DialogTexturesLayer.h diff --git a/src/editing/textures/DialogTexturesLayer.ui b/src/interface/desktop/textures/DialogTexturesLayer.ui similarity index 100% rename from src/editing/textures/DialogTexturesLayer.ui rename to src/interface/desktop/textures/DialogTexturesLayer.ui diff --git a/src/editing/textures/PreviewCumul.cpp b/src/interface/desktop/textures/PreviewCumul.cpp similarity index 100% rename from src/editing/textures/PreviewCumul.cpp rename to src/interface/desktop/textures/PreviewCumul.cpp diff --git a/src/editing/textures/PreviewCumul.h b/src/interface/desktop/textures/PreviewCumul.h similarity index 95% rename from src/editing/textures/PreviewCumul.h rename to src/interface/desktop/textures/PreviewCumul.h index f06ef08..4ae5b74 100644 --- a/src/editing/textures/PreviewCumul.h +++ b/src/interface/desktop/textures/PreviewCumul.h @@ -1,7 +1,7 @@ #ifndef EDITING_TEXTURES_PREVIEWCUMUL_H #define EDITING_TEXTURES_PREVIEWCUMUL_H -#include "editing_global.h" +#include "desktop_global.h" #include "Base2dPreviewRenderer.h" diff --git a/src/editing/textures/PreviewLayerCoverage.cpp b/src/interface/desktop/textures/PreviewLayerCoverage.cpp similarity index 100% rename from src/editing/textures/PreviewLayerCoverage.cpp rename to src/interface/desktop/textures/PreviewLayerCoverage.cpp diff --git a/src/editing/textures/PreviewLayerCoverage.h b/src/interface/desktop/textures/PreviewLayerCoverage.h similarity index 95% rename from src/editing/textures/PreviewLayerCoverage.h rename to src/interface/desktop/textures/PreviewLayerCoverage.h index b5f2371..8e15673 100644 --- a/src/editing/textures/PreviewLayerCoverage.h +++ b/src/interface/desktop/textures/PreviewLayerCoverage.h @@ -1,7 +1,7 @@ #ifndef EDITING_TEXTURES_PREVIEWLAYERCOVERAGE_H #define EDITING_TEXTURES_PREVIEWLAYERCOVERAGE_H -#include "editing_global.h" +#include "desktop_global.h" #include "Base2dPreviewRenderer.h" diff --git a/src/editing/textures/PreviewLayerLook.cpp b/src/interface/desktop/textures/PreviewLayerLook.cpp similarity index 100% rename from src/editing/textures/PreviewLayerLook.cpp rename to src/interface/desktop/textures/PreviewLayerLook.cpp diff --git a/src/editing/textures/PreviewLayerLook.h b/src/interface/desktop/textures/PreviewLayerLook.h similarity index 95% rename from src/editing/textures/PreviewLayerLook.h rename to src/interface/desktop/textures/PreviewLayerLook.h index 50a9194..c995a95 100644 --- a/src/editing/textures/PreviewLayerLook.h +++ b/src/interface/desktop/textures/PreviewLayerLook.h @@ -1,7 +1,7 @@ #ifndef EDITING_TEXTURES_PREVIEWLAYERLOOK_H #define EDITING_TEXTURES_PREVIEWLAYERLOOK_H -#include "editing_global.h" +#include "desktop_global.h" #include "Base2dPreviewRenderer.h" diff --git a/src/editing/textures/maintexturesform.cpp b/src/interface/desktop/textures/maintexturesform.cpp similarity index 100% rename from src/editing/textures/maintexturesform.cpp rename to src/interface/desktop/textures/maintexturesform.cpp diff --git a/src/editing/textures/maintexturesform.h b/src/interface/desktop/textures/maintexturesform.h similarity index 100% rename from src/editing/textures/maintexturesform.h rename to src/interface/desktop/textures/maintexturesform.h diff --git a/src/editing/textures/maintexturesform.ui b/src/interface/desktop/textures/maintexturesform.ui similarity index 100% rename from src/editing/textures/maintexturesform.ui rename to src/interface/desktop/textures/maintexturesform.ui diff --git a/src/editing/tools.cpp b/src/interface/desktop/tools.cpp similarity index 100% rename from src/editing/tools.cpp rename to src/interface/desktop/tools.cpp diff --git a/src/editing/tools.h b/src/interface/desktop/tools.h similarity index 100% rename from src/editing/tools.h rename to src/interface/desktop/tools.h diff --git a/src/editing/widgetcurveeditor.cpp b/src/interface/desktop/widgetcurveeditor.cpp similarity index 100% rename from src/editing/widgetcurveeditor.cpp rename to src/interface/desktop/widgetcurveeditor.cpp diff --git a/src/editing/widgetcurveeditor.h b/src/interface/desktop/widgetcurveeditor.h similarity index 100% rename from src/editing/widgetcurveeditor.h rename to src/interface/desktop/widgetcurveeditor.h diff --git a/src/paysages.pro b/src/paysages.pro index 5191561..6f3f563 100644 --- a/src/paysages.pro +++ b/src/paysages.pro @@ -10,6 +10,6 @@ SUBDIRS = \ render/preview \ render/opengl \ interface/commandline \ - editing \ + interface/desktop \ tests/googletest \ tests diff --git a/src/render/opengl/OpenGLRenderer.cpp b/src/render/opengl/OpenGLRenderer.cpp index be45248..35e7cc0 100644 --- a/src/render/opengl/OpenGLRenderer.cpp +++ b/src/render/opengl/OpenGLRenderer.cpp @@ -4,20 +4,15 @@ #include #include #include "Scenery.h" -#include "SoftwareRenderer.h" -#include "renderer.h" #include "CameraDefinition.h" OpenGLRenderer::OpenGLRenderer(Scenery* scenery): - scenery(scenery) + SoftwareRenderer(scenery) { - renderer = new SoftwareRenderer(scenery); - renderer->prepare(); } OpenGLRenderer::~OpenGLRenderer() { - rendererDelete(renderer); } void OpenGLRenderer::initialize() @@ -41,6 +36,8 @@ void OpenGLRenderer::initialize() glDisable(GL_FOG); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + + prepare(); } void OpenGLRenderer::resize(int width, int height) @@ -51,7 +48,7 @@ void OpenGLRenderer::resize(int width, int height) glMatrixMode(GL_PROJECTION); glLoadIdentity(); - perspective = renderer->render_camera->getPerspective(); + perspective = render_camera->getPerspective(); gluPerspective(perspective.yfov * 180.0 / M_PI, perspective.xratio, perspective.znear, perspective.zfar); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); diff --git a/src/render/opengl/OpenGLRenderer.h b/src/render/opengl/OpenGLRenderer.h index 8b6b94a..bc05720 100644 --- a/src/render/opengl/OpenGLRenderer.h +++ b/src/render/opengl/OpenGLRenderer.h @@ -3,8 +3,7 @@ #include "opengl_global.h" -class Scenery; -class Renderer; +#include "SoftwareRenderer.h" namespace paysages { namespace opengl { @@ -12,19 +11,15 @@ namespace opengl { /*! * \brief Scenery renderer in an OpenGL context. */ -class OPENGLSHARED_EXPORT OpenGLRenderer +class OPENGLSHARED_EXPORT OpenGLRenderer: protected SoftwareRenderer { public: OpenGLRenderer(Scenery* scenery=0); - ~OpenGLRenderer(); + virtual ~OpenGLRenderer(); void initialize(); void resize(int width, int height); void paint(); - -private: - Scenery* scenery; - Renderer* renderer; }; }