From 72b3f96b713b33028a2d8d4b3e2c12b4e9f90741 Mon Sep 17 00:00:00 2001 From: James Alliban Date: Fri, 10 Jan 2014 00:33:16 +0000 Subject: [PATCH] Video added - Video / imag visibility can be adjusted in GUI --- of/Active Tripod/bin/Active_Tripod.lib | Bin 78700 -> 78700 bytes .../data/GUI/BACKGROUNDguiPagesettings.xml | 10 ++++++++++ .../data/GUI/SIMULATIONguiPagesettings.xml | 2 +- of/Active Tripod/src/gui/GUI.cpp | 3 +++ of/Active Tripod/src/visual/Scene.cpp | 10 +++++++++- of/Active Tripod/src/visual/Scene.h | 3 +++ 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/of/Active Tripod/bin/Active_Tripod.lib b/of/Active Tripod/bin/Active_Tripod.lib index c0eb44eb5f2c97a787caf678be70c205f3d117e1..e5bbfb7a2b608ab2223ca97f64460b98e7079a9f 100644 GIT binary patch delta 6729 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 delta 6729 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 v`jZLI + 2 + Toggle Video Visibility + 1 + + + 2 + Toggle Image Visibility + 0 + 4 Brightness diff --git a/of/Active Tripod/bin/data/GUI/SIMULATIONguiPagesettings.xml b/of/Active Tripod/bin/data/GUI/SIMULATIONguiPagesettings.xml index 1908c35..65a6ee7 100644 --- a/of/Active Tripod/bin/data/GUI/SIMULATIONguiPagesettings.xml +++ b/of/Active Tripod/bin/data/GUI/SIMULATIONguiPagesettings.xml @@ -1,7 +1,7 @@ 2 Toggle Data Simulation - 0 + 1 4 diff --git a/of/Active Tripod/src/gui/GUI.cpp b/of/Active Tripod/src/gui/GUI.cpp index 6529621..36e66f0 100644 --- a/of/Active Tripod/src/gui/GUI.cpp +++ b/of/Active Tripod/src/gui/GUI.cpp @@ -139,6 +139,9 @@ void GUI::addBackgroundGUI() string title = "BACKGROUND"; ofxUICanvas* gui = getNewGUI(title); + gui->addToggle("Toggle Video Visibility", &app->scene.isVideoVisible, toggleDim, toggleDim); + gui->addToggle("Toggle Image Visibility", &app->scene.isImageVisible, toggleDim, toggleDim); + gui->addLabel("VIDEO IMAGE SETTINGS"); gui->addSlider("Brightness", 0, 2, &app->scene.brightness, length, dim); gui->addSlider("Contrast", 0, 2, &app->scene.contrast, length, dim); diff --git a/of/Active Tripod/src/visual/Scene.cpp b/of/Active Tripod/src/visual/Scene.cpp index 797d841..ed637b0 100644 --- a/of/Active Tripod/src/visual/Scene.cpp +++ b/of/Active Tripod/src/visual/Scene.cpp @@ -11,6 +11,9 @@ void Scene::setup() { + vidGrabber.initGrabber(1280, 720); + vidGrabber.setDesiredFrameRate(30); + bgImg.loadImage("images/tanks.jpg"); rgbShader.load("shaders/RGBShader"); barGraph.setup(); @@ -25,6 +28,8 @@ void Scene::setup() void Scene::update() { + vidGrabber.update(); + activeGraph->update(); text.setLineLength(lineLength); @@ -54,7 +59,10 @@ void Scene::drawVideo() rgbShader.setUniform1f("blue", blue); rgbShader.setUniform1f("alpha", alpha); - bgImg.draw(0, 0, ofGetWidth(), ofGetHeight()); + if (isVideoVisible) + vidGrabber.draw(0, 0, ofGetWidth(), ofGetHeight()); + if (isImageVisible) + bgImg.draw(0, 0, ofGetWidth(), ofGetHeight()); rgbShader.end(); } diff --git a/of/Active Tripod/src/visual/Scene.h b/of/Active Tripod/src/visual/Scene.h index c403f00..b1cc87e 100644 --- a/of/Active Tripod/src/visual/Scene.h +++ b/of/Active Tripod/src/visual/Scene.h @@ -32,6 +32,7 @@ public: BarGraph barGraph; BodyGraph bodyGraph; ofShader rgbShader; + ofVideoGrabber vidGrabber; ofImage bgImg; ofxFTGLSimpleLayout text; @@ -47,6 +48,8 @@ public: float green; float blue; float alpha; + bool isVideoVisible; + bool isImageVisible; // HUD background vars float hudColour[4];