diff --git a/data/ui_pictures.qrc b/data/ui_pictures.qrc
index a3fa8d0..1a0f84c 100644
--- a/data/ui_pictures.qrc
+++ b/data/ui_pictures.qrc
@@ -9,6 +9,11 @@
images/load.png
images/new.png
images/save.png
+ images/layer_add.png
+ images/layer_del.png
+ images/layer_down.png
+ images/layer_rename.png
+ images/layer_up.png
images/tab_atmosphere.png
diff --git a/src/editing/common/mainwindow.ui b/src/editing/common/mainwindow.ui
index b6744c8..8958a02 100644
--- a/src/editing/common/mainwindow.ui
+++ b/src/editing/common/mainwindow.ui
@@ -135,8 +135,6 @@
- widget
- widget
-
@@ -260,7 +258,7 @@
-
- 0
+ 1
@@ -277,6 +275,15 @@
Lanscape shape
+
+
+
+ :/tabs/images/tab_textures.png:/tabs/images/tab_textures.png
+
+
+ Textures
+
+
@@ -483,6 +490,12 @@
terrain/mainterrainform.h
1
+
+ MainTexturesForm
+ QWidget
+ textures/maintexturesform.h
+ 1
+
@@ -515,8 +528,8 @@
425
- 213
- 425
+ -1
+ -1
diff --git a/src/editing/paysages-qt.pro b/src/editing/paysages-qt.pro
index b9067f5..9336ebc 100644
--- a/src/editing/paysages-qt.pro
+++ b/src/editing/paysages-qt.pro
@@ -71,7 +71,8 @@ HEADERS += \
common/previewrenderer.h \
terrain/widgetterrainbasenoisepreview.h \
common/mainwindow.h \
- terrain/dialogbaseterrainnoise.h
+ terrain/dialogbaseterrainnoise.h \
+ textures/maintexturesform.h
SOURCES += \
terrain/widgetheightmap.cpp \
@@ -122,14 +123,16 @@ SOURCES += \
common/previewrenderer.cpp \
terrain/widgetterrainbasenoisepreview.cpp \
common/mainwindow.cpp \
- terrain/dialogbaseterrainnoise.cpp
+ terrain/dialogbaseterrainnoise.cpp \
+ textures/maintexturesform.cpp
FORMS += \
terrain/dialogterrainpainting.ui \
common/widgetglobalformbuttons.ui \
terrain/mainterrainform.ui \
common/mainwindow.ui \
- terrain/dialogbaseterrainnoise.ui
+ terrain/dialogbaseterrainnoise.ui \
+ textures/maintexturesform.ui
RESOURCES += \
../../data/ui_pictures.qrc
diff --git a/src/editing/terrain/mainterrainform.ui b/src/editing/terrain/mainterrainform.ui
index 0a74c6d..a1fc947 100644
--- a/src/editing/terrain/mainterrainform.ui
+++ b/src/editing/terrain/mainterrainform.ui
@@ -6,8 +6,8 @@
0
0
- 1079
- 720
+ 1181
+ 693
@@ -293,7 +293,7 @@
- Go to textures to add small height displacements (rocks...)
+ Go to textures to add relief effect (rocks...)
diff --git a/src/editing/textures/maintexturesform.cpp b/src/editing/textures/maintexturesform.cpp
new file mode 100644
index 0000000..d9e3f4a
--- /dev/null
+++ b/src/editing/textures/maintexturesform.cpp
@@ -0,0 +1,14 @@
+#include "maintexturesform.h"
+#include "ui_maintexturesform.h"
+
+MainTexturesForm::MainTexturesForm(QWidget *parent) :
+ QWidget(parent),
+ ui(new Ui::MainTexturesForm)
+{
+ ui->setupUi(this);
+}
+
+MainTexturesForm::~MainTexturesForm()
+{
+ delete ui;
+}
diff --git a/src/editing/textures/maintexturesform.h b/src/editing/textures/maintexturesform.h
new file mode 100644
index 0000000..ec63a62
--- /dev/null
+++ b/src/editing/textures/maintexturesform.h
@@ -0,0 +1,22 @@
+#ifndef MAINTEXTURESFORM_H
+#define MAINTEXTURESFORM_H
+
+#include
+
+namespace Ui {
+class MainTexturesForm;
+}
+
+class MainTexturesForm : public QWidget
+{
+ Q_OBJECT
+
+public:
+ explicit MainTexturesForm(QWidget *parent = 0);
+ ~MainTexturesForm();
+
+private:
+ Ui::MainTexturesForm *ui;
+};
+
+#endif // MAINTEXTURESFORM_H
diff --git a/src/editing/textures/maintexturesform.ui b/src/editing/textures/maintexturesform.ui
new file mode 100644
index 0000000..d4fbf17
--- /dev/null
+++ b/src/editing/textures/maintexturesform.ui
@@ -0,0 +1,370 @@
+
+
+ MainTexturesForm
+
+
+
+ 0
+ 0
+ 1008
+ 664
+
+
+
+ Form
+
+
+ -
+
+
-
+
+
+ Texture layers
+
+
+ true
+
+
+
-
+
+
+
+ true
+
+
+
+ These are the layers of textures that control the ground details. Each texture has two effects : a relief effect to add better definition to the base terrain shape, and a detail effect for close views.
+
+
+ Qt::AutoText
+
+
+ true
+
+
+
+ -
+
+
-
+
+
+ -
+
+
-
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Add layer
+
+
+
+ :/buttons/logo/images/layer_add.png:/buttons/logo/images/layer_add.png
+
+
+
+ -
+
+
+ Remove layer
+
+
+
+ :/buttons/logo/images/layer_del.png:/buttons/logo/images/layer_del.png
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Rename layer
+
+
+
+ :/buttons/logo/images/layer_rename.png:/buttons/logo/images/layer_rename.png
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Move layer down
+
+
+
+ :/buttons/logo/images/layer_down.png:/buttons/logo/images/layer_down.png
+
+
+
+ -
+
+
+ Move layer up
+
+
+
+ :/buttons/logo/images/layer_up.png:/buttons/logo/images/layer_up.png
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Selected layer previews
+
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 200
+ 200
+
+
+
+
+ 200
+ 200
+
+
+
+
+ -
+
+
+ Coverage
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 200
+ 200
+
+
+
+
+ 200
+ 200
+
+
+
+
+ -
+
+
+ Appearance
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ -
+
+
-
+
+
+ All layers preview
+
+
+ true
+
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 200
+ 200
+
+
+
+
+ 200
+ 200
+
+
+
+
+ -
+
+
+ Render preview
+
+
+
+ :/buttons/logo/images/render.png:/buttons/logo/images/render.png
+
+
+
+ -
+
+
+ Explore in 3D
+
+
+
+ :/buttons/logo/images/explore.png:/buttons/logo/images/explore.png
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+ -
+
+
+ Actions
+
+
+ true
+
+
+
-
+
+
+ Revert modifications
+
+
+
+ :/buttons/logo/images/revert.png:/buttons/logo/images/revert.png
+
+
+
+ -
+
+
+ Apply modifications
+
+
+
+ :/buttons/logo/images/apply.png:/buttons/logo/images/apply.png
+
+
+
+
+
+
+
+
+
+
+
+
+ BasePreview
+ QWidget
+
+ 1
+
+
+
+
+
+
+