From 1b1e884555f9c9f563c79d0c8162c34baafbf14f Mon Sep 17 00:00:00 2001
From: James Alliban <j.alliban@gmail.com>
Date: Sat, 11 Jan 2014 04:13:22 +0000
Subject: [PATCH] Camera draw size adjustable by percent of window

---
 of/Active Tripod/bin/Active_Tripod.lib        | Bin 78700 -> 78700 bytes
 .../data/GUI/BACKGROUNDguiPagesettings.xml    |  14 ++++++++++++--
 of/Active Tripod/src/gui/GUI.cpp              |   4 ++++
 of/Active Tripod/src/testApp.cpp              |   1 -
 of/Active Tripod/src/visual/Scene.cpp         |  12 +++++++++---
 of/Active Tripod/src/visual/Scene.h           |   2 ++
 6 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/of/Active Tripod/bin/Active_Tripod.lib b/of/Active Tripod/bin/Active_Tripod.lib
index cc9b6a91b44f6f933c67d3bd0708542e96718139..66a1d2fd6efdfcd2ef1fe50cf72f993822ffa5b8 100644
GIT binary patch
delta 6729
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

delta 6729
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

diff --git a/of/Active Tripod/bin/data/GUI/BACKGROUNDguiPagesettings.xml b/of/Active Tripod/bin/data/GUI/BACKGROUNDguiPagesettings.xml
index f04304a..4fb43c0 100644
--- a/of/Active Tripod/bin/data/GUI/BACKGROUNDguiPagesettings.xml	
+++ b/of/Active Tripod/bin/data/GUI/BACKGROUNDguiPagesettings.xml	
@@ -1,12 +1,22 @@
 <Widget>
     <Kind>2</Kind>
     <Name>Toggle Video Visibility</Name>
-    <Value>0</Value>
+    <Value>1</Value>
 </Widget>
 <Widget>
     <Kind>2</Kind>
     <Name>Toggle Image Visibility</Name>
-    <Value>1</Value>
+    <Value>0</Value>
+</Widget>
+<Widget>
+    <Kind>4</Kind>
+    <Name>Video/Image Width Percent</Name>
+    <Value>0.875000000</Value>
+</Widget>
+<Widget>
+    <Kind>4</Kind>
+    <Name>Video/Image Height Percent</Name>
+    <Value>1.000000000</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
diff --git a/of/Active Tripod/src/gui/GUI.cpp b/of/Active Tripod/src/gui/GUI.cpp
index 6a23e7d..ea2c87a 100644
--- a/of/Active Tripod/src/gui/GUI.cpp	
+++ b/of/Active Tripod/src/gui/GUI.cpp	
@@ -146,6 +146,10 @@ void GUI::addBackgroundGUI()
 
 	gui->addToggle("Toggle Video Visibility", &app->scene.isVideoVisible, toggleDim, toggleDim);
 	gui->addToggle("Toggle Image Visibility", &app->scene.isImageVisible, toggleDim, toggleDim);
+	gui->addSlider("Video/Image Width Percent", 0, 2, &app->scene.videoWidthPercentage, length, dim);
+	gui->addSlider("Video/Image Height Percent", 0, 2, &app->scene.videoHeightPercentage, length, dim);
+
+	
 
     gui->addLabel("VIDEO IMAGE SETTINGS");
 	gui->addSlider("Brightness", 0, 2, &app->scene.brightness, length, dim);
diff --git a/of/Active Tripod/src/testApp.cpp b/of/Active Tripod/src/testApp.cpp
index b333e76..e9d7190 100644
--- a/of/Active Tripod/src/testApp.cpp	
+++ b/of/Active Tripod/src/testApp.cpp	
@@ -2,7 +2,6 @@
 
 // TODO
 // ====
-// - Make HUD BG hole size a percentage rather than pixels
 // - Add option to resize video draw size (rather than making it fullscreen) and init size
 // - Make system to slow down data - The screen should show 15-20 minutes worth of data
 // - Make 3rd graph - separate fade
diff --git a/of/Active Tripod/src/visual/Scene.cpp b/of/Active Tripod/src/visual/Scene.cpp
index d4c08f2..c4c6c70 100644
--- a/of/Active Tripod/src/visual/Scene.cpp	
+++ b/of/Active Tripod/src/visual/Scene.cpp	
@@ -56,11 +56,17 @@ void Scene::drawVideo()
 	rgbShader.setUniform1f("blue", blue);
 	rgbShader.setUniform1f("alpha", alpha);
 	
+	float vidW = ofGetWidth() * videoWidthPercentage;
+	float vidH = ofGetHeight() * videoHeightPercentage;
+
+	ofPushMatrix();
+	ofTranslate((ofGetWidth() - vidW) * 0.5, (ofGetHeight() - vidH) * 0.5);
 	if (isVideoVisible)
-		vidGrabber.draw(0, 0, ofGetWidth(), ofGetHeight());
+		vidGrabber.draw(0, 0, vidW, vidH);
 	if (isImageVisible)
-	    bgImg.draw(0, 0, ofGetWidth(), ofGetHeight());
-	
+	    bgImg.draw(0, 0, vidW, vidH);
+	ofPopMatrix();
+
 	rgbShader.end();
 }
 
diff --git a/of/Active Tripod/src/visual/Scene.h b/of/Active Tripod/src/visual/Scene.h
index a40634d..23681c0 100644
--- a/of/Active Tripod/src/visual/Scene.h	
+++ b/of/Active Tripod/src/visual/Scene.h	
@@ -49,6 +49,8 @@ public:
 	float green;
 	float blue;
 	float alpha;
+	float videoWidthPercentage;
+	float videoHeightPercentage;
 	bool isVideoVisible;
 	bool isImageVisible;