From 73081efcd2621324abe6559b4d5abbe897da0a75 Mon Sep 17 00:00:00 2001 From: James Alliban Date: Sat, 11 Jan 2014 03:47:53 +0000 Subject: [PATCH] HUD hole size based on percentage not pixels --- of/Active Tripod/bin/Active_Tripod.lib | Bin 78700 -> 78700 bytes .../data/GUI/BACKGROUNDguiPagesettings.xml | 8 ++++---- .../data/GUI/GRAPH GLOBALguiPagesettings.xml | 4 ++-- of/Active Tripod/src/gui/GUI.cpp | 4 ++-- of/Active Tripod/src/testApp.cpp | 1 - of/Active Tripod/src/visual/Scene.cpp | 3 +++ of/Active Tripod/src/visual/Scene.h | 4 ++-- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/of/Active Tripod/bin/Active_Tripod.lib b/of/Active Tripod/bin/Active_Tripod.lib index c489dac6cc2920e0883d810a784c73c4d7374e4c..cc9b6a91b44f6f933c67d3bd0708542e96718139 100644 GIT binary patch delta 6729 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 wpg)=LO#aD~A 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;