From e51abf7a53593d55b79486e19dbc4463aa2ec5b1 Mon Sep 17 00:00:00 2001 From: James Alliban Date: Thu, 16 Jan 2014 20:21:24 +0000 Subject: [PATCH] Large numbers now being handled correctly... - long long ints being used where necessary - Commas being added to numbers larger than 999 - No more values being rendered as 1.5332e+012 --- of/Active Tripod/bin/Active_Tripod.lib | Bin 78700 -> 78700 bytes of/Active Tripod/bin/Active_Tripod_debug.ilk | 0 of/Active Tripod/bin/Active_Tripod_debug.lib | Bin 0 -> 80566 bytes .../data/GUI/GRAPH GLOBALguiPagesettings.xml | 4 +- of/Active Tripod/src/data/DataManager.cpp | 57 +++++++- of/Active Tripod/src/data/DataManager.h | 3 + of/Active Tripod/src/visual/Scene.cpp | 125 ++++++++++++++---- of/Active Tripod/src/visual/Scene.h | 10 +- of/Utility_Box/bin/Utility_Box.lib | Bin 78002 -> 78002 bytes of/Utility_Box/bin/data/subscriber_log.txt | 24 ++-- of/Utility_Box/obj/Release/CL.read.1.tlog | Bin 2468246 -> 2468402 bytes of/Utility_Box/obj/Release/Scene.obj | Bin 518829 -> 518829 bytes of/Utility_Box/obj/Release/Utility_Box.log | 4 +- .../obj/Release/Utility_Box.write.1.tlog | 5 + of/Utility_Box/obj/Release/testApp.obj | Bin 417840 -> 417840 bytes of/Utility_Box/obj/Release/vc110.pdb | Bin 4321280 -> 4321280 bytes of/Utility_Box/src/testApp.cpp | 2 +- of/Utility_Box/src/visual/Camera.cpp | 13 ++ of/Utility_Box/src/visual/Camera.h | 4 + of/Utility_Box/src/visual/Scene.cpp | 3 +- 20 files changed, 199 insertions(+), 55 deletions(-) create mode 100644 of/Active Tripod/bin/Active_Tripod_debug.ilk create mode 100644 of/Active Tripod/bin/Active_Tripod_debug.lib diff --git a/of/Active Tripod/bin/Active_Tripod.lib b/of/Active Tripod/bin/Active_Tripod.lib index 2c76e8cd1b1aa7e38d643533909b00e7a3181fd6..91d6c1836901a10e53fa1be4edef029610f8932b 100644 GIT binary patch delta 7553 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 EAAQ?k{{R30 delta 7553 zcmaJ`d2p5070-oiWFZMJdGBQ-iI9Y>ycY<>DuqZbV`&t180b_Qqtng+gNQn!;%`JMfI zj~kc6Z(I&vkP%rCD6beEfIz)>W5vKntv@%v{Aj8DH|$$pW}bci;P7nc-_tR_7QMqt zn@&FA6JcS|Fm+}6=3lJ%Rv2clr>uOK#obGDZ~pztc$)|2uS)E#>2IwXOmw+7UKDB~ z^j}c0u<(h{{a@8k}O^Faib#Tr$fA*62yZX} zaj{HlAS}lF6HEgYSAmMgr3l2J@G4G5aQa~fU&qdnw&RC+4yWp^n zeAi-iNZa2fC=enYe2=6J#K!k5UPnCteT!s;Y32JICaQv*#vWBr*GLW;BM}=|BgJ9% z24d3~;rs>Um- za(No|^H2HZhrNUiK>LQNpT6Z0g0Ac#>G~GR2xqE~cBfS7D}atIK1i&HhWQ_a=ubz0{eZepV_!lV0)4snK>{ICZ?M zi6DX+^B9_e3gKua(v<3far?M730}iK+b~M#mGiKYX!fPRsQoNKy|Q#a_X;WTeZ)#= zyDa>Ow*-+Q4iL%2bmjp9Y-k-!Qz`&oOpR zo0}`tu6NNh$dU~Aj+c=34Og51S2t6DO$oI$Q@sGCcfx0sUc=V>8M9H>J@PrZxA=m4 zJMHO2M}r2878^8cXr7cZbEwpybR)O1}r^WK$%u4#6l=gre~@` zI9}|BYuD{5uQ6BOb(iHi!rXmB&4SwVURd>qSf~y}K;{?RIyR_T=NXhsMz{5npN;aK zFR27|h2Y~5_4pTjtoyQ@PF1+r^N)(eRx9Rre5KIIW}7ow z^*L3is;lOWWVn%^3=vm2SW2I{{j0C=AR~b1uNZ*thts61JYQ*XHeY2yT3C;L!(3=X zjd`3eddx4@^CM?U7F_>^fT(?eAuUtSOW?@045*$G1tipZx=I@oKpB0|$xD zm1#dREGp90AGr)DW*EzwTU^f+^_E+t(Bysme|ypnGmQ_m%G+#(7UT!F?FDImR>=Q} z_a1!!%b)mAu{UHyr{Q#t4$QV5<~v|Umlq~I7zO|65xeHj<{=lKYfo8l3-Gyqwr4 zH`3>p=|b^ol6^ z^V@A*nbccw@7kO1kQS1Sy#=j4z0&xD{;(cV9nbq^ML0XkBSbC?7u@_h_3n>MvQLDd z>M_i-BA6M82wS(rDWqV&i`-09Q zIX1!gZ2vqd4$0-`pgZQ>GG$%(5)T~$;NaG0L z@!;OQ^0hP;4;iSPvMybCVd)?H%E5LN)DL*h7?-c53!3A4vSK^wQ>qIk<=_k+#v#vl z9mR=%in02GAR%=9ZG2BbZ(5Qj%QHCxbQ#IIOs_FA_XHUVs zDP>oGK}V%q1K93=%L;J~X$je!7G5NE7EPO?peE#4rko$=82FzL$fQrsIG0HpCR;~5KIh2n zfmVGu_r9Dt(1PdES}ht?Y)vkQ#w|gN*u`9~So!=Q_p|cn3Q|8AED))X_((W3&g>_b z=do$c=aVgY!dbqf6tjnz{jxZ}8{_nRm+>LRm`se}aQ{-T+-;a$P*|b5FH$sTCXD@a zjO-g~+ZjhI28rL&;ATMRQc;1J6!M}G;LFYeQEhVI=&33+g-Urr<^zRhh`5KL98<)* zohyBN5i3wW$n;{@Sg@Gu(}~zxdf8dr4f>E0H$8KucF}DgS4Bt8P1o4 zHp4k53Ho>N9NAGSGUU8c?rAx0u=7)ryk5$l8{+K2hNyFoZYKm792;E`V552n;Gu_! z(k+lDgJq(Bw_hmnRsTYnuU~WJ(V!@#$WvbzmHi*B1zOGzPgjM@6J?@+WJ59(93me0 EAHNQ=WdHyG diff --git a/of/Active Tripod/bin/Active_Tripod_debug.ilk b/of/Active Tripod/bin/Active_Tripod_debug.ilk new file mode 100644 index 0000000..e69de29 diff --git a/of/Active Tripod/bin/Active_Tripod_debug.lib b/of/Active Tripod/bin/Active_Tripod_debug.lib new file mode 100644 index 0000000000000000000000000000000000000000..d8afbc92fbf44fe66971e0ce11317b22d3fb2900 GIT binary patch literal 80566 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 Z#jFv%y}F%M>b&9jlnqV#ZM=9}{clwLs2~6U literal 0 HcmV?d00001 diff --git a/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml b/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml index fdc0ea6..9056bea 100644 --- a/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml +++ b/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml @@ -1,12 +1,12 @@ 2 Bar graph - 0 + 1 2 Solid Body graph - 1 + 0 2 diff --git a/of/Active Tripod/src/data/DataManager.cpp b/of/Active Tripod/src/data/DataManager.cpp index 55a2c2b..de8d38d 100644 --- a/of/Active Tripod/src/data/DataManager.cpp +++ b/of/Active Tripod/src/data/DataManager.cpp @@ -116,7 +116,25 @@ void DataManager::onMessage( Spacebrew::Message & m ) } if (data[i].substr(0, 6) == "value:") { - dataObject.value = ofToFloat(data[i].substr(6, -1).c_str()); + string valString = data[i].substr(6, -1).c_str(); + dataObject.value = ofToFloat(valString); + + if (dataObject.value > 1000000000) + { + // create long long int + stringstream sstr(valString); + __int64 val; + sstr >> val; + dataObject.longlongIntValue = val; + dataObject.stringValue = addCommasToNumberString(valString); + } + else + { + dataObject.longlongIntValue = 0; + dataObject.stringValue = (dataObject.value > 999) ? addCommasToNumberString(valString) : valString; + } + + printf("\ndataObject.longlongValue = %llli \n\n",dataObject.longlongIntValue); } if (data[i].substr(0, 4) == "min:") { @@ -129,7 +147,6 @@ void DataManager::onMessage( Spacebrew::Message & m ) if (data[i].substr(0, 5) == "unit:") { dataObject.unitMeasure = data[i].substr(5, -1).c_str(); - printf("------------ dataObject.unitMeasure = %s", data[i].substr(5, -1).c_str()); } } @@ -180,4 +197,40 @@ vector DataManager::explode(const string &delimiter, const string &str) } arr.push_back( str.substr(k, i-k) ); return arr; +} + + +string DataManager::addCommasToNumberString(string num) +{ + printf("adding commas \n"); + string temp; + string integral = num; + string fractional; + int decimalLocation = integral.find('.'); + + if (decimalLocation != -1) + { + integral = integral.substr(0 , decimalLocation); + fractional = integral.substr(decimalLocation); + } + else + { + integral = num; + fractional = ""; + } + + int endstring = integral.length(); + int i; + for(i = endstring - 3; i >= 0; i -= 3) { + if (i > 0) { + temp = ","+ integral.substr(i, 3) + temp; + } else { + temp = integral.substr(i, 3) + temp; + } + } + if (i < 0) { + temp = integral.substr(0, 3+i) + temp; + } + printf("adding commas - temp = %s\n", temp.c_str()); + return temp + fractional; } \ No newline at end of file diff --git a/of/Active Tripod/src/data/DataManager.h b/of/Active Tripod/src/data/DataManager.h index fba8d45..d8f773c 100644 --- a/of/Active Tripod/src/data/DataManager.h +++ b/of/Active Tripod/src/data/DataManager.h @@ -13,6 +13,8 @@ struct DataObject { string info; float value; + string stringValue; + long long int longlongIntValue; float min; float max; string unitMeasure; @@ -27,6 +29,7 @@ class DataManager void update(); void draw(); vector explode( const string &delimiter, const string &str); + string addCommasToNumberString(string num); // listen to spacebrew Messages void onMessage( Spacebrew::Message & m ); diff --git a/of/Active Tripod/src/visual/Scene.cpp b/of/Active Tripod/src/visual/Scene.cpp index ef6c65f..7d860a5 100644 --- a/of/Active Tripod/src/visual/Scene.cpp +++ b/of/Active Tripod/src/visual/Scene.cpp @@ -82,11 +82,11 @@ void Scene::drawGraphValues() ofSetColor(graphTextColour[0], graphTextColour[1], graphTextColour[2], graphTextColour[3]); text.setSize(graphTextSize); text.drawString( - ofToString(activeGraph->publisher0Data.back().value) + " " + activeGraph->publisher0Data[activeGraph->publisher0Data.size() - 1].unitMeasure, + activeGraph->publisher0Data.back().stringValue + " " + activeGraph->publisher0Data.back().unitMeasure, val0.x + 10, val0.y); text.drawString( - ofToString(activeGraph->publisher1Data.back().value) + " " + activeGraph->publisher1Data[activeGraph->publisher1Data.size() - 1].unitMeasure, + activeGraph->publisher1Data.back().stringValue + " " + activeGraph->publisher1Data.back().unitMeasure, val1.x + 10, val1.y); ofPopStyle(); @@ -156,30 +156,70 @@ void Scene::drawHUDCopy() vector *p0Data = &activeGraph->publisher0Data; vector *p1Data = &activeGraph->publisher1Data; + + + int amountToAverage = MIN(p0Data->size(), averageAmount); if (p0Data->size() > 2) { - float average0 = 0; - for (int i = 0; i < (int)amountToAverage; i++) - average0 += p0Data->at(p0Data->size() - i - 1).value; - average0 /= (int)amountToAverage; + if (p0Data->back().longlongIntValue > 0) + { + long long int average0 = 0; + for (int i = 0; i < (int)amountToAverage; i++) + average0 += p0Data->at(p0Data->size() - i - 1).value; + average0 /= (int)amountToAverage; - // (p0Data->back() + p0Data->at(p0Data->size() - 2) + p0Data->at(p0Data->size() - 2)) - blStr = "Increase: " + ofToString(p0Data->back().value - p0Data->at(p0Data->size() - 2).value) + "\n" + - "Current Value: " + ofToString(p0Data->back().value) + "\n" + - "Running average: " + ofToString(average0); - drawTextBox(blStr, "BOTTOM LEFT"); - + string valueWithCommas = addCommasToNumberString(ofToString(average0)); - float average1 = 0; - for (int i = 0; i < (int)amountToAverage; i++) - average1 += p1Data->at(p1Data->size() - i - 1).value; - average1 /= (int)amountToAverage; + blStr = "Increase: " + ofToString(p0Data->back().value - p0Data->at(p0Data->size() - 2).value) + "\n" + + "Current Value: " + p0Data->back().stringValue + "\n" + + "Running average: " + valueWithCommas; + drawTextBox(blStr, "BOTTOM LEFT"); + } + else + { + float average0 = 0; + for (int i = 0; i < (int)amountToAverage; i++) + average0 += p0Data->at(p0Data->size() - i - 1).value; + average0 /= (int)amountToAverage; + + string valueWithCommas = (average0 > 999) ? addCommasToNumberString(ofToString(average0)) : ofToString(average0); - brStr = "Increase: " + ofToString(p1Data->back().value - p1Data->at(p1Data->size() - 2).value) + "\n" + - "Current Value: " + ofToString(p1Data->back().value) + "\n" + - "Running average: " + ofToString(average1); - drawTextBox(brStr, "BOTTOM RIGHT"); + blStr = "Increase: " + ofToString(p0Data->back().value - p0Data->at(p0Data->size() - 2).value) + "\n" + + "Current Value: " + p0Data->back().stringValue + "\n" + + "Running average: " + valueWithCommas; + drawTextBox(blStr, "BOTTOM LEFT"); + } + + + if (p1Data->back().longlongIntValue > 0) + { + float average1 = 0; + for (int i = 0; i < (int)amountToAverage; i++) + average1 += p1Data->at(p1Data->size() - i - 1).value; + average1 /= (int)amountToAverage; + + string valueWithCommas = addCommasToNumberString(ofToString(average1)); + + brStr = "Increase: " + ofToString(p1Data->back().value - p1Data->at(p1Data->size() - 2).value) + "\n" + + "Current Value: " + p1Data->back().stringValue + "\n" + + "Running average: " + valueWithCommas; + drawTextBox(brStr, "BOTTOM RIGHT"); + } + else + { + long long int average1 = 0; + for (int i = 0; i < (int)amountToAverage; i++) + average1 += p1Data->at(p1Data->size() - i - 1).value; + average1 /= (int)amountToAverage; + + string valueWithCommas = (average1 > 999) ? addCommasToNumberString(ofToString(average1)) : ofToString(average1); + + brStr = "Increase: " + ofToString(p1Data->back().value - p1Data->at(p1Data->size() - 2).value) + "\n" + + "Current Value: " + p1Data->back().stringValue + "\n" + + "Running average: " + valueWithCommas; + drawTextBox(brStr, "BOTTOM RIGHT"); + } } } @@ -247,14 +287,13 @@ void Scene::addNewData(vector newData) bodyGraph.addNewData(newData); separateBodyGraph.addNewData(newData); - tlStr = newData[0].info + newData[0].unitMeasure + "\n" + ofToString(newData[0].value); - trStr = newData[1].info + newData[1].unitMeasure + "\n" + ofToString(newData[1].value); + tlStr = newData[0].info + newData[0].unitMeasure + "\n" + ofToString(newData[0].stringValue); + trStr = newData[1].info + newData[1].unitMeasure + "\n" + ofToString(newData[1].stringValue); } void Scene::keyPressed(int key) { - } @@ -263,4 +302,44 @@ void Scene::clearGraphData() barGraph.clear(); bodyGraph.clear(); separateBodyGraph.clear(); +} + + + + + + + + +string Scene::addCommasToNumberString(string num) +{ + string temp; + string integral = num; + string fractional; + int decimalLocation = integral.find('.'); + + if (decimalLocation != -1) + { + integral = integral.substr(0 , decimalLocation); + fractional = integral.substr(decimalLocation); + } + else + { + integral = num; + fractional = ""; + } + + int endstring = integral.length(); + int i; + for(i = endstring - 3; i >= 0; i -= 3) { + if (i > 0) { + temp = ","+ integral.substr(i, 3) + temp; + } else { + temp = integral.substr(i, 3) + temp; + } + } + if (i < 0) { + temp = integral.substr(0, 3+i) + temp; + } + return temp + fractional; } \ No newline at end of file diff --git a/of/Active Tripod/src/visual/Scene.h b/of/Active Tripod/src/visual/Scene.h index 5bad73c..35f83a2 100644 --- a/of/Active Tripod/src/visual/Scene.h +++ b/of/Active Tripod/src/visual/Scene.h @@ -1,10 +1,4 @@ -// -// GUI.h -// emptyExample -// -// Created by James Alliban on 25/06/2013. -// -// + #pragma once @@ -33,7 +27,7 @@ public: void addNewData(vector newData); void clearGraphData(); void keyPressed(int key); - + string addCommasToNumberString(string num); BarGraph barGraph; BodyGraph bodyGraph; diff --git a/of/Utility_Box/bin/Utility_Box.lib b/of/Utility_Box/bin/Utility_Box.lib index 20d8d9e4dcf18b1c8adecc971aa5527dd6dc4318..a778369fa950e3d734901b8b8cbcc14e90647075 100644 GIT binary patch delta 5950 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 a+NFH+M3PurL^&99UPN=wU6^02jr|{OI8JQ< delta 5950 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 ayHsGFND^y`CuO+4^pdcjlKbL|OAOw$vTn9V@E zu~Ov>-JPk1g{V>^9;iO4L7V2rmYPrF*F%67F<)dCX$ Dj+!_p delta 187 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 "C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\Utility_Box.vcxproj" on node 2 (Build target(s)). 1>ClCompile: C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\CL.exe /c /I..\..\..\libs\openFrameworks /I..\..\..\libs\openFrameworks\graphics /I..\..\..\libs\openFrameworks\app /I..\..\..\libs\openFrameworks\sound /I..\..\..\libs\openFrameworks\utils /I..\..\..\libs\openFrameworks\communication /I..\..\..\libs\openFrameworks\video /I..\..\..\libs\openFrameworks\types /I..\..\..\libs\openFrameworks\math /I..\..\..\libs\openFrameworks\3d /I..\..\..\libs\openFrameworks\gl /I..\..\..\libs\openFrameworks\events /I..\..\..\libs\glut\include /I..\..\..\libs\rtAudio\include /I..\..\..\libs\quicktime\include /I..\..\..\libs\freetype\include /I..\..\..\libs\freetype\include\freetype2 /I..\..\..\libs\freeImage\include /I..\..\..\libs\fmodex\include /I..\..\..\libs\videoInput\include /I..\..\..\libs\glew\include\ /I..\..\..\libs\glu\include /I..\..\..\libs\tess2\include /I..\..\..\libs\cairo\include\cairo /I..\..\..\libs\poco\include /I..\..\..\libs\glfw\include /I..\..\..\..\libs\openssl\include /I..\..\..\addons /Isrc /Isrc\data /Isrc\gui /Isrc\visual /Isrc\visual\graph /I..\..\..\addons\ofxLibwebsockets\libs\jsoncpp /I..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json /I..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\ /I..\..\..\addons\ofxLibwebsockets\libs\openssl\openssl /I..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include /I..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets /I..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src /I..\..\..\addons\ofxLibwebsockets\src /I..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port /I..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port\win32helpers /I..\..\..\addons\ofxSpacebrew\src /I..\..\..\addons\ofxUI\src /I..\..\..\addons\ofxXmlSettings\libs /I..\..\..\addons\ofxXmlSettings\src /I..\..\..\addons\ofxFTGL\src /I..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL /I..\..\..\addons\ofxFTGL\libs\FTGL\include /I..\..\..\addons\ofxFTGL\libs\FTGL /Zi /nologo /W3 /WX- /O2 /Oy- /D WIN32 /D NDEBUG /D _CONSOLE /D POCO_STATIC /D CAIRO_WIN32_STATIC_BUILD /D DISABLE_SOME_FLOATING_POINT /D _UNICODE /D UNICODE /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"obj\Release\\" /Fd"obj\Release\vc110.pdb" /Gd /TP /analyze- /errorReport:prompt src\testApp.cpp src\visual\Scene.cpp @@ -118,4 +118,4 @@ Build succeeded. -Time Elapsed 00:00:10.33 +Time Elapsed 00:00:11.17 diff --git a/of/Utility_Box/obj/Release/Utility_Box.write.1.tlog b/of/Utility_Box/obj/Release/Utility_Box.write.1.tlog index 5a4d276..83e531b 100644 --- a/of/Utility_Box/obj/Release/Utility_Box.write.1.tlog +++ b/of/Utility_Box/obj/Release/Utility_Box.write.1.tlog @@ -1233,3 +1233,8 @@ C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Util C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\bin\Utility_Box.lib C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\bin\Utility_Box.exp C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\bin\Utility_Box.exp +^C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\Utility_Box.vcxproj +C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\bin\Utility_Box.lib +C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\bin\Utility_Box.lib +C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\bin\Utility_Box.exp +C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\bin\Utility_Box.exp diff --git a/of/Utility_Box/obj/Release/testApp.obj b/of/Utility_Box/obj/Release/testApp.obj index aff92af4a874976056f80181310b384408bc6ac2..fb132762fcb6db735c76c30895a0db1bc0e7048c 100644 GIT binary patch delta 1556 zcmZuxe@xV67{Bk``#FJ-9fs7!aSF`R)Gqs>6|AsT3xQ$e#SnB@V;aH5Y#4IX(1jAe z##s8|ITb;6C)sjMd`q@u{?o2(GuK*w93*N#C{i40jFt5~-|si}-R!p8=lML(`#kUS z>;0Y_ai1Jna>?K!T1KSg0aU5_EAIg zkV7cvZ$Osp1bJk{Bc3hG6R^xIqT()W=0j%_vB-WkqAn%k6Xw2BgP%&m5c4V*ZV_xr z#w)6HMQZsIR@y$CI=eYdOR983uM|Vm0$<7WU}+B{vsC-Tn9s`4DkL(7A2IOM zqX^Tc$%>~aa@*r*{EtW?i&e=Qj%Av!JfWKvogJQ2=I5YgjyRsSkl|=J&4=!NJzgAXi1Ev*e~8bLji}8v(Kd9={<&h4N-0rXWsVhf&ilNWu6Mipyx()qbDr~@ zd!F}Hujf>+$GOS~8%f36ok6D&blQVXN0(C!x!tZgA3a%p^6->%wA!svi*3g(KTxlb5~} zdCC|R2kb^j$)ChqhEb}b46lmT^hmxbf>KaOJYZjeCUk zlQBxjpTbJ5nTj}0R~e0X>+pvj*E^h>h75L1oq;V}`!0{Jz0Cvf!}{hEkLtvjNA;#y zI5@u4Yp$1jz2t9~$61PY^{p3X$D(Fo86Pk!PIG@eo@ISL0Xt3mY+Pi<&P6s+5`F5k zM9gO6H%X>Z#mqwy>ksB@4kRO=b*c}^yome>s_rRFVq@b%xR|X^Yo1=jjS9)4C6u{# zF#_X4l9;7(Q#hC99(>MpD~j!YU`$WL?gzs0!b76_MeHDtTDlC|BlL`&dliyR1uM<= zs!Qp}Wu26Pb@upBtIZZ^v)P38J4WPZf`*M|=x8P`&@GUgSL^?!VKtXjs%U0b@L7pI zwKE5sxTHI4b&xw3Ub`Nf|0bj`4>i1U=yjaul|-Mqo{zI!Pg5a=nYBfTb`Xzjzzw3@ zU92;<7o(dm5#hk3F93E!lW~B1^D;0R3ne{Hpm_1t%WWG{~0%r4jXeY{5 zex0|>k7l;Jx6%o8#XGi*&ve^1%wXqN0o~W-AEK9aL={eOPtH{9B;Qx#B45vzAfo=? z)K06J++=>Jso(9w5GU%{gN0oENR3HJr|`+w>Tp|sHeTL~XV~qp$8`>WqX7%}@HP9X zy|h2+Om+Wb&}XPrm49Lmj=CVRk99%F97a{!sQJYqOrs)Ye-jmbxmDh6q9pD%HThGX pAnM>@sr_L{|+o>FeB}QSk0J%kg~pZ_QjJ*gR_O zmhVoSz4+Os6Ftoy*_FQ(J3`pPC;TEHf}%l$L|8;bqi7P%A}V4cE*#M!T1A^kh@@y2 z9U>*tqEmEuF zC<uuPcT;?^-Pdh17^`JXJ>=F8On2d5Q`J1gBgx;Ul$(DvpYdSA%N=h1**s;w0F(G@ AzW@LL delta 395 zcmYk0Jx^0%07iRnzi#2ydu^dDR9cECA0nP2@+I2){sRUQMsPAFB>n

F_WE39S4A z(}bk&-~gkOb#gL+(V-)oiSZ7^Fr48mC#QXL=(c0J3)zdk>^IM!aGhFmKj;7cRDE}3 zKBxWJMD5_>DEt_loQL`2$&P#T_rG=!j&Ma%q(oX|L{@krCx*nZ@I_uc5P=BALs1Y# zF(O7qNt8uJjEQkk6_3P(sEN9m6b&&Y9*b%5L_8HUVphzFdGSmvi05Kayb$qEQ!I&> zVp+TrD`HiwiFL6dUW-lfM!XfRQzFmVKFbm9Iwkvo=xaSco=PODG0B*UZEi*V>)w`0 zg>Err=fAXmI`&t?gc&>7iIy`?!8X2|Yo`~QLD>%8n-TA{+w!fCxea=4<8d$FHJ3rI Wc$Y8R=9T#qq(@^f+2#+^um1z8OLK+* diff --git a/of/Utility_Box/src/testApp.cpp b/of/Utility_Box/src/testApp.cpp index 725e514..13ad0d5 100644 --- a/of/Utility_Box/src/testApp.cpp +++ b/of/Utility_Box/src/testApp.cpp @@ -2,7 +2,7 @@ // TODO // ==== -// - Add a minimum time for each angle +// - Add a minimum time for each angle to avoif unslightly quick switching // - optimise - don't calculate graph point values evey frame // - investigate backward graph animation (use alternating colours) // - Colour range - tween between 2-3 points diff --git a/of/Utility_Box/src/visual/Camera.cpp b/of/Utility_Box/src/visual/Camera.cpp index 654ef92..f9eda18 100644 --- a/of/Utility_Box/src/visual/Camera.cpp +++ b/of/Utility_Box/src/visual/Camera.cpp @@ -6,11 +6,13 @@ void Camera::setup(int _camID) camID = _camID; lookAtNode.setPosition(0, 0, 0); setDistance(100); + minSecondsBeforeSwapping = 2; } void Camera::update() { + positionVec.x = sin(ofGetElapsedTimef() * rotSpeed) * distance; //positionVec.y = 40; positionVec.z = cos(ofGetElapsedTimef() * rotSpeed) * distance; @@ -18,4 +20,15 @@ void Camera::update() lookAtNode.setPosition(lookAtVec); setPosition(positionVec); lookAt(lookAtNode); +} + + +void Camera::activate() +{ + timeBecameActive = ofGetElapsedTimef(); +} + + +void Camera::deactivate() +{ } \ No newline at end of file diff --git a/of/Utility_Box/src/visual/Camera.h b/of/Utility_Box/src/visual/Camera.h index 68abce4..8774e02 100644 --- a/of/Utility_Box/src/visual/Camera.h +++ b/of/Utility_Box/src/visual/Camera.h @@ -15,6 +15,8 @@ class Camera : public ofEasyCam public: void setup(int _camID); void update(); + void activate(); + void deactivate(); int camID; @@ -26,4 +28,6 @@ public: float distance; float rotSpeed; float swapProbability; + float minSecondsBeforeSwapping; + float timeBecameActive; }; \ No newline at end of file diff --git a/of/Utility_Box/src/visual/Scene.cpp b/of/Utility_Box/src/visual/Scene.cpp index 7f482e1..ac1eb9c 100644 --- a/of/Utility_Box/src/visual/Scene.cpp +++ b/of/Utility_Box/src/visual/Scene.cpp @@ -144,6 +144,7 @@ void Scene::switchCamera() newCamID = (ofRandom(2) < 0.5) ? 0 : 1; printf("************ changing cameras to %i ************** \n", newCamID); - + activeCamera->deactivate(); activeCamera = &cameras[newCamID]; + activeCamera->activate(); } \ No newline at end of file