diff --git a/Content/BP/BP_PointCloud.uasset b/Content/BP/BP_PointCloud.uasset
index 25ae0b7d6c918d2006e9cf87ad0fdbfd7affc376..4048fca6735aad5ea50be90c8b5eef757b3da4e3 100644
Binary files a/Content/BP/BP_PointCloud.uasset and b/Content/BP/BP_PointCloud.uasset differ
diff --git a/Content/Input/MetaCast_Config.uasset b/Content/Input/MetaCast_Config.uasset
index 40e70f9d1f58779b95d92092b75bc2bf28f0df52..6e75b792e9180155925babf5cfb6cfb73fa8dcb8 100644
Binary files a/Content/Input/MetaCast_Config.uasset and b/Content/Input/MetaCast_Config.uasset differ
diff --git a/Content/Maps/BaselineMap.umap b/Content/Maps/BaselineMap.umap
index 12a2df715ed1de654bda7a10f473afad9a9dd408..79edbdbc27976764ee3cfe4ad05314858487a9a3 100644
Binary files a/Content/Maps/BaselineMap.umap and b/Content/Maps/BaselineMap.umap differ
diff --git a/Content/Maps/Login.umap b/Content/Maps/Login.umap
index 62888f5e290de3bf089910f131cd47a75dfcd4b0..59179d1f572ecd2e51ec808713a73d8079a0df1f 100644
Binary files a/Content/Maps/Login.umap and b/Content/Maps/Login.umap differ
diff --git a/Content/Materials/Confirm.uasset b/Content/Materials/Confirm.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..c14ecd004713b57783587c34454e61c3073201a8
Binary files /dev/null and b/Content/Materials/Confirm.uasset differ
diff --git a/Content/Materials/block.uasset b/Content/Materials/block.uasset
new file mode 100644
index 0000000000000000000000000000000000000000..5ad9348658b8472498444a7ebc6f838a7cc72d6f
Binary files /dev/null and b/Content/Materials/block.uasset differ
diff --git a/Content/UI/LoginManager.uasset b/Content/UI/LoginManager.uasset
index b1b768ba1acc2668d81e328572248ec9224bc911..c56510e63d229a25ecd05120f3ee1429b9fe976b 100644
Binary files a/Content/UI/LoginManager.uasset and b/Content/UI/LoginManager.uasset differ
diff --git a/Data/data/Flocculentcube1 b/Data/data/Flocculentcube1
deleted file mode 100644
index 719740a29b8579401d5f2d6d06c699be1f675a70..0000000000000000000000000000000000000000
Binary files a/Data/data/Flocculentcube1 and /dev/null differ
diff --git a/Data/data/Flocculentcube2 b/Data/data/Flocculentcube2
deleted file mode 100644
index 1747dfc626e6c50eec95f6bc407eec9919b445d1..0000000000000000000000000000000000000000
Binary files a/Data/data/Flocculentcube2 and /dev/null differ
diff --git a/Data/data/Flocculentcube3 b/Data/data/Flocculentcube3
deleted file mode 100644
index 813f641872ccea219eab00b1a3ed336633402c83..0000000000000000000000000000000000000000
Binary files a/Data/data/Flocculentcube3 and /dev/null differ
diff --git a/Data/data/ball_hemisphere b/Data/data/ball_hemisphere
deleted file mode 100644
index dddbf6f16413f23817cafb4bd7e743f3ef65d97b..0000000000000000000000000000000000000000
Binary files a/Data/data/ball_hemisphere and /dev/null differ
diff --git a/Data/data/disk b/Data/data/disk
deleted file mode 100644
index 17215632170fe7f0f2be2f0661adc548490af94f..0000000000000000000000000000000000000000
Binary files a/Data/data/disk and /dev/null differ
diff --git a/Data/data/fiveellipsolds b/Data/data/fiveellipsolds
deleted file mode 100644
index f0a518a4d0529dd3e8257772adae4f5004c57d82..0000000000000000000000000000000000000000
Binary files a/Data/data/fiveellipsolds and /dev/null differ
diff --git a/Data/data/galaxy b/Data/data/galaxy
deleted file mode 100644
index 2293adc99ac10f3240672eeada206133c27b9dc8..0000000000000000000000000000000000000000
Binary files a/Data/data/galaxy and /dev/null differ
diff --git a/Data/data/multiEllipsolds b/Data/data/multiEllipsolds
deleted file mode 100644
index 38f19defbd9054302194301bc995792ab1f80dde..0000000000000000000000000000000000000000
Binary files a/Data/data/multiEllipsolds and /dev/null differ
diff --git a/Data/data/nbody1 b/Data/data/nbody1
deleted file mode 100644
index aac76e9ebbcd4ea5ee04774e362b13f826ae5b11..0000000000000000000000000000000000000000
Binary files a/Data/data/nbody1 and /dev/null differ
diff --git a/Data/data/nbody2 b/Data/data/nbody2
deleted file mode 100644
index 2e4f0d4043973ef7a85e486b6fa645134343df2f..0000000000000000000000000000000000000000
Binary files a/Data/data/nbody2 and /dev/null differ
diff --git a/Data/data/snap_animation b/Data/data/snap_animation
deleted file mode 100644
index c0435e63400f67f03c504f33ef1aa54216a9ab9b..0000000000000000000000000000000000000000
Binary files a/Data/data/snap_animation and /dev/null differ
diff --git a/Data/data/stringf b/Data/data/stringf
deleted file mode 100644
index 254be663e258c5fc772b476eecbcf4c0aa2b1d74..0000000000000000000000000000000000000000
Binary files a/Data/data/stringf and /dev/null differ
diff --git a/Data/data/stringf1 b/Data/data/stringf1
deleted file mode 100644
index 862adc31c89abe00d89b8be053967d08497ce372..0000000000000000000000000000000000000000
Binary files a/Data/data/stringf1 and /dev/null differ
diff --git a/Data/data/strings b/Data/data/strings
deleted file mode 100644
index 3a619fb895319db8df397cb2d5447b4a8024ffd1..0000000000000000000000000000000000000000
Binary files a/Data/data/strings and /dev/null differ
diff --git a/Data/data/three_rings b/Data/data/three_rings
deleted file mode 100644
index 0c305df407c8dc77bd41692595784488e05bcab1..0000000000000000000000000000000000000000
Binary files a/Data/data/three_rings and /dev/null differ
diff --git a/Data/data/training_cylinder b/Data/data/training_cylinder
deleted file mode 100644
index 8b3d37cb62acbadf5744c9700e1e0b6875b72d12..0000000000000000000000000000000000000000
Binary files a/Data/data/training_cylinder and /dev/null differ
diff --git a/Data/data/training_cylinder_2 b/Data/data/training_cylinder_2
deleted file mode 100644
index 8b3d37cb62acbadf5744c9700e1e0b6875b72d12..0000000000000000000000000000000000000000
Binary files a/Data/data/training_cylinder_2 and /dev/null differ
diff --git a/Data/data/training_pyramid b/Data/data/training_pyramid
deleted file mode 100644
index c0e280e042fd8e735dfeeb1aa44180e78d76e4c1..0000000000000000000000000000000000000000
Binary files a/Data/data/training_pyramid and /dev/null differ
diff --git a/Data/data/training_pyramid_2 b/Data/data/training_pyramid_2
deleted file mode 100644
index c0e280e042fd8e735dfeeb1aa44180e78d76e4c1..0000000000000000000000000000000000000000
Binary files a/Data/data/training_pyramid_2 and /dev/null differ
diff --git a/Data/data/training_sphere b/Data/data/training_sphere
deleted file mode 100644
index 40549f59555077bdbc59481d6c7e2f0fd219b1ff..0000000000000000000000000000000000000000
Binary files a/Data/data/training_sphere and /dev/null differ
diff --git a/Data/data/training_sphere_2 b/Data/data/training_sphere_2
deleted file mode 100644
index 40549f59555077bdbc59481d6c7e2f0fd219b1ff..0000000000000000000000000000000000000000
Binary files a/Data/data/training_sphere_2 and /dev/null differ
diff --git a/Data/data/training_torus b/Data/data/training_torus
deleted file mode 100644
index 84e4b176d0c4af564d7680357c8e2f5014e48e4d..0000000000000000000000000000000000000000
Binary files a/Data/data/training_torus and /dev/null differ
diff --git a/Data/data/uniform_Lines b/Data/data/uniform_Lines
deleted file mode 100644
index df5b5c9fe85f5c87032c5c5fb932614953e084d7..0000000000000000000000000000000000000000
Binary files a/Data/data/uniform_Lines and /dev/null differ
diff --git a/Data/data/ununiform_Lines b/Data/data/ununiform_Lines
deleted file mode 100644
index ebc6fd539fb2d350306a45c05f9b502777426fe5..0000000000000000000000000000000000000000
Binary files a/Data/data/ununiform_Lines and /dev/null differ
diff --git a/Data/flags/Flocculentcube1_flags_1 b/Data/flags/Flocculentcube1_flags_1
deleted file mode 100644
index 8af45816dcfb059ea97292a1cb27dfe2a21cb6e7..0000000000000000000000000000000000000000
Binary files a/Data/flags/Flocculentcube1_flags_1 and /dev/null differ
diff --git a/Data/flags/Flocculentcube1_flags_2 b/Data/flags/Flocculentcube1_flags_2
deleted file mode 100644
index c6277c42eb1828369e8e54d3f49cd93e3554ca64..0000000000000000000000000000000000000000
Binary files a/Data/flags/Flocculentcube1_flags_2 and /dev/null differ
diff --git a/Data/flags/Flocculentcube1_flags_3 b/Data/flags/Flocculentcube1_flags_3
deleted file mode 100644
index 22e320f6348437fd2f29b84792dec60dd3cf69a2..0000000000000000000000000000000000000000
Binary files a/Data/flags/Flocculentcube1_flags_3 and /dev/null differ
diff --git a/Data/flags/Flocculentcube1_prestudy_flags b/Data/flags/Flocculentcube1_prestudy_flags
deleted file mode 100644
index 0ce38c1de28e3466e4fd0ec39ed8f5efe6875456..0000000000000000000000000000000000000000
Binary files a/Data/flags/Flocculentcube1_prestudy_flags and /dev/null differ
diff --git a/Data/flags/Flocculentcube2_flags b/Data/flags/Flocculentcube2_flags
deleted file mode 100644
index 9cc0f93309d9842c6356ab5767c9afcfc8b09070..0000000000000000000000000000000000000000
Binary files a/Data/flags/Flocculentcube2_flags and /dev/null differ
diff --git a/Data/flags/Flocculentcube3_flags b/Data/flags/Flocculentcube3_flags
deleted file mode 100644
index caf9663e065431833ffd13bdeef37dbc23635890..0000000000000000000000000000000000000000
Binary files a/Data/flags/Flocculentcube3_flags and /dev/null differ
diff --git a/Data/flags/ball_hemisphere_flags b/Data/flags/ball_hemisphere_flags
deleted file mode 100644
index 2ffd68f8c621cfd08bc6eae6ec0bcc0ae52cc8cd..0000000000000000000000000000000000000000
Binary files a/Data/flags/ball_hemisphere_flags and /dev/null differ
diff --git a/Data/flags/disk_flags b/Data/flags/disk_flags
deleted file mode 100644
index e5b450fcb846f104e5d0d927b4cc9383597ee3ab..0000000000000000000000000000000000000000
Binary files a/Data/flags/disk_flags and /dev/null differ
diff --git a/Data/flags/fivecluster_prestudy_flags b/Data/flags/fivecluster_prestudy_flags
deleted file mode 100644
index 5df2a61fff79ba97b8b16233255f23f8f39a5e23..0000000000000000000000000000000000000000
Binary files a/Data/flags/fivecluster_prestudy_flags and /dev/null differ
diff --git a/Data/flags/fiveellipsolds_flags_1 b/Data/flags/fiveellipsolds_flags_1
deleted file mode 100644
index 80b7eb1a6305e706d1ee329f739ce6703a54dadb..0000000000000000000000000000000000000000
Binary files a/Data/flags/fiveellipsolds_flags_1 and /dev/null differ
diff --git a/Data/flags/fiveellipsolds_flags_2 b/Data/flags/fiveellipsolds_flags_2
deleted file mode 100644
index 45bf7c96c8ed94e68440e21fdb552f327f8fa17c..0000000000000000000000000000000000000000
Binary files a/Data/flags/fiveellipsolds_flags_2 and /dev/null differ
diff --git a/Data/flags/halfrings_flags b/Data/flags/halfrings_flags
deleted file mode 100644
index 4f61d649f98f053892b4a01863e2f7145a1244e6..0000000000000000000000000000000000000000
Binary files a/Data/flags/halfrings_flags and /dev/null differ
diff --git a/Data/flags/nbody1_flags b/Data/flags/nbody1_flags
deleted file mode 100644
index 3cc2e9c901675b42206d1413e308cb2cacf750e0..0000000000000000000000000000000000000000
Binary files a/Data/flags/nbody1_flags and /dev/null differ
diff --git a/Data/flags/nbody2_flags b/Data/flags/nbody2_flags
deleted file mode 100644
index 3f31ed7c397b618b0c6365e47767442bbd7ba563..0000000000000000000000000000000000000000
Binary files a/Data/flags/nbody2_flags and /dev/null differ
diff --git a/Data/flags/nbody_prestudy_flags b/Data/flags/nbody_prestudy_flags
deleted file mode 100644
index 70f93aebd5959064941c2a646d19b7f26211774d..0000000000000000000000000000000000000000
Binary files a/Data/flags/nbody_prestudy_flags and /dev/null differ
diff --git a/Data/flags/new_plus_flags b/Data/flags/new_plus_flags
deleted file mode 100644
index 154f5f62b2309531e05d563dc7e94521c7c98914..0000000000000000000000000000000000000000
Binary files a/Data/flags/new_plus_flags and /dev/null differ
diff --git a/Data/flags/shell_prestudy_flags b/Data/flags/shell_prestudy_flags
deleted file mode 100644
index e547980bf16ff902fd76e5d9252ea5f6318be214..0000000000000000000000000000000000000000
Binary files a/Data/flags/shell_prestudy_flags and /dev/null differ
diff --git a/Data/flags/snap_animation_flags b/Data/flags/snap_animation_flags
deleted file mode 100644
index f0c478de4d0489519ca66215cf6fb4ef56e8bb2f..0000000000000000000000000000000000000000
Binary files a/Data/flags/snap_animation_flags and /dev/null differ
diff --git a/Data/flags/three_rings_flags b/Data/flags/three_rings_flags
deleted file mode 100644
index def44500afa203dcc2529aa27027891abb782329..0000000000000000000000000000000000000000
Binary files a/Data/flags/three_rings_flags and /dev/null differ
diff --git a/Data/flags/training_cylinder_flags b/Data/flags/training_cylinder_flags
deleted file mode 100644
index c7c1e7d15fb7bd8518a0e3b8e3031ea431f2c049..0000000000000000000000000000000000000000
Binary files a/Data/flags/training_cylinder_flags and /dev/null differ
diff --git a/Data/flags/training_pyramid_flags b/Data/flags/training_pyramid_flags
deleted file mode 100644
index 57141fb4d1176e0974a4fb369bc263378a4683b6..0000000000000000000000000000000000000000
Binary files a/Data/flags/training_pyramid_flags and /dev/null differ
diff --git a/Data/flags/training_sphere_flags b/Data/flags/training_sphere_flags
deleted file mode 100644
index 230120a6b894a6bd68f21666cd66c1a97825703b..0000000000000000000000000000000000000000
Binary files a/Data/flags/training_sphere_flags and /dev/null differ
diff --git a/Data/flags/training_torus_flags b/Data/flags/training_torus_flags
deleted file mode 100644
index a2b41f7a5d882c01333da5e67513be51af6f02f6..0000000000000000000000000000000000000000
Binary files a/Data/flags/training_torus_flags and /dev/null differ
diff --git a/Data/flags/uniform_Lines_flags b/Data/flags/uniform_Lines_flags
deleted file mode 100644
index 01bb40f62edb12a9fb2c09834c3b8cef1be6a368..0000000000000000000000000000000000000000
Binary files a/Data/flags/uniform_Lines_flags and /dev/null differ
diff --git a/Data/flags/ununiform_Lines_flags b/Data/flags/ununiform_Lines_flags
deleted file mode 100644
index 9eb8910d32f9e802be5a01468bda030c25202543..0000000000000000000000000000000000000000
Binary files a/Data/flags/ununiform_Lines_flags and /dev/null differ
diff --git a/ParticipantLogs/Participant_22/PlayInEditor_08-02-24_18-55-31/22_0_1722617737.csv b/ParticipantLogs/Participant_22/PlayInEditor_08-02-24_18-55-31/22_0_1722617737.csv
deleted file mode 100644
index 06fd0b8a21a7c395b36783722402e5cb4455f49d..0000000000000000000000000000000000000000
--- a/ParticipantLogs/Participant_22/PlayInEditor_08-02-24_18-55-31/22_0_1722617737.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-sep=,
-ParticipantId,Condition,TrialId,SelectionDuration,InitDuration,NumberOfUndos,NumberOfRedos,Correctness,FalsePositives,FalseNegatives,NumberOfPoints,ControllerMovementDeltaSumL,ControllerRotationDeltaSumL,ControllerMovementDeltaSumR,ControllerRotationDeltaSumR
-22,Brush,0,66.405647,-1.000000,0,0,27938,56,8359,102000,83.258499,523.878662,83.258499,523.878662
-22,Brush,1,6.217079,0.000000,0,0,8372,18,1870,48350,18.527472,76.350372,18.527472,76.350372
-22,Brush,2,8.529503,0.000000,0,0,24725,4172,10661,100000,28.252308,140.422897,28.252308,140.422897
-22,Brush,3,6.832428,0.000000,0,0,5782,1708,600,219604,20.773771,69.138535,20.773771,69.138535
-22,Brush,4,5.314774,0.000000,0,0,46042,684,10624,76884,16.445362,60.148403,16.445362,60.148403
-22,Brush,5,6.883400,0.000000,0,0,10376,2969,1452,442079,25.332155,81.563560,25.332155,81.563560
-22,Brush,6,7.092995,0.000000,0,0,114421,9833,1488,164525,31.137712,63.762012,31.137712,63.762012
-22,Brush,7,8.127098,0.000000,0,0,10519,3415,207,442079,30.535780,111.181107,30.535780,111.181107
-22,Brush,8,7.421082,0.000000,0,0,16408,4273,1219,184384,48.294510,186.310852,48.294510,186.310852
-22,Brush,9,4.881645,0.000000,0,0,18049,220,2313,180000,24.182035,67.127136,24.182035,67.127136
-22,Brush,10,4.006783,0.000000,0,0,162404,4544,0,200000,13.161320,48.386547,13.161320,48.386547
-22,Brush,11,6.901337,0.000000,0,0,9405,5358,680,442079,23.534765,78.444916,23.534765,78.444916
-22,Brush,12,8.539749,0.000000,0,0,39426,763,41274,146578,34.802883,205.449692,34.802883,205.449692
-22,Brush,13,8.623703,0.000000,0,0,175274,1134,66250,369017,25.109783,72.361580,25.109783,72.361580
-22,Brush,14,8.165741,0.000000,0,0,42024,1014,18425,180000,34.499352,106.883904,34.499352,106.883904
\ No newline at end of file
diff --git a/ParticipantLogs/Participant_22/PlayInEditor_08-02-24_19-01-59/22_0_1722618125.csv b/ParticipantLogs/Participant_22/PlayInEditor_08-02-24_19-01-59/22_0_1722618125.csv
deleted file mode 100644
index c6db63f415fac6f5e118b4f29ef7b75c00855c29..0000000000000000000000000000000000000000
--- a/ParticipantLogs/Participant_22/PlayInEditor_08-02-24_19-01-59/22_0_1722618125.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-sep=,
-ParticipantId,Condition,TrialId,SelectionDuration,InitDuration,NumberOfUndos,NumberOfRedos,Correctness,FalsePositives,FalseNegatives,NumberOfPoints,ControllerMovementDeltaSumL,ControllerRotationDeltaSumL,ControllerMovementDeltaSumR,ControllerRotationDeltaSumR
-22,MagicWand,0,49.289768,-1.000000,0,0,10223,7,19,48350,151.414124,623.953979,425.264160,1540.879028
-22,MagicWand,1,3.053661,0.000000,0,0,0,0,35386,100000,11.946115,41.754967,17.964380,89.791473
-22,MagicWand,2,3.363247,0.000000,0,0,0,0,6382,219604,14.007499,60.382793,34.809868,108.994507
-22,MagicWand,3,5.301796,0.000000,0,0,20362,159638,0,180000,26.039272,130.816193,158.358704,377.945068
-22,MagicWand,4,4.752987,0.000000,0,0,10085,431994,0,442079,26.667606,141.186447,148.823746,359.391296
-22,MagicWand,5,4.944084,0.000000,0,0,55293,5525,1373,76884,25.193750,88.308907,115.723885,338.354797
-22,MagicWand,6,4.451790,0.000000,0,0,11136,166860,692,442079,15.636705,36.020729,119.875114,300.019348
-22,MagicWand,7,4.527931,0.000000,0,0,241203,75804,321,369017,10.173052,31.477270,64.750984,252.611420
-22,MagicWand,8,4.604195,0.000000,0,0,115892,22622,17,164525,13.610723,44.587154,172.813736,462.262970
-22,MagicWand,9,3.041245,0.000000,0,0,0,0,162404,200000,4.895485,15.515758,7.971580,25.419287
-22,MagicWand,10,3.213333,0.000000,0,0,0,0,17627,184384,6.184259,19.198984,5.364115,4.161320
-22,MagicWand,11,3.071724,0.000000,0,0,0,0,10726,442079,4.266028,15.013531,3.947251,2.829496
-22,MagicWand,12,3.261223,0.000000,0,0,0,0,60449,180000,7.132989,38.549740,5.592680,3.489734
-22,MagicWand,13,4.658905,0.000000,0,0,0,0,80700,146578,8.871463,31.820374,33.137611,67.688362
-22,MagicWand,14,3.811348,0.000000,0,0,0,0,36297,102000,14.722054,77.422829,56.078011,157.540863
\ No newline at end of file
diff --git a/ParticipantLogs/Participant_22/PlayInEditor_08-02-24_19-10-16/22_0_1722618622.csv b/ParticipantLogs/Participant_22/PlayInEditor_08-02-24_19-10-16/22_0_1722618622.csv
deleted file mode 100644
index 389539a1b1a954e5d484799ff26b3e515f0a2085..0000000000000000000000000000000000000000
--- a/ParticipantLogs/Participant_22/PlayInEditor_08-02-24_19-10-16/22_0_1722618622.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-sep=,
-ParticipantId,Condition,TrialId,SelectionDuration,InitDuration,NumberOfUndos,NumberOfRedos,Correctness,FalsePositives,FalseNegatives,NumberOfPoints,ControllerMovementDeltaSumL,ControllerRotationDeltaSumL,ControllerMovementDeltaSumR,ControllerRotationDeltaSumR
-22,MetaPoint,0,5.931007,0.679726,0,0,20362,201,0,180000,38.302246,134.238525,0.000000,0.000000
-22,MetaPoint,1,14.911892,0.000000,6,0,229273,177,12251,369017,36.453590,137.696808,0.000000,0.000000
-22,MetaPoint,2,2.934853,0.000000,0,0,0,0,60449,180000,828.016418,99.874504,0.000000,0.000000
-22,MetaPoint,3,3.062843,0.000000,0,0,0,0,35386,100000,6.972543,27.331812,0.000000,0.000000
-22,MetaPoint,4,2.931389,0.000000,0,0,0,0,6382,219604,8.809179,33.957024,0.000000,0.000000
-22,MetaPoint,5,2.891571,0.000000,0,0,0,0,10085,442079,6.611887,51.812572,0.000000,0.000000
-22,MetaPoint,6,3.122841,0.000000,0,0,0,0,10242,48350,4.396231,20.044922,0.000000,0.000000
-22,MetaPoint,7,5.241692,0.000000,0,0,162404,36577,0,200000,22.511133,129.080872,0.000000,0.000000
-22,MetaPoint,8,4.438736,0.000000,0,0,11734,307600,94,442079,7.901199,27.494295,0.000000,0.000000
-22,MetaPoint,9,3.129112,0.000000,0,0,0,0,56666,76884,3.114630,10.421172,0.000000,0.000000
-22,MetaPoint,10,7.319748,0.000000,0,0,13057,11338,23240,102000,10.168749,40.628536,0.000000,0.000000
-22,MetaPoint,11,3.088768,0.000000,0,0,0,0,115909,164525,3.586389,14.156151,0.000000,0.000000
-22,MetaPoint,12,2.980354,0.000000,0,0,0,0,17627,184384,2.006846,8.311061,0.000000,0.000000
-22,MetaPoint,13,4.346992,0.000000,0,0,72670,314,8030,146578,6.799451,29.390976,0.000000,0.000000
-22,MetaPoint,14,5.098320,0.000000,0,0,10691,308455,35,442079,9.233177,20.976006,0.000000,0.000000
\ No newline at end of file
diff --git a/ParticipantLogs/Participant_33/PlayInEditor_08-02-24_19-19-19/33_0_1722619165.csv b/ParticipantLogs/Participant_33/PlayInEditor_08-02-24_19-19-19/33_0_1722619165.csv
deleted file mode 100644
index 5297d4d6615c774fe7cbe106a7d34749096a0e11..0000000000000000000000000000000000000000
--- a/ParticipantLogs/Participant_33/PlayInEditor_08-02-24_19-19-19/33_0_1722619165.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-sep=,
-ParticipantId,Condition,TrialId,SelectionDuration,InitDuration,NumberOfUndos,NumberOfRedos,Correctness,FalsePositives,FalseNegatives,NumberOfPoints,ControllerMovementDeltaSumL,ControllerRotationDeltaSumL,ControllerMovementDeltaSumR,ControllerRotationDeltaSumR
-33,Brush,0,2.843294,0.000000,0,0,0,0,17627,184384,14.897712,138.379120,16.051794,36.110638
-33,Brush,1,2.337376,0.000000,0,0,0,0,60449,180000,11.761449,59.744629,11.673991,13.920630
\ No newline at end of file
diff --git a/Plugins/UE4_GPUPointCloudRenderer b/Plugins/UE4_GPUPointCloudRenderer
index 18f5859e69817efcba3f84f2de1150dedfd14f0a..fdaaee33ffb92b9448b3bd7346c2bac066ef8777 160000
--- a/Plugins/UE4_GPUPointCloudRenderer
+++ b/Plugins/UE4_GPUPointCloudRenderer
@@ -1 +1 @@
-Subproject commit 18f5859e69817efcba3f84f2de1150dedfd14f0a
+Subproject commit fdaaee33ffb92b9448b3bd7346c2bac066ef8777
diff --git a/Plugins/UEPlugin-Kdtree b/Plugins/UEPlugin-Kdtree
index 94ef56d465cf19d96e17b6e34c3a3739e1384a7e..6d2dda3bbe2ed2abae3f476a185e518653416de1 160000
--- a/Plugins/UEPlugin-Kdtree
+++ b/Plugins/UEPlugin-Kdtree
@@ -1 +1 @@
-Subproject commit 94ef56d465cf19d96e17b6e34c3a3739e1384a7e
+Subproject commit 6d2dda3bbe2ed2abae3f476a185e518653416de1
diff --git a/Plugins/rwth-vr-toolkit-with-meta-cast b/Plugins/rwth-vr-toolkit-with-meta-cast
index fb36657e086d1dfc89e89d40d44867bf321a20b4..340473f4509a5775343293f09a199bb397acaa4e 160000
--- a/Plugins/rwth-vr-toolkit-with-meta-cast
+++ b/Plugins/rwth-vr-toolkit-with-meta-cast
@@ -1 +1 @@
-Subproject commit fb36657e086d1dfc89e89d40d44867bf321a20b4
+Subproject commit 340473f4509a5775343293f09a199bb397acaa4e
diff --git a/Plugins/universallogging b/Plugins/universallogging
index a5dc8c43b44425eedcdbde56230e2d9181fc51e1..056d70b84b712aa77d62d41adbd12eac687f7e7a 160000
--- a/Plugins/universallogging
+++ b/Plugins/universallogging
@@ -1 +1 @@
-Subproject commit a5dc8c43b44425eedcdbde56230e2d9181fc51e1
+Subproject commit 056d70b84b712aa77d62d41adbd12eac687f7e7a
diff --git a/Source/MetaCastBachelor/PointStorage/PointCloud.cpp b/Source/MetaCastBachelor/PointStorage/PointCloud.cpp
index a13bb1ea074c17df393608ebaff1e010733f5c84..c86416324732753f028115e68aeddada3be4d880 100644
--- a/Source/MetaCastBachelor/PointStorage/PointCloud.cpp
+++ b/Source/MetaCastBachelor/PointStorage/PointCloud.cpp
@@ -177,6 +177,8 @@ void APointCloud::ReadPointCloudFromIndex(const int Index)
if(CurrentPointCloudIndex >= ValidPointClouds.Num())
{
UE_LOG(LogTemp, Error, TEXT("Invalid index %d"), CurrentPointCloudIndex);
+
+ UKismetSystemLibrary::QuitGame(GetWorld(), nullptr, EQuitPreference::Background, false);
//UKismetSystemLibrary::QuitGame(GetWorld(), nullptr, EQuitPreference::Quit, false);
return;
}
@@ -187,6 +189,7 @@ void APointCloud::ReadPointCloudFromIndex(const int Index)
MySelectionStatistics = FSelectionStatistics();
MySelectionStatistics.InitSelection(GetWorld()->TimeSeconds);
+ MySelectionStatistics.StartSelection(GetWorld()->TimeSeconds);
}
void APointCloud::ResetPointCloudData()
@@ -433,6 +436,7 @@ void APointCloud::LogSelectionResults()
int FalsePositives = 0;
int FalseNegatives = 0;
int TotalSelections = 0;
+ int TotalHighlighted = 0;
const int TotalPoints = DefaultFlags.Num();
for (int i = 0; i < DefaultFlags.Num(); i++)
@@ -451,6 +455,11 @@ void APointCloud::LogSelectionResults()
}
if (DefaultFlags[i])
+ {
+ TotalHighlighted++;
+ }
+
+ if (SelectionFlags[i])
{
TotalSelections++;
}
@@ -460,6 +469,8 @@ void APointCloud::LogSelectionResults()
MySelectionStatistics.SetFalsePositive(FalsePositives);
MySelectionStatistics.SetFalseNegative(FalseNegatives);
MySelectionStatistics.SetTotalPointNumber(TotalPoints);
+ MySelectionStatistics.SetNumberOfHighlightedPoints(TotalHighlighted);
+ MySelectionStatistics.SetNumberOfSelectedPoints(TotalSelections);
}
void APointCloud::StartAllowSelectionWithLogging()
@@ -467,6 +478,6 @@ void APointCloud::StartAllowSelectionWithLogging()
if(IsSelectionFrozen)
{
IsSelectionFrozen = false;
- MySelectionStatistics.StartSelection(GetWorld()->TimeSeconds);
+ //MySelectionStatistics.StartSelection(GetWorld()->TimeSeconds);
}
}
diff --git a/Source/MetaCastBachelor/SelectionStatistics.h b/Source/MetaCastBachelor/SelectionStatistics.h
index 303eec074cedb6b620db9eb1919c4264f674f2cf..4e99ebebcb3e89376fd5277ee9892cc79c92f6f5 100644
--- a/Source/MetaCastBachelor/SelectionStatistics.h
+++ b/Source/MetaCastBachelor/SelectionStatistics.h
@@ -17,17 +17,40 @@ public:
float InitDuration;
- int32 NumberOfUndos;
+ int NumberOfUndos;
- int32 NumberOfRedos;
+ int NumberOfRedos;
- float CorrectSelections;
+ int CorrectSelections;
- float FalsePositiveSelections;
+ int FalsePositiveSelections;
- float FalseNegativeSelections;
+ int FalseNegativeSelections;
int NumberOfPoints;
+ int NumberOfSelectedPoints;
+
+ void SetNumberOfSelectedPoints(const int _NumberOfSelectedPoints)
+ {
+ this->NumberOfSelectedPoints = _NumberOfSelectedPoints;
+ }
+
+ void SetNumberOfHighlightedPoints(const int _NumberOfHighlightedPoints)
+ {
+ this->NumberOfHighlightedPoints = _NumberOfHighlightedPoints;
+ }
+
+ int GetNumberOfSelectedPoints() const
+ {
+ return NumberOfSelectedPoints;
+ }
+
+ int GetNumberOfHighlightedPoints() const
+ {
+ return NumberOfHighlightedPoints;
+ }
+
+ int NumberOfHighlightedPoints;
float ControllerMovementDeltaSumL;
diff --git a/Source/MetaCastBachelor/StudyManager.cpp b/Source/MetaCastBachelor/StudyManager.cpp
index 4e06ae0d09952e26fd1451bf5880209bb1f23b29..9df361c9ed83af6ad54b61cdd37baa8ce83650ab 100644
--- a/Source/MetaCastBachelor/StudyManager.cpp
+++ b/Source/MetaCastBachelor/StudyManager.cpp
@@ -22,7 +22,7 @@ void UStudyManager::InitCSVLog() const
{
// Write CSV headers
UniLog.LogF(StreamName, TEXT("sep=,\n"));
- UniLog.LogF(StreamName, TEXT("ParticipantId,Condition,TrialId,SelectionDuration,InitDuration,NumberOfUndos,NumberOfRedos,Correctness,FalsePositives,FalseNegatives,NumberOfPoints,ControllerMovementDeltaSumL,ControllerRotationDeltaSumL,ControllerMovementDeltaSumR,ControllerRotationDeltaSumR"));
+ UniLog.LogF(StreamName, TEXT("ParticipantId,Condition,TrialId,SelectionDuration,NumberOfUndos,NumberOfRedos,NumberCorrect,FalsePositives,FalseNegatives,NumberOfPoints,NumberOfSelected,NumberOfHighlighted,ControllerMovementDeltaSumL,ControllerRotationDeltaSumL,ControllerMovementDeltaSumR,ControllerRotationDeltaSumR"));
}
else
{
@@ -106,16 +106,17 @@ void UStudyManager::LogTrialResultsFromPointCloud()
Stats.FalsePositiveSelections,
Stats.FalseNegativeSelections,
Stats.NumberOfPoints,
+ Stats.CorrectSelections,
+ Stats.NumberOfHighlightedPoints,
Stats.ControllerMovementDeltaSumL,
Stats.ControllerRotationDeltaSumL,
Stats.ControllerMovementDeltaSumR,
- Stats.ControllerRotationDeltaSumR
- );
+ Stats.ControllerRotationDeltaSumR);
}
void UStudyManager::LogTrialResults(const float Duration,
const float InitDuration, const int Undos, const int Redos, const int Correctness,
- const int FalsePositives, const int FalseNegatives, const int PointsCount, const float MovementL,
+ const int FalsePositives, const int FalseNegatives, const int PointsCount, const int PointsSelected, const int PointsHighlighted, const float MovementL,
const float RotationL, const float MovementR, const float RotationR)
{
const FString StreamName = FString::Printf(TEXT("Participant_%d"), CurrentParticipantID);
@@ -123,10 +124,10 @@ void UStudyManager::LogTrialResults(const float Duration,
const FString Condition = GetEnumAsText(CurrentState);
// Format the data as a CSV line
- const FString CSVLine = FString::Printf(TEXT("%d,%s,%d,%f,%f,%d,%d,%d,%d,%d,%d,%f,%f,%f,%f"),
+ const FString CSVLine = FString::Printf(TEXT("%d,%s,%d,%f,%d,%d,%d,%d,%d,%d,%d,%d,%f,%f,%f,%f"),
CurrentParticipantID, *Condition, CurrentTrialId,
- Duration, InitDuration, Undos, Redos, Correctness,
- FalsePositives, FalseNegatives, PointsCount,
+ Duration, Undos, Redos, Correctness,
+ FalsePositives, FalseNegatives, PointsCount, PointsSelected, PointsHighlighted,
MovementL, RotationL, MovementR, RotationR);
// Log the data line to the file
diff --git a/Source/MetaCastBachelor/StudyManager.h b/Source/MetaCastBachelor/StudyManager.h
index b3a524680b9f82cc05ddc01d90bf529c9e3685c1..40b3a8e9844bc5156e190d8a9f60c3d02d7c435e 100644
--- a/Source/MetaCastBachelor/StudyManager.h
+++ b/Source/MetaCastBachelor/StudyManager.h
@@ -53,7 +53,7 @@ public:
void LogTrialResultsFromPointCloud();
UFUNCTION(BlueprintCallable)
- void LogTrialResults(const float Duration, const float InitDuration, const int Undos, const int Redos, const int Correctness, const int FalsePositives, const int FalseNegatives, const int PointsCount, const float MovementL, const float RotationL, const float MovementR, const float RotationR);
+ void LogTrialResults(const float Duration, const float InitDuration, const int Undos, const int Redos, const int Correctness, const int FalsePositives, const int FalseNegatives, const int PointsCount, const int PointsSelected, const int PointsHighlighted, const float MovementL, const float RotationL, const float MovementR, const float RotationR);
static FString GetEnumAsText(const EStudyState EnumVal)
{