fix: #57 remove button/coordinate union to allow clicks to have coord…

…inate data associated with them when present.

Tests/Tests.cpp

@@ -255,7 +255,8 @@ void handle_transaction_complete(void* context, interactive_session session, con
 		transaction_data data = transactionItr->second;
 		switch (data.type)
 		{
-		case input_type_button:
+		case input_type_click:
+		case input_type_key:
 			Logger::WriteMessage((std::string("Executing button press for participant: ") + data.participantName).c_str());
 
 			// Look for a cooldown metadata property and tigger it if it exists.
@@ -286,9 +287,10 @@ void handle_input(void* context, interactive_session session, const interactive_
 
 	switch (input->type)
 	{
-	case input_type_button:
+	case input_type_click:
+	case input_type_key:
 	{
-		if (input->buttonData.action == interactive_button_action::down)
+		if (input->buttonData.action == interactive_button_action_down)
 		{
 			// This requries a transaction. Store relevant data.
 			transaction_data data;
@@ -308,7 +310,7 @@ void handle_input(void* context, interactive_session session, const interactive_
 		}
 		break;
 	}
-	case input_type_coordinate:
+	case input_type_move:
 	{
 		Logger::WriteMessage((std::string("MOVEMENT on ") + input->control.id).c_str());
 		Logger::WriteMessage(("X:\t" + std::to_string(input->coordinateData.x)).c_str());

samples/InteractiveSampleUWP/InteractiveSampleUWP/App.xaml.cpp

@@ -175,7 +175,7 @@ void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEvent
 		err = interactive_register_input_handler(session, [](void* context, interactive_session session, const interactive_input* input)
 		{
 			std::map<std::string, std::string>& controlsByTransaction = *(std::map <std::string, std::string>*)context;
-			if (input_type_button == input->type && interactive_button_action::down == input->buttonData.action)
+			if ((input_type_key == input->type || input_type_click == input->type) && interactive_button_action_down == input->buttonData.action)
 			{
 				// Capture the transaction on button down to deduct sparks
 				controlsByTransaction[input->transactionId] = input->control.id;

samples/InteractiveXboxSample/Game.cpp

@@ -106,7 +106,7 @@ void Game::Initialize(IUnknown* window)
 	err = interactive_register_input_handler(m_interactiveSession, [](void* context, interactive_session session, const interactive_input* input)
 	{
 		Game* game = (Game*)context;
-		if (input_type_button == input->type && interactive_button_action::down == input->buttonData.action)
+		if ((input_type_key == input->type || input_type_click == input->type) && interactive_button_action_down == input->buttonData.action)
 		{
 			// Capture the transaction on button down to deduct sparks
 			int err = interactive_capture_transaction(session, input->transactionId);

source/interactivity.h

@@ -101,16 +101,17 @@ extern "C" {
 	};
 
 	enum interactive_input_type
-	{
-		input_type_button,
-		input_type_coordinate,
+	{	
+		input_type_key,
+		input_type_click,
+		input_type_move,
 		input_type_custom
 	};
 
 	enum interactive_button_action
 	{
-		up,
-		down
+		interactive_button_action_up,
+		interactive_button_action_down
 	};
 
 	struct interactive_input
@@ -123,18 +124,15 @@ extern "C" {
 		size_t jsonDataLength;
 		const char* transactionId;
 		size_t transactionIdLength;
-		union
+		struct buttonData
+		{
+			interactive_button_action action;
+		} buttonData;
+		struct coordinateData
 		{
-			struct buttonData
-			{
-				interactive_button_action action;
-			} buttonData;
-			struct coordinateData
-			{
-				float x;
-				float y;
-			} coordinateData;
-		};
+			float x;
+			float y;
+		} coordinateData;
 	};
 
 	struct interactive_group : public interactive_object