summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Suhren <suhren.stefan@fh-swf.de>2015-11-13 12:11:34 +0100
committerStefan Suhren <suhren.stefan@fh-swf.de>2015-11-13 12:11:50 +0100
commit0f8ceacadd3190123cd736260a0401baa8130239 (patch)
treeb91872654b6e6c4a2c861eab73813ae1b172a0fd
parentf248f3f8034e221066825d953d5564e9f7e13714 (diff)
downloadMultimedia-0f8ceacadd3190123cd736260a0401baa8130239.tar.gz
Multimedia-0f8ceacadd3190123cd736260a0401baa8130239.zip
Change background and start without rotating
-rw-r--r--qml/MainForm.ui.qml4
-rw-r--r--src/mmscene.cpp5
2 files changed, 6 insertions, 3 deletions
diff --git a/qml/MainForm.ui.qml b/qml/MainForm.ui.qml
index 9c40e63..19cc165 100644
--- a/qml/MainForm.ui.qml
+++ b/qml/MainForm.ui.qml
@@ -16,7 +16,7 @@ MMScene {
Rectangle{
id: backgroundRect
anchors.fill: parent
- color: "black"
+ color: "lightgrey"
}
@@ -28,7 +28,7 @@ MMScene {
Button {
id: button1
- text: qsTr("Stop")
+ text: qsTr("Start")
}
Button {
diff --git a/src/mmscene.cpp b/src/mmscene.cpp
index 882e781..d9cda29 100644
--- a/src/mmscene.cpp
+++ b/src/mmscene.cpp
@@ -8,8 +8,11 @@ MMScene::MMScene(QQuickItem *parent)
// Initialize with NULL
m_cube = NULL;
+ // Stop rotation
+ toggleMove();
+
m_vertexShaderFilename = ":/shaders/vshader.vsh";
- m_eye = 20.0 * v_XYZ;
+ m_eye = 5.0 * v_XYZ;
m_lightingEnabled = true;
m_colorArrayEnabled = false;
}