From dfaf752d730c105e74e05c606ea2061911b395ee Mon Sep 17 00:00:00 2001
From: Riku Avelar <riku.avelar@gmail.com>
Date: Wed, 30 Nov 2016 16:55:47 -0500
Subject: [PATCH] Animation Controls

---
 mainwindow.ui               | 44 +++++++++++++++++++++++++++++++++++--
 src/viewer/simpleViewer.cpp | 18 +++++++--------
 src/viewer/simpleViewer.h   |  5 +++--
 src/window/mainwindow.cpp   |  4 ++++
 src/window/mainwindow.h     |  1 +
 5 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/mainwindow.ui b/mainwindow.ui
index 329e3be..b4402cf 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -30,7 +30,7 @@
     </sizepolicy>
    </property>
    <layout class="QGridLayout" name="gridLayout_2">
-    <item row="0" column="0">
+    <item row="0" column="1">
      <widget class="QFrame" name="frame">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -56,9 +56,10 @@
       <property name="frameShadow">
        <enum>QFrame::Raised</enum>
       </property>
+      <zorder>speedSlider</zorder>
      </widget>
     </item>
-    <item row="0" column="1">
+    <item row="0" column="4">
      <layout class="QGridLayout" name="gridLayout">
       <property name="horizontalSpacing">
        <number>6</number>
@@ -212,6 +213,45 @@
       </item>
      </layout>
     </item>
+    <item row="1" column="1">
+     <widget class="QSlider" name="speedSlider">
+      <property name="minimum">
+       <number>0</number>
+      </property>
+      <property name="maximum">
+       <number>100</number>
+      </property>
+      <property name="singleStep">
+       <number>1</number>
+      </property>
+      <property name="value">
+       <number>10</number>
+      </property>
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="tickPosition">
+       <enum>QSlider::TicksBelow</enum>
+      </property>
+      <property name="tickInterval">
+       <number>10</number>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="4">
+     <widget class="QPushButton" name="play_button">
+      <property name="font">
+       <font>
+        <pointsize>10</pointsize>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>	⏯</string>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menuBar">
diff --git a/src/viewer/simpleViewer.cpp b/src/viewer/simpleViewer.cpp
index 7aeccc7..8ae1c90 100644
--- a/src/viewer/simpleViewer.cpp
+++ b/src/viewer/simpleViewer.cpp
@@ -881,17 +881,13 @@ void Viewer::changeColor(QColor c){
 }
 
 void Viewer::animate(){
-	clock_t time = clock();
-	double dt = time - startTime;
-	frame += dt * 0.006 * frame_mult; // 60fps
-	startTime = time;
-	update();
+    clock_t time = clock();
+    double dt = time - startTime;
+    frame += dt * 0.006 * frame_mult; // 60fps
+    startTime = time;
+    update();
 }
 
-void Viewer::startAniumation(){}
-
-void Viewer::stopAnimation(){}
-
 void Viewer::rotateSelectedObjXCCW() {
     rotateSelected(RotateDirection::X_CCW);
 }
@@ -911,6 +907,10 @@ void Viewer::rotateSelectedObjZCW() {
     rotateSelected(RotateDirection::Z_CW);
 }
 
+void Viewer::animationSpeedChange(int val) {
+    frame_mult = fmax(double(val) / 10, 0.05);
+}
+
 void Viewer::rotateSelected(RotateDirection dir) {
     if(selectedObj.shape == nullptr || selectedObj.shape->getParent() == nullptr) return;
 
diff --git a/src/viewer/simpleViewer.h b/src/viewer/simpleViewer.h
index c32d442..ea61947 100644
--- a/src/viewer/simpleViewer.h
+++ b/src/viewer/simpleViewer.h
@@ -81,6 +81,7 @@ public slots:
     void rotateSelectedObjYCW();
     void rotateSelectedObjZCCW();
     void rotateSelectedObjZCW();
+    void animationSpeedChange(int);
 
 signals:
 	int shapeSelected(int);
@@ -107,8 +108,8 @@ private:
     PickedGeom pickGeom(int, int);
 
 	void animate();
-	void startAniumation();
-	void stopAnimation();
+//    void startAnimation();
+//	void stopAnimation();
 
 	void drawUi();
 
diff --git a/src/window/mainwindow.cpp b/src/window/mainwindow.cpp
index 62ba704..90e4b98 100644
--- a/src/window/mainwindow.cpp
+++ b/src/window/mainwindow.cpp
@@ -75,6 +75,10 @@ void MainWindow::addViewer(Viewer* viewer)
     connect(ui->cw_y, SIGNAL(clicked(bool)), viewer, SLOT(rotateSelectedObjYCW()));
     connect(ui->ccw_z, SIGNAL(clicked(bool)), viewer, SLOT(rotateSelectedObjZCCW()));
     connect(ui->cw_z, SIGNAL(clicked(bool)), viewer, SLOT(rotateSelectedObjZCW()));
+
+    connect(ui->speedSlider, SIGNAL(valueChanged(int)), viewer, SLOT(animationSpeedChange(int)));
+    connect(ui->play_button, SIGNAL(clicked(bool)), viewer, SLOT(toggleAnimation()));
+
 }
 
 void MainWindow::onColorPickerActivate(){
diff --git a/src/window/mainwindow.h b/src/window/mainwindow.h
index b21499c..4a44b33 100644
--- a/src/window/mainwindow.h
+++ b/src/window/mainwindow.h
@@ -23,6 +23,7 @@ public:
 
 public slots:
 	void onColorPickerActivate();
+//    void onToggleAnimationText();
     //void onTextureToggle();
 
 private: