Merge branch 'experimental' of https://github.com/labatrockwell/openTSPS

 into experimental

standalone/basic/openTSPS.vcxproj

@@ -58,7 +58,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <AdditionalIncludeDirectories>..\..\..\addons\ofxXmlSettings\src;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxNetwork\src;..\..\..\addons\ofxOsc\libs\oscpack\src\ip\win32;..\..\..\addons\ofxOsc\libs\oscpack\src\ip\posix;..\..\..\addons\ofxOsc\libs\oscpack\src\osc;..\..\..\addons\ofxOsc\libs\oscpack\src\ip;..\..\..\addons\ofxOsc\src;..\..\..\addons\ofxOpenCv\libs;..\..\..\addons\ofxOpenCv\libs\opencv;..\..\..\addons\ofxOpenCv\libs\opencv\include;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\calib3d;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\contrib;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\core;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\features2d;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\flann;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\gpu;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\highgui;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\imgproc;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\legacy;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ml;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video;..\..\..\addons\ofxOpenCv\libs\opencv\lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010;..\..\..\addons\ofxOpenCv\src;..\..\addons\ofxKinect\libs\libfreenect;..\..\addons\ofxKinect\src;..\..\addons\ofxLabGui\src\elements;..\..\addons\ofxLabGui\src;..\..\addons\ofxLibwebsockets\src;..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port;..\..\addons\ofxLibwebsockets\libs\libwebsockets\include;..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\addons\ofxLibwebsockets\libs\openssl\openssl;..\..\addons\ofxOpenCVExtensions\src;..\..\addons\ofxOpenNI\include\openni;..\..\addons\ofxOpenNI\include\openni\Win32;..\..\addons\ofxOpenNI\include\nite;..\..\addons\ofxOpenNI\src;..\..\addons\ofxTSPS\libs\ofxTSPS\src;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\utils;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\source;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\openni;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\opencv;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\gui;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\cv;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\communication;..\..\addons\ofxTSPS\libs\ofxTSPS\include;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS;..\..\addons\ofxTSPS\src;..\..\addons\ofxTuioWrapper\src\oscpack\include;..\..\addons\ofxTuioWrapper\src\oscpack\include\osc;..\..\addons\ofxTuioWrapper\src\oscpack\include\ip;..\..\addons\ofxTuioWrapper\src\core;..\..\addons\ofxTuioWrapper\src;..\..\addons\ofxMSAInteractiveObject\src;..\..\addons\ofxCv\libs\ofxCv\src;..\..\addons\ofxCv\libs\ofxCv\include;..\..\addons\ofxCv\src;..\..\addons\ofxSpacebrew\src;%(AdditionalIncludeDirectories);src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\addons\ofxXmlSettings\src;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxNetwork\src;..\..\..\addons\ofxOsc\libs\oscpack\src\ip\win32;..\..\..\addons\ofxOsc\libs\oscpack\src\ip\posix;..\..\..\addons\ofxOsc\libs\oscpack\src\osc;..\..\..\addons\ofxOsc\libs\oscpack\src\ip;..\..\..\addons\ofxOsc\src;..\..\..\addons\ofxOpenCv\libs;..\..\..\addons\ofxOpenCv\libs\opencv;..\..\..\addons\ofxOpenCv\libs\opencv\include;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\calib3d;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\contrib;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\core;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\features2d;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\flann;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\gpu;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\highgui;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\imgproc;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\legacy;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ml;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video;..\..\..\addons\ofxOpenCv\libs\opencv\lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010;..\..\..\addons\ofxOpenCv\src;..\..\addons\ofxKinect\libs\libfreenect;..\..\addons\ofxKinect\src;..\..\addons\ofxLabGui\src\elements;..\..\addons\ofxLabGui\src;..\..\addons\ofxLibwebsockets\src;..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port;..\..\addons\ofxLibwebsockets\libs\libwebsockets\include;..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\addons\ofxLibwebsockets\libs\openssl\openssl;..\..\addons\ofxOpenCVExtensions\src;..\..\addons\ofxOpenNI\include\openni;..\..\addons\ofxOpenNI\include\openni\Win32;..\..\addons\ofxOpenNI\include\nite;..\..\addons\ofxTSPS\extras;..\..\addons\ofxOpenNI\src;..\..\addons\ofxTSPS\libs\ofxTSPS\src;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\utils;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\source;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\openni;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\opencv;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\gui;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\cv;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\communication;..\..\addons\ofxTSPS\libs\ofxTSPS\include;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS;..\..\addons\ofxTSPS\src;..\..\addons\ofxTuioWrapper\src\oscpack\include;..\..\addons\ofxTuioWrapper\src\oscpack\include\osc;..\..\addons\ofxTuioWrapper\src\oscpack\include\ip;..\..\addons\ofxTuioWrapper\src\core;..\..\addons\ofxTuioWrapper\src;..\..\addons\ofxMSAInteractiveObject\src;..\..\addons\ofxCv\libs\ofxCv\src;..\..\addons\ofxCv\libs\ofxCv\include;..\..\addons\ofxCv\src;..\..\addons\ofxSpacebrew\src;%(AdditionalIncludeDirectories);src</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
@@ -82,7 +82,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat />
-      <AdditionalIncludeDirectories>..\..\..\addons\ofxXmlSettings\src;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxNetwork\src;..\..\..\addons\ofxOsc\libs\oscpack\src\ip\win32;..\..\..\addons\ofxOsc\libs\oscpack\src\ip\posix;..\..\..\addons\ofxOsc\libs\oscpack\src\osc;..\..\..\addons\ofxOsc\libs\oscpack\src\ip;..\..\..\addons\ofxOsc\src;..\..\..\addons\ofxOpenCv\libs;..\..\..\addons\ofxOpenCv\libs\opencv;..\..\..\addons\ofxOpenCv\libs\opencv\include;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\calib3d;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\contrib;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\core;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\features2d;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\flann;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\gpu;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\highgui;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\imgproc;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\legacy;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ml;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video;..\..\..\addons\ofxOpenCv\libs\opencv\lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010;..\..\..\addons\ofxOpenCv\src;..\..\addons\ofxKinect\libs\libfreenect;..\..\addons\ofxKinect\src;..\..\addons\ofxLabGui\src\elements;..\..\addons\ofxLabGui\src;..\..\addons\ofxLibwebsockets\src;..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port;..\..\addons\ofxLibwebsockets\libs\libwebsockets\include;..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\addons\ofxLibwebsockets\libs\openssl\openssl;..\..\addons\ofxOpenCVExtensions\src;..\..\addons\ofxOpenNI\include\openni;..\..\addons\ofxOpenNI\include\openni\Win32;..\..\addons\ofxOpenNI\include\nite;..\..\addons\ofxOpenNI\src;..\..\addons\ofxTSPS\libs\ofxTSPS\src;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\utils;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\source;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\openni;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\opencv;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\gui;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\cv;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\communication;..\..\addons\ofxTSPS\libs\ofxTSPS\include;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS;..\..\addons\ofxTSPS\src;..\..\addons\ofxTuioWrapper\src\oscpack\include;..\..\addons\ofxTuioWrapper\src\oscpack\include\osc;..\..\addons\ofxTuioWrapper\src\oscpack\include\ip;..\..\addons\ofxTuioWrapper\src\core;..\..\addons\ofxTuioWrapper\src;..\..\addons\ofxMSAInteractiveObject\src;..\..\addons\ofxCv\libs\ofxCv\src;..\..\addons\ofxCv\libs\ofxCv\include;..\..\addons\ofxCv\src;..\..\addons\ofxSpacebrew\src;%(AdditionalIncludeDirectories);src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\addons\ofxXmlSettings\src;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxNetwork\src;..\..\..\addons\ofxOsc\libs\oscpack\src\ip\win32;..\..\..\addons\ofxOsc\libs\oscpack\src\ip\posix;..\..\..\addons\ofxOsc\libs\oscpack\src\osc;..\..\..\addons\ofxOsc\libs\oscpack\src\ip;..\..\..\addons\ofxOsc\src;..\..\..\addons\ofxOpenCv\libs;..\..\..\addons\ofxOpenCv\libs\opencv;..\..\..\addons\ofxOpenCv\libs\opencv\include;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\calib3d;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\contrib;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\core;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\features2d;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\flann;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\gpu;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\highgui;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\imgproc;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\legacy;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ml;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts;..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video;..\..\..\addons\ofxOpenCv\libs\opencv\lib;..\..\..\addons\ofxOpenCv\libs\opencv\lib\vs2010;..\..\..\addons\ofxOpenCv\src;..\..\addons\ofxKinect\libs\libfreenect;..\..\addons\ofxKinect\src;..\..\addons\ofxLabGui\src\elements;..\..\addons\ofxLabGui\src;..\..\addons\ofxLibwebsockets\src;..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port;..\..\addons\ofxLibwebsockets\libs\libwebsockets\include;..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\addons\ofxLibwebsockets\libs\openssl\openssl;..\..\addons\ofxOpenCVExtensions\src;..\..\addons\ofxOpenNI\include\openni;..\..\addons\ofxOpenNI\include\openni\Win32;..\..\addons\ofxOpenNI\include\nite;..\..\addons\ofxTSPS\extras;..\..\addons\ofxOpenNI\src;..\..\addons\ofxTSPS\libs\ofxTSPS\src;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\utils;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\source;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\openni;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\opencv;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\gui;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\cv;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\communication;..\..\addons\ofxTSPS\libs\ofxTSPS\include;..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS;..\..\addons\ofxTSPS\src;..\..\addons\ofxTuioWrapper\src\oscpack\include;..\..\addons\ofxTuioWrapper\src\oscpack\include\osc;..\..\addons\ofxTuioWrapper\src\oscpack\include\ip;..\..\addons\ofxTuioWrapper\src\core;..\..\addons\ofxTuioWrapper\src;..\..\addons\ofxMSAInteractiveObject\src;..\..\addons\ofxCv\libs\ofxCv\src;..\..\addons\ofxCv\libs\ofxCv\include;..\..\addons\ofxCv\src;..\..\addons\ofxSpacebrew\src;%(AdditionalIncludeDirectories);src</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -155,6 +155,7 @@
     <ClCompile Include="..\..\addons\ofxOpenCVExtensions\src\ofxCvCoordWarping.cpp" />
     <ClCompile Include="..\..\addons\ofxOpenCVExtensions\src\ofxCvCoordWarpingGui.cpp" />
     <ClCompile Include="..\..\addons\ofxSpacebrew\src\ofxSpacebrew.cpp" />
+    <ClCompile Include="..\..\addons\ofxTSPS\extras\TSPSDelegate.cpp" />
     <ClCompile Include="..\..\addons\ofxTSPS\libs\ofxTSPS\src\CvPerson.cpp" />
     <ClCompile Include="..\..\addons\ofxTSPS\libs\ofxTSPS\src\CvProcessor.cpp" />
     <ClCompile Include="..\..\addons\ofxTSPS\libs\ofxTSPS\src\SpacebrewSender.cpp" />
@@ -426,6 +427,7 @@
     <ClInclude Include="..\..\addons\ofxOpenCVExtensions\src\ofxCvCoordWarping.h" />
     <ClInclude Include="..\..\addons\ofxOpenCVExtensions\src\ofxCvCoordWarpingGui.h" />
     <ClInclude Include="..\..\addons\ofxSpacebrew\src\ofxSpacebrew.h" />
+    <ClInclude Include="..\..\addons\ofxTSPS\extras\TSPSDelegate.h" />
     <ClInclude Include="..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\communication\OscSender.h" />
     <ClInclude Include="..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\communication\SpacebrewSender.h" />
     <ClInclude Include="..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\communication\TCPSender.h" />

standalone/basic/openTSPS.vcxproj.filters

@@ -235,6 +235,9 @@
     <ClCompile Include="..\..\addons\ofxTSPS\libs\ofxTSPS\src\SpacebrewSender.cpp">
       <Filter>addons\third-party\ofxTSPS\libs\ofxTSPS\src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\addons\ofxTSPS\extras\TSPSDelegate.cpp">
+      <Filter>addons\third-party\ofxTSPS\extra</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="src">
@@ -462,6 +465,9 @@
     <Filter Include="addons\third-party\ofxLibwebsockets\libs\ofxLibwebsockets">
       <UniqueIdentifier>{0dd271c9-8e80-4465-b796-5ff4e976367d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="addons\third-party\ofxTSPS\extra">
+      <UniqueIdentifier>{d57ecba9-f912-44d7-b325-b59e7bbb8658}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\tspsApp.h">
@@ -1328,6 +1334,9 @@
     <ClInclude Include="..\..\addons\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\communication\SpacebrewSender.h">
       <Filter>addons\third-party\ofxTSPS\libs\ofxTSPS\include\ofxTSPS\communication</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\addons\ofxTSPS\extras\TSPSDelegate.h">
+      <Filter>addons\third-party\ofxTSPS\extra</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\addons\ofxKinect\libs\libfreenect\lib\vs2010\freenect.dll">