-splitted TuioCommunicator (TuioCommunicator send normal TUIO data for gesture recogniction, TuioCommicatorHack sends button+palm-position)

-Port TuioCommunicator 3333
-Port TuioCommunicatorHack 3336

bbiwarg/BBWIWARG.cs

@@ -58,6 +58,7 @@ namespace BBIWARG
         /// <summary>
         /// the tuio communicator
         /// </summary>
+        private TuioCommunicatorHack tuioCommunicatorHack;
         private TuioCommunicator tuioCommunicator;
 
         /// <summary>
@@ -82,6 +83,7 @@ namespace BBIWARG
         public BBIWARG(string[] args)
         {
             handleArgs(args);
+            
 
             debugWindowEnabled = Parameters.DebugWindowEnabled;
             glassesWindowEnabled = Parameters.GlassesWindowEnabled && Screen.AllScreens.Count() >= 2;
@@ -97,7 +99,10 @@ namespace BBIWARG
             // tuioCommunicator
             if (tuioEnabled)
             {
-                tuioCommunicator = new TuioCommunicator(tuioIP, tuioPort);
+                tuioCommunicatorHack = new TuioCommunicatorHack(tuioIP, tuioPort);
+                inputHandler.NewProcessedFrameEvent += tuioCommunicatorHack.handleNewFrameData;
+
+                tuioCommunicator = new TuioCommunicator("127.0.0.1", 3333);
                 inputHandler.NewProcessedFrameEvent += tuioCommunicator.handleNewFrameData;
             }
 
@@ -186,14 +191,14 @@ namespace BBIWARG
                         portString = parts[1];
                 }
 
-                while (!TuioCommunicator.tryParseIPAddress(ipString, out tuioIP))
+                while (!TuioCommunicatorHack.tryParseIPAddress(ipString, out tuioIP))
                 {
                     Console.WriteLine("Please insert the TUIO-Client's IP (Default is " + Parameters.TuioDefaultIP + "):");
                     ipString = Console.ReadLine();
                 }
                 Console.WriteLine("TUIO-IP is set to:" + tuioIP);
 
-                while (!TuioCommunicator.tryParsePort(portString, out tuioPort))
+                while (!TuioCommunicatorHack.tryParsePort(portString, out tuioPort))
                 {
                     Console.WriteLine("Please insert the TUIO-Client's Port (Default is " + Parameters.TuioDefaultPort + "):");
                     portString = Console.ReadLine();

bbiwarg/Parameters.cs

@@ -114,7 +114,7 @@ namespace BBIWARG
         /// <summary>
         /// the default port of the tuio server
         /// </summary>
-        public static readonly Int16 TuioDefaultPort = 3333;
+        public static readonly Int16 TuioDefaultPort = 3336;
 
         /// <summary>
         /// true iff the tuio server is enabled

bbiwarg/TUIO/TuioCommunicator.cs

@@ -96,16 +96,15 @@ namespace BBIWARG.TUIO
 
                 foreach (TouchEvent te in frameData.TouchEvents)
                 {
-                    Point p = getButton(te.Touch.RelativePosition.X, te.Touch.RelativePosition.Y);
                     switch (te.Type)
                     {
                         case TouchEventType.Down:
-                            TuioCursor tcur = server.addTuioCursor(p.X, p.Y);
+                            TuioCursor tcur = server.addTuioCursor(te.Touch.RelativePosition.X, te.Touch.RelativePosition.Y);
                             tcursors.Add(te.Touch.TrackID, tcur);
                             break;
 
                         case TouchEventType.Move:
-                            server.updateTuioCursor(tcursors[te.Touch.TrackID], p.X, p.Y);
+                            server.updateTuioCursor(tcursors[te.Touch.TrackID], te.Touch.RelativePosition.X, te.Touch.RelativePosition.Y);
                             break;
 
                         case TouchEventType.Up:
@@ -115,142 +114,10 @@ namespace BBIWARG.TUIO
                     }
                 }
 
-                List<int> updatedIDs = new List<int>();
-                foreach (Palm palm in frameData.TrackedPalms)
-                {
-                    if (tobjects.Keys.Contains(palm.TrackID))
-                    {
-                        // update / move
-                        List<TuioObject> palmTobjs = tobjects[palm.TrackID];
-                        Vector2D[] corners = palm.Quad.Corners;
-                        for (int i = 0; i < 4; i++)
-                        {
-                            /* BEGIN HACK */
-                            int x0 = 0;
-                            int y0 = 0;
-                            int x1 = 0;
-                            int y1 = 0;
-
-                            if (i == 0)
-                            {
-                                x0 = (int)corners[0].X;
-                                y0 = (int)corners[0].Y;
-                                x1 = (int)corners[2].X;
-                                y1 = (int)corners[2].Y;
-                            }
-                            else if (i == 1)
-                            {
-                                x0 = (int)corners[1].X;
-                                y0 = (int)corners[1].Y;
-                                x1 = (int)corners[3].X;
-                                y1 = (int)corners[3].Y;
-                            }
-                            else if (i == 2)
-                            {
-                                x0 = (int)corners[2].X;
-                                y0 = (int)corners[2].Y;
-                                x1 = (int)corners[0].X;
-                                y1 = (int)corners[0].Y;
-                            }
-                            else if (i == 3)
-                            {
-                                x0 = (int)corners[3].X;
-                                y0 = (int)corners[3].Y;
-                                x1 = (int)corners[1].X;
-                                y1 = (int)corners[1].Y;
-                            }
-                            /* END HACK */
-                            server.updateTuioObject(
-                                palmTobjs[i],
-                                corners[i].X,
-                                corners[i].Y,
-                                frameData.DepthImage.getDepthAtFixed(x0, y0, x1, y1));
-                                //frameData.DepthImage.getDepthAt((int)corners[i].X, (int)corners[i].Y));
-                        }
-                        updatedIDs.Add(palm.TrackID);
-                    }
-                    else
-                    {
-                        // add / create
-                        List<TuioObject> palmTobjs = new List<TuioObject>();
-                        Vector2D[] corners = palm.Quad.Corners;
-                        for (int i = 0; i < 4; i++) 
-                        {
-                            
-                            /* BEGIN HACK */
-                            int x0 = 0;
-                            int y0 = 0;
-                            int x1 = 0;
-                            int y1 = 0;
-
-                            if (i == 0)
-                            {
-                                x0 = (int)corners[0].X;
-                                y0 = (int)corners[0].Y;
-                                x1 = (int)corners[2].X;
-                                y1 = (int)corners[2].Y;
-                            }
-                            else if (i == 1)
-                            {
-                                x0 = (int)corners[1].X;
-                                y0 = (int)corners[1].Y;
-                                x1 = (int)corners[3].X;
-                                y1 = (int)corners[3].Y;
-                            }
-                            else if (i == 2)
-                            {
-                                x0 = (int)corners[2].X;
-                                y0 = (int)corners[2].Y;
-                                x1 = (int)corners[0].X;
-                                y1 = (int)corners[0].Y;
-                            }
-                            else if (i == 3)
-                            {
-                                x0 = (int)corners[3].X;
-                                y0 = (int)corners[3].Y;
-                                x1 = (int)corners[1].X;
-                                y1 = (int)corners[1].Y;
-                            }
-                            /* END HACK */
-                            palmTobjs.Add(server.addTuioObject(
-                                corners[i].X, 
-                                corners[i].Y, 
-                                frameData.DepthImage.getDepthAtFixed(x0, y0, x1, y1))); //palm.TrackID + 0.1f * i));
-                        }
-                        tobjects.Add(palm.TrackID, palmTobjs);
-                        updatedIDs.Add(palm.TrackID);
-                    }
-                }
-
-                // remove
-                List<int> ids = tobjects.Keys.ToList();
-                for (int i = ids.Count - 1; i >= 0; i--)
-                {
-                    int id = ids[i];
-                    if (!updatedIDs.Contains(id))
-                    {
-                        foreach (TuioObject tobj in tobjects[id])
-                            server.removeTuioObject(tobj);
-                        tobjects.Remove(id);
-                    }
-                }
             }
             server.commitFrame();
         }
 
-
-        private Point getButton(float rX , float rY)
-        {
-            int activeRow = (int)Math.Min(rY * Parameters.ActiveTouches.Count,
-                Parameters.PalmGridDefaultNumRows - 1);
-            int activeCol = (int)Math.Min(rX * Parameters.ActiveTouches.ElementAt(activeRow).Count,
-                Parameters.ActiveTouches.ElementAt(activeRow).Count - 1);
-            if (activeRow != Parameters.PalmSliderPos)
-                return new Point(activeRow, activeCol);
-            else
-                return new Point(activeRow, Parameters.PalmSliderCurr);
-        }
-
         /// <summary>
         /// Resets the server by removing all cursors and objects.
         /// </summary>

bbiwarg/TUIO/TuioCommunicatorHack.cs

@@ -0,0 +1,271 @@
+using BBIWARG.Input.InputHandling;
+using BBIWARG.Recognition.PalmRecognition;
+using BBIWARG.Recognition.TouchRecognition;
+using BBIWARG.Utility;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using TUIO;
+
+namespace BBIWARG.TUIO
+{
+    /// <summary>
+    /// TuioCommunicator sends generated touch events and palm grid coordinates to tuio clients using a <see cref="TuioServer"/>.
+    /// </summary>
+    internal class TuioCommunicatorHack
+    {
+        /// <summary>
+        /// the tuio server
+        /// </summary>
+        private TuioServer server;
+
+        /// <summary>
+        /// dictionary of lists of tuio cursors indexed by touch id
+        /// </summary>
+        private Dictionary<int, TuioCursor> tcursors;
+
+        /// <summary>
+        /// dictionary of lists of tuio objects indexed by palm id
+        /// </summary>
+        private Dictionary<int, List<TuioObject>> tobjects;
+
+        /// <summary>
+        /// Constructs a TuioCommunicator.
+        /// </summary>
+        /// <param name="host">server ip</param>
+        /// <param name="port">server port</param>
+        public TuioCommunicatorHack(string host, int port)
+        {
+            server = new TuioServer(host, port);
+            tcursors = new Dictionary<int, TuioCursor>();
+            tobjects = new Dictionary<int, List<TuioObject>>();
+        }
+
+        /// <summary>
+        /// Tries to parse an ip address string.
+        /// </summary>
+        /// <param name="ipIn">the ip address string to parse</param>
+        /// <param name="ipOut">out parameter for the ip address in *.*.*.* format if ipIn is valid and null otherwise</param>
+        /// <returns>true iff ipIn is a valid ip address</returns>
+        public static bool tryParseIPAddress(String ipIn, out String ipOut)
+        {
+            IPAddress ipAddress;
+            bool result = IPAddress.TryParse(ipIn, out ipAddress) && ipAddress.AddressFamily == AddressFamily.InterNetwork;
+            if (result)
+                ipOut = ipAddress.ToString();
+            else
+                ipOut = null;
+            return result;
+        }
+
+        /// <summary>
+        /// Tries to parse a port string.
+        /// </summary>
+        /// <param name="portIn">the port string to parse</param>
+        /// <param name="portOut">out parameter for the port if portIn is valid and undefined otherwise</param>
+        /// <returns>true iff portIn is a valid port</returns>
+        public static bool tryParsePort(String portIn, out Int16 portOut)
+        {
+            return Int16.TryParse(portIn, out portOut);
+        }
+
+        /// <summary>
+        /// Closes the server.
+        /// </summary>
+        public void close()
+        {
+            server.close();
+        }
+
+        /// <summary>
+        /// Handles the event that a new frame is finished processing by updating the cursors and objects and sending them.
+        /// </summary>
+        /// <param name="sender">event sender</param>
+        /// <param name="e">event arguments</param>
+        public void handleNewFrameData(object sender, NewProcessedFrameEventArgs e)
+        {
+            server.initFrame();
+            FrameData frameData = e.FrameData;
+            lock (frameData)
+            {
+                if (frameData.ResetFlag)
+                    reset();
+
+                foreach (TouchEvent te in frameData.TouchEvents)
+                {
+                    Point p = getButton(te.Touch.RelativePosition.X, te.Touch.RelativePosition.Y);
+                    switch (te.Type)
+                    {
+                        case TouchEventType.Down:
+                            TuioCursor tcur = server.addTuioCursor(p.X, p.Y);
+                            tcursors.Add(te.Touch.TrackID, tcur);
+                            break;
+
+                        case TouchEventType.Move:
+                            server.updateTuioCursor(tcursors[te.Touch.TrackID], p.X, p.Y);
+                            break;
+
+                        case TouchEventType.Up:
+                            server.removeTuioCursor(tcursors[te.Touch.TrackID]);
+                            tcursors.Remove(te.Touch.TrackID);
+                            break;
+                    }
+                }
+
+                List<int> updatedIDs = new List<int>();
+                foreach (Palm palm in frameData.TrackedPalms)
+                {
+                    if (tobjects.Keys.Contains(palm.TrackID))
+                    {
+                        // update / move
+                        List<TuioObject> palmTobjs = tobjects[palm.TrackID];
+                        Vector2D[] corners = palm.Quad.Corners;
+                        for (int i = 0; i < 4; i++)
+                        {
+                            /* BEGIN HACK */
+                            int x0 = 0;
+                            int y0 = 0;
+                            int x1 = 0;
+                            int y1 = 0;
+
+                            if (i == 0)
+                            {
+                                x0 = (int)corners[0].X;
+                                y0 = (int)corners[0].Y;
+                                x1 = (int)corners[2].X;
+                                y1 = (int)corners[2].Y;
+                            }
+                            else if (i == 1)
+                            {
+                                x0 = (int)corners[1].X;
+                                y0 = (int)corners[1].Y;
+                                x1 = (int)corners[3].X;
+                                y1 = (int)corners[3].Y;
+                            }
+                            else if (i == 2)
+                            {
+                                x0 = (int)corners[2].X;
+                                y0 = (int)corners[2].Y;
+                                x1 = (int)corners[0].X;
+                                y1 = (int)corners[0].Y;
+                            }
+                            else if (i == 3)
+                            {
+                                x0 = (int)corners[3].X;
+                                y0 = (int)corners[3].Y;
+                                x1 = (int)corners[1].X;
+                                y1 = (int)corners[1].Y;
+                            }
+                            /* END HACK */
+                            server.updateTuioObject(
+                                palmTobjs[i],
+                                corners[i].X,
+                                corners[i].Y,
+                                frameData.DepthImage.getDepthAtFixed(x0, y0, x1, y1));
+                                //frameData.DepthImage.getDepthAt((int)corners[i].X, (int)corners[i].Y));
+                        }
+                        updatedIDs.Add(palm.TrackID);
+                    }
+                    else
+                    {
+                        // add / create
+                        List<TuioObject> palmTobjs = new List<TuioObject>();
+                        Vector2D[] corners = palm.Quad.Corners;
+                        for (int i = 0; i < 4; i++) 
+                        {
+                            
+                            /* BEGIN HACK */
+                            int x0 = 0;
+                            int y0 = 0;
+                            int x1 = 0;
+                            int y1 = 0;
+
+                            if (i == 0)
+                            {
+                                x0 = (int)corners[0].X;
+                                y0 = (int)corners[0].Y;
+                                x1 = (int)corners[2].X;
+                                y1 = (int)corners[2].Y;
+                            }
+                            else if (i == 1)
+                            {
+                                x0 = (int)corners[1].X;
+                                y0 = (int)corners[1].Y;
+                                x1 = (int)corners[3].X;
+                                y1 = (int)corners[3].Y;
+                            }
+                            else if (i == 2)
+                            {
+                                x0 = (int)corners[2].X;
+                                y0 = (int)corners[2].Y;
+                                x1 = (int)corners[0].X;
+                                y1 = (int)corners[0].Y;
+                            }
+                            else if (i == 3)
+                            {
+                                x0 = (int)corners[3].X;
+                                y0 = (int)corners[3].Y;
+                                x1 = (int)corners[1].X;
+                                y1 = (int)corners[1].Y;
+                            }
+                            /* END HACK */
+                            palmTobjs.Add(server.addTuioObject(
+                                corners[i].X, 
+                                corners[i].Y, 
+                                frameData.DepthImage.getDepthAtFixed(x0, y0, x1, y1))); //palm.TrackID + 0.1f * i));
+                        }
+                        tobjects.Add(palm.TrackID, palmTobjs);
+                        updatedIDs.Add(palm.TrackID);
+                    }
+                }
+
+                // remove
+                List<int> ids = tobjects.Keys.ToList();
+                for (int i = ids.Count - 1; i >= 0; i--)
+                {
+                    int id = ids[i];
+                    if (!updatedIDs.Contains(id))
+                    {
+                        foreach (TuioObject tobj in tobjects[id])
+                            server.removeTuioObject(tobj);
+                        tobjects.Remove(id);
+                    }
+                }
+            }
+            server.commitFrame();
+        }
+
+
+        private Point getButton(float rX , float rY)
+        {
+            int activeRow = (int)Math.Min(rY * Parameters.ActiveTouches.Count,
+                Parameters.PalmGridDefaultNumRows - 1);
+            int activeCol = (int)Math.Min(rX * Parameters.ActiveTouches.ElementAt(activeRow).Count,
+                Parameters.ActiveTouches.ElementAt(activeRow).Count - 1);
+            if (activeRow != Parameters.PalmSliderPos)
+                return new Point(activeRow, activeCol);
+            else
+                return new Point(activeRow, Parameters.PalmSliderCurr);
+        }
+
+        /// <summary>
+        /// Resets the server by removing all cursors and objects.
+        /// </summary>
+        public void reset()
+        {
+            foreach (int id in tcursors.Keys)
+                server.removeTuioCursor(tcursors[id]);
+
+            tcursors.Clear();
+
+            foreach (int id in tobjects.Keys)
+                foreach (TuioObject tobj in tobjects[id])
+                    server.removeTuioObject(tobj);
+
+            tobjects.Clear();
+        }
+    }
+}

bbiwarg/bbiwarg.csproj

@@ -11,6 +11,8 @@
     <AssemblyName>bbiwarg</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <WcfConfigValidationEnabled>True</WcfConfigValidationEnabled>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -23,10 +25,8 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <WcfConfigValidationEnabled>True</WcfConfigValidationEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -123,6 +123,7 @@
       <DependentUpon>GlassesWindow.cs</DependentUpon>
       <ExcludeFromStyleCop>True</ExcludeFromStyleCop>
     </Compile>
+    <Compile Include="TUIO\TuioCommunicator.cs" />
     <Compile Include="TUIO\TUIO\TuioObject.cs">
       <ExcludeFromStyleCop>True</ExcludeFromStyleCop>
     </Compile>
@@ -185,7 +186,7 @@
     <Compile Include="TUIO\OSC.NET\OSCTransmitter.cs">
       <ExcludeFromStyleCop>True</ExcludeFromStyleCop>
     </Compile>
-    <Compile Include="TUIO\TuioCommunicator.cs" />
+    <Compile Include="TUIO\TuioCommunicatorHack.cs" />
     <Compile Include="TUIO\TUIO\TuioContainer.cs">
       <ExcludeFromStyleCop>True</ExcludeFromStyleCop>
     </Compile>