paysages: Project tree reorganization

git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@552 b1fd45b6-86a6-48da-8261-f70d1f35bdcc

Makefile

@@ -2,20 +2,20 @@ BUILDMODE=debug
 BUILDPATH=./build/${BUILDMODE}
 
 all:
-	@+cd lib_paysages && make BUILDMODE=${BUILDMODE}
-	@+cd exploring && make BUILDMODE=${BUILDMODE}
-	@+cd cli && make BUILDMODE=${BUILDMODE}
-	@+cd gui_qt && qmake "BUILDMODE=${BUILDMODE}" && make
+	@+cd src/rendering && make BUILDMODE=${BUILDMODE} PROJECT_PATH=${CURDIR}
+	@+cd src/exploring && make BUILDMODE=${BUILDMODE} PROJECT_PATH=${CURDIR}
+	@+cd src/controlling && make BUILDMODE=${BUILDMODE} PROJECT_PATH=${CURDIR}
+	@+cd src/editing && qmake "BUILDMODE=${BUILDMODE}" "PROJECT_PATH=${CURDIR}" && make
 
 clean:
-	cd lib_paysages && make clean BUILDMODE=${BUILDMODE}
-	cd exploring && make clean BUILDMODE=${BUILDMODE}
-	cd cli && make clean BUILDMODE=${BUILDMODE}
-	cd gui_qt && qmake "BUILDMODE=${BUILDMODE}" && make clean
-	rm -f ${BUILDPATH}/paysages-qt
+	cd src/rendering && make clean BUILDMODE=${BUILDMODE} PROJECT_PATH=${CURDIR}
+	cd src/exploring && make clean BUILDMODE=${BUILDMODE} PROJECT_PATH=${CURDIR}
+	cd src/controlling && make clean BUILDMODE=${BUILDMODE} PROJECT_PATH=${CURDIR}
+	cd src/editing && qmake "BUILDMODE=${BUILDMODE}" "PROJECT_PATH=${CURDIR}" && make clean
 	rm -f ${BUILDPATH}/paysages-cli
+	rm -f ${BUILDPATH}/paysages-qt
 	rm -f ${BUILDPATH}/libpaysages_exploring.so
-	rm -f ${BUILDPATH}/libpaysages.so
+	rm -f ${BUILDPATH}/libpaysages_rendering.so
 
 release:
 	make BUILDMODE=release all

src/common_post.mk

@@ -13,7 +13,7 @@ ifneq (,${LIBS})
 	CC_LDFLAGS += $(shell pkg-config --libs ${LIBS})
 endif
 
-CC_FLAGS += -fPIC -Wall
+CC_FLAGS += -fPIC -Wall -I${PROJECT_PATH}/src
 CC_LDFLAGS += -fPIC
 
 all:prepare ${RESULT}

src/common_pre.mk

@@ -1,4 +1,11 @@
-PATH_LIB_PAYSAGES = ../lib_paysages
+ifeq ($(strip $(BUILDMODE)),)
+    exit 1
+endif
+ifeq ($(strip $(PROJECT_PATH)),)
+    exit 1
+endif
+
+PATH_LIB_PAYSAGES = ${PROJECT_PATH}/rendering
 BUILDMODE = debug
-BUILDPATH = ../build/${BUILDMODE}
+BUILDPATH = ${PROJECT_PATH}/build/${BUILDMODE}
 HEADERS = $(${PATH_LIB_PAYSAGES}/atmosphere/*.h ${PATH_LIB_PAYSAGES}/clouds/*.h ${PATH_LIB_PAYSAGES}/terrain/*.h ${PATH_LIB_PAYSAGES}/textures/*.h ${PATH_LIB_PAYSAGES}/water/*.h ${PATH_LIB_PAYSAGES}/tools/*.h ${PATH_LIB_PAYSAGES}/shared/*.h)

src/controlling/Makefile

@@ -1,10 +1,10 @@
 include ../common_pre.mk
 
-OBJPATH = ${BUILDPATH}/cli
+OBJPATH = ${BUILDPATH}/controlling
 RESULT = ${BUILDPATH}/paysages-cli
 SOURCES += $(wildcard *.c)
 HEADERS += $(wildcard *.h)
 
-CC_LDFLAGS += -L${BUILDPATH} -lpaysages
+CC_LDFLAGS += -L${BUILDPATH} -lpaysages_rendering
 
 include ../common_post.mk

src/controlling/main.c

@@ -3,10 +3,10 @@
 #include <string.h>
 #include <math.h>
 
-#include "../lib_paysages/auto.h"
-#include "../lib_paysages/main.h"
-#include "../lib_paysages/render.h"
-#include "../lib_paysages/scenery.h"
+#include "rendering/auto.h"
+#include "rendering/main.h"
+#include "rendering/render.h"
+#include "rendering/scenery.h"
 
 void startRender(Renderer* renderer, char* outputpath, RenderParams params)
 {

src/editing/baseexplorerchunk.h

@@ -4,7 +4,7 @@
 #include <QMutex>
 #include <QImage>
 #include <QGLWidget>
-#include "../lib_paysages/renderer.h"
+#include "rendering/renderer.h"
 
 class BaseExplorerChunk
 {

src/editing/baseform.cpp

@@ -49,31 +49,31 @@ BaseForm::BaseForm(QWidget* parent, bool auto_apply, bool with_layers) : QWidget
         layers->layout()->addWidget(_layer_list);
         QObject::connect(_layer_list, SIGNAL(currentIndexChanged(int)), this, SLOT(layerListChanged()));
 
-        _layer_new = new QPushButton(QIcon("images/layer_add.png"), "", layers);
+        _layer_new = new QPushButton(QIcon(getDataPath("images/layer_add.png")), "", layers);
         _layer_new->setToolTip(tr("Add layer"));
         _layer_new->setMaximumSize(30, 30);
         layers->layout()->addWidget(_layer_new);
         QObject::connect(_layer_new, SIGNAL(clicked()), this, SLOT(layerAddClicked()));
 
-        _layer_del = new QPushButton(QIcon("images/layer_del.png"), "", layers);
+        _layer_del = new QPushButton(QIcon(getDataPath("images/layer_del.png")), "", layers);
         _layer_del->setToolTip(tr("Delete layer"));
         _layer_del->setMaximumSize(30, 30);
         layers->layout()->addWidget(_layer_del);
         QObject::connect(_layer_del, SIGNAL(clicked()), this, SLOT(layerDelClicked()));
 
-        _layer_rename = new QPushButton(QIcon("images/layer_rename.png"), "", layers);
+        _layer_rename = new QPushButton(QIcon(getDataPath("images/layer_rename.png")), "", layers);
         _layer_rename->setToolTip(tr("Rename layer"));
         _layer_rename->setMaximumSize(30, 30);
         layers->layout()->addWidget(_layer_rename);
         QObject::connect(_layer_rename, SIGNAL(clicked()), this, SLOT(layerRenameClicked()));
 
-        _layer_up = new QPushButton(QIcon("images/layer_up.png"), "", layers);
+        _layer_up = new QPushButton(QIcon(getDataPath("images/layer_up.png")), "", layers);
         _layer_up->setToolTip(tr("Move layer upward"));
         _layer_up->setMaximumSize(30, 30);
         layers->layout()->addWidget(_layer_up);
         QObject::connect(_layer_up, SIGNAL(clicked()), this, SLOT(layerUpClicked()));
 
-        _layer_down = new QPushButton(QIcon("images/layer_down.png"), "", layers);
+        _layer_down = new QPushButton(QIcon(getDataPath("images/layer_down.png")), "", layers);
         _layer_down->setToolTip(tr("Move layer downward"));
         _layer_down->setMaximumSize(30, 30);
         layers->layout()->addWidget(_layer_down);
@@ -112,15 +112,15 @@ BaseForm::BaseForm(QWidget* parent, bool auto_apply, bool with_layers) : QWidget
     control->layout()->setAlignment(_buttons, Qt::AlignBottom);
 
     _button_revert = addButton(tr("Revert"));
-    _button_revert->setIcon(QIcon("images/cancel.png"));
+    _button_revert->setIcon(QIcon(getDataPath("images/cancel.png")));
     _button_revert->setEnabled(false);
     connect(_button_revert, SIGNAL(clicked()), this, SLOT(revertConfig()));
     _button_apply = addButton(tr("Apply"));
-    _button_apply->setIcon(QIcon("images/apply.png"));
+    _button_apply->setIcon(QIcon(getDataPath("images/apply.png")));
     _button_apply->setEnabled(false);
     connect(_button_apply, SIGNAL(clicked()), this, SLOT(applyConfig()));
     _button_preset = addButton(tr("Load preset"));
-    _button_preset->setIcon(QIcon("images/auto.png"));
+    _button_preset->setIcon(QIcon(getDataPath("images/auto.png")));
     _button_preset->hide();
     connect(_button_preset, SIGNAL(clicked()), this, SLOT(presetChoiceClicked()));
 

src/editing/baseform.h

@@ -8,12 +8,12 @@
 #include "basepreview.h"
 #include "baseinput.h"
 #include "dialoglayers.h"
-#include "../lib_paysages/shared/types.h"
-#include "../lib_paysages/tools/curve.h"
-#include "../lib_paysages/tools/color.h"
-#include "../lib_paysages/tools/pack.h"
-#include "../lib_paysages/noise.h"
-#include "../lib_paysages/layers.h"
+#include "rendering/shared/types.h"
+#include "rendering/tools/curve.h"
+#include "rendering/tools/color.h"
+#include "rendering/tools/pack.h"
+#include "rendering/noise.h"
+#include "rendering/layers.h"
 
 class BaseForm:public QWidget
 {

src/editing/baseformlayer.h

@@ -4,7 +4,7 @@
 /* Base form, with automatic layer control */
 
 #include "baseform.h"
-#include "../lib_paysages/layers.h"
+#include "rendering/layers.h"
 
 class BaseFormLayer:public BaseForm
 {

src/editing/basepreview.cpp

@@ -9,7 +9,7 @@
 #include <assert.h>
 #include <math.h>
 #include "tools.h"
-#include "../lib_paysages/system.h"
+#include "rendering/system.h"
 
 /*************** PreviewChunk ***************/
 class PreviewChunk
@@ -744,7 +744,7 @@ void BasePreview::contextMenuEvent(QContextMenuEvent* event)
             action->setProperty("value", i);
             if (i == iter1.value().current)
             {
-                action->setIcon(QIcon("images/choice_on.png"));
+                action->setIcon(QIcon(getDataPath("images/choice_on.png")));
                 action->setIconVisibleInMenu(true);
             }
         }
@@ -767,7 +767,7 @@ void BasePreview::contextMenuEvent(QContextMenuEvent* event)
         action->setProperty("value", not iter2.value().value);
         if (iter2.value().value)
         {
-            action->setIcon(QIcon("images/toggle_on.png"));
+            action->setIcon(QIcon(getDataPath("images/toggle_on.png")));
             action->setIconVisibleInMenu(true);
         }
     }

src/editing/basepreview.h

@@ -10,7 +10,7 @@
 #include <QLabel>
 #include <QHash>
 #include "previewosd.h"
-#include "../lib_paysages/tools/pack.h"
+#include "rendering/tools/pack.h"
 
 class _ContextChoice
 {

src/editing/dialogcolorgradation.h

@@ -6,8 +6,8 @@
 #include "widgetcurveeditor.h"
 #include "previewcolorgradation.h"
 
-#include "../lib_paysages/tools/color.h"
-#include "../lib_paysages/tools/curve.h"
+#include "rendering/tools/color.h"
+#include "rendering/tools/curve.h"
 
 class DialogColorGradation : public QDialog
 {

src/editing/dialogcurve.cpp

@@ -49,17 +49,17 @@ DialogCurve::DialogCurve(QWidget *parent, Curve* curve, double xmin, double xmax
     buttons->setLayout(new QHBoxLayout());
 
     _button_cancel = new QPushButton(tr("Cancel"), buttons);
-    _button_cancel->setIcon(QIcon("images/cancel.png"));
+    _button_cancel->setIcon(QIcon(getDataPath("images/cancel.png")));
     buttons->layout()->addWidget(_button_cancel);
     QObject::connect(_button_cancel, SIGNAL(clicked()), this, SLOT(reject()));
 
     _button_revert = new QPushButton(tr("Revert"), buttons);
-    _button_revert->setIcon(QIcon("images/revert.png"));
+    _button_revert->setIcon(QIcon(getDataPath("images/revert.png")));
     buttons->layout()->addWidget(_button_revert);
     QObject::connect(_button_revert, SIGNAL(clicked()), this, SLOT(revert()));
 
     _button_accept = new QPushButton(tr("Validate"), buttons);
-    _button_accept->setIcon(QIcon("images/apply.png"));
+    _button_accept->setIcon(QIcon(getDataPath("images/apply.png")));
     buttons->layout()->addWidget(_button_accept);
     QObject::connect(_button_accept, SIGNAL(clicked()), this, SLOT(accept()));
 

src/editing/dialogcurve.h

@@ -5,7 +5,7 @@
 #include <QPushButton>
 #include "widgetcurveeditor.h"
 
-#include "../lib_paysages/tools/curve.h"
+#include "rendering/tools/curve.h"
 
 class DialogCurve : public QDialog
 {

src/editing/dialogexplorer.h

@@ -3,7 +3,7 @@
 
 #include <QDialog>
 #include "widgetexplorer.h"
-#include "../lib_paysages/camera.h"
+#include "rendering/camera.h"
 
 class DialogExplorer : public QDialog
 {

src/editing/dialogheightmap.cpp

@@ -9,7 +9,7 @@
 #include <QFileDialog>
 #include <QInputDialog>
 #include <math.h>
-#include "../lib_paysages/scenery.h"
+#include "rendering/scenery.h"
 #include "widgetheightmap.h"
 
 /**************** Dialog form ****************/
@@ -110,17 +110,17 @@ DialogHeightMap::DialogHeightMap(QWidget* parent, TerrainDefinition* terrain) :
 
     // Buttons layout
     button = new QPushButton(tr("Cancel"), buttons);
-    button->setIcon(QIcon("images/cancel.png"));
+    button->setIcon(QIcon(getDataPath("images/cancel.png")));
     buttons->layout()->addWidget(button);
     QObject::connect(button, SIGNAL(clicked()), this, SLOT(reject()));
 
     button = new QPushButton(tr("Revert"), buttons);
-    button->setIcon(QIcon("images/revert.png"));
+    button->setIcon(QIcon(getDataPath("images/revert.png")));
     buttons->layout()->addWidget(button);
     QObject::connect(button, SIGNAL(clicked()), this, SLOT(revert()));
 
     button = new QPushButton(tr("Validate"), buttons);
-    button->setIcon(QIcon("images/apply.png"));
+    button->setIcon(QIcon(getDataPath("images/apply.png")));
     buttons->layout()->addWidget(button);
     QObject::connect(button, SIGNAL(clicked()), this, SLOT(accept()));
 

src/editing/dialogheightmap.h

@@ -2,7 +2,7 @@
 #define _PAYSAGES_QT_DIALOGHEIGHTMAP_H_
 
 #include <QLabel>
-#include "../lib_paysages/terrain/public.h"
+#include "rendering/terrain/public.h"
 #include "tools.h"
 #include "widgetheightmap.h"
 

src/editing/dialoglayers.cpp

@@ -26,17 +26,17 @@ DialogLayers::DialogLayers(QWidget *parent, Layers* layers, QString title, FormL
     layout()->setAlignment(buttons, Qt::AlignBottom);
 
     button = new QPushButton(tr("Cancel"), buttons);
-    button->setIcon(QIcon("images/cancel.png"));
+    button->setIcon(QIcon(getDataPath("images/cancel.png")));
     buttons->layout()->addWidget(button);
     QObject::connect(button, SIGNAL(clicked()), this, SLOT(reject()));
 
     button = new QPushButton(tr("Reset"), buttons);
-    button->setIcon(QIcon("images/revert.png"));
+    button->setIcon(QIcon(getDataPath("images/revert.png")));
     buttons->layout()->addWidget(button);
     QObject::connect(button, SIGNAL(clicked()), this, SLOT(revert()));
 
     button = new QPushButton(tr("Validate"), buttons);
-    button->setIcon(QIcon("images/apply.png"));
+    button->setIcon(QIcon(getDataPath("images/apply.png")));
     buttons->layout()->addWidget(button);
     QObject::connect(button, SIGNAL(clicked()), this, SLOT(accept()));
 

src/editing/dialoglayers.h

@@ -6,7 +6,7 @@
 #include <QListWidget>
 #include "tools.h"
 
-#include "../lib_paysages/layers.h"
+#include "rendering/layers.h"
 
 class DialogLayers;
 class BaseFormLayer;

src/editing/dialogmaterial.cpp

@@ -23,17 +23,17 @@ DialogMaterial::DialogMaterial(QWidget *parent, SurfaceMaterial* material) : Dia
     layout()->setAlignment(buttons, Qt::AlignBottom);
 
     button = new QPushButton(tr("Cancel"), buttons);
-    button->setIcon(QIcon("images/cancel.png"));
+    button->setIcon(QIcon(getDataPath("images/cancel.png")));
     buttons->layout()->addWidget(button);
     QObject::connect(button, SIGNAL(clicked()), this, SLOT(reject()));
 
     button = new QPushButton(tr("Revert"), buttons);
-    button->setIcon(QIcon("images/revert.png"));
+    button->setIcon(QIcon(getDataPath("images/revert.png")));
     buttons->layout()->addWidget(button);
     QObject::connect(button, SIGNAL(clicked()), this, SLOT(revert()));
 
     button = new QPushButton(tr("Validate"), buttons);
-    button->setIcon(QIcon("images/apply.png"));
+    button->setIcon(QIcon(getDataPath("images/apply.png")));
     buttons->layout()->addWidget(button);
     QObject::connect(button, SIGNAL(clicked()), this, SLOT(accept()));
 

src/editing/dialogmaterial.h

@@ -7,7 +7,7 @@
 #include "formmaterial.h"
 #include "tools.h"
 
-#include "../lib_paysages/shared/types.h"
+#include "rendering/shared/types.h"
 
 class DialogMaterial : public DialogWithPreview
 {

src/editing/dialognoise.cpp

@@ -10,7 +10,7 @@
 #include <QScrollArea>
 #include <QPushButton>
 #include <math.h>
-#include "../lib_paysages/tools/color.h"
+#include "rendering/tools/color.h"
 
 /**************** Previews ****************/
 class PreviewLevel:public BasePreview
@@ -184,17 +184,17 @@ DialogNoise::DialogNoise(QWidget *parent, NoiseGenerator* value):
     form->layout()->addWidget(buttons);
 
     button = new QPushButton(tr("Cancel"), buttons);
-    button->setIcon(QIcon("images/cancel.png"));
+    button->setIcon(QIcon(getDataPath("images/cancel.png")));
     buttons->layout()->addWidget(button);
     QObject::connect(button, SIGNAL(clicked()), this, SLOT(reject()));
 
     button = new QPushButton(tr("Revert"), buttons);
-    button->setIcon(QIcon("images/revert.png"));
+    button->setIcon(QIcon(getDataPath("images/revert.png")));
     buttons->layout()->addWidget(button);
     QObject::connect(button, SIGNAL(clicked()), this, SLOT(revert()));
 
     button = new QPushButton(tr("Validate"), buttons);
-    button->setIcon(QIcon("images/apply.png"));
+    button->setIcon(QIcon(getDataPath("images/apply.png")));
     buttons->layout()->addWidget(button);
     QObject::connect(button, SIGNAL(clicked()), this, SLOT(accept()));
 

src/editing/dialognoise.h

@@ -6,7 +6,7 @@
 #include "basepreview.h"
 #include "tools.h"
 
-#include "../lib_paysages/noise.h"
+#include "rendering/noise.h"
 
 class DialogNoise : public DialogWithPreview
 {

src/editing/dialogrender.cpp

@@ -12,8 +12,8 @@
 #include <QPushButton>
 #include "tools.h"
 
-#include "../lib_paysages/scenery.h"
-#include "../lib_paysages/auto.h"
+#include "rendering/scenery.h"
+#include "rendering/auto.h"
 
 static DialogRender* _current_dialog;
 
@@ -129,7 +129,7 @@ DialogRender::DialogRender(QWidget *parent, Renderer* renderer):
     _exposure_control->setValue(200);
     _actions->layout()->addWidget(_exposure_control);
 
-    _save_button = new QPushButton(QIcon("images/save.png"), tr("Save picture"), _actions);
+    _save_button = new QPushButton(QIcon(getDataPath("images/save.png")), tr("Save picture"), _actions);
     _actions->layout()->addWidget(_save_button);
 
     // Connections

src/editing/dialogrender.h

@@ -10,8 +10,8 @@
 #include <QComboBox>
 #include <QLabel>
 #include <QMutex>
-#include "../lib_paysages/renderer.h"
-#include "../lib_paysages/tools/color.h"
+#include "rendering/renderer.h"
+#include "rendering/tools/color.h"
 
 class DialogRender : public QDialog
 {

src/editing/explorerchunksky.cpp

@@ -2,7 +2,7 @@
 
 #include <math.h>
 #include "baseexplorerchunk.h"
-#include "../lib_paysages/camera.h"
+#include "rendering/camera.h"
 
 ExplorerChunkSky::ExplorerChunkSky(Renderer* renderer, double size, SkyboxOrientation orientation) : BaseExplorerChunk(renderer)
 {

src/editing/explorerchunksky.h

@@ -2,8 +2,8 @@
 #define _PAYSAGES_QT_EXPLORERCHUNKSKY_H_
 
 #include "baseexplorerchunk.h"
-#include "../lib_paysages/renderer.h"
-#include "../lib_paysages/tools/euclid.h"
+#include "rendering/renderer.h"
+#include "rendering/tools/euclid.h"
 
 enum SkyboxOrientation
 {

src/editing/explorerchunkterrain.cpp

@@ -2,7 +2,7 @@
 
 #include <math.h>
 #include "baseexplorerchunk.h"
-#include "../lib_paysages/camera.h"
+#include "rendering/camera.h"
 
 ExplorerChunkTerrain::ExplorerChunkTerrain(Renderer* renderer, double x, double z, double size, int nbchunks, double water_height) : BaseExplorerChunk(renderer)
 {

src/editing/explorerchunkterrain.h

@@ -2,8 +2,8 @@
 #define _PAYSAGES_QT_EXPLORERCHUNKTERRAIN_H_
 
 #include "baseexplorerchunk.h"
-#include "../lib_paysages/renderer.h"
-#include "../lib_paysages/tools/euclid.h"
+#include "rendering/renderer.h"
+#include "rendering/tools/euclid.h"
 
 class ExplorerChunkTerrain:public BaseExplorerChunk
 {

src/editing/formatmosphere.cpp

@@ -6,9 +6,9 @@
 #include <QSlider>
 #include <math.h>
 
-#include "../lib_paysages/atmosphere/public.h"
-#include "../lib_paysages/scenery.h"
-#include "../lib_paysages/renderer.h"
+#include "rendering/atmosphere/public.h"
+#include "rendering/scenery.h"
+#include "rendering/renderer.h"
 
 static AtmosphereDefinition* _definition;
 

src/editing/formclouds.cpp

@@ -1,8 +1,8 @@
 #include "formclouds.h"
 
-#include "../lib_paysages/tools/color.h"
-#include "../lib_paysages/tools/euclid.h"
-#include "../lib_paysages/scenery.h"
+#include "rendering/tools/color.h"
+#include "rendering/tools/euclid.h"
+#include "rendering/scenery.h"
 
 #include "tools.h"
 

src/editing/formclouds.h

@@ -4,7 +4,7 @@
 #include <QWidget>
 #include "basepreview.h"
 #include "baseformlayer.h"
-#include "../lib_paysages/clouds/public.h"
+#include "rendering/clouds/public.h"
 
 class FormClouds : public BaseFormLayer
 {

src/editing/formmaterial.h

@@ -4,7 +4,7 @@
 #include "basepreview.h"
 #include "baseform.h"
 
-#include "../lib_paysages/shared/types.h"
+#include "rendering/shared/types.h"
 
 class FormMaterial : public BaseForm
 {

src/editing/formrender.cpp

@@ -3,8 +3,8 @@
 #include "dialogrender.h"
 #include "inputcamera.h"
 #include "tools.h"
-#include "../lib_paysages/render.h"
-#include "../lib_paysages/scenery.h"
+#include "rendering/render.h"
+#include "rendering/scenery.h"
 
 /**************** Previews ****************/
 class PreviewRenderLandscape:public BasePreview

src/editing/formrender.h

@@ -2,9 +2,9 @@
 #define _PAYSAGES_QT_FORMRENDER_H_
 
 #include "baseform.h"
-#include "../lib_paysages/camera.h"
-#include "../lib_paysages/renderer.h"
-#include "../lib_paysages/render.h"
+#include "rendering/camera.h"
+#include "rendering/renderer.h"
+#include "rendering/render.h"
 
 class FormRender : public BaseForm
 {

src/editing/formterrain.cpp

@@ -4,7 +4,7 @@
 #include <QSlider>
 #include "tools.h"
 #include "dialogheightmap.h"
-#include "../lib_paysages/scenery.h"
+#include "rendering/scenery.h"
 
 static TerrainDefinition* _definition;
 

src/editing/formtextures.cpp

@@ -1,6 +1,6 @@
 #include "formtextures.h"
 
-#include "../lib_paysages/scenery.h"
+#include "rendering/scenery.h"
 #include "tools.h"
 
 /**************** Previews ****************/

src/editing/formtextures.h

@@ -4,7 +4,7 @@
 #include <QWidget>
 #include "basepreview.h"
 #include "baseformlayer.h"
-#include "../lib_paysages/textures/public.h"
+#include "rendering/textures/public.h"
 
 class FormTextures : public BaseFormLayer
 {

src/editing/formwater.cpp

@@ -5,11 +5,11 @@
 #include <QSlider>
 #include <math.h>
 
-#include "../lib_paysages/tools/euclid.h"
-#include "../lib_paysages/tools/lighting.h"
-#include "../lib_paysages/renderer.h"
-#include "../lib_paysages/scenery.h"
-#include "../lib_paysages/water/public.h"
+#include "rendering/tools/euclid.h"
+#include "rendering/tools/lighting.h"
+#include "rendering/renderer.h"
+#include "rendering/scenery.h"
+#include "rendering/water/public.h"
 #include "tools.h"
 
 static WaterDefinition* _definition;

src/editing/inputcamera.h

@@ -4,7 +4,7 @@
 #include <QWidget>
 #include "baseinput.h"
 
-#include "../lib_paysages/camera.h"
+#include "rendering/camera.h"
 
 class InputCamera:public BaseInput
 {

src/editing/inputcolor.h

@@ -4,7 +4,7 @@
 #include <QWidget>
 #include "baseinput.h"
 
-#include "../lib_paysages/shared/types.h"
+#include "rendering/shared/types.h"
 
 class InputColor:public BaseInput
 {

src/editing/inputcolorgradation.h

@@ -4,7 +4,7 @@
 #include <QWidget>
 #include "baseinput.h"
 
-#include "../lib_paysages/tools/color.h"
+#include "rendering/tools/color.h"
 
 class InputColorGradation:public BaseInput
 {

src/editing/inputcurve.h

@@ -4,7 +4,7 @@
 #include <QWidget>
 #include "baseinput.h"
 
-#include "../lib_paysages/tools/curve.h"
+#include "rendering/tools/curve.h"
 
 class InputCurve:public BaseInput
 {

src/editing/inputlayers.h

@@ -4,7 +4,7 @@
 #include <QWidget>
 #include "baseinput.h"
 #include "dialoglayers.h"
-#include "../lib_paysages/layers.h"
+#include "rendering/layers.h"
 
 class InputLayers:public BaseInput
 {

src/editing/inputmaterial.h

@@ -4,8 +4,8 @@
 #include <QWidget>
 #include "baseinput.h"
 
-#include "../lib_paysages/shared/types.h"
-#include "../lib_paysages/tools/lighting.h"
+#include "rendering/shared/types.h"
+#include "rendering/tools/lighting.h"
 
 class InputMaterial:public BaseInput
 {