diff --git a/of/Active Tripod/bin/Active_Tripod.lib b/of/Active Tripod/bin/Active_Tripod.lib index c489dac..cc9b6a9 100644 Binary files a/of/Active Tripod/bin/Active_Tripod.lib and b/of/Active Tripod/bin/Active_Tripod.lib differ diff --git a/of/Active Tripod/bin/data/GUI/BACKGROUNDguiPagesettings.xml b/of/Active Tripod/bin/data/GUI/BACKGROUNDguiPagesettings.xml index de94a55..f04304a 100644 --- a/of/Active Tripod/bin/data/GUI/BACKGROUNDguiPagesettings.xml +++ b/of/Active Tripod/bin/data/GUI/BACKGROUNDguiPagesettings.xml @@ -65,13 +65,13 @@ 4 - Radius Width - 829.532897949 + Hole Width Percent + 0.875000000 4 - Radius Height - 612.536193848 + Hole Height Percent + 1.019736886 4 diff --git a/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml b/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml index 56534c8..8a017a7 100644 --- a/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml +++ b/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml @@ -16,6 +16,6 @@ 6 Graph X begin/end (percent) - 0.838815808 - 0.069078945 + 0.786184192 + 0.059210528 diff --git a/of/Active Tripod/src/gui/GUI.cpp b/of/Active Tripod/src/gui/GUI.cpp index 935f6b2..6a23e7d 100644 --- a/of/Active Tripod/src/gui/GUI.cpp +++ b/of/Active Tripod/src/gui/GUI.cpp @@ -162,8 +162,8 @@ void GUI::addBackgroundGUI() gui->addSlider("Green .", 0, 255, &app->scene.hudColour[1], length, dim); gui->addSlider("Blue .", 0, 255, &app->scene.hudColour[2], length, dim); gui->addSlider("Alpha .", 0, 255, &app->scene.hudColour[3], length, dim); - gui->addSlider("Radius Width", 1, 2000, &app->scene.radiusW, length, dim); - gui->addSlider("Radius Height", 1, 2000, &app->scene.radiusH, length, dim); + gui->addSlider("Hole Width Percent", 0, 2, &app->scene.hudHoleWidthPercentage, length, dim); + gui->addSlider("Hole Height Percent", 0, 2, &app->scene.hudHoleHeightPercentage, length, dim); gui->addSlider("Circle Point Size", 0, 100, &app->scene.circlePointSize, length, dim); ofAddListener(gui->newGUIEvent, this, &GUI::variousGUIEvent); diff --git a/of/Active Tripod/src/testApp.cpp b/of/Active Tripod/src/testApp.cpp index e673d18..b333e76 100644 --- a/of/Active Tripod/src/testApp.cpp +++ b/of/Active Tripod/src/testApp.cpp @@ -5,7 +5,6 @@ // - 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 -// - add ability to remove the lines or body from body graph // - Make 3rd graph - separate fade // - Crosshairs in HUD // - Create graph animation system diff --git a/of/Active Tripod/src/visual/Scene.cpp b/of/Active Tripod/src/visual/Scene.cpp index b27c014..d4c08f2 100644 --- a/of/Active Tripod/src/visual/Scene.cpp +++ b/of/Active Tripod/src/visual/Scene.cpp @@ -76,6 +76,9 @@ void Scene::drawHUDBG() ofVertex(0, ofGetHeight()); ofNextContour(true); + + float radiusW = (ofGetWidth() * 0.5) * hudHoleWidthPercentage; + float radiusH = (ofGetHeight() * 0.5) * hudHoleHeightPercentage; for (int i = 0; i < (int)circlePointSize; i++) { diff --git a/of/Active Tripod/src/visual/Scene.h b/of/Active Tripod/src/visual/Scene.h index 570c09f..a40634d 100644 --- a/of/Active Tripod/src/visual/Scene.h +++ b/of/Active Tripod/src/visual/Scene.h @@ -55,8 +55,8 @@ public: // HUD background vars float hudColour[4]; float circlePointSize; - float radiusW; - float radiusH; + float hudHoleWidthPercentage; + float hudHoleHeightPercentage; // text vars float xMargin;