Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
9ccf041
Merge pull request #1 from Rigaro/v0.6.1
Rigaro Dec 4, 2020
3b57517
Bottle reaching experiment
tianshi-yu Dec 4, 2020
b0469a4
Separability Experiment Update
tianshi-yu Dec 5, 2020
50bb951
Experiment flow update
tianshi-yu Dec 6, 2020
ee05abf
Update experiment flow control
tianshi-yu Dec 7, 2020
2b1f4d7
Update ForestWorld.unity
tianshi-yu Dec 7, 2020
6b02b9c
Add target bottle base
tianshi-yu Dec 7, 2020
a3573b8
Fix minor bugs
tianshi-yu Dec 8, 2020
8958a94
Fixed EMG Sampling Rate
tianshi-yu Dec 8, 2020
d2b16a7
Minor update
tianshi-yu Dec 8, 2020
c6260d6
Experiment flow done
tianshi-yu Dec 9, 2020
79ab24a
Minor update
tianshi-yu Dec 9, 2020
577ee32
Generate confusing targets based on anchor one
tianshi-yu Dec 10, 2020
b8cb317
Update target set
tianshi-yu Dec 10, 2020
32fe2de
Update target set.
tianshi-yu Dec 11, 2020
c75a228
Minor update
tianshi-yu Dec 13, 2020
286f264
Update
tianshi-yu Dec 14, 2020
60d4cfc
Minor update
tianshi-yu Dec 15, 2020
8c11e38
Target grid can use both bottle and ball
tianshi-yu Dec 15, 2020
61f1e93
Generate targets by the subject
tianshi-yu Dec 16, 2020
de660cd
Update instructions and training
tianshi-yu Dec 16, 2020
9289050
Update Instructions
tianshi-yu Dec 17, 2020
67d1581
Update instructions
tianshi-yu Dec 17, 2020
4ef09e9
Sync
tianshi-yu Jan 7, 2021
58ecc75
Update intructions.
tianshi-yu Jan 7, 2021
36e056f
Minor update
tianshi-yu Jan 8, 2021
b63d573
Minor Update
tianshi-yu Jan 8, 2021
a32a172
Minor update
tianshi-yu Mar 5, 2021
e2ee927
Bug fix
tianshi-yu Apr 13, 2021
a8d8979
Added Python TCP requester
tianshi-yu Apr 18, 2021
d01833d
Add EMG feature extractor class
tianshi-yu Apr 19, 2021
e4f51aa
Test GridReaching for TH
tianshi-yu Jul 30, 2021
589b64c
Merge branch 'master' of https://github.com/UniMelbHumanRoboticsLab/V…
tianshi-yu Jul 30, 2021
c07eb2d
Skeleton of ANN interface
tianshi-yu Aug 4, 2021
957f37b
Initial
tianshi-yu Aug 25, 2021
7a8a313
Update ConfigurableElbowManager.cs
tianshi-yu Aug 25, 2021
1f92187
monday
tianshi-yu Aug 30, 2021
6408d2f
1/9/21
tianshi-yu Sep 1, 2021
25d9112
1/9/21
tianshi-yu Sep 1, 2021
1af4076
monday 9/6
tianshi-yu Sep 6, 2021
12eb85b
wednesday 8/9/21
tianshi-yu Sep 8, 2021
65e3931
Thursday 9/9/21
tianshi-yu Sep 9, 2021
4ff5fdc
091521
tianshi-yu Sep 15, 2021
223661c
9/29
tianshi-yu Sep 29, 2021
defd50f
29/9
tianshi-yu Sep 29, 2021
3a8df10
1/10/21
tianshi-yu Oct 1, 2021
47cae4c
4/10/21
tianshi-yu Oct 4, 2021
3d4fba9
Tianshi commit for sync
tianshi-yu Oct 22, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
184 changes: 161 additions & 23 deletions VRProEP/Assets/0_Scenes/Development/PhotoStage.unity
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 148029179}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.66, y: 0.1, z: 0.4}
m_LocalPosition: {x: 9.119, y: 0.1, z: 0.4}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 704021892}
Expand Down Expand Up @@ -581,7 +581,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 326849312}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 4.325, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
Expand Down Expand Up @@ -1038,10 +1038,38 @@ PrefabInstance:
propertyPath: m_LocalPosition.z
value: 0.54
objectReference: {fileID: 0}
- target: {fileID: 741826681, guid: d83b14c74aace804b9b3abf47de700da, type: 3}
propertyPath: m_text
value: Low
objectReference: {fileID: 0}
- target: {fileID: 741826681, guid: d83b14c74aace804b9b3abf47de700da, type: 3}
propertyPath: m_textInfo.characterCount
value: 3
objectReference: {fileID: 0}
- target: {fileID: 741826681, guid: d83b14c74aace804b9b3abf47de700da, type: 3}
propertyPath: m_textInfo.wordCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 741826681, guid: d83b14c74aace804b9b3abf47de700da, type: 3}
propertyPath: m_textInfo.lineCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 741826681, guid: d83b14c74aace804b9b3abf47de700da, type: 3}
propertyPath: m_textInfo.pageCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 741826683, guid: d83b14c74aace804b9b3abf47de700da, type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 2058425390, guid: d83b14c74aace804b9b3abf47de700da, type: 3}
propertyPath: m_text
value: High
objectReference: {fileID: 0}
- target: {fileID: 2058425390, guid: d83b14c74aace804b9b3abf47de700da, type: 3}
propertyPath: m_textInfo.characterCount
value: 4
objectReference: {fileID: 0}
- target: {fileID: 2058425392, guid: d83b14c74aace804b9b3abf47de700da, type: 3}
propertyPath: m_Mesh
value:
Expand Down Expand Up @@ -1074,37 +1102,52 @@ PrefabInstance:
- target: {fileID: 2675765168826227593, guid: d83b14c74aace804b9b3abf47de700da,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.334
value: 1.248
objectReference: {fileID: 0}
- target: {fileID: 2675765168826227593, guid: d83b14c74aace804b9b3abf47de700da,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.003
value: 0.1381
objectReference: {fileID: 0}
- target: {fileID: 2675765168826227593, guid: d83b14c74aace804b9b3abf47de700da,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.05412698
value: -0.16262026
objectReference: {fileID: 0}
- target: {fileID: 2675765168826227593, guid: d83b14c74aace804b9b3abf47de700da,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.00000001117587
value: -0.18153574
objectReference: {fileID: 0}
- target: {fileID: 2675765168826227593, guid: d83b14c74aace804b9b3abf47de700da,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.9985341
value: 0.9691014
objectReference: {fileID: 0}
- target: {fileID: 2675765168826227593, guid: d83b14c74aace804b9b3abf47de700da,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -6.2060003
value: -19.207
objectReference: {fileID: 0}
- target: {fileID: 2675765168826227593, guid: d83b14c74aace804b9b3abf47de700da,
type: 3}
propertyPath: m_LocalPosition.x
value: -0
value: 0.1084
objectReference: {fileID: 0}
- target: {fileID: 2675765168826227593, guid: d83b14c74aace804b9b3abf47de700da,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.037971005
objectReference: {fileID: 0}
- target: {fileID: 2675765168826227593, guid: d83b14c74aace804b9b3abf47de700da,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -0.883
objectReference: {fileID: 0}
- target: {fileID: 2675765168826227593, guid: d83b14c74aace804b9b3abf47de700da,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -21.070002
objectReference: {fileID: 0}
- target: {fileID: 6209948516388270475, guid: d83b14c74aace804b9b3abf47de700da,
type: 3}
Expand All @@ -1119,7 +1162,7 @@ PrefabInstance:
- target: {fileID: 8319260673236699376, guid: d83b14c74aace804b9b3abf47de700da,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: 4.325
objectReference: {fileID: 0}
- target: {fileID: 8319260673236699376, guid: d83b14c74aace804b9b3abf47de700da,
type: 3}
Expand Down Expand Up @@ -1179,12 +1222,12 @@ PrefabInstance:
- target: {fileID: 8322025925855230210, guid: d83b14c74aace804b9b3abf47de700da,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.227
value: 1.308
objectReference: {fileID: 0}
- target: {fileID: 8322025925855230210, guid: d83b14c74aace804b9b3abf47de700da,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.335
value: -0.274
objectReference: {fileID: 0}
- target: {fileID: 8322025925855230210, guid: d83b14c74aace804b9b3abf47de700da,
type: 3}
Expand Down Expand Up @@ -1596,17 +1639,17 @@ PrefabInstance:
- target: {fileID: 4631709204240014776, guid: 68cc1343d52190d4289466e5ce96e76e,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: 4.258
objectReference: {fileID: 0}
- target: {fileID: 4631709204240014776, guid: 68cc1343d52190d4289466e5ce96e76e,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.36
value: 1.317
objectReference: {fileID: 0}
- target: {fileID: 4631709204240014776, guid: 68cc1343d52190d4289466e5ce96e76e,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.12
value: 0.053
objectReference: {fileID: 0}
- target: {fileID: 4631709204240014776, guid: 68cc1343d52190d4289466e5ce96e76e,
type: 3}
Expand Down Expand Up @@ -1955,7 +1998,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 727212913}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 4.325, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 137550831}
Expand Down Expand Up @@ -2032,13 +2075,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 775232909}
m_LocalRotation: {x: -0, y: -0.32608604, z: -0, w: 0.94534016}
m_LocalPosition: {x: 0.634, y: 1.47, z: -0.976}
m_LocalRotation: {x: -0.0038772626, y: -0.94881636, z: 0.07608935, w: 0.3065011}
m_LocalPosition: {x: 0.382, y: 1.47, z: 0.633}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 727212914}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: -38.063004, z: 0}
m_LocalEulerAnglesHint: {x: 8.1640005, y: -143.972, z: 3.127}
--- !u!1 &828816451
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2207,7 +2250,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1069788602}
m_LocalRotation: {x: -0, y: -0.9973971, z: -0, w: -0.072104}
m_LocalPosition: {x: 0.782, y: 1.201, z: 0.143}
m_LocalPosition: {x: 4.9919996, y: 1.091, z: 0.278}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1660203378}
Expand All @@ -2234,7 +2277,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 468542, guid: 861fea087c7148246939515a3d957d2e, type: 3}
propertyPath: m_LocalPosition.x
value: -0.48
value: -0.55
objectReference: {fileID: 0}
- target: {fileID: 468542, guid: 861fea087c7148246939515a3d957d2e, type: 3}
propertyPath: m_LocalPosition.y
Expand Down Expand Up @@ -2461,6 +2504,100 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 1563351595}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1609385500
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1609385501}
- component: {fileID: 1609385504}
- component: {fileID: 1609385503}
- component: {fileID: 1609385502}
m_Layer: 0
m_Name: Plane (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1609385501
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1609385500}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 2.64, y: 0, z: -0.75}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2122418399}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!64 &1609385502
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1609385500}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 3
m_Convex: 0
m_CookingOptions: 14
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1609385503
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1609385500}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: ad85f9e7244d11642a59e3f98452aa89, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &1609385504
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1609385500}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &1637033453
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2967,7 +3104,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1926374159}
m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5}
m_LocalPosition: {x: -0.86, y: 0, z: -1.56}
m_LocalPosition: {x: -2.18, y: 0, z: -1.56}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2122418399}
Expand Down Expand Up @@ -3061,7 +3198,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1971517875}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 3.129, y: 0, z: 0.002}
m_LocalPosition: {x: 3.129, y: -1.67, z: 0.002}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2122418399}
Expand Down Expand Up @@ -3366,6 +3503,7 @@ Transform:
- {fileID: 253790709}
- {fileID: 1971517876}
- {fileID: 828816453}
- {fileID: 1609385501}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down
Loading