diff --git a/src/interface/quick/OpenGLView.cpp b/src/interface/quick/OpenGLView.cpp
index 6f35ec2..cf962fd 100644
--- a/src/interface/quick/OpenGLView.cpp
+++ b/src/interface/quick/OpenGLView.cpp
@@ -39,6 +39,8 @@ void OpenGLView::paint()
initialized = true;
}
- renderer.resize(window()->width(), window()->height());
+ renderer.resize(width(), height());
renderer.paint();
+
+ window()->resetOpenGLState();
}
diff --git a/src/interface/quick/images.qrc b/src/interface/quick/images.qrc
new file mode 100644
index 0000000..d8083b0
--- /dev/null
+++ b/src/interface/quick/images.qrc
@@ -0,0 +1,10 @@
+
+
+ images/tab_atmosphere.png
+ images/tab_terrain.png
+ images/tab_textures.png
+ images/tab_water.png
+ images/tab_clouds.png
+ images/tab_render.png
+
+
diff --git a/src/interface/quick/images/images.qrc b/src/interface/quick/images/images.qrc
new file mode 100644
index 0000000..d3a2921
--- /dev/null
+++ b/src/interface/quick/images/images.qrc
@@ -0,0 +1,10 @@
+
+
+ tab_water.png
+ tab_atmosphere.png
+ tab_clouds.png
+ tab_render.png
+ tab_terrain.png
+ tab_textures.png
+
+
diff --git a/src/interface/quick/images/tab_atmosphere.png b/src/interface/quick/images/tab_atmosphere.png
new file mode 100644
index 0000000..d1e3189
Binary files /dev/null and b/src/interface/quick/images/tab_atmosphere.png differ
diff --git a/src/interface/quick/images/tab_clouds.png b/src/interface/quick/images/tab_clouds.png
new file mode 100644
index 0000000..0fe90b2
Binary files /dev/null and b/src/interface/quick/images/tab_clouds.png differ
diff --git a/src/interface/quick/images/tab_render.png b/src/interface/quick/images/tab_render.png
new file mode 100644
index 0000000..0715265
Binary files /dev/null and b/src/interface/quick/images/tab_render.png differ
diff --git a/src/interface/quick/images/tab_terrain.png b/src/interface/quick/images/tab_terrain.png
new file mode 100644
index 0000000..343522d
Binary files /dev/null and b/src/interface/quick/images/tab_terrain.png differ
diff --git a/src/interface/quick/images/tab_textures.png b/src/interface/quick/images/tab_textures.png
new file mode 100644
index 0000000..d846a9b
Binary files /dev/null and b/src/interface/quick/images/tab_textures.png differ
diff --git a/src/interface/quick/images/tab_water.png b/src/interface/quick/images/tab_water.png
new file mode 100644
index 0000000..1b29d63
Binary files /dev/null and b/src/interface/quick/images/tab_water.png differ
diff --git a/src/interface/quick/main.qml b/src/interface/quick/main.qml
index 55b587b..95f641d 100644
--- a/src/interface/quick/main.qml
+++ b/src/interface/quick/main.qml
@@ -1,11 +1,83 @@
import QtQuick 2.2
import Paysages 1.0
-Item {
+OpenGLView {
width: 640
height: 480
- OpenGLView {
+ Item {
+ id: primary_toolbar
+ x: 0
+ y: 0
+ width: 70
+ height: parent.height
+
+ Rectangle {
+ width: parent.height
+ height: parent.width
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.verticalCenter: parent.verticalCenter
+ transformOrigin: Item.Center
+ rotation: -90
+ gradient: Gradient {
+ GradientStop { position: 0.0; color: "#605055FF" }
+ GradientStop { position: 1.0; color: "#005055FF" }
+ }
+ }
+
+ Column {
+
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.verticalCenter: parent.verticalCenter
+ spacing: (parent.height - 6 * tool_terrain.height) / 7
+
+ Image {
+ id: tool_terrain
+ opacity: 0.5
+ source: "qrc:///toolbar/primary/tab_terrain.png"
+ }
+ Image {
+ id: tool_textures
+ opacity: 0.5
+ source: "qrc:///toolbar/primary/tab_textures.png"
+ }
+ Image {
+ id: tool_water
+ opacity: 0.5
+ source: "qrc:///toolbar/primary/tab_water.png"
+ }
+ Image {
+ id: tool_atmosphere
+ opacity: 0.5
+ source: "qrc:///toolbar/primary/tab_atmosphere.png"
+ }
+ Image {
+ id: tool_clouds
+ opacity: 0.5
+ source: "qrc:///toolbar/primary/tab_clouds.png"
+ }
+ Image {
+ id: tool_render
+ opacity: 0.5
+ source: "qrc:///toolbar/primary/tab_render.png"
+ }
+ }
}
+
+ Rectangle {
+ id: toolbar_render
+ anchors.top: primary_toolbar.top
+ anchors.left: primary_toolbar.right
+ width: primary_toolbar.width
+ height: primary_toolbar.height
+ color: "green"
+
+ SequentialAnimation on width {
+ loops: Animation.Infinite
+ PropertyAnimation { to: 0; duration: 1000 }
+ PropertyAnimation { to: primary_toolbar.width; duration: 1000 }
+ }
+ }
+
}
diff --git a/src/interface/quick/quick.pro b/src/interface/quick/quick.pro
index 6b90cf3..fb2c7a0 100644
--- a/src/interface/quick/quick.pro
+++ b/src/interface/quick/quick.pro
@@ -7,7 +7,8 @@ include(../../common.pri)
SOURCES += main.cpp \
OpenGLView.cpp
-RESOURCES += qml.qrc
+RESOURCES += qml.qrc \
+ images/images.qrc
# Additional import path used to resolve QML modules in Qt Creator's code model
QML_IMPORT_PATH =