Merge branch 'master' of github.com:uic-evl/omicron

Author: arthurnishimoto

data/oinputserver.cfg

@@ -4,7 +4,8 @@ config:
 
 	showEventStream = false;		// Show outgoing UDP events
 	showEventMessages = false;		// Show outgoing TCP events
-	showIncomingStream = false;
+	showIncomingStream = false;		// Show incoming streaming events
+	showIncomingMessages = true;	// Show incoming single events
 
 	services:
 	{
@@ -42,7 +43,7 @@ config:
 			debug = false;
 
 			// Stream data to serverIP on dataPort instead of receiving (Default: false)
-			// Best is serverIP is IP number rather than DNS name
+			// Best if serverIP is numerical IP address rather than DNS name
 			dataStreamOut = false;
 
 			// Delay in ms between connection attempts to serverIP (Default: 5000)
@@ -56,20 +57,23 @@ config:
 		MSKinectService:
 		{
 			checkInterval = 2.0;
-			seatedMode = false;
 			debug = false;
 
+			// Body Tracking
 			enableKinectBody = true;
+			seatedMode = false;
+			kinectOriginOffset = [0, 0, 0];
 
 			// Generates a head and wand mocap event similar to the CAVE2 tracker
 			// Will not accurately track orientation or Z movement
-			caveSimulator = false;
+			caveSimulator = true;
 
 			// Speech recognition
 			enableKinectSpeech = false;
 			useGrammar = true;
 			useDictation = false;
-			speechGrammerFilePath = "C:/Workspace/Kinect/Samples v2.0/SpeechBasics-D2D/SpeechBasics-D2D.grxml";
+			speechGrammerFilePath = "C:/Workspace/EVL/Kinect/Samples v2.0/SpeechBasics-D2D/SpeechBasics-D2D.grxml";
+			confidenceThreshold = 0.3;
 		};
 
 		// Combine game controller with motion capture object

include/omicron/InputServer.h

@@ -366,6 +366,7 @@ class OMICRON_API InputServer
     bool showStreamSpeed;
 	bool showEventMessages;
 	bool showIncomingStream;
+	bool showIncomingMessages;
     int lastOutgoingEventTime;
     int eventCount;
 

src/omicron/omicron/InputServer.cpp

@@ -551,6 +551,7 @@ void InputServer::startConnection(Config* cfg)
     showStreamSpeed = Config::getBoolValue("showStreamSpeed", sCfg, false );
 	showEventMessages = Config::getBoolValue("showEventMessages", sCfg, false);
 	showIncomingStream = Config::getBoolValue("showIncomingStream", sCfg, false);
+	showIncomingMessages = Config::getBoolValue("showIncomingMessages", sCfg, false);
 
     if( checkForDisconnectedClients )
         omsg("Check for disconnected clients enabled.");
@@ -826,6 +827,12 @@ void InputServer::loop()
 				{
 					printf("InputServer: Data in id: %d pos: %f %f %f\n", ed.sourceId, ed.posx, ed.posy, ed.posz);
 				}
+				if (showIncomingMessages && ed.serviceType == EventBase::ServiceTypeSpeech)
+				{
+					Event e;
+					e.deserialize(&ed);
+					printf("NetService: Speech in: (speech text, condidence) '%s' %f\n", e.getExtraDataString(), ed.posx);
+				}
 
 				// Add to local service manager's event list
 				if (serviceManager)