From 11229ede83c48fab01e6e566155536b5e7e9d762 Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Mon, 24 Jun 2013 23:18:03 +0100
Subject: yay

---
 06_performance/src/testApp.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to '06_performance/src/testApp.cpp')

diff --git a/06_performance/src/testApp.cpp b/06_performance/src/testApp.cpp
index 57749b0..746d52f 100644
--- a/06_performance/src/testApp.cpp
+++ b/06_performance/src/testApp.cpp
@@ -168,7 +168,10 @@ void testApp::setup(){
             else printf("no video clips found!\n");
         }
     }
-}
+
+    xOffs=startX=yOffs=startY=0;
+};
+
 
 
 
@@ -242,6 +245,9 @@ void testApp::update(){
     for (int i=0;i<videoclips.size();i++) videoclips[i].update();
 
     narrator.update();
+
+	xOffs*=.95;
+	yOffs*=.95;
 }
 
 //--------------------------------------------------------------
@@ -319,8 +325,8 @@ void testApp::draw(){
 	}
 
 	F_xRotation+=(F_xRotate*interval);
-	F_yRotation+=(F_yRotate*interval);
-	F_zRotation+=(F_zRotate*interval);
+	F_yRotation+=((F_yRotate+xOffs)*interval);
+	F_zRotation+=((F_zRotate+yOffs)*interval);
 	F_drawFrames=max(1.99f,min(F_drawFrames+(F_drawStep*interval),(float)BUFFER_FRAMES));
 
 	ofPushMatrix();
@@ -588,17 +594,18 @@ void testApp::mouseMoved(int x, int y ){
 
 //--------------------------------------------------------------
 void testApp::mouseDragged(int x, int y, int button){
-
+	xOffs=x-startX;
+	yOffs=y-startY;
 }
 
 //--------------------------------------------------------------
 void testApp::mousePressed(int x, int y, int button){
-
+	startX=x;
+	startY=y;
 }
 
 //--------------------------------------------------------------
 void testApp::mouseReleased(){
-
 }
 
 
-- 
cgit v1.2.3