gauthiier/CRITICAL-INFRASTRUCTURE
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Large numbers now being handled correctly...

Browse Source 
- long long ints being used where necessary
- Commas being added to numbers larger than 999
- No more values being rendered as 1.5332e+012
This commit is contained in:
James Alliban
2014-01-16 20:21:24 +00:00
parent b3e6565bde
commit e51abf7a53
20 changed files with 199 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
of/Utility_Box/bin/Utility_Box.lib
BIN
View File
Binary file not shown.
of/Utility_Box/bin/data/subscriber_log.txt
+8 -16
View File
@@ -13,33 +13,25 @@ Cryptocurrency exchange rate on mtgox.com
7 = Number of likes of the transmediale fan page on Facebook
8 = Haus der Kulturen Main Foyer - Noise Level
9 = Total twitter updates
9 =
10 = Haus der Kulturen Bar Area - Noise Level
11 = HUAWEI Guangdong Stock Price on the Shenzen Exchange
11 =
12 = Haus der Kulturen Beneath Main Foyer - Power Consumption (Amperes)
13 = Google Inc. Stock Price on the NASDAQ Exchange
13 =
14 = Haus der Kulturen Main Foyer - Power Consumption (Amperes)
15 =
16 = Haus der Kulturen Back Smoking Area - Air Quality
17 =
18 = Haus der Kulturen Mezanine Smoking Area - Air Quality
19 = Percentage of books about media art out of all books on sale on ebay
19 =
20 = Haus der Kulturen Mezanine Smoking Area - Air Quality
21 = Number of photos tagged with berlin on Flickr
21 =
22 =
23 = Number of photos tagged with berlin on Instagram
23 =
24 =
25 = Number of photos tagged with transmediale on Instagram
25 =
26 =
27 = Number of downvotes on reddit.com/r/funny
27 =
28 =
29 =
of/Utility_Box/obj/Release/CL.read.1.tlog
BIN
View File
Binary file not shown.
of/Utility_Box/obj/Release/Scene.obj
BIN
View File
Binary file not shown.
of/Utility_Box/obj/Release/Utility_Box.log
+2 -2
View File
@@ -1,4 +1,4 @@
Build started 16/1/2014 4:59:12 AM.
Build started 16/1/2014 2:57:32 PM.
1>Project "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
of/Utility_Box/obj/Release/Utility_Box.write.1.tlog
+5
View File
@@ -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
of/Utility_Box/obj/Release/testApp.obj
BIN
View File
Binary file not shown.
of/Utility_Box/obj/Release/vc110.pdb
BIN
View File
Binary file not shown.
of/Utility_Box/src/testApp.cpp
+1 -1
View File
@@ -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
of/Utility_Box/src/visual/Camera.cpp
+13
View File
@@ -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()
{
}
of/Utility_Box/src/visual/Camera.h
+4
View File
@@ -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;
};
of/Utility_Box/src/visual/Scene.cpp
+2 -1
View File
@@ -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();
}