diff --git a/of/Utility_Box/Utility_Box.vcxproj b/of/Utility_Box/Utility_Box.vcxproj index cf1e399..789b1ec 100644 --- a/of/Utility_Box/Utility_Box.vcxproj +++ b/of/Utility_Box/Utility_Box.vcxproj @@ -75,7 +75,7 @@ %(PreprocessorDefinitions) MultiThreadedDLL Level3 - %(AdditionalIncludeDirectories);src;src\data;src\gui;src\visual;src\visual\graph;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\;..\..\..\addons\ofxLibwebsockets\libs\openssl\openssl;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port\win32helpers;..\..\..\addons\ofxSpacebrew\src;..\..\..\addons\ofxUI\src;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxXmlSettings\src;..\..\..\addons\ofxFTGL\src;..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL;..\..\..\addons\ofxFTGL\libs\FTGL\include;..\..\..\addons\ofxFTGL\libs\FTGL + %(AdditionalIncludeDirectories);src;src\data;src\gui;src\visual;src\visual\graph;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\;..\..\..\addons\ofxLibwebsockets\libs\openssl\openssl;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port\win32helpers;..\..\..\addons\ofxSpacebrew\src;..\..\..\addons\ofxUI\src;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxXmlSettings\src;..\..\..\addons\ofxFTGL\src;..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL;..\..\..\addons\ofxFTGL\libs\FTGL\include;..\..\..\addons\ofxFTGL\libs\FTGL;..\..\..\addons\ofxOsc\libs;..\..\..\addons\ofxOsc\libs\oscpack;..\..\..\addons\ofxOsc\libs\oscpack\src;..\..\..\addons\ofxOsc\libs\oscpack\src\ip;..\..\..\addons\ofxOsc\libs\oscpack\src\ip\posix;..\..\..\addons\ofxOsc\libs\oscpack\src\ip\win32;..\..\..\addons\ofxOsc\libs\oscpack\src\osc;..\..\..\addons\ofxOsc\src CompileAsCpp @@ -92,6 +92,20 @@ + + + + + + + + + + + + + + @@ -141,6 +155,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/of/Utility_Box/Utility_Box.vcxproj.filters b/of/Utility_Box/Utility_Box.vcxproj.filters index d3bfe35..8ec707a 100644 --- a/of/Utility_Box/Utility_Box.vcxproj.filters +++ b/of/Utility_Box/Utility_Box.vcxproj.filters @@ -79,6 +79,48 @@ src\visual + + addons\ofxOsc\src + + + addons\ofxOsc\src + + + addons\ofxOsc\src + + + addons\ofxOsc\src + + + addons\ofxOsc\src + + + addons\ofxOsc\libs\oscpack\src\ip + + + addons\ofxOsc\libs\oscpack\src\ip\posix + + + addons\ofxOsc\libs\oscpack\src\ip\posix + + + addons\ofxOsc\libs\oscpack\src\ip\win32 + + + addons\ofxOsc\libs\oscpack\src\ip\win32 + + + addons\ofxOsc\libs\oscpack\src\osc + + + addons\ofxOsc\libs\oscpack\src\osc + + + addons\ofxOsc\libs\oscpack\src\osc + + + addons\ofxOsc\libs\oscpack\src\osc + @@ -144,6 +186,33 @@ {c8f02691-0523-43c1-b471-e9e043b64209} + + {0301b5d1-0437-4442-9652-87c938d86e6e} + + + {299b7043-38bc-403f-bf63-a3bf56908234} + + + {df081857-323f-4969-899b-b9775fb8c299} + + + {b5e7c4ed-12de-4a71-88af-e28a47e5446f} + + + {a3ce02d3-6938-4970-96bb-b824f3fdaf8d} + + + {025fb83e-3bda-46df-8ab1-7ada1df88870} + + + {1d7cf4bc-cb6b-4ae9-8419-7ef8e6368bc9} + + + {2199ab94-f693-480e-8949-1136450d76cd} + + + {59621f98-68cf-4f9e-9d1b-5208e9ae5c67} + @@ -380,6 +449,66 @@ src\visual + + addons\ofxOsc\src + + + addons\ofxOsc\src + + + addons\ofxOsc\src + + + addons\ofxOsc\src + + + addons\ofxOsc\src + + + addons\ofxOsc\src + + + addons\ofxOsc\src + + + addons\ofxOsc\libs\oscpack\src\ip + + + addons\ofxOsc\libs\oscpack\src\ip + + + addons\ofxOsc\libs\oscpack\src\ip + + + addons\ofxOsc\libs\oscpack\src\ip + + + addons\ofxOsc\libs\oscpack\src\ip + + + addons\ofxOsc\libs\oscpack\src\osc + + + addons\ofxOsc\libs\oscpack\src\osc + + + addons\ofxOsc\libs\oscpack\src\osc + + + addons\ofxOsc\libs\oscpack\src\osc + + + addons\ofxOsc\libs\oscpack\src\osc + + + addons\ofxOsc\libs\oscpack\src\osc + + + addons\ofxOsc\libs\oscpack\src\osc + + + addons\ofxOsc\libs\oscpack\src\osc + diff --git a/of/Utility_Box/bin/Utility_Box.lib b/of/Utility_Box/bin/Utility_Box.lib index 5562066..ffc9776 100644 Binary files a/of/Utility_Box/bin/Utility_Box.lib and b/of/Utility_Box/bin/Utility_Box.lib differ diff --git a/of/Utility_Box/obj/Release/AbstractGraph.obj b/of/Utility_Box/obj/Release/AbstractGraph.obj index 36f1415..6f69f7e 100644 Binary files a/of/Utility_Box/obj/Release/AbstractGraph.obj and b/of/Utility_Box/obj/Release/AbstractGraph.obj differ diff --git a/of/Utility_Box/obj/Release/CL.read.1.tlog b/of/Utility_Box/obj/Release/CL.read.1.tlog index 275a6e1..d1243ae 100644 Binary files a/of/Utility_Box/obj/Release/CL.read.1.tlog and b/of/Utility_Box/obj/Release/CL.read.1.tlog differ diff --git a/of/Utility_Box/obj/Release/CL.write.1.tlog b/of/Utility_Box/obj/Release/CL.write.1.tlog index f61f334..0cff414 100644 Binary files a/of/Utility_Box/obj/Release/CL.write.1.tlog and b/of/Utility_Box/obj/Release/CL.write.1.tlog differ diff --git a/of/Utility_Box/obj/Release/Camera.obj b/of/Utility_Box/obj/Release/Camera.obj index aea5d35..487d4c8 100644 Binary files a/of/Utility_Box/obj/Release/Camera.obj and b/of/Utility_Box/obj/Release/Camera.obj differ diff --git a/of/Utility_Box/obj/Release/Client.obj b/of/Utility_Box/obj/Release/Client.obj index e153078..ecea727 100644 Binary files a/of/Utility_Box/obj/Release/Client.obj and b/of/Utility_Box/obj/Release/Client.obj differ diff --git a/of/Utility_Box/obj/Release/Connection.obj b/of/Utility_Box/obj/Release/Connection.obj index b687af1..a81b74d 100644 Binary files a/of/Utility_Box/obj/Release/Connection.obj and b/of/Utility_Box/obj/Release/Connection.obj differ diff --git a/of/Utility_Box/obj/Release/DataManager.obj b/of/Utility_Box/obj/Release/DataManager.obj index 2775de6..91a56fa 100644 Binary files a/of/Utility_Box/obj/Release/DataManager.obj and b/of/Utility_Box/obj/Release/DataManager.obj differ diff --git a/of/Utility_Box/obj/Release/Events.obj b/of/Utility_Box/obj/Release/Events.obj index e647b4e..e0fcf69 100644 Binary files a/of/Utility_Box/obj/Release/Events.obj and b/of/Utility_Box/obj/Release/Events.obj differ diff --git a/of/Utility_Box/obj/Release/GUI.obj b/of/Utility_Box/obj/Release/GUI.obj index defab45..f2d063c 100644 Binary files a/of/Utility_Box/obj/Release/GUI.obj and b/of/Utility_Box/obj/Release/GUI.obj differ diff --git a/of/Utility_Box/obj/Release/GUIManager.obj b/of/Utility_Box/obj/Release/GUIManager.obj index 9082d57..1fe8e55 100644 Binary files a/of/Utility_Box/obj/Release/GUIManager.obj and b/of/Utility_Box/obj/Release/GUIManager.obj differ diff --git a/of/Utility_Box/obj/Release/Graph.obj b/of/Utility_Box/obj/Release/Graph.obj index 3d1efb3..4f982a9 100644 Binary files a/of/Utility_Box/obj/Release/Graph.obj and b/of/Utility_Box/obj/Release/Graph.obj differ diff --git a/of/Utility_Box/obj/Release/GraphManager.obj b/of/Utility_Box/obj/Release/GraphManager.obj index cf35a5b..8aa895f 100644 Binary files a/of/Utility_Box/obj/Release/GraphManager.obj and b/of/Utility_Box/obj/Release/GraphManager.obj differ diff --git a/of/Utility_Box/obj/Release/IpEndpointName.obj b/of/Utility_Box/obj/Release/IpEndpointName.obj new file mode 100644 index 0000000..63374d4 Binary files /dev/null and b/of/Utility_Box/obj/Release/IpEndpointName.obj differ diff --git a/of/Utility_Box/obj/Release/NetworkingUtils.obj b/of/Utility_Box/obj/Release/NetworkingUtils.obj new file mode 100644 index 0000000..c1dad2b Binary files /dev/null and b/of/Utility_Box/obj/Release/NetworkingUtils.obj differ diff --git a/of/Utility_Box/obj/Release/NetworkingUtilsWin.obj b/of/Utility_Box/obj/Release/NetworkingUtilsWin.obj new file mode 100644 index 0000000..2948abc Binary files /dev/null and b/of/Utility_Box/obj/Release/NetworkingUtilsWin.obj differ diff --git a/of/Utility_Box/obj/Release/OscOutboundPacketStream.obj b/of/Utility_Box/obj/Release/OscOutboundPacketStream.obj new file mode 100644 index 0000000..98b52dd Binary files /dev/null and b/of/Utility_Box/obj/Release/OscOutboundPacketStream.obj differ diff --git a/of/Utility_Box/obj/Release/OscPrintReceivedElements.obj b/of/Utility_Box/obj/Release/OscPrintReceivedElements.obj new file mode 100644 index 0000000..f2e92f3 Binary files /dev/null and b/of/Utility_Box/obj/Release/OscPrintReceivedElements.obj differ diff --git a/of/Utility_Box/obj/Release/OscReceivedElements.obj b/of/Utility_Box/obj/Release/OscReceivedElements.obj new file mode 100644 index 0000000..0b65dd1 Binary files /dev/null and b/of/Utility_Box/obj/Release/OscReceivedElements.obj differ diff --git a/of/Utility_Box/obj/Release/OscTypes.obj b/of/Utility_Box/obj/Release/OscTypes.obj new file mode 100644 index 0000000..f013c52 Binary files /dev/null and b/of/Utility_Box/obj/Release/OscTypes.obj differ diff --git a/of/Utility_Box/obj/Release/Protocol.obj b/of/Utility_Box/obj/Release/Protocol.obj index 9a76d13..d7c27b6 100644 Binary files a/of/Utility_Box/obj/Release/Protocol.obj and b/of/Utility_Box/obj/Release/Protocol.obj differ diff --git a/of/Utility_Box/obj/Release/Reactor.obj b/of/Utility_Box/obj/Release/Reactor.obj index 282cb25..e2aff6e 100644 Binary files a/of/Utility_Box/obj/Release/Reactor.obj and b/of/Utility_Box/obj/Release/Reactor.obj differ diff --git a/of/Utility_Box/obj/Release/Scene.obj b/of/Utility_Box/obj/Release/Scene.obj index 5e7ba0b..f5e3b9f 100644 Binary files a/of/Utility_Box/obj/Release/Scene.obj and b/of/Utility_Box/obj/Release/Scene.obj differ diff --git a/of/Utility_Box/obj/Release/Server.obj b/of/Utility_Box/obj/Release/Server.obj index 3ba3044..fd376d9 100644 Binary files a/of/Utility_Box/obj/Release/Server.obj and b/of/Utility_Box/obj/Release/Server.obj differ diff --git a/of/Utility_Box/obj/Release/UdpSocket.obj b/of/Utility_Box/obj/Release/UdpSocket.obj new file mode 100644 index 0000000..056db07 Binary files /dev/null and b/of/Utility_Box/obj/Release/UdpSocket.obj differ diff --git a/of/Utility_Box/obj/Release/UdpSocketWin.obj b/of/Utility_Box/obj/Release/UdpSocketWin.obj new file mode 100644 index 0000000..0179067 Binary files /dev/null and b/of/Utility_Box/obj/Release/UdpSocketWin.obj differ diff --git a/of/Utility_Box/obj/Release/Utility_Box.log b/of/Utility_Box/obj/Release/Utility_Box.log index f4304e3..b25192f 100644 --- a/of/Utility_Box/obj/Release/Utility_Box.log +++ b/of/Utility_Box/obj/Release/Utility_Box.log @@ -1,7 +1,32 @@ -Build started 17/1/2014 1:05:33 AM. +Build started 17/1/2014 1:59:04 AM. 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\gui\GUI.cpp + 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 /I..\..\..\addons\ofxOsc\libs /I..\..\..\addons\ofxOsc\libs\oscpack /I..\..\..\addons\ofxOsc\libs\oscpack\src /I..\..\..\addons\ofxOsc\libs\oscpack\src\ip /I..\..\..\addons\ofxOsc\libs\oscpack\src\ip\posix /I..\..\..\addons\ofxOsc\libs\oscpack\src\ip\win32 /I..\..\..\addons\ofxOsc\libs\oscpack\src\osc /I..\..\..\addons\ofxOsc\src /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\data\DataManager.cpp src\gui\GUI.cpp src\main.cpp src\testApp.cpp src\visual\Scene.cpp src\visual\graph\Graph.cpp src\visual\graph\GraphManager.cpp + DataManager.cpp + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(126): warning C4250: 'Poco::InputStreamConverter' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\istream(74) : see declaration of 'std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(144): warning C4250: 'Poco::OutputStreamConverter' : inherits 'std::basic_ostream<_Elem,_Traits>::std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\ostream(90) : see declaration of 'std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' + with + [ + _Elem=char, + _Traits=std::char_traits + ] GUI.cpp 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(126): warning C4250: 'Poco::InputStreamConverter' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance with @@ -27,10 +52,150 @@ _Elem=char, _Traits=std::char_traits ] + main.cpp + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(126): warning C4250: 'Poco::InputStreamConverter' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\istream(74) : see declaration of 'std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(144): warning C4250: 'Poco::OutputStreamConverter' : inherits 'std::basic_ostream<_Elem,_Traits>::std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\ostream(90) : see declaration of 'std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + testApp.cpp + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(126): warning C4250: 'Poco::InputStreamConverter' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\istream(74) : see declaration of 'std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(144): warning C4250: 'Poco::OutputStreamConverter' : inherits 'std::basic_ostream<_Elem,_Traits>::std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\ostream(90) : see declaration of 'std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + Scene.cpp + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(126): warning C4250: 'Poco::InputStreamConverter' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\istream(74) : see declaration of 'std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(144): warning C4250: 'Poco::OutputStreamConverter' : inherits 'std::basic_ostream<_Elem,_Traits>::std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\ostream(90) : see declaration of 'std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + Graph.cpp + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(126): warning C4250: 'Poco::InputStreamConverter' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\istream(74) : see declaration of 'std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(144): warning C4250: 'Poco::OutputStreamConverter' : inherits 'std::basic_ostream<_Elem,_Traits>::std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\ostream(90) : see declaration of 'std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + GraphManager.cpp + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(126): warning C4250: 'Poco::InputStreamConverter' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\istream(74) : see declaration of 'std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(144): warning C4250: 'Poco::OutputStreamConverter' : inherits 'std::basic_ostream<_Elem,_Traits>::std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\ostream(90) : see declaration of 'std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + Generating Code... Link: C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"bin\Utility_Box.exe" /INCREMENTAL:NO /NOLOGO /LIBPATH:..\..\..\libs\glut\lib\vs /LIBPATH:..\..\..\libs\glfw\lib\vs /LIBPATH:..\..\..\libs\rtAudio\lib\vs /LIBPATH:..\..\..\libs\FreeImage\lib\vs /LIBPATH:..\..\..\libs\freetype\lib\vs /LIBPATH:..\..\..\libs\quicktime\lib\vs /LIBPATH:..\..\..\libs\fmodex\lib\vs /LIBPATH:..\..\..\libs\videoInput\lib\vs /LIBPATH:..\..\..\libs\cairo\lib\vs /LIBPATH:..\..\..\libs\glew\lib\vs /LIBPATH:..\..\..\libs\glu\lib\vs /LIBPATH:..\..\..\libs\openssl\lib\vs /LIBPATH:..\..\..\libs\Poco\lib\vs /LIBPATH:..\..\..\libs\tess2\lib\vs /LIBPATH:..\..\..\addons\ofxFTGL\libs\FTGL\lib\vs2012 /LIBPATH:..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\win32\Release "cairo-static.lib" "pixman-1.lib" msimg32.lib OpenGL32.lib GLu32.lib kernel32.lib setupapi.lib Vfw32.lib comctl32.lib glut32.lib rtAudio.lib videoInput.lib libfreetype.lib FreeImage.lib qtmlClient.lib dsound.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib glew32s.lib fmodex_vc.lib glu32.lib crypt32.lib libeay32MD.lib ssleay32MD.lib PocoFoundationmd.lib PocoNetmd.lib PocoUtilmd.lib PocoXMLmd.lib Ws2_32.lib tess2.lib glfw3.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib websockets_static.lib ZLIB.lib ftgl_static.lib /NODEFAULTLIB:PocoFoundationd.lib /NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:LIBC.lib /NODEFAULTLIB:LIBCMT /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /PDB:"bin\Utility_Box.pdb" /SUBSYSTEM:CONSOLE /OPT:REF /OPT:ICF /LTCG /TLBID:1 /DYNAMICBASE:NO /NXCOMPAT /IMPLIB:"bin\Utility_Box.lib" /MACHINE:X86 /SAFESEH obj\Release\icon.res obj\Release\ofxFTGLFont.obj obj\Release\ofxFTGLSimpleLayout.obj + obj\Release\IpEndpointName.obj + obj\Release\NetworkingUtils.obj + obj\Release\UdpSocket.obj + obj\Release\NetworkingUtilsWin.obj + obj\Release\UdpSocketWin.obj + obj\Release\OscOutboundPacketStream.obj + obj\Release\OscPrintReceivedElements.obj + obj\Release\OscReceivedElements.obj + obj\Release\OscTypes.obj + obj\Release\ofxOscBundle.obj + obj\Release\ofxOscMessage.obj + obj\Release\ofxOscParameterSync.obj + obj\Release\ofxOscReceiver.obj + obj\Release\ofxOscSender.obj obj\Release\tinyxml.obj obj\Release\tinyxmlerror.obj obj\Release\tinyxmlparser.obj @@ -92,4 +257,4 @@ Build succeeded. -Time Elapsed 00:00:08.59 +Time Elapsed 00:00:31.07 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 f913044..566da1a 100644 --- a/of/Utility_Box/obj/Release/Utility_Box.write.1.tlog +++ b/of/Utility_Box/obj/Release/Utility_Box.write.1.tlog @@ -1373,3 +1373,28 @@ 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 +^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 +^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 +^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 +^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/cl.command.1.tlog b/of/Utility_Box/obj/Release/cl.command.1.tlog index 4bfe2d3..1112da3 100644 Binary files a/of/Utility_Box/obj/Release/cl.command.1.tlog and b/of/Utility_Box/obj/Release/cl.command.1.tlog differ diff --git a/of/Utility_Box/obj/Release/jsoncpp.obj b/of/Utility_Box/obj/Release/jsoncpp.obj index 48c8fd8..fa966e5 100644 Binary files a/of/Utility_Box/obj/Release/jsoncpp.obj and b/of/Utility_Box/obj/Release/jsoncpp.obj differ diff --git a/of/Utility_Box/obj/Release/link.command.1.tlog b/of/Utility_Box/obj/Release/link.command.1.tlog index 6e89657..afd5566 100644 Binary files a/of/Utility_Box/obj/Release/link.command.1.tlog and b/of/Utility_Box/obj/Release/link.command.1.tlog differ diff --git a/of/Utility_Box/obj/Release/link.read.1.tlog b/of/Utility_Box/obj/Release/link.read.1.tlog index 1562141..3926a3f 100644 Binary files a/of/Utility_Box/obj/Release/link.read.1.tlog and b/of/Utility_Box/obj/Release/link.read.1.tlog differ diff --git a/of/Utility_Box/obj/Release/link.write.1.tlog b/of/Utility_Box/obj/Release/link.write.1.tlog index 9c5f9f4..37046eb 100644 Binary files a/of/Utility_Box/obj/Release/link.write.1.tlog and b/of/Utility_Box/obj/Release/link.write.1.tlog differ diff --git a/of/Utility_Box/obj/Release/main.obj b/of/Utility_Box/obj/Release/main.obj index f1e0e3d..24db0cf 100644 Binary files a/of/Utility_Box/obj/Release/main.obj and b/of/Utility_Box/obj/Release/main.obj differ diff --git a/of/Utility_Box/obj/Release/ofxFTGLFont.obj b/of/Utility_Box/obj/Release/ofxFTGLFont.obj index 6660105..4379956 100644 Binary files a/of/Utility_Box/obj/Release/ofxFTGLFont.obj and b/of/Utility_Box/obj/Release/ofxFTGLFont.obj differ diff --git a/of/Utility_Box/obj/Release/ofxFTGLSimpleLayout.obj b/of/Utility_Box/obj/Release/ofxFTGLSimpleLayout.obj index 86019da..99aa037 100644 Binary files a/of/Utility_Box/obj/Release/ofxFTGLSimpleLayout.obj and b/of/Utility_Box/obj/Release/ofxFTGLSimpleLayout.obj differ diff --git a/of/Utility_Box/obj/Release/ofxOscBundle.obj b/of/Utility_Box/obj/Release/ofxOscBundle.obj new file mode 100644 index 0000000..65e56a6 Binary files /dev/null and b/of/Utility_Box/obj/Release/ofxOscBundle.obj differ diff --git a/of/Utility_Box/obj/Release/ofxOscMessage.obj b/of/Utility_Box/obj/Release/ofxOscMessage.obj new file mode 100644 index 0000000..c551cef Binary files /dev/null and b/of/Utility_Box/obj/Release/ofxOscMessage.obj differ diff --git a/of/Utility_Box/obj/Release/ofxOscParameterSync.obj b/of/Utility_Box/obj/Release/ofxOscParameterSync.obj new file mode 100644 index 0000000..882ac0e Binary files /dev/null and b/of/Utility_Box/obj/Release/ofxOscParameterSync.obj differ diff --git a/of/Utility_Box/obj/Release/ofxOscReceiver.obj b/of/Utility_Box/obj/Release/ofxOscReceiver.obj new file mode 100644 index 0000000..a2c5a60 Binary files /dev/null and b/of/Utility_Box/obj/Release/ofxOscReceiver.obj differ diff --git a/of/Utility_Box/obj/Release/ofxOscSender.obj b/of/Utility_Box/obj/Release/ofxOscSender.obj new file mode 100644 index 0000000..5832281 Binary files /dev/null and b/of/Utility_Box/obj/Release/ofxOscSender.obj differ diff --git a/of/Utility_Box/obj/Release/ofxSpacebrew.obj b/of/Utility_Box/obj/Release/ofxSpacebrew.obj index c6be20a..f7908c9 100644 Binary files a/of/Utility_Box/obj/Release/ofxSpacebrew.obj and b/of/Utility_Box/obj/Release/ofxSpacebrew.obj differ diff --git a/of/Utility_Box/obj/Release/ofxXmlSettings.obj b/of/Utility_Box/obj/Release/ofxXmlSettings.obj index e3d5713..aafc88c 100644 Binary files a/of/Utility_Box/obj/Release/ofxXmlSettings.obj and b/of/Utility_Box/obj/Release/ofxXmlSettings.obj differ diff --git a/of/Utility_Box/obj/Release/testApp.obj b/of/Utility_Box/obj/Release/testApp.obj index 71ed5d6..18e92ec 100644 Binary files a/of/Utility_Box/obj/Release/testApp.obj and b/of/Utility_Box/obj/Release/testApp.obj differ diff --git a/of/Utility_Box/obj/Release/tinyxml.obj b/of/Utility_Box/obj/Release/tinyxml.obj index 7af00f9..3dc3e8c 100644 Binary files a/of/Utility_Box/obj/Release/tinyxml.obj and b/of/Utility_Box/obj/Release/tinyxml.obj differ diff --git a/of/Utility_Box/obj/Release/tinyxmlerror.obj b/of/Utility_Box/obj/Release/tinyxmlerror.obj index 99a42b0..d2bc543 100644 Binary files a/of/Utility_Box/obj/Release/tinyxmlerror.obj and b/of/Utility_Box/obj/Release/tinyxmlerror.obj differ diff --git a/of/Utility_Box/obj/Release/tinyxmlparser.obj b/of/Utility_Box/obj/Release/tinyxmlparser.obj index 687d6ac..9b2626b 100644 Binary files a/of/Utility_Box/obj/Release/tinyxmlparser.obj and b/of/Utility_Box/obj/Release/tinyxmlparser.obj differ diff --git a/of/Utility_Box/obj/Release/vc110.pdb b/of/Utility_Box/obj/Release/vc110.pdb index 5fb44ab..b0729f3 100644 Binary files a/of/Utility_Box/obj/Release/vc110.pdb and b/of/Utility_Box/obj/Release/vc110.pdb differ diff --git a/of/Utility_Box/src/visual/Scene.cpp b/of/Utility_Box/src/visual/Scene.cpp index 966f7ea..9674cc0 100644 --- a/of/Utility_Box/src/visual/Scene.cpp +++ b/of/Utility_Box/src/visual/Scene.cpp @@ -86,16 +86,8 @@ void Scene::draw() { string newStr = ofToString(i) + " - " + graphManager.graphs[i]->info; str += newStr + "\n"; - //if (ofGetFrameNum() % 30 == 0) - // printf("- str:%s\n- - - - - *** - - - - -\n", newStr.c_str()); } - //if (ofGetFrameNum() % 30 == 0) - //{ - // printf("\n\n\n\n"); - // printf("str(all):%s\n- - - - - *** - - - - -\n", str.c_str()); - // printf("\n\n\n\n"); - //} - + text.drawString(str, legendTextPoint.x, legendTextPoint.y); ofPopStyle(); } diff --git a/of/Utility_Box/src/visual/graph/Graph.cpp b/of/Utility_Box/src/visual/graph/Graph.cpp index a9fb343..6ccd3ec 100644 --- a/of/Utility_Box/src/visual/graph/Graph.cpp +++ b/of/Utility_Box/src/visual/graph/Graph.cpp @@ -176,6 +176,12 @@ void Graph::addNewData(DataObject newData) float xOffset = 0; float outputMin = 0; float outputMax = graphHeightMax; + + if (newData.value == -999) newData.value = 0; + if (newData.min == -999) newData.min = 0; + if (newData.max == -999) newData.max = 0; + + currentValue = newData.value; int graphMeshSize = graphMesh.getVertices().size(); vector *meshVertices = &graphMesh.getVertices(); diff --git a/of/Utility_Box/src/visual/graph/Graph.h b/of/Utility_Box/src/visual/graph/Graph.h index b29c0dc..3f75dcb 100644 --- a/of/Utility_Box/src/visual/graph/Graph.h +++ b/of/Utility_Box/src/visual/graph/Graph.h @@ -16,7 +16,6 @@ public: void drawGraphBody(); void drawGraphText(); void addNewData(DataObject newData); - ofMesh getMesh(vector publisherData, float* col); void setFboSettings(); void drawInfoToFbo(); void clear(); @@ -61,5 +60,5 @@ public: string info; ofMesh graphMesh; - + float currentValue; }; \ No newline at end of file diff --git a/of/Utility_Box/src/visual/graph/GraphManager.cpp b/of/Utility_Box/src/visual/graph/GraphManager.cpp index 1376965..1033431 100644 --- a/of/Utility_Box/src/visual/graph/GraphManager.cpp +++ b/of/Utility_Box/src/visual/graph/GraphManager.cpp @@ -12,6 +12,8 @@ void GraphManager::setup() graphs.push_back(graph); reorderedGraphs.push_back(graph); } + + sender.setup(HOST, PORT); } @@ -24,6 +26,15 @@ void GraphManager::update(ofVec3f ativeCamPos) graph->update(ativeCamPos); } + ofxOscMessage m; + m.setAddress("/utilityvalues"); + for (int i = 0; i < graphs.size(); i++) + { + m.addStringArg(graphs[i]->info); + m.addFloatArg(graphs[i]->currentValue); + } + sender.sendMessage(m); + std::sort(reorderedGraphs.begin(), reorderedGraphs.end(), compareGraphByDistToCam()); } diff --git a/of/Utility_Box/src/visual/graph/GraphManager.h b/of/Utility_Box/src/visual/graph/GraphManager.h index 3c74dd0..4e9d966 100644 --- a/of/Utility_Box/src/visual/graph/GraphManager.h +++ b/of/Utility_Box/src/visual/graph/GraphManager.h @@ -3,6 +3,10 @@ #include "DataManager.h" #include "Graph.h" #include "ofxFTGL.h" +#include "ofxOsc.h" + +#define HOST "localhost" +#define PORT 7500 struct compareGraphByDistToCam { @@ -23,4 +27,6 @@ public: vector graphs; vector reorderedGraphs; ofxFTGLSimpleLayout text; + + ofxOscSender sender; }; \ No newline at end of file