diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index ab81606da..6f8f30975 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -83,11 +83,6 @@ bUseMouseForTouch=False bEnableMouseSmoothing=True bEnableFOVScaling=True bCaptureMouseOnLaunch=True -bEnableLegacyInputScales=True -bEnableMotionControls=True -bFilterInputByPlatformUser=False -bShouldFlushPressedKeysOnViewportFocusLost=True -bEnableDynamicComponentInputBinding=True bAlwaysShowTouchInterface=False bShowConsoleOnFourFingerTap=True bEnableGestureRecognizer=False @@ -113,6 +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) +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/SteamVRBindings/gamepad.json b/Config/SteamVRBindings/gamepad.json index 7e068dab8..3b8fbd952 100644 --- a/Config/SteamVRBindings/gamepad.json +++ b/Config/SteamVRBindings/gamepad.json @@ -9,5 +9,5 @@ "sources": [] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/holographic_controller.json b/Config/SteamVRBindings/holographic_controller.json index 1d6b62ae6..e856e800d 100644 --- a/Config/SteamVRBindings/holographic_controller.json +++ b/Config/SteamVRBindings/holographic_controller.json @@ -40,5 +40,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/hpmotioncontroller.json b/Config/SteamVRBindings/hpmotioncontroller.json index c1311f5eb..227e930ba 100644 --- a/Config/SteamVRBindings/hpmotioncontroller.json +++ b/Config/SteamVRBindings/hpmotioncontroller.json @@ -40,5 +40,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/indexhmd.json b/Config/SteamVRBindings/indexhmd.json index 1062aca52..684b27865 100644 --- a/Config/SteamVRBindings/indexhmd.json +++ b/Config/SteamVRBindings/indexhmd.json @@ -9,5 +9,5 @@ "sources": [] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/knuckles.json b/Config/SteamVRBindings/knuckles.json index df89f0f1c..60a8c06b9 100644 --- a/Config/SteamVRBindings/knuckles.json +++ b/Config/SteamVRBindings/knuckles.json @@ -40,5 +40,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/oculus_touch.json b/Config/SteamVRBindings/oculus_touch.json index bd9f79839..3738b8a8b 100644 --- a/Config/SteamVRBindings/oculus_touch.json +++ b/Config/SteamVRBindings/oculus_touch.json @@ -40,5 +40,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/rift.json b/Config/SteamVRBindings/rift.json index 6a8a0065d..3a282d0d8 100644 --- a/Config/SteamVRBindings/rift.json +++ b/Config/SteamVRBindings/rift.json @@ -9,5 +9,5 @@ "sources": [] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/steamvr_manifest.json b/Config/SteamVRBindings/steamvr_manifest.json index 435cf32d3..917c6cbde 100644 --- a/Config/SteamVRBindings/steamvr_manifest.json +++ b/Config/SteamVRBindings/steamvr_manifest.json @@ -183,6 +183,14 @@ "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" @@ -199,6 +207,106 @@ } ], "default_bindings": [ + { + "controller_type": "gamepad", + "binding_url": "gamepad.json" + }, + { + "controller_type": "holographic_controller", + "binding_url": "holographic_controller.json" + }, + { + "controller_type": "hpmotioncontroller", + "binding_url": "hpmotioncontroller.json" + }, + { + "controller_type": "indexhmd", + "binding_url": "indexhmd.json" + }, + { + "controller_type": "knuckles", + "binding_url": "knuckles.json" + }, + { + "controller_type": "oculus_touch", + "binding_url": "oculus_touch.json" + }, + { + "controller_type": "rift", + "binding_url": "rift.json" + }, + { + "controller_type": "vive", + "binding_url": "vive.json" + }, + { + "controller_type": "vive_controller", + "binding_url": "vive_controller.json" + }, + { + "controller_type": "vive_cosmos_controller", + "binding_url": "vive_cosmos_controller.json" + }, + { + "controller_type": "vive_pro", + "binding_url": "vive_pro.json" + }, + { + "controller_type": "vive_tracker", + "binding_url": "vive_tracker.json" + }, + { + "controller_type": "vive_tracker_camera", + "binding_url": "vive_tracker_camera.json" + }, + { + "controller_type": "vive_tracker_chest", + "binding_url": "vive_tracker_chest.json" + }, + { + "controller_type": "vive_tracker_handed", + "binding_url": "vive_tracker_handed.json" + }, + { + "controller_type": "vive_tracker_keyboard", + "binding_url": "vive_tracker_keyboard.json" + }, + { + "controller_type": "vive_tracker_left_elbow", + "binding_url": "vive_tracker_left_elbow.json" + }, + { + "controller_type": "vive_tracker_left_foot", + "binding_url": "vive_tracker_left_foot.json" + }, + { + "controller_type": "vive_tracker_left_knee", + "binding_url": "vive_tracker_left_knee.json" + }, + { + "controller_type": "vive_tracker_left_shoulder", + "binding_url": "vive_tracker_left_shoulder.json" + }, + { + "controller_type": "vive_tracker_right_elbow", + "binding_url": "vive_tracker_right_elbow.json" + }, + { + "controller_type": "vive_tracker_right_foot", + "binding_url": "vive_tracker_right_foot.json" + }, + { + "controller_type": "vive_tracker_right_knee", + "binding_url": "vive_tracker_right_knee.json" + }, + { + "controller_type": "vive_tracker_right_shoulder", + "binding_url": "vive_tracker_right_shoulder.json" + }, + { + "controller_type": "vive_tracker_waist", + "binding_url": "vive_tracker_waist.json" + }, { "controller_type": "knuckles", "binding_url": "knuckles.json" @@ -341,6 +449,8 @@ "/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.json b/Config/SteamVRBindings/vive.json index 607daa27f..62f54462e 100644 --- a/Config/SteamVRBindings/vive.json +++ b/Config/SteamVRBindings/vive.json @@ -9,5 +9,5 @@ "sources": [] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_controller.json b/Config/SteamVRBindings/vive_controller.json index aaacb586a..56011b367 100644 --- a/Config/SteamVRBindings/vive_controller.json +++ b/Config/SteamVRBindings/vive_controller.json @@ -141,6 +141,36 @@ } } }, + { + "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", @@ -197,5 +227,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_cosmos_controller.json b/Config/SteamVRBindings/vive_cosmos_controller.json index 0bea4ba55..1fdd0e6be 100644 --- a/Config/SteamVRBindings/vive_cosmos_controller.json +++ b/Config/SteamVRBindings/vive_cosmos_controller.json @@ -40,5 +40,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_pro.json b/Config/SteamVRBindings/vive_pro.json index 5a61458ec..06f199159 100644 --- a/Config/SteamVRBindings/vive_pro.json +++ b/Config/SteamVRBindings/vive_pro.json @@ -9,5 +9,5 @@ "sources": [] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_tracker.json b/Config/SteamVRBindings/vive_tracker.json index 8852e9625..0c8c9a9ed 100644 --- a/Config/SteamVRBindings/vive_tracker.json +++ b/Config/SteamVRBindings/vive_tracker.json @@ -60,5 +60,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_tracker_camera.json b/Config/SteamVRBindings/vive_tracker_camera.json index 42436372b..529ddcddd 100644 --- a/Config/SteamVRBindings/vive_tracker_camera.json +++ b/Config/SteamVRBindings/vive_tracker_camera.json @@ -15,5 +15,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_tracker_chest.json b/Config/SteamVRBindings/vive_tracker_chest.json index 5c55217d4..a80b08b56 100644 --- a/Config/SteamVRBindings/vive_tracker_chest.json +++ b/Config/SteamVRBindings/vive_tracker_chest.json @@ -15,5 +15,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_tracker_handed.json b/Config/SteamVRBindings/vive_tracker_handed.json index d1005538f..609aad2e1 100644 --- a/Config/SteamVRBindings/vive_tracker_handed.json +++ b/Config/SteamVRBindings/vive_tracker_handed.json @@ -60,5 +60,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_tracker_keyboard.json b/Config/SteamVRBindings/vive_tracker_keyboard.json index 87d6e538b..224078b36 100644 --- a/Config/SteamVRBindings/vive_tracker_keyboard.json +++ b/Config/SteamVRBindings/vive_tracker_keyboard.json @@ -15,5 +15,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_tracker_left_elbow.json b/Config/SteamVRBindings/vive_tracker_left_elbow.json index 0b5840c84..8be22adf5 100644 --- a/Config/SteamVRBindings/vive_tracker_left_elbow.json +++ b/Config/SteamVRBindings/vive_tracker_left_elbow.json @@ -15,5 +15,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_tracker_left_foot.json b/Config/SteamVRBindings/vive_tracker_left_foot.json index ba1aa3e9e..af1e6c799 100644 --- a/Config/SteamVRBindings/vive_tracker_left_foot.json +++ b/Config/SteamVRBindings/vive_tracker_left_foot.json @@ -15,5 +15,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_tracker_left_knee.json b/Config/SteamVRBindings/vive_tracker_left_knee.json index 05d5b8aca..c55e04588 100644 --- a/Config/SteamVRBindings/vive_tracker_left_knee.json +++ b/Config/SteamVRBindings/vive_tracker_left_knee.json @@ -15,5 +15,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_tracker_left_shoulder.json b/Config/SteamVRBindings/vive_tracker_left_shoulder.json index f72899438..1ec407718 100644 --- a/Config/SteamVRBindings/vive_tracker_left_shoulder.json +++ b/Config/SteamVRBindings/vive_tracker_left_shoulder.json @@ -15,5 +15,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_tracker_right_elbow.json b/Config/SteamVRBindings/vive_tracker_right_elbow.json index 4095bbe86..1cc69ecd0 100644 --- a/Config/SteamVRBindings/vive_tracker_right_elbow.json +++ b/Config/SteamVRBindings/vive_tracker_right_elbow.json @@ -15,5 +15,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_tracker_right_foot.json b/Config/SteamVRBindings/vive_tracker_right_foot.json index 6ec59407a..8aa9410bb 100644 --- a/Config/SteamVRBindings/vive_tracker_right_foot.json +++ b/Config/SteamVRBindings/vive_tracker_right_foot.json @@ -15,5 +15,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_tracker_right_knee.json b/Config/SteamVRBindings/vive_tracker_right_knee.json index c7ec921cb..9766c0969 100644 --- a/Config/SteamVRBindings/vive_tracker_right_knee.json +++ b/Config/SteamVRBindings/vive_tracker_right_knee.json @@ -15,5 +15,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_tracker_right_shoulder.json b/Config/SteamVRBindings/vive_tracker_right_shoulder.json index e238eefbe..5923ea448 100644 --- a/Config/SteamVRBindings/vive_tracker_right_shoulder.json +++ b/Config/SteamVRBindings/vive_tracker_right_shoulder.json @@ -15,5 +15,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_tracker_waist.json b/Config/SteamVRBindings/vive_tracker_waist.json index c45b0f869..e45039dd9 100644 --- a/Config/SteamVRBindings/vive_tracker_waist.json +++ b/Config/SteamVRBindings/vive_tracker_waist.json @@ -15,5 +15,5 @@ ] } }, - "description": "" + "description": "RobCoG-18319896" } \ No newline at end of file diff --git a/Content/Levels/Laborraum.umap b/Content/Levels/Laborraum.umap index 765001430..7addfa30c 100644 Binary files a/Content/Levels/Laborraum.umap and b/Content/Levels/Laborraum.umap differ diff --git a/Content/Maps/Apartment/Main.umap b/Content/Maps/Apartment/Main.umap index c8765cc04..fba367082 100644 Binary files a/Content/Maps/Apartment/Main.umap and b/Content/Maps/Apartment/Main.umap differ diff --git a/Content/Maps/Simulation/BP_SimulatorActor.uasset b/Content/Maps/Simulation/BP_SimulatorActor.uasset index 1fc93367e..0c42ee0d6 100644 Binary files a/Content/Maps/Simulation/BP_SimulatorActor.uasset and b/Content/Maps/Simulation/BP_SimulatorActor.uasset differ diff --git a/Content/Maps/Simulation/BP_SimulatorActor_15ParticlesBigBowl.uasset b/Content/Maps/Simulation/BP_SimulatorActor_15ParticlesBigBowl.uasset index d5bebb7fe..7b16f2eb4 100644 Binary files a/Content/Maps/Simulation/BP_SimulatorActor_15ParticlesBigBowl.uasset and b/Content/Maps/Simulation/BP_SimulatorActor_15ParticlesBigBowl.uasset differ diff --git a/Content/Maps/Simulation/BP_SimulatorActor_28Particles.uasset b/Content/Maps/Simulation/BP_SimulatorActor_28Particles.uasset index b30b5af01..be685639f 100644 Binary files a/Content/Maps/Simulation/BP_SimulatorActor_28Particles.uasset and b/Content/Maps/Simulation/BP_SimulatorActor_28Particles.uasset differ diff --git a/Content/Maps/Simulation/BP_SimulatorActor_BigSource_SmallDest.uasset b/Content/Maps/Simulation/BP_SimulatorActor_BigSource_SmallDest.uasset index 2483b7c8c..155d63c8a 100644 Binary files a/Content/Maps/Simulation/BP_SimulatorActor_BigSource_SmallDest.uasset and b/Content/Maps/Simulation/BP_SimulatorActor_BigSource_SmallDest.uasset differ diff --git a/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMBigBowl.uasset b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMBigBowl.uasset new file mode 100644 index 000000000..f7ea10570 Binary files /dev/null and b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMBigBowl.uasset differ diff --git a/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMBlueCup.uasset b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMBlueCup.uasset new file mode 100644 index 000000000..c31423ba5 Binary files /dev/null and b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMBlueCup.uasset differ diff --git a/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMCup.uasset b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMCup.uasset new file mode 100644 index 000000000..f94404ff8 Binary files /dev/null and b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMCup.uasset differ diff --git a/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMMilkPitcher.uasset b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMMilkPitcher.uasset new file mode 100644 index 000000000..73954aea8 Binary files /dev/null and b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMMilkPitcher.uasset differ diff --git a/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMRedBowl.uasset b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMRedBowl.uasset new file mode 100644 index 000000000..81300c643 Binary files /dev/null and b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SMRedBowl.uasset differ diff --git a/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SM_EspressoCup.uasset b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SM_EspressoCup.uasset new file mode 100644 index 000000000..1e2d9dbcc Binary files /dev/null and b/Content/Maps/Simulation/MaxFullness/BP_Simulator_MaxFullness_SM_EspressoCup.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCupDestBigBowl/BP_SimulatorActor_15Particles.uasset b/Content/Maps/Simulation/Old_SourceSMCupDestBigBowl/BP_SimulatorActor_15Particles.uasset similarity index 61% rename from Content/Maps/Simulation/SourceSMCupDestBigBowl/BP_SimulatorActor_15Particles.uasset rename to Content/Maps/Simulation/Old_SourceSMCupDestBigBowl/BP_SimulatorActor_15Particles.uasset index 37289ef9d..b0063352c 100644 Binary files a/Content/Maps/Simulation/SourceSMCupDestBigBowl/BP_SimulatorActor_15Particles.uasset and b/Content/Maps/Simulation/Old_SourceSMCupDestBigBowl/BP_SimulatorActor_15Particles.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCupDestBigBowl/BP_SimulatorActor_30ParticlesMiddlePosition.uasset b/Content/Maps/Simulation/Old_SourceSMCupDestBigBowl/BP_SimulatorActor_30ParticlesMiddlePosition.uasset similarity index 63% rename from Content/Maps/Simulation/SourceSMCupDestBigBowl/BP_SimulatorActor_30ParticlesMiddlePosition.uasset rename to Content/Maps/Simulation/Old_SourceSMCupDestBigBowl/BP_SimulatorActor_30ParticlesMiddlePosition.uasset index 4ef3b0202..9abe9ab7e 100644 Binary files a/Content/Maps/Simulation/SourceSMCupDestBigBowl/BP_SimulatorActor_30ParticlesMiddlePosition.uasset and b/Content/Maps/Simulation/Old_SourceSMCupDestBigBowl/BP_SimulatorActor_30ParticlesMiddlePosition.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCupDestBigBowl/BP_SimulatorActor_15ParticlesMiddlePosition.uasset b/Content/Maps/Simulation/Old_SourceSMCupDestBigBowl/old_wrongScale/BP_SimulatorActor_15ParticlesMiddlePosition.uasset similarity index 54% rename from Content/Maps/Simulation/SourceSMCupDestBigBowl/BP_SimulatorActor_15ParticlesMiddlePosition.uasset rename to Content/Maps/Simulation/Old_SourceSMCupDestBigBowl/old_wrongScale/BP_SimulatorActor_15ParticlesMiddlePosition.uasset index 621b953db..c1c141945 100644 Binary files a/Content/Maps/Simulation/SourceSMCupDestBigBowl/BP_SimulatorActor_15ParticlesMiddlePosition.uasset and b/Content/Maps/Simulation/Old_SourceSMCupDestBigBowl/old_wrongScale/BP_SimulatorActor_15ParticlesMiddlePosition.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCupDestBigBowl/BP_SimulatorActor_30Particles.uasset b/Content/Maps/Simulation/Old_SourceSMCupDestBigBowl/old_wrongScale/BP_SimulatorActor_30Particles.uasset similarity index 65% rename from Content/Maps/Simulation/SourceSMCupDestBigBowl/BP_SimulatorActor_30Particles.uasset rename to Content/Maps/Simulation/Old_SourceSMCupDestBigBowl/old_wrongScale/BP_SimulatorActor_30Particles.uasset index 600b2cc04..b698702ea 100644 Binary files a/Content/Maps/Simulation/SourceSMCupDestBigBowl/BP_SimulatorActor_30Particles.uasset and b/Content/Maps/Simulation/Old_SourceSMCupDestBigBowl/old_wrongScale/BP_SimulatorActor_30Particles.uasset differ diff --git a/Content/Maps/Simulation/PouringSimulator_single.umap b/Content/Maps/Simulation/PouringSimulator_1.umap similarity index 91% rename from Content/Maps/Simulation/PouringSimulator_single.umap rename to Content/Maps/Simulation/PouringSimulator_1.umap index 547b2ae3e..c2310287a 100644 Binary files a/Content/Maps/Simulation/PouringSimulator_single.umap and b/Content/Maps/Simulation/PouringSimulator_1.umap differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl100.uasset new file mode 100644 index 000000000..dddea1703 Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl50.uasset new file mode 100644 index 000000000..a55b1fe7e Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSMCup/BP_SMBigBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl10.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl10.uasset new file mode 100644 index 000000000..cfe9cba5c Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl10.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl25.uasset new file mode 100644 index 000000000..03a5b98f2 Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl25.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl50.uasset new file mode 100644 index 000000000..687c704b7 Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_BlueCup/BP_SMBigBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset new file mode 100644 index 000000000..58a0ecea7 Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl10.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl10.uasset new file mode 100644 index 000000000..554609d17 Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl10.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl100.uasset new file mode 100644 index 000000000..06a86fbca Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl25.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl25.uasset new file mode 100644 index 000000000..eb21fed10 Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl25.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl50.uasset new file mode 100644 index 000000000..bf3d8a971 Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_MilkPitcher/BP_SMBigBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl100.uasset new file mode 100644 index 000000000..0e61db4f3 Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl50.uasset new file mode 100644 index 000000000..6a348b474 Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/DestSM_RedBowl/BP_SMBigBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/old/BP_SimulatorActor_BigBowl.uasset b/Content/Maps/Simulation/SourceBigBowl/old/BP_SimulatorActor_BigBowl.uasset new file mode 100644 index 000000000..663564cd7 Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/old/BP_SimulatorActor_BigBowl.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowlDestSMCup/BP_SimulatorActor_BigSource_SmallDest.uasset b/Content/Maps/Simulation/SourceBigBowl/old/BP_SimulatorActor_BigSource_SmallDest.uasset similarity index 57% rename from Content/Maps/Simulation/SourceBigBowlDestSMCup/BP_SimulatorActor_BigSource_SmallDest.uasset rename to Content/Maps/Simulation/SourceBigBowl/old/BP_SimulatorActor_BigSource_SmallDest.uasset index a670d043f..de22ebf63 100644 Binary files a/Content/Maps/Simulation/SourceBigBowlDestSMCup/BP_SimulatorActor_BigSource_SmallDest.uasset and b/Content/Maps/Simulation/SourceBigBowl/old/BP_SimulatorActor_BigSource_SmallDest.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowl/old/BP_SimulatorActor_BigSource_SmallDest1.uasset b/Content/Maps/Simulation/SourceBigBowl/old/BP_SimulatorActor_BigSource_SmallDest1.uasset new file mode 100644 index 000000000..e3e3caab0 Binary files /dev/null and b/Content/Maps/Simulation/SourceBigBowl/old/BP_SimulatorActor_BigSource_SmallDest1.uasset differ diff --git a/Content/Maps/Simulation/SourceBigBowlDestSMCup/BP_SimulatorActor_BigBowl.uasset b/Content/Maps/Simulation/SourceBigBowlDestSMCup/BP_SimulatorActor_BigBowl.uasset deleted file mode 100644 index 9a9dfec51..000000000 Binary files a/Content/Maps/Simulation/SourceBigBowlDestSMCup/BP_SimulatorActor_BigBowl.uasset and /dev/null differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl100.uasset new file mode 100644 index 000000000..c2eb9d7c6 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl25.uasset new file mode 100644 index 000000000..bfa4d7af5 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl25.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl50.uasset new file mode 100644 index 000000000..c1370165d Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSMCup/BP_SMRedBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl100.uasset new file mode 100644 index 000000000..c4de1053c Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl50.uasset new file mode 100644 index 000000000..173681d1f Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_BigBowl/BP_SMBigBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl10.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl10.uasset new file mode 100644 index 000000000..fdc70217c Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl10.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl100.uasset new file mode 100644 index 000000000..dfbe11d55 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl25.uasset new file mode 100644 index 000000000..68df4bbe9 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl25.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl50.uasset new file mode 100644 index 000000000..373fa1150 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_BlueCup/BP_SMRedBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset new file mode 100644 index 000000000..21d3736e8 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_EspressoCup/BP_SMBigBowl10.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl10.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl10.uasset new file mode 100644 index 000000000..293a47b23 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl10.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl100.uasset new file mode 100644 index 000000000..742bea107 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl25.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl25.uasset new file mode 100644 index 000000000..eff12f450 Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl25.uasset differ diff --git a/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl50.uasset b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl50.uasset new file mode 100644 index 000000000..cdaacb8ce Binary files /dev/null and b/Content/Maps/Simulation/SourceRedBowl/DestSM_MilkPitcher/BP_SMRedBowl50.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/BP_Sim_SMCup_SM_EspressoCup.uasset b/Content/Maps/Simulation/SourceSMCup/BP_Sim_SMCup_SM_EspressoCup.uasset new file mode 100644 index 000000000..b3e2ed18c Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/BP_Sim_SMCup_SM_EspressoCup.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/BP_SimulatorActor_15Particles1.uasset b/Content/Maps/Simulation/SourceSMCup/BP_SimulatorActor_15Particles1.uasset new file mode 100644 index 000000000..9f8d7ddea Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/BP_SimulatorActor_15Particles1.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/BP_SimulatorActor_15Particles1_C.uasset b/Content/Maps/Simulation/SourceSMCup/BP_SimulatorActor_15Particles1_C.uasset new file mode 100644 index 000000000..b40675ad9 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/BP_SimulatorActor_15Particles1_C.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/Default__BP_SimulatorActor_15Particles1_C.uasset b/Content/Maps/Simulation/SourceSMCup/Default__BP_SimulatorActor_15Particles1_C.uasset new file mode 100644 index 000000000..2429562f1 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/Default__BP_SimulatorActor_15Particles1_C.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup100.uasset new file mode 100644 index 000000000..d894da0ff Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup25.uasset b/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup25.uasset new file mode 100644 index 000000000..ee235ea60 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup25.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup50.uasset b/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup50.uasset new file mode 100644 index 000000000..20c70d68a Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSMBigBowl/BP_SMCup50.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup100.uasset new file mode 100644 index 000000000..e172bb68c Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup25.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup25.uasset new file mode 100644 index 000000000..2924c4b93 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup25.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup50.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup50.uasset new file mode 100644 index 000000000..bb7b4c4eb Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_BlueCup/BP_SMCup50.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_EspressoCup/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_EspressoCup/BP_SMCup100.uasset new file mode 100644 index 000000000..8703295a6 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_EspressoCup/BP_SMCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup100.uasset new file mode 100644 index 000000000..e00a4ded6 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup25.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup25.uasset new file mode 100644 index 000000000..e3984425e Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup25.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup50.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup50.uasset new file mode 100644 index 000000000..7ed2a6e19 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_MilkPitcher/BP_SMCup50.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup100.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup100.uasset new file mode 100644 index 000000000..c33df3dcb Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup25.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup25.uasset new file mode 100644 index 000000000..2143c4cfa Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup25.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup50.uasset b/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup50.uasset new file mode 100644 index 000000000..875272834 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMCup/DestSM_RedBowl/BP_SMCup50.uasset differ diff --git a/Content/Maps/Simulation/SourceSMCupDestSmall/BP_SimulatorActor_15Particles1.uasset b/Content/Maps/Simulation/SourceSMCupDestSmall/BP_SimulatorActor_15Particles1.uasset deleted file mode 100644 index bc1d4aaf8..000000000 Binary files a/Content/Maps/Simulation/SourceSMCupDestSmall/BP_SimulatorActor_15Particles1.uasset and /dev/null differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMRedBowl100.uasset new file mode 100644 index 000000000..6b80d8eaf Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSMRedBawl/BP_SMRedBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMRedBowl100.uasset b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMRedBowl100.uasset new file mode 100644 index 000000000..86bf13711 Binary files /dev/null and b/Content/Maps/Simulation/SourceSMMilkPitcher/DestSM_Blue_Cup/BP_SMRedBowl100.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup100.uasset new file mode 100644 index 000000000..2fc31bba7 Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup50.uasset new file mode 100644 index 000000000..a61aa7d27 Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMBigBowl/BP_SMEspressoCup50.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup100.uasset new file mode 100644 index 000000000..c5807384c Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup50.uasset new file mode 100644 index 000000000..f58690c0b Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMCup/BP_SMEspressoCup50.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup100.uasset new file mode 100644 index 000000000..6b0f3456f Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup50.uasset new file mode 100644 index 000000000..9d3f5f53f Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSMMilkPitcher/BP_SMEspressoCup50.uasset differ 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 new file mode 100644 index 000000000..ffef360c7 Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup100.uasset differ 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 new file mode 100644 index 000000000..fa0e31348 Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_Blue_Cup/BP_SMEspressoCup50.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup100.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup100.uasset new file mode 100644 index 000000000..b63b99b6f Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup100.uasset differ diff --git a/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup50.uasset b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup50.uasset new file mode 100644 index 000000000..6d43007de Binary files /dev/null and b/Content/Maps/Simulation/SourceSM_espressoCup/DestSM_RedBowl/BP_SMEspressoCup50.uasset differ diff --git a/Content/Models/IAIKitchen/Dishes/BigBowl/SM_BigBowl.uasset b/Content/Models/IAIKitchen/Dishes/BigBowl/SM_BigBowl.uasset index 749346561..03f0b9ad8 100644 Binary files a/Content/Models/IAIKitchen/Dishes/BigBowl/SM_BigBowl.uasset and b/Content/Models/IAIKitchen/Dishes/BigBowl/SM_BigBowl.uasset differ diff --git a/Content/Models/IAIKitchen/Dishes/JeroenCup/SM_BlueCylinderCup.uasset b/Content/Models/IAIKitchen/Dishes/JeroenCup/SM_BlueCylinderCup.uasset index cf020983f..eae7793a1 100644 Binary files a/Content/Models/IAIKitchen/Dishes/JeroenCup/SM_BlueCylinderCup.uasset and b/Content/Models/IAIKitchen/Dishes/JeroenCup/SM_BlueCylinderCup.uasset differ diff --git a/Content/Models/SM_Bowl.uasset b/Content/Models/SM_Bowl.uasset index 092b2c46c..307269846 100644 Binary files a/Content/Models/SM_Bowl.uasset and b/Content/Models/SM_Bowl.uasset differ diff --git a/Plugins/USemLog b/Plugins/USemLog index 3924eedc8..f60e093fe 160000 --- a/Plugins/USemLog +++ b/Plugins/USemLog @@ -1 +1 @@ -Subproject commit 3924eedc85d9b435d13f15dfe886eee645e2945b +Subproject commit f60e093fe5e10cdc39d7676b673cca61a9bb23a7 diff --git a/REST_GET_CALL.txt b/REST_GET_CALL.txt deleted file mode 100644 index 5f89d5c8d..000000000 --- a/REST_GET_CALL.txt +++ /dev/null @@ -1,111 +0,0 @@ -FString FSLKRRestClient::SendCreateActorRequest(FString create_actor_url) { - FString Return_Actor; - FHttpRequestRef Request = FHttpModule::Get().CreateRequest(); - // - FString FINAL_URL = URL + create_actor_url; - Request->SetURL(FINAL_URL); - Request->SetVerb((TEXT("GET"))); - Request->SetHeader(TEXT("Content-Type"), TEXT("application/json")); - Request->OnProcessRequestComplete().BindLambda( - // Here, we "capture" the 'this' pointer (the "&"), so our lambda can call this - // class's methods in the callback. - [&]( - FHttpRequestPtr Request, - FHttpResponsePtr Response, - bool connectedSuccessfully) mutable { - - if (connectedSuccessfully) { - - UE_LOG(LogTemp, Display, TEXT("Successfully connected to the server")); - // We should have a JSON response - attempt to process it. - FString ResponseJsonString = *Response->GetContentAsString(); //Json converted to FString - //UE_LOG(LogTemp, Display, TEXT("Response %s"), *ResponseJsonString); // log the response as string - - TSharedPtr JsonResponseObject; - - // Create a reader pointer to read the json data - TSharedRef> Reader = TJsonReaderFactory<>::Create(Response->GetContentAsString()); - - // Deserialize the json data given Reader and the actual object to deserialize - if (FJsonSerializer::Deserialize(Reader, JsonResponseObject) && JsonResponseObject.IsValid()) { - //Get the value of the json object by field name - Return_Actor = JsonResponseObject->GetStringField("Actor"); - - //UE_LOG(LogTemp, Display, TEXT("Actor found: %s"), *Return_Actor); // log actor as string - } - } - else { - switch (Request->GetStatus()) { - case EHttpRequestStatus::Failed_ConnectionError: - UE_LOG(LogTemp, Error, TEXT("Connection failed.")); - default: - UE_LOG(LogTemp, Error, TEXT("Request failed.")); - } - } - }); - Request->ProcessRequest(); - return Return_Actor; -} - - - -TArray FSLKRRestClient::SendGetActorsRequest(FString find_all_actors_url) { - - TArray Return_Actors; - FHttpRequestRef Request = FHttpModule::Get().CreateRequest(); - // - FString FINAL_URL = URL + find_all_actors_url; - Request->SetURL(FINAL_URL); - Request->SetVerb((TEXT("GET"))); - Request->SetHeader(TEXT("Content-Type"), TEXT("application/json")); - Request->OnProcessRequestComplete().BindLambda( - // Here, we "capture" the 'this' pointer (the "&"), so our lambda can call this - // class's methods in the callback. - [&]( - FHttpRequestPtr Request, - FHttpResponsePtr Response, - bool connectedSuccessfully) mutable { - - if (connectedSuccessfully) { - - UE_LOG(LogTemp, Display, TEXT("Successfully connected to the server")); - // We should have a JSON response - attempt to process it. - FString ResponseJsonString = *Response->GetContentAsString(); //Json converted to FString - //UE_LOG(LogTemp, Display, TEXT("Response %s"), *ResponseJsonString); // log the response as string - - // Array of json objects at top level of json. - // It is important to note here that if the response has - // an array then only TArray is correctly deserialized. - TArray> JsonArray; - - // Create a reader pointer to read the json data - TSharedRef> Reader = TJsonReaderFactory<>::Create(ResponseJsonString); - - // Deserialize the json data given Reader and the actual object to deserialize - if (FJsonSerializer::Deserialize(Reader, JsonArray) && JsonArray.Num() != 0) { - //Get the value of the json object by field name - FString actor = JsonArray[0]->AsObject()->GetStringField("Actor"); - Return_Actors.Emplace(actor); - //UE_LOG(LogTemp, Display, TEXT("Actor found: %s"), *actor); // log actor as string - } - } - else { - switch (Request->GetStatus()) { - case EHttpRequestStatus::Failed_ConnectionError: - UE_LOG(LogTemp, Error, TEXT("Connection failed.")); - default: - UE_LOG(LogTemp, Error, TEXT("Request failed.")); - } - } - }); - Request->ProcessRequest(); - - if (Return_Actors.Num() == 0) { - UE_LOG(LogTemp, Display, TEXT("There are no actors in the knowedge base, please create one!")); - // create an actor - FString actor = SendCreateActorRequest(TEXT("create_actor")); - Return_Actors.Emplace(actor); - UE_LOG(LogTemp, Display, TEXT("Actor created: %s"), *actor); - } - return Return_Actors; -} \ No newline at end of file diff --git a/SavedData.csv b/SavedData.csv deleted file mode 100644 index 2b4cb1a46..000000000 --- a/SavedData.csv +++ /dev/null @@ -1,20 +0,0 @@ -SourceContainer,DestinationContainer,PouringTime,RotationSpeed,MinimumAngle,MaximumAngle,PosDiffX,PosDiffY,PosDiffZ,IsPouringFailed -SM_Cup,SM_EspressoCup,0.75472,1.0,94.999863,130.999817,0.149391,3.776699,10.722626,False -SM_Cup,SM_EspressoCup,0.429797,1.0,100.999901,130.999817,0.149391,3.776699,10.722626,False -SM_Cup,SM_EspressoCup,0.462801,1.0,96.999855,130.999817,0.149391,3.776699,10.722626,False -SM_Cup,SM_EspressoCup,0.41035,1.0,101.999924,130.999817,0.149391,3.776699,10.722626,False -SM_Cup,SM_EspressoCup,0.425477,1.0,95.999855,130.999817,0.149391,3.776699,10.722626,False -SM_Cup,SM_EspressoCup,1.420614,1.0,89.99987,130.999817,0.149391,3.776699,10.722626,True -SM_Cup,SM_EspressoCup,1.24081,1.0,5.000005,130.999817,0.149391,3.776699,10.722626,False -SM_Cup,SM_EspressoCup,1.920474,0.5,86.99955,130.499207,0.149391,3.776699,10.722626,False -SM_Cup,SM_EspressoCup,0.703011,0.5,96.499512,130.499207,0.149391,3.776699,10.722626,False -SM_Cup,SM_EspressoCup,0.621559,0.5,95.999512,127.999352,0.149391,3.776699,10.722626,False -SM_Cup,SM_EspressoCup,0.641231,0.5,97.999519,130.499207,0.149384,5.096256,10.722626,False -SM_Cup,SM_EspressoCup,0.886682,0.5,82.499596,128.499329,0.149384,5.096256,10.722626,False -SM_Cup,SM_EspressoCup,0.721377,0.5,90.999519,129.499252,0.149384,5.096256,10.722626,False -SM_Cup,SM_EspressoCup,1.573037,0.5,87.99955,110.49971,0.149384,5.096256,10.722626,False -SM_Cup,SM_EspressoCup,0.922951,0.5,90.999519,110.49971,0.149384,5.096256,10.722626,False -SM_Cup,SM_EspressoCup,0.484655,0.5,96.999504,110.49971,0.149384,5.096256,10.722626,False -SM_Cup,SM_EspressoCup,0.744315,0.5,93.499512,110.49971,0.149384,5.096256,10.722626,False -SM_Cup,SM_EspressoCup,1.004156,0.5,88.49955,110.49971,0.149384,5.096256,10.722626,False - diff --git a/SavedData_10Particles_33%SM_CupFullPositionSide1.txt b/SavedData_10Particles_33%SM_CupFullPositionSide1.txt deleted file mode 100644 index 7cf703777..000000000 --- a/SavedData_10Particles_33%SM_CupFullPositionSide1.txt +++ /dev/null @@ -1,52 +0,0 @@ -SourceContainer,DestinationContainer,PouringTime,RotationSpeed,MinimumAngle,MaximumAngle,PosDiffX,PosDiffY,PosDiffZ,IsPouringFailed -SM_Cup,SM_BigBowl,0.409762,1.0,89.99987,117.999832,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.417821,1.0,90.999863,119.999832,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.427045,1.0,88.99987,117.999832,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.415272,1.0,89.99987,117.999832,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.390761,1.0,92.999855,119.999832,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.420293,1.0,90.999863,119.999832,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.398489,1.0,90.999863,118.999825,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.385167,1.0,91.999855,117.999832,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.424399,1.0,88.99987,118.999825,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.419691,1.0,89.99987,118.999825,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.335422,2.0,99.999916,129.999863,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.245404,2.0,97.999901,129.999863,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.277423,2.0,99.999916,131.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.199128,2.0,101.999924,127.999886,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.274108,2.0,97.999901,133.999878,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.212964,2.0,103.999947,131.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.244796,2.0,99.999916,129.999863,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.224273,2.0,101.999924,131.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.259141,2.0,99.999916,133.999878,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.252764,2.0,99.999916,133.999878,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.179934,3.0,104.999962,140.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.216497,3.0,104.999962,143.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.206271,3.0,107.999962,146.999863,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.167939,3.0,107.999962,140.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.166952,3.0,110.999954,143.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.17482,3.0,107.999962,143.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.249979,3.0,104.999962,143.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.200505,3.0,104.999962,143.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.17552,3.0,107.999962,140.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.202539,3.0,104.999962,143.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.177966,4.0,111.999939,151.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.220574,4.0,111.999939,151.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.130747,4.0,111.999939,143.999908,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.185722,4.0,111.999939,147.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.142963,4.0,115.999924,151.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.139901,4.0,111.999939,147.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.220789,4.0,111.999939,147.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.174458,4.0,107.999962,151.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.161482,4.0,111.999939,151.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.171755,4.0,111.999939,151.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.138178,5.0,114.999969,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.148201,5.0,114.999969,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.137796,5.0,114.999969,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.155497,5.0,114.999969,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.146752,5.0,114.999969,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.137289,5.0,119.999969,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.144888,5.0,114.999969,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.169095,5.0,119.999969,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.137453,5.0,114.999969,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.142291,5.0,114.999969,154.999969,0.148987,3.478122,5.378319,True - diff --git a/SavedData_15Particles_50%SM_CupFullPositionMiddle b/SavedData_15Particles_50%SM_CupFullPositionMiddle deleted file mode 100644 index 1b0732256..000000000 --- a/SavedData_15Particles_50%SM_CupFullPositionMiddle +++ /dev/null @@ -1,111 +0,0 @@ -SourceContainer,DestinationContainer,PouringTime,RotationSpeed,MinimumAngle,MaximumAngle,PosDiffX,PosDiffY,PosDiffZ,IsPouringFailed -SM_Cup,SM_BigBowl,0.514755,1.0,85.999878,114.999886,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.567957,1.0,84.999886,117.999832,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.657659,1.0,79.999916,116.999847,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.656725,1.0,79.999916,118.999825,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.721314,1.0,76.999969,115.99987,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.640447,1.0,80.999908,116.999847,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.61377,1.0,82.999893,118.999825,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.715202,1.0,76.999969,115.99987,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.774273,1.0,74.000038,115.99987,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.626954,1.0,81.999908,116.999847,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.412189,2.0,85.999931,129.999863,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.417402,2.0,85.999931,131.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.416222,2.0,87.999924,133.999878,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.414531,2.0,87.999924,135.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.381477,2.0,87.999924,129.999863,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.450127,2.0,83.999931,131.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.391821,2.0,85.999931,127.999886,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.364096,2.0,91.999908,131.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.402695,2.0,87.999924,131.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.411343,2.0,83.999931,127.999886,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.424885,3.0,92.999924,137.999878,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.386806,3.0,83.999931,143.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.414094,3.0,80.999939,146.999863,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.364478,3.0,89.999924,143.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.27381,3.0,92.999924,134.999908,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.320425,3.0,92.999924,143.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.290249,3.0,95.999916,143.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.31114,3.0,92.999924,143.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.348582,3.0,86.999924,143.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.344199,3.0,89.999924,146.999863,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.287184,4.0,95.999939,151.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.276256,4.0,95.999939,151.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.259421,4.0,95.999939,151.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.241851,4.0,99.999947,151.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.230879,4.0,99.999947,151.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.286845,4.0,87.999954,147.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.306188,4.0,91.999947,155.999908,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.2579,4.0,99.999947,151.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.238376,4.0,99.999947,151.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.253785,4.0,99.999947,151.999893,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.218146,5.0,99.999985,154.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.226893,5.0,99.999985,154.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.197542,5.0,105.0,154.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.237156,5.0,99.999985,154.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.230383,5.0,105.0,154.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.217662,5.0,105.0,154.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.250699,5.0,94.999969,154.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.238098,5.0,99.999985,154.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.251829,5.0,105.0,154.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.202664,5.0,105.0,154.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.184479,6.0,107.999977,155.999908,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.208053,6.0,107.999977,155.999908,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.179561,6.0,107.999977,155.999908,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.204677,6.0,101.999977,155.999908,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.23106,6.0,101.999977,155.999908,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.20777,6.0,101.999977,155.999908,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.1775,6.0,107.999977,155.999908,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.205746,6.0,107.999977,155.999908,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.19783,6.0,107.999977,155.999908,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.193318,6.0,107.999977,155.999908,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.225412,6.0,95.999954,155.999908,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.217779,7.0,97.999985,153.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.188472,7.0,105.0,153.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.194289,7.0,105.0,153.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.258226,7.0,97.999985,153.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.156534,7.0,111.999977,153.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.149759,7.0,118.999977,153.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.179383,7.0,111.999977,153.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.163836,7.0,111.999977,153.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.225292,7.0,97.999985,153.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.221088,7.0,90.999977,153.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.15554,8.0,111.999931,151.999924,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.203339,8.0,103.999947,151.999924,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.208432,8.0,103.999947,151.999924,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.201985,8.0,103.999947,151.999924,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.183722,8.0,103.999947,151.999924,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.219913,8.0,95.999931,151.999924,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.230637,8.0,95.999931,151.999924,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.210729,8.0,103.999947,151.999924,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.163497,8.0,111.999931,151.999924,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.206437,8.0,103.999947,151.999924,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.205819,8.0,95.999931,151.999924,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.146666,8.0,119.999939,151.999924,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.157959,9.0,117.000015,153.000031,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.171814,9.0,108.000015,153.000031,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.134959,9.0,117.000015,153.000031,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.157384,9.0,117.000015,153.000031,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.1515,9.0,117.000015,153.000031,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.170438,9.0,108.000015,153.000031,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.20371,9.0,117.000015,153.000031,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.172726,9.0,117.000015,153.000031,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.178415,9.0,108.000015,153.000031,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.151392,9.0,117.000015,153.000031,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.22328,9.0,99.000008,153.000031,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.16682,9.0,108.000015,153.000031,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.172868,9.0,108.000015,153.000031,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.154393,9.0,108.000015,153.000031,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.158832,10.0,109.999969,159.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.111548,10.0,119.999969,159.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.115501,10.0,119.999969,159.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.135999,10.0,109.999969,159.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.185491,10.0,99.999985,159.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.156234,10.0,109.999969,159.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.129049,10.0,119.999969,159.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.172196,10.0,109.999969,159.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.141083,10.0,119.999969,159.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.14228,10.0,119.999969,159.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.133975,10.0,109.999969,159.999969,0.148956,1.815791,5.378319,False -SM_Cup,SM_BigBowl,0.146506,10.0,109.999969,159.999969,0.148956,1.815791,5.378319,False - diff --git a/SavedData_15Particles_50%SM_CupFullPositionSide1 b/SavedData_15Particles_50%SM_CupFullPositionSide1 deleted file mode 100644 index 8874c63e7..000000000 --- a/SavedData_15Particles_50%SM_CupFullPositionSide1 +++ /dev/null @@ -1,52 +0,0 @@ -SourceContainer,DestinationContainer,PouringTime,RotationSpeed,MinimumAngle,MaximumAngle,PosDiffX,PosDiffY,PosDiffZ,IsPouringFailed -SM_Cup,SM_BigBowl,0.799581,1.0,75.999992,117.999832,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.807741,1.0,73.000061,116.999847,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.639339,1.0,81.999908,118.999825,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.717441,1.0,77.999947,116.999847,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.728871,1.0,78.999931,115.99987,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.640538,1.0,80.999908,115.99987,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.736866,1.0,77.999947,113.999924,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.657504,1.0,81.999908,119.999832,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.642581,1.0,80.999908,114.999886,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.621559,1.0,81.999908,115.99987,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.42615,2.0,85.999931,131.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.43797,2.0,83.999931,129.999863,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.414938,2.0,87.999924,131.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.411262,2.0,87.999924,131.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.44978,2.0,83.999931,131.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.447479,2.0,83.999931,129.999863,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.510755,2.0,79.999954,131.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.456227,2.0,83.999931,131.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.398201,2.0,87.999924,127.999886,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.518949,2.0,79.999954,131.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.363776,3.0,92.999924,140.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.33339,3.0,92.999924,143.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.334201,3.0,92.999924,143.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.290802,3.0,95.999916,140.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.35016,3.0,86.999924,137.999878,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.344472,3.0,86.999924,137.999878,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.296585,3.0,89.999924,137.999878,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.329687,3.0,89.999924,140.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.396157,3.0,89.999924,137.999878,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.307031,3.0,95.999916,143.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.290072,4.0,91.999947,151.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.262033,4.0,95.999939,147.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.252107,4.0,99.999947,147.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.234076,4.0,99.999947,147.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.234104,4.0,99.999947,147.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.239928,4.0,99.999947,147.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.290571,4.0,95.999939,151.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.299449,4.0,91.999947,151.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.211079,4.0,107.999962,151.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.283055,4.0,99.999947,151.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.234595,5.0,99.999985,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.278383,5.0,94.999969,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.24163,5.0,99.999985,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.231747,5.0,99.999985,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.210004,5.0,105.0,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.289345,5.0,94.999969,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.230888,5.0,99.999985,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.26729,5.0,89.999977,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.252594,5.0,99.999985,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.266325,5.0,94.999969,154.999969,0.148987,3.478122,5.378319,True - diff --git a/SavedData_30Particles_100%SM_CupFullPositionMiddle b/SavedData_30Particles_100%SM_CupFullPositionMiddle deleted file mode 100644 index 193d03bfa..000000000 --- a/SavedData_30Particles_100%SM_CupFullPositionMiddle +++ /dev/null @@ -1,164 +0,0 @@ -SourceContainer,DestinationContainer,PouringTime,RotationSpeed,MinimumAngle,MaximumAngle,PosDiffX,PosDiffY,PosDiffZ,IsPouringFailed -SM_Cup,SM_BigBowl,1.661502,1.0,58.000023,115.99987,0.148949,1.815792,5.378319,True -SM_Cup,SM_BigBowl,1.853132,1.0,59.000004,117.999832,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,1.618623,1.0,61.999989,119.999832,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,1.917626,1.0,58.000023,114.999886,0.148949,1.815792,5.378319,True -SM_Cup,SM_BigBowl,1.675432,1.0,58.000023,115.99987,0.148949,1.815792,5.378319,True -SM_Cup,SM_BigBowl,1.762714,1.0,58.000023,117.999832,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,1.724763,1.0,58.000023,116.999847,0.148949,1.815792,5.378319,True -SM_Cup,SM_BigBowl,1.741119,1.0,58.000023,116.999847,0.148949,1.815792,5.378319,True -SM_Cup,SM_BigBowl,1.795806,1.0,59.000004,112.999947,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,1.648363,1.0,61.999989,119.999832,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,1.637463,1.0,61.999989,118.999825,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.861223,2.0,72.000038,129.999863,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.851489,2.0,72.000038,127.999886,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.860577,2.0,72.000038,129.999863,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.880816,2.0,72.000038,131.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,1.08603,2.0,62.000008,129.999863,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.867576,2.0,72.000038,131.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,1.085543,2.0,62.000008,127.999886,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.847244,2.0,72.000038,127.999886,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.84805,2.0,72.000038,127.999886,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,1.085002,2.0,62.000008,127.999886,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.864071,2.0,72.000038,129.999863,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.860437,2.0,72.000038,129.999863,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.869991,2.0,72.000038,129.999863,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.842057,2.0,72.000038,127.999886,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.877227,2.0,72.000038,131.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.809421,3.0,66.000023,140.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.806067,3.0,66.000023,140.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.812035,3.0,66.000023,140.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.811933,3.0,66.000023,140.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.772137,3.0,69.000031,143.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.789057,3.0,69.000031,146.999863,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.794341,3.0,69.000031,146.999863,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.790603,3.0,69.000031,146.999863,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.808305,3.0,66.000023,140.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.805574,3.0,69.000031,149.999847,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.758796,4.0,63.999989,151.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.635154,4.0,71.999992,151.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.66762,4.0,67.999992,147.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.74447,4.0,63.999989,151.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.799309,4.0,63.999989,151.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.671626,4.0,67.999992,147.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.652471,4.0,67.999992,147.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.643242,4.0,75.999977,151.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.734526,4.0,63.999989,151.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.632448,4.0,75.999977,151.999893,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.540627,5.0,75.000015,154.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.518176,5.0,75.000015,154.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.535694,5.0,75.000015,154.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.529464,5.0,75.000015,154.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.529028,5.0,75.000015,154.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.548631,5.0,75.000015,154.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.534355,5.0,75.000015,154.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.53769,5.0,75.000015,154.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.516584,5.0,75.000015,154.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.532464,5.0,75.000015,154.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.52738,5.0,75.000015,154.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.542127,5.0,75.000015,154.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.524178,5.0,75.000015,154.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.525223,5.0,75.000015,154.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.534105,5.0,75.000015,154.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.332176,10.0,89.999977,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.271312,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.275093,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.273133,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.267736,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.31933,10.0,89.999977,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.271678,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.270173,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.270303,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.330934,10.0,89.999977,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.321786,10.0,89.999977,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.273055,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.268786,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.27772,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.321931,10.0,89.999977,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.269915,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.324639,10.0,89.999977,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.270767,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.418786,6.0,83.999977,155.999908,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.427217,6.0,83.999977,155.999908,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.392721,6.0,89.999962,155.999908,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.396023,6.0,89.999962,155.999908,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.504892,6.0,72.000015,155.999908,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.423053,6.0,83.999977,155.999908,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.420323,6.0,83.999977,155.999908,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.422147,6.0,83.999977,155.999908,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.49687,6.0,77.999992,155.999908,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.392368,6.0,89.999962,155.999908,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.505532,6.0,77.999992,155.999908,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.392537,6.0,89.999962,155.999908,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.409726,7.0,83.999977,153.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.403016,7.0,83.999977,153.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.409909,7.0,83.999977,153.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.415612,7.0,83.999977,153.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.405648,7.0,83.999977,153.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.405601,7.0,83.999977,153.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.407797,7.0,83.999977,153.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.408778,7.0,83.999977,153.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.404124,7.0,83.999977,153.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.457863,7.0,76.999985,153.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.389996,8.0,87.999931,151.999924,0.148949,1.815792,5.378319,True -SM_Cup,SM_BigBowl,0.314536,8.0,95.999931,151.999924,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.334728,8.0,95.999931,151.999924,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.36563,8.0,87.999931,151.999924,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.331202,8.0,95.999931,151.999924,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.330362,8.0,95.999931,151.999924,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.361164,8.0,95.999931,151.999924,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.316703,8.0,95.999931,151.999924,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.317345,8.0,95.999931,151.999924,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.368176,8.0,87.999931,151.999924,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.366579,9.0,89.999992,153.000031,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.293718,9.0,99.000008,153.000031,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.353374,9.0,89.999992,153.000031,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.348091,9.0,89.999992,153.000031,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.367932,9.0,89.999992,153.000031,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.339042,9.0,89.999992,153.000031,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.350318,9.0,89.999992,153.000031,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.327787,9.0,99.000008,153.000031,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.295613,9.0,99.000008,153.000031,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.333128,9.0,89.999992,153.000031,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.332176,10.0,89.999977,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.271312,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.275093,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.273133,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.267736,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.31933,10.0,89.999977,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.271678,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.270173,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.270303,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.330934,10.0,89.999977,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.321786,10.0,89.999977,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.273055,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.268786,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.27772,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.321931,10.0,89.999977,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.269915,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.324639,10.0,89.999977,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.270767,10.0,99.999985,159.999969,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.286746,15.0,74.999985,164.999939,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.286303,15.0,89.999977,164.999939,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.30925,15.0,74.999985,164.999939,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.287347,15.0,89.999977,164.999939,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.275789,15.0,89.999977,164.999939,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.278679,15.0,89.999977,164.999939,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.303126,15.0,74.999985,164.999939,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.286098,15.0,89.999977,164.999939,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.275387,15.0,89.999977,164.999939,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.22601,20.0,99.999969,159.999985,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.227061,20.0,99.999969,159.999985,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.227893,20.0,99.999969,159.999985,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.250683,20.0,79.999954,159.999985,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.261901,20.0,79.999954,159.999985,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.262562,20.0,79.999954,159.999985,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.238227,20.0,99.999969,159.999985,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.262654,20.0,79.999954,159.999985,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.244492,20.0,79.999954,159.999985,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.229923,20.0,99.999969,159.999985,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.255757,20.0,79.999954,159.999985,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.264139,20.0,79.999954,159.999985,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.277316,20.0,79.999954,159.999985,0.148949,1.815792,5.378319,False -SM_Cup,SM_BigBowl,0.239049,20.0,99.999969,159.999985,0.148949,1.815792,5.378319,False - diff --git a/SavedData_30Particles_100%SM_CupFullPositionSide1 b/SavedData_30Particles_100%SM_CupFullPositionSide1 deleted file mode 100644 index 3f541bd40..000000000 --- a/SavedData_30Particles_100%SM_CupFullPositionSide1 +++ /dev/null @@ -1,55 +0,0 @@ -SourceContainer,DestinationContainer,PouringTime,RotationSpeed,MinimumAngle,MaximumAngle,PosDiffX,PosDiffY,PosDiffZ,IsPouringFailed -SM_Cup,SM_BigBowl,1.822815,1.0,58.000023,113.999924,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,1.755476,1.0,58.000023,114.999886,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,1.769929,1.0,58.000023,115.99987,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,1.630227,1.0,60.999985,115.99987,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,1.767049,1.0,58.000023,116.999847,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,1.75766,1.0,58.000023,113.999924,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,1.794498,1.0,58.000023,115.99987,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,1.552752,1.0,61.999989,114.999886,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,1.77624,1.0,58.000023,116.999847,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,1.782088,1.0,58.000023,114.999886,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,0.873021,2.0,70.000053,129.999863,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,0.925936,2.0,68.000046,125.999924,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,1.006229,2.0,64.000015,129.999863,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,1.115516,2.0,60.0,131.999893,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,1.025812,2.0,64.000015,129.999863,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,0.936764,2.0,68.000046,127.999886,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,1.095721,2.0,60.0,129.999863,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,1.118812,2.0,60.0,129.999863,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,1.098148,2.0,60.0,129.999863,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,0.938677,2.0,68.000046,127.999886,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,0.789731,3.0,66.000023,140.999893,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,0.778779,3.0,66.000023,137.999878,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,0.766915,3.0,69.000031,140.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.800123,3.0,66.000023,140.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.804739,3.0,66.000023,143.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.791359,3.0,66.000023,140.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.77822,3.0,69.000031,140.999893,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,0.744693,3.0,72.000015,146.999863,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.782123,3.0,69.000031,143.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.808451,3.0,66.000023,140.999893,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,0.77928,3.0,69.000031,143.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.888127,3.0,63.000008,143.999893,0.148987,3.478123,5.378319,False -SM_Cup,SM_BigBowl,0.746096,3.0,69.000031,140.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.580022,4.0,75.999977,147.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.565222,4.0,75.999977,147.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.616712,4.0,71.999992,151.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.598447,4.0,75.999977,151.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.618227,4.0,71.999992,151.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.629658,4.0,71.999992,151.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.598541,4.0,71.999992,147.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.627426,4.0,71.999992,151.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.590668,4.0,75.999977,147.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.564755,4.0,75.999977,147.999893,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.494468,5.0,80.0,154.999969,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.570193,5.0,70.000031,154.999969,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.472156,5.0,80.0,154.999969,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.469006,5.0,80.0,154.999969,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.470623,5.0,84.999985,154.999969,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.437252,5.0,84.999985,154.999969,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.43847,5.0,84.999985,154.999969,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.516887,5.0,80.0,154.999969,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.432666,5.0,84.999985,154.999969,0.148987,3.478123,5.378319,True -SM_Cup,SM_BigBowl,0.436027,5.0,84.999985,154.999969,0.148987,3.478123,5.378319,True - diff --git a/SavedData_5Particles_16%SM_CupFullPositionSide1 b/SavedData_5Particles_16%SM_CupFullPositionSide1 deleted file mode 100644 index 85e7cc3b1..000000000 --- a/SavedData_5Particles_16%SM_CupFullPositionSide1 +++ /dev/null @@ -1,51 +0,0 @@ -SourceContainer,DestinationContainer,PouringTime,RotationSpeed,MinimumAngle,MaximumAngle,PosDiffX,PosDiffY,PosDiffZ,IsPouringFailed -SM_Cup,SM_BigBowl,0.256584,1.0,100.999901,117.999832,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.144956,1.0,101.999924,114.999886,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.151793,1.0,100.999901,114.999886,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.14731,1.0,101.999924,115.99987,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.131178,1.0,100.999901,112.999947,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.119099,1.0,99.999886,110.999985,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.171103,1.0,96.999855,112.999947,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.120369,1.0,100.999901,111.999969,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.144433,1.0,101.999924,114.999886,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.082755,1.0,102.999939,110.0,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.071008,2.0,115.999924,127.999886,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.070035,2.0,115.999924,127.999886,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.083638,2.0,113.999939,127.999886,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.090599,2.0,113.999939,125.999924,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.067988,2.0,115.999924,127.999886,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.087016,2.0,111.999954,127.999886,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.16643,2.0,111.999954,121.999931,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.058349,2.0,115.999924,125.999924,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.069005,2.0,113.999939,125.999924,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.106319,2.0,111.999954,131.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.057073,3.0,125.999924,140.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.200121,3.0,119.999901,137.999878,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.056822,3.0,128.999908,140.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.045464,3.0,125.999924,137.999878,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.107737,3.0,125.999924,137.999878,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.037087,3.0,128.999908,137.999878,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.066362,3.0,125.999924,143.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.044112,3.0,125.999924,137.999878,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.055036,3.0,125.999924,140.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.047506,3.0,125.999924,137.999878,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.044289,4.0,135.999924,151.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.045356,4.0,131.999908,147.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.054803,4.0,131.999908,151.999893,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.100167,4.0,131.999908,143.999908,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.163914,4.0,123.999931,143.999908,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.023564,4.0,135.999924,143.999908,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.102662,4.0,131.999908,143.999908,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.054756,4.0,131.999908,143.999908,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.066288,4.0,135.999924,151.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.037337,4.0,135.999924,147.999893,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.073688,5.0,124.999992,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.057336,5.0,129.999985,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.025796,5.0,144.999969,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.045072,5.0,139.999985,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.046692,5.0,139.999985,154.999969,0.148987,3.478122,5.378319,False -SM_Cup,SM_BigBowl,0.036381,5.0,139.999985,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.097863,5.0,139.999985,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.056836,5.0,139.999985,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.05766,5.0,139.999985,154.999969,0.148987,3.478122,5.378319,True -SM_Cup,SM_BigBowl,0.099603,5.0,134.999985,149.999954,0.148987,3.478122,5.378319,True \ No newline at end of file diff --git a/Source/RobCoG/Private/BP_ParentActor.cpp b/Source/RobCoG/Private/BP_ParentActor.cpp index a630ae18b..d2a9da557 100644 --- 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,PosDiffX,PosDiffY,PosDiffZ,IsPouringFailed"); + FString FinalString = TEXT("SourceContainer,DestinationContainer,PouringTime,RotationSpeed,MinimumAngle,MaximumAngle,SourcePosX,SourcePosY,SourcePosZ,DestPosX,DestPosY,DestPosZ,NumberOfParticles,IsPouringFailed"); FinalString += LINE_TERMINATOR; FString FinalOutPutStr = ""; @@ -81,6 +81,13 @@ void ABP_ParentActor::EndPlay(const EEndPlayReason::Type reason) { MinimumPouringAngle = FirstRawArrayData[4]; MaximumPouringAngle = LastRawArrayData[4]; } + + // here do check for minimum angle if it is less than threshold, lets say 45' then ignore the data. + // Since it is due to the popcorn effect that the particles have jumped + /*float MinimumPouringAngleFloat = FCString::Atof(*MinimumPouringAngle); + if (MinimumPouringAngleFloat < 45) { + return; + }*/ for (int i = 0; i < FirstRawArrayData.Num(); i++) { // if the value of array is time (i == 2) or angle value (i == 4) then use calculated values