Video added
- Video / imag visibility can be adjusted in GUI
This commit is contained in:
parent
759936b322
commit
72b3f96b71
Binary file not shown.
@ -1,3 +1,13 @@
|
||||
<Widget>
|
||||
<Kind>2</Kind>
|
||||
<Name>Toggle Video Visibility</Name>
|
||||
<Value>1</Value>
|
||||
</Widget>
|
||||
<Widget>
|
||||
<Kind>2</Kind>
|
||||
<Name>Toggle Image Visibility</Name>
|
||||
<Value>0</Value>
|
||||
</Widget>
|
||||
<Widget>
|
||||
<Kind>4</Kind>
|
||||
<Name>Brightness</Name>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<Widget>
|
||||
<Kind>2</Kind>
|
||||
<Name>Toggle Data Simulation</Name>
|
||||
<Value>0</Value>
|
||||
<Value>1</Value>
|
||||
</Widget>
|
||||
<Widget>
|
||||
<Kind>4</Kind>
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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,6 +59,9 @@ void Scene::drawVideo()
|
||||
rgbShader.setUniform1f("blue", blue);
|
||||
rgbShader.setUniform1f("alpha", alpha);
|
||||
|
||||
if (isVideoVisible)
|
||||
vidGrabber.draw(0, 0, ofGetWidth(), ofGetHeight());
|
||||
if (isImageVisible)
|
||||
bgImg.draw(0, 0, ofGetWidth(), ofGetHeight());
|
||||
|
||||
rgbShader.end();
|
||||
|
||||
@ -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];
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user