Pouring simulator changes

robcog-iai · andreosse1 · Oct 12, 2023 · Oct 15, 2023 · Oct 16, 2023 · Oct 16, 2023
commit 2c436229aa09cfc6d9cbd12a1974e2c4579d6aee
diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini
@@ -108,8 +108,8 @@ DoubleClickTime=0.200000
 +ActionMappings=(ActionName="SLGenericTrigger",bShift=False,bCtrl=False,bAlt=True,bCmd=False,Key=N)
 +ActionMappings=(ActionName="VizQCineCamTrigger",bShift=False,bCtrl=False,bAlt=True,bCmd=False,Key=K)
 +ActionMappings=(ActionName="VizQCineCamEffectTrigger",bShift=False,bCtrl=False,bAlt=True,bCmd=False,Key=J)
-+ActionMappings=(ActionName="SLAudioStartTrigger",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Trackpad_Up)
-+ActionMappings=(ActionName="SLAudioStopTrigger",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Trackpad_Down)
++ActionMappings=(ActionName="SLAudioStopTrigger",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=X)
++ActionMappings=(ActionName="SLAudioStartTrigger",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Y)
 +AxisMappings=(AxisName="LeftGrasp",Scale=1.000000,Key=Vive_Left_Trigger_Axis)
 +AxisMappings=(AxisName="RightGrasp",Scale=1.000000,Key=Vive_Right_Trigger_Axis)
 DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput

diff --git a/Config/DefaultRos.ini b/Config/DefaultRos.ini
@@ -1,5 +1,5 @@
 
 
 [/Script/UROSBridge.RosSettings]
-ROSBridgeServerHost=192.168.101.245
+ROSBridgeServerHost=192.168.56.101
 
diff --git a/Config/SteamVRBindings/steamvr_manifest.json b/Config/SteamVRBindings/steamvr_manifest.json
@@ -183,14 +183,6 @@
 			"name": "/actions/main/in/RightGraspHelper",
 			"type": "boolean"
 		},
-		{
-			"name": "/actions/main/in/SLAudioStartTrigger",
-			"type": "boolean"
-		},
-		{
-			"name": "/actions/main/in/SLAudioStopTrigger",
-			"type": "boolean"
-		},
 		{
 			"name": "/actions/main/in/LeftGrasp axis",
 			"type": "vector1"
@@ -449,8 +441,6 @@
 			"/actions/main/in/SLTrigger": "SLTrigger",
 			"/actions/main/in/LeftGraspHelper": "LeftGraspHelper",
 			"/actions/main/in/RightGraspHelper": "RightGraspHelper",
-			"/actions/main/in/SLAudioStartTrigger": "SLAudioStartTrigger",
-			"/actions/main/in/SLAudioStopTrigger": "SLAudioStopTrigger",
 			"/actions/main/in/LeftGrasp axis": "LeftGrasp",
 			"/actions/main/in/RightGrasp axis": "RightGrasp",
 			"/actions/main": "Main Game Actions"

diff --git a/Config/SteamVRBindings/vive_controller.json b/Config/SteamVRBindings/vive_controller.json
@@ -141,36 +141,6 @@
 						}
 					}
 				},
-				{
-					"mode": "dpad",
-					"path": "/user/hand/right/input/trackpad",
-					"parameters":
-					{
-						"sub_mode": "click"
-					},
-					"inputs":
-					{
-						"north":
-						{
-							"output": "/actions/main/in/SLAudioStartTrigger"
-						}
-					}
-				},
-				{
-					"mode": "dpad",
-					"path": "/user/hand/right/input/trackpad",
-					"parameters":
-					{
-						"sub_mode": "click"
-					},
-					"inputs":
-					{
-						"south":
-						{
-							"output": "/actions/main/in/SLAudioStopTrigger"
-						}
-					}
-				},
 				{
 					"mode": "trigger",
 					"path": "/user/hand/left/input/trigger",

diff --git a/Content/Levels/Laborraum.umap b/Content/Levels/Laborraum.umap
diff --git a/Content/Maps/Apartment/Breakfast_Map_1.umap b/Content/Maps/Apartment/Breakfast_Map_1.umap
diff --git a/Content/Maps/Apartment/Main.umap b/Content/Maps/Apartment/Main.umap
diff --git a/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMBlueCup.uasset b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMBlueCup.uasset
diff --git a/Content/Maps/Simulation/PouringSimulator_1.umap b/Content/Maps/Simulation/PouringSimulator_1.umap
diff --git a/Content/Maps/Simulation/SM_Blue_cup/BP_SM_Blue_Cup25.uasset b/Content/Maps/Simulation/SM_Blue_cup/BP_SM_Blue_Cup25.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup100.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup100.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup25.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup25.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup50.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup50.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup75.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_BigBowl/BP_SM_Blue_Cup75.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup100.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup100.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup25.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup25.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup50.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup50.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup75.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Blue_Cup/BP_SM_Blue_Cup75.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup100.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup100.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup25.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup25.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup50.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup50.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup75.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_Cup/BP_SM_Blue_Cup75.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_EspressoCup/BP_SM_Blue_Cup100.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_EspressoCup/BP_SM_Blue_Cup100.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup100.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup100.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup25.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup25.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup50.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup50.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup75.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_MilkPitcher/BP_SM_Blue_Cup75.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup100.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup100.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup25.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup25.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup50.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup50.uasset
diff --git a/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup75.uasset b/Content/Maps/Simulation/SM_Blue_cup/DestSM_RedBowl/BP_SM_Blue_Cup75.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl25.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl75.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl75.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl25.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl75.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BigBowl/BP_SMBigBowl75.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl10.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl10.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl25.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl75.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl75.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl10.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl10.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl25.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl75.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl75.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl25.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl75.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl75.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl25.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl75.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl75.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl25.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl75.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl75.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl25.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl75.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMBigBowl75.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl10.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl10.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl25.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl10.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl10.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl25.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl75.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl75.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl25.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl50.uasset
diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl75.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_RedBowl/BP_SMRedBowl75.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup75.uasset b/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup75.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup25.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup25.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup50.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup75.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup75.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup100_old.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup100_old.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup25.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup25.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup50.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup75.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_Cup/BP_SMCup75.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_EspressoCup/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_EspressoCup/BP_SMCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup25.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup25.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup50.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup75.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup75.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup75.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup75.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher100.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher25.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher25.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher50.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher50.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher75.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMMilkPitcher75.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMRedBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher100.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher25.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher25.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher50.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher50.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher75.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_BigBowl/BP_SMMilkPitcher75.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher100.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher25.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher25.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher50.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher50.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher75.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMMilkPitcher75.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMRedBowl100.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher100.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher25.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher25.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher50.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher50.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher75.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Cup/BP_SMMilkPitcher75.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_EspressoCup/BP_SMMilkPitcher100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_EspressoCup/BP_SMMilkPitcher100.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher100.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher25.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher25.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher25_2.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher25_2.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher50.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher50.uasset
diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher75.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_MilkPitcher/BP_SMMilkPitcher75.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup25.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup25.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup75.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup75.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup25.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup25.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup75.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup75.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup25.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup25.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup75.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup75.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup25.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup25.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup75.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup75.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup25.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup25.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup75.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup75.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup100.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup25.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup25.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup50.uasset
diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup75.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/SM_EspressoCup/BP_SMEspressoCup75.uasset
diff --git a/Content/Models/IAIKitchen/Dishes/BigBowl/SM_BigBowl_01.uasset b/Content/Models/IAIKitchen/Dishes/BigBowl/SM_BigBowl_01.uasset
diff --git a/Content/Models/IAIKitchen/Dishes/JeroenCup/SM_BlueCylinderCup.uasset b/Content/Models/IAIKitchen/Dishes/JeroenCup/SM_BlueCylinderCup.uasset
diff --git a/Content/Models/Misc/PouringParticle/BP_CupWithSphereParticles.uasset b/Content/Models/Misc/PouringParticle/BP_CupWithSphereParticles.uasset
diff --git a/Content/Models/Misc/PouringParticle/BP_SM_BigBowl.uasset b/Content/Models/Misc/PouringParticle/BP_SM_BigBowl.uasset
diff --git a/Content/Models/Misc/PouringParticle/BP_SM_Table.uasset b/Content/Models/Misc/PouringParticle/BP_SM_Table.uasset
diff --git a/Content/Models/Misc/PouringParticle/BP_SphereParticlesWorks.uasset b/Content/Models/Misc/PouringParticle/BP_SphereParticlesWorks.uasset
diff --git a/Content/Models/Misc/PouringParticle/SM_BigBowl_1.uasset b/Content/Models/Misc/PouringParticle/SM_BigBowl_1.uasset
diff --git a/Plugins/USemLog b/Plugins/USemLog
diff --git a/SavedData.csv b/SavedData.csv
@@ -0,0 +1,4 @@
+SourceContainer,DestinationContainer,PouringTime,RotationSpeed,MaximumAngle,SourcePosX,SourcePosY,SourcePosZ,DestPosX,DestPosY,DestPosZ,NumberOfParticles,IsPouringFailed
+SM_Cup,SM_Blue_Cup,2.485097,1.0,110.0,-0.06665,-6.788941,63.928764,-0.066666,0.375078,49.741776,132,True
+SM_Cup,SM_Blue_Cup,1.969125,1.0,110.0,-0.06665,-6.788941,63.928764,-0.066666,0.375078,49.741776,132,True
+
diff --git a/Source/RobCoG/Private/BP_ParentActor.cpp b/Source/RobCoG/Private/BP_ParentActor.cpp
@@ -37,7 +37,7 @@ void ABP_ParentActor::EndPlay(const EEndPlayReason::Type reason) {
 	SaveDirectory += TEXT("SavedData.csv");
 
 	// if overwriting is allowed then overwrite the file each time the game starts.
-	FString FinalString = TEXT("SourceContainer,DestinationContainer,PouringTime,RotationSpeed,MinimumAngle,MaximumAngle,SourcePosX,SourcePosY,SourcePosZ,DestPosX,DestPosY,DestPosZ,NumberOfParticles,IsPouringFailed");
+	FString FinalString = TEXT("SourceContainer,DestinationContainer,PouringTime,RotationSpeed,MaximumAngle,SourcePosX,SourcePosY,SourcePosZ,DestPosX,DestPosY,DestPosZ,NumberOfParticles,IsPouringFailed");
 	FinalString += LINE_TERMINATOR;
 
 	FString FinalOutPutStr = "";
@@ -74,11 +74,11 @@ void ABP_ParentActor::EndPlay(const EEndPlayReason::Type reason) {
 
 		// this is basically time stamps from first and last raws and getting how long it took to pour.
 		double PouringTime = 0.0;
-		FString MinimumPouringAngle, MaximumPouringAngle;
+		FString MaximumPouringAngle;
 		// check if all data are correctly logged from the blueprint
 		if(LastRawArrayData.Num() > 5 && FirstRawArrayData.Num() > 5) {
 			PouringTime = FCString::Atod(*LastRawArrayData[2]) - FCString::Atod(*FirstRawArrayData[2]);
-			MinimumPouringAngle = FirstRawArrayData[4];
+			//MinimumPouringAngle = FirstRawArrayData[4];
 			MaximumPouringAngle = LastRawArrayData[4];
 		}
 
@@ -95,7 +95,7 @@ void ABP_ParentActor::EndPlay(const EEndPlayReason::Type reason) {
 				FinalOutPutStr += FString::SanitizeFloat(PouringTime) + TEXT(",");
 			}
 			else if (i == 4) {
-				FinalOutPutStr += MinimumPouringAngle + TEXT(",");
+				//FinalOutPutStr += MinimumPouringAngle + TEXT(",");
 				FinalOutPutStr += MaximumPouringAngle + TEXT(",");
 			}
 			else {
+20 −2		Source/USemLog/Classes/Events/SLContactEventHandler.h
+12 −2		Source/USemLog/Classes/Events/SLPouringEvent.h
+4 −1		Source/USemLog/Classes/Knowrob/SLKRRestClient.h
+3 −2		Source/USemLog/Private/Events/SLContactEvent.cpp
+96 −45		Source/USemLog/Private/Events/SLContactEventHandler.cpp
+2 −1		Source/USemLog/Private/Events/SLContainerEvent.cpp
+2 −1		Source/USemLog/Private/Events/SLGraspEvent.cpp
+2 −1		Source/USemLog/Private/Events/SLPickUpEvent.cpp
+218 −7		Source/USemLog/Private/Events/SLPouringEvent.cpp
+2 −1		Source/USemLog/Private/Events/SLPreGraspEvent.cpp
+2 −1		Source/USemLog/Private/Events/SLPutDownEvent.cpp
+2 −1		Source/USemLog/Private/Events/SLReachEvent.cpp
+2 −1		Source/USemLog/Private/Events/SLSlicingEvent.cpp
+2 −1		Source/USemLog/Private/Events/SLSlideEvent.cpp
+2 −1		Source/USemLog/Private/Events/SLSupportedByEvent.cpp
+2 −1		Source/USemLog/Private/Events/SLTransportEvent.cpp
+22 −3		Source/USemLog/Private/Knowrob/SLKRRestClient.cpp
+25 −0		Source/USemLog/Private/Runtime/SLLoggerManager.cpp
+1 −1		Source/USemLog/Private/Speech/SLSpeechRestClient.cpp