Skip to content

Commit 111cdef

Browse files
authored
Merge pull request #49 from robertncoomber/web-scroll
Web scroll with joystick
2 parents a70c437 + 0195ca8 commit 111cdef

4 files changed

Lines changed: 197 additions & 150 deletions

File tree

UnityProject/Assets/Scenes/OverlayBrowserDemo.unity

Lines changed: 83 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -3256,6 +3256,8 @@ MonoBehaviour:
32563256
m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
32573257
m_Name:
32583258
m_EditorClassIdentifier:
3259+
m_Padding: {x: 0, y: 0, z: 0, w: 0}
3260+
m_Softness: {x: 0, y: 0}
32593261
--- !u!1 &530874921
32603262
GameObject:
32613263
m_ObjectHideFlags: 0
@@ -4040,6 +4042,50 @@ CanvasRenderer:
40404042
m_PrefabAsset: {fileID: 0}
40414043
m_GameObject: {fileID: 824653619}
40424044
m_CullTransparentMesh: 0
4045+
--- !u!1 &827921068
4046+
GameObject:
4047+
m_ObjectHideFlags: 0
4048+
m_CorrespondingSourceObject: {fileID: 0}
4049+
m_PrefabInstance: {fileID: 0}
4050+
m_PrefabAsset: {fileID: 0}
4051+
serializedVersion: 6
4052+
m_Component:
4053+
- component: {fileID: 827921069}
4054+
- component: {fileID: 827921070}
4055+
m_Layer: 0
4056+
m_Name: web scroll
4057+
m_TagString: Untagged
4058+
m_Icon: {fileID: 0}
4059+
m_NavMeshLayer: 0
4060+
m_StaticEditorFlags: 0
4061+
m_IsActive: 1
4062+
--- !u!4 &827921069
4063+
Transform:
4064+
m_ObjectHideFlags: 0
4065+
m_CorrespondingSourceObject: {fileID: 0}
4066+
m_PrefabInstance: {fileID: 0}
4067+
m_PrefabAsset: {fileID: 0}
4068+
m_GameObject: {fileID: 827921068}
4069+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4070+
m_LocalPosition: {x: 0, y: 0, z: 0}
4071+
m_LocalScale: {x: 1, y: 1, z: 1}
4072+
m_Children: []
4073+
m_Father: {fileID: 0}
4074+
m_RootOrder: 6
4075+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4076+
--- !u!114 &827921070
4077+
MonoBehaviour:
4078+
m_ObjectHideFlags: 0
4079+
m_CorrespondingSourceObject: {fileID: 0}
4080+
m_PrefabInstance: {fileID: 0}
4081+
m_PrefabAsset: {fileID: 0}
4082+
m_GameObject: {fileID: 827921068}
4083+
m_Enabled: 1
4084+
m_EditorHideFlags: 0
4085+
m_Script: {fileID: 11500000, guid: f7ce75c3b1f428749b5368f39f505983, type: 3}
4086+
m_Name:
4087+
m_EditorClassIdentifier:
4088+
browserView: {fileID: 52953136}
40434089
--- !u!1 &851230871
40444090
GameObject:
40454091
m_ObjectHideFlags: 0
@@ -4689,48 +4735,6 @@ CanvasRenderer:
46894735
m_PrefabAsset: {fileID: 0}
46904736
m_GameObject: {fileID: 1308659364}
46914737
m_CullTransparentMesh: 0
4692-
--- !u!21 &1322957314
4693-
Material:
4694-
serializedVersion: 6
4695-
m_ObjectHideFlags: 0
4696-
m_CorrespondingSourceObject: {fileID: 0}
4697-
m_PrefabInstance: {fileID: 0}
4698-
m_PrefabAsset: {fileID: 0}
4699-
m_Name: GazePointer (Instance)
4700-
m_Shader: {fileID: 4800000, guid: 38ad33c152e32ee46a9bbbb0e656f7e1, type: 3}
4701-
m_ShaderKeywords:
4702-
m_LightmapFlags: 5
4703-
m_EnableInstancingVariants: 0
4704-
m_DoubleSidedGI: 0
4705-
m_CustomRenderQueue: -1
4706-
stringTagMap: {}
4707-
disabledShaderPasses: []
4708-
m_SavedProperties:
4709-
serializedVersion: 3
4710-
m_TexEnvs:
4711-
- _AlphaTex:
4712-
m_Texture: {fileID: 2800000, guid: 8b000a1e9077a124f9ad4e81392fccba, type: 3}
4713-
m_Scale: {x: 1, y: 1}
4714-
m_Offset: {x: 0, y: 0}
4715-
- _Illum:
4716-
m_Texture: {fileID: 0}
4717-
m_Scale: {x: 1, y: 1}
4718-
m_Offset: {x: 0, y: 0}
4719-
- _MainTex:
4720-
m_Texture: {fileID: 2800000, guid: 82026cb669304dc4897d2c11d3753141, type: 3}
4721-
m_Scale: {x: 1, y: 1}
4722-
m_Offset: {x: 0, y: 0}
4723-
m_Floats:
4724-
- _AlphaCutoff: 0
4725-
- _Cutoff: 0.5
4726-
- _EmissionLM: 0
4727-
- _EndRadius: 0.8
4728-
- _Fill: 0.5
4729-
- _InvFade: 1.11
4730-
- _StartRadius: 0.2
4731-
m_Colors:
4732-
- _Color: {r: 0, g: 1, b: 0.006896496, a: 1}
4733-
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
47344738
--- !u!1 &1353640615
47354739
GameObject:
47364740
m_ObjectHideFlags: 0
@@ -5723,6 +5727,10 @@ PrefabInstance:
57235727
propertyPath: m_LocalPosition.y
57245728
value: 1
57255729
objectReference: {fileID: 0}
5730+
- target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3}
5731+
propertyPath: m_RootOrder
5732+
value: 0
5733+
objectReference: {fileID: 0}
57265734
- target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3}
57275735
propertyPath: m_LocalPosition.x
57285736
value: 0
@@ -5735,6 +5743,10 @@ PrefabInstance:
57355743
propertyPath: m_LocalPosition.z
57365744
value: 0
57375745
objectReference: {fileID: 0}
5746+
- target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3}
5747+
propertyPath: m_LocalRotation.w
5748+
value: 1
5749+
objectReference: {fileID: 0}
57385750
- target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3}
57395751
propertyPath: m_LocalRotation.x
57405752
value: 0
@@ -5747,18 +5759,14 @@ PrefabInstance:
57475759
propertyPath: m_LocalRotation.z
57485760
value: 0
57495761
objectReference: {fileID: 0}
5750-
- target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3}
5751-
propertyPath: m_LocalRotation.w
5752-
value: 1
5753-
objectReference: {fileID: 0}
5754-
- target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3}
5755-
propertyPath: m_RootOrder
5756-
value: 0
5757-
objectReference: {fileID: 0}
57585762
- target: {fileID: 400008, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3}
57595763
propertyPath: m_LocalPosition.y
57605764
value: 1
57615765
objectReference: {fileID: 0}
5766+
- target: {fileID: 11400010, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3}
5767+
propertyPath: Acceleration
5768+
value: 0
5769+
objectReference: {fileID: 0}
57625770
- target: {fileID: 11400010, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3}
57635771
propertyPath: useProfileData
57645772
value: 0
@@ -6107,6 +6115,26 @@ PrefabInstance:
61076115
propertyPath: m_Name
61086116
value: GazeIcon
61096117
objectReference: {fileID: 0}
6118+
- target: {fileID: 3937605212045273671, guid: 82375f4a69352460caf2496fc14a87e1,
6119+
type: 3}
6120+
propertyPath: m_RootOrder
6121+
value: 0
6122+
objectReference: {fileID: 0}
6123+
- target: {fileID: 3937605212045273671, guid: 82375f4a69352460caf2496fc14a87e1,
6124+
type: 3}
6125+
propertyPath: m_LocalScale.x
6126+
value: 2
6127+
objectReference: {fileID: 0}
6128+
- target: {fileID: 3937605212045273671, guid: 82375f4a69352460caf2496fc14a87e1,
6129+
type: 3}
6130+
propertyPath: m_LocalScale.y
6131+
value: 2
6132+
objectReference: {fileID: 0}
6133+
- target: {fileID: 3937605212045273671, guid: 82375f4a69352460caf2496fc14a87e1,
6134+
type: 3}
6135+
propertyPath: m_LocalScale.z
6136+
value: 2
6137+
objectReference: {fileID: 0}
61106138
- target: {fileID: 3937605212045273671, guid: 82375f4a69352460caf2496fc14a87e1,
61116139
type: 3}
61126140
propertyPath: m_LocalPosition.x
@@ -6122,6 +6150,11 @@ PrefabInstance:
61226150
propertyPath: m_LocalPosition.z
61236151
value: 0
61246152
objectReference: {fileID: 0}
6153+
- target: {fileID: 3937605212045273671, guid: 82375f4a69352460caf2496fc14a87e1,
6154+
type: 3}
6155+
propertyPath: m_LocalRotation.w
6156+
value: 1
6157+
objectReference: {fileID: 0}
61256158
- target: {fileID: 3937605212045273671, guid: 82375f4a69352460caf2496fc14a87e1,
61266159
type: 3}
61276160
propertyPath: m_LocalRotation.x
@@ -6137,16 +6170,6 @@ PrefabInstance:
61376170
propertyPath: m_LocalRotation.z
61386171
value: -0
61396172
objectReference: {fileID: 0}
6140-
- target: {fileID: 3937605212045273671, guid: 82375f4a69352460caf2496fc14a87e1,
6141-
type: 3}
6142-
propertyPath: m_LocalRotation.w
6143-
value: 1
6144-
objectReference: {fileID: 0}
6145-
- target: {fileID: 3937605212045273671, guid: 82375f4a69352460caf2496fc14a87e1,
6146-
type: 3}
6147-
propertyPath: m_RootOrder
6148-
value: 0
6149-
objectReference: {fileID: 0}
61506173
- target: {fileID: 3937605212045273671, guid: 82375f4a69352460caf2496fc14a87e1,
61516174
type: 3}
61526175
propertyPath: m_LocalEulerAnglesHint.x
@@ -6162,20 +6185,5 @@ PrefabInstance:
61626185
propertyPath: m_LocalEulerAnglesHint.z
61636186
value: 0
61646187
objectReference: {fileID: 0}
6165-
- target: {fileID: 3937605212045273671, guid: 82375f4a69352460caf2496fc14a87e1,
6166-
type: 3}
6167-
propertyPath: m_LocalScale.x
6168-
value: 2
6169-
objectReference: {fileID: 0}
6170-
- target: {fileID: 3937605212045273671, guid: 82375f4a69352460caf2496fc14a87e1,
6171-
type: 3}
6172-
propertyPath: m_LocalScale.y
6173-
value: 2
6174-
objectReference: {fileID: 0}
6175-
- target: {fileID: 3937605212045273671, guid: 82375f4a69352460caf2496fc14a87e1,
6176-
type: 3}
6177-
propertyPath: m_LocalScale.z
6178-
value: 2
6179-
objectReference: {fileID: 0}
61806188
m_RemovedComponents: []
61816189
m_SourcePrefab: {fileID: 100100000, guid: 82375f4a69352460caf2496fc14a87e1, type: 3}

0 commit comments

Comments
 (0)