From 92c28ae2927d384d08ef9a88484db2293a932fcb Mon Sep 17 00:00:00 2001 From: James Alliban Date: Tue, 14 Jan 2014 19:44:05 +0000 Subject: [PATCH] Transparency sorting in place --- of/Utility_Box/src/testApp.cpp | 6 +++--- of/Utility_Box/src/visual/graph/Graph.cpp | 4 ++++ of/Utility_Box/src/visual/graph/Graph.h | 5 +++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/of/Utility_Box/src/testApp.cpp b/of/Utility_Box/src/testApp.cpp index 4102b89..e471ef9 100644 --- a/of/Utility_Box/src/testApp.cpp +++ b/of/Utility_Box/src/testApp.cpp @@ -2,9 +2,9 @@ // TODO // ==== -// - If min or max values change - clear graph - ask bout this -// - Create a single config file to be loaded from online location. It will contain IP address and host name -// - Create graph animation system +// - Add text planes +// - Add animated camera +// - Colour range - tweet between 3 points // //-------------------------------------------------------------- void testApp::setup() diff --git a/of/Utility_Box/src/visual/graph/Graph.cpp b/of/Utility_Box/src/visual/graph/Graph.cpp index 6a5668e..3ba05aa 100644 --- a/of/Utility_Box/src/visual/graph/Graph.cpp +++ b/of/Utility_Box/src/visual/graph/Graph.cpp @@ -130,6 +130,10 @@ ofMesh Graph::getMesh(vector publisherData, float* col) } +void Graph::createInfoTextFbo() +{ +} + void Graph::addNewData(DataObject newData) { diff --git a/of/Utility_Box/src/visual/graph/Graph.h b/of/Utility_Box/src/visual/graph/Graph.h index 74af3e7..c4ee667 100644 --- a/of/Utility_Box/src/visual/graph/Graph.h +++ b/of/Utility_Box/src/visual/graph/Graph.h @@ -14,6 +14,7 @@ public: void draw(); void addNewData(DataObject newData); ofMesh getMesh(vector publisherData, float* col); + void createInfoTextFbo(); void clear(); testApp *app; @@ -21,9 +22,9 @@ public: vector publisher0Data; int maxData; // calculated from graphWidth and graphItemXGap - - //ofFbo + ofFbo infoTextFbo; + static float minGraphPercent; static float maxGraphPercent; static float maxGraphWidth;