Skip to content

Commit ef50d30

Browse files
author
András Velvárt
committed
Renamed Example scene to GameControllerManipulatorTest as requested by @HodgsonSDAS
1 parent 5978dda commit ef50d30

File tree

2 files changed

+47
-41
lines changed

2 files changed

+47
-41
lines changed

Assets/HoloToolkit-Examples/GameControllerManipulator/Example.unity renamed to Assets/HoloToolkit-Examples/GameControllerManipulator/GameControllerManipulatorTest.unity

Lines changed: 47 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!29 &1
4-
SceneSettings:
4+
OcclusionCullingSettings:
55
m_ObjectHideFlags: 0
6-
m_PVSData:
7-
m_PVSObjectsArray: []
8-
m_PVSPortalsArray: []
6+
serializedVersion: 2
97
m_OcclusionBakeSettings:
108
smallestOccluder: 5
119
smallestHole: 0.25
1210
backfaceThreshold: 100
11+
m_SceneGUID: 00000000000000000000000000000000
12+
m_OcclusionCullingData: {fileID: 0}
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
@@ -79,28 +79,29 @@ NavMeshSettings:
7979
m_ObjectHideFlags: 0
8080
m_BuildSettings:
8181
serializedVersion: 2
82+
agentTypeID: 0
8283
agentRadius: 0.5
8384
agentHeight: 2
8485
agentSlope: 45
8586
agentClimb: 0.4
8687
ledgeDropHeight: 0
8788
maxJumpAcrossDistance: 0
88-
accuratePlacement: 0
8989
minRegionArea: 2
90-
cellSize: 0.16666667
9190
manualCellSize: 0
91+
cellSize: 0.16666667
92+
accuratePlacement: 0
9293
m_NavMeshData: {fileID: 0}
9394
--- !u!1 &231993163
9495
GameObject:
9596
m_ObjectHideFlags: 0
9697
m_PrefabParentObject: {fileID: 0}
9798
m_PrefabInternal: {fileID: 0}
98-
serializedVersion: 4
99+
serializedVersion: 5
99100
m_Component:
100-
- 4: {fileID: 231993167}
101-
- 33: {fileID: 231993166}
102-
- 136: {fileID: 231993165}
103-
- 23: {fileID: 231993164}
101+
- component: {fileID: 231993167}
102+
- component: {fileID: 231993166}
103+
- component: {fileID: 231993165}
104+
- component: {fileID: 231993164}
104105
m_Layer: 0
105106
m_Name: Cylinder
106107
m_TagString: Untagged
@@ -122,15 +123,17 @@ MeshRenderer:
122123
m_ReflectionProbeUsage: 0
123124
m_Materials:
124125
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
125-
m_SubsetIndices:
126+
m_StaticBatchInfo:
127+
firstSubMesh: 0
128+
subMeshCount: 0
126129
m_StaticBatchRoot: {fileID: 0}
127130
m_ProbeAnchor: {fileID: 0}
128131
m_LightProbeVolumeOverride: {fileID: 0}
129132
m_ScaleInLightmap: 1
130133
m_PreserveUVs: 1
131134
m_IgnoreNormalsForChartDetection: 0
132135
m_ImportantGI: 0
133-
m_SelectedWireframeHidden: 0
136+
m_SelectedEditorRenderState: 3
134137
m_MinimumChartSize: 4
135138
m_AutoUVMaxDistance: 0.5
136139
m_AutoUVMaxAngle: 89
@@ -166,20 +169,20 @@ Transform:
166169
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
167170
m_LocalPosition: {x: 0.12, y: 0.00032137, z: 2.0714917}
168171
m_LocalScale: {x: 0.5, y: 0.16054544, z: 0.5}
169-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
170172
m_Children: []
171173
m_Father: {fileID: 0}
172174
m_RootOrder: 1
175+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
173176
--- !u!1 &402900807
174177
GameObject:
175178
m_ObjectHideFlags: 0
176179
m_PrefabParentObject: {fileID: 0}
177180
m_PrefabInternal: {fileID: 0}
178-
serializedVersion: 4
181+
serializedVersion: 5
179182
m_Component:
180-
- 4: {fileID: 402900810}
181-
- 114: {fileID: 402900809}
182-
- 114: {fileID: 402900808}
183+
- component: {fileID: 402900810}
184+
- component: {fileID: 402900809}
185+
- component: {fileID: 402900808}
183186
m_Layer: 0
184187
m_Name: Managers
185188
m_TagString: Untagged
@@ -205,13 +208,13 @@ MonoBehaviour:
205208
MoveZAxisName: ControllerTriggerAxis
206209
MoveZAxisSpeed: 0.2
207210
MoveWithGazeButtonName: Fire1
208-
RotateAroundXAxisName: ControllerLeftStickY
211+
RotateAroundXAxisName: ControllerRightStickY
209212
RotateAroundXAxisSpeed: -1
210-
RotateAroundYAxisName: ControllerLeftStickX
213+
RotateAroundYAxisName: ControllerRightStickX
211214
RotateAroundYAxisSpeed: -1
212215
RotateAroundZAxisName:
213216
RotateAroundZAxisSpeed: 1
214-
RotateModifierButtonName: Fire2
217+
RotateModifierButtonName:
215218
MoveGazeTarget: 1
216219
--- !u!114 &402900809
217220
MonoBehaviour:
@@ -231,6 +234,7 @@ MonoBehaviour:
231234
SetStabilizationPlane: 1
232235
LerpStabilizationPlanePowerCloser: 4
233236
LerpStabilizationPlanePowerFarther: 7
237+
UseBuiltInGazeStabilization: 1
234238
--- !u!4 &402900810
235239
Transform:
236240
m_ObjectHideFlags: 0
@@ -240,21 +244,21 @@ Transform:
240244
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
241245
m_LocalPosition: {x: 0, y: 0, z: 0}
242246
m_LocalScale: {x: 1, y: 1, z: 1}
243-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
244247
m_Children: []
245248
m_Father: {fileID: 0}
246249
m_RootOrder: 3
250+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
247251
--- !u!1 &473449477
248252
GameObject:
249253
m_ObjectHideFlags: 0
250254
m_PrefabParentObject: {fileID: 0}
251255
m_PrefabInternal: {fileID: 0}
252-
serializedVersion: 4
256+
serializedVersion: 5
253257
m_Component:
254-
- 4: {fileID: 473449482}
255-
- 33: {fileID: 473449481}
256-
- 65: {fileID: 473449480}
257-
- 23: {fileID: 473449479}
258+
- component: {fileID: 473449482}
259+
- component: {fileID: 473449481}
260+
- component: {fileID: 473449480}
261+
- component: {fileID: 473449479}
258262
m_Layer: 0
259263
m_Name: Cube
260264
m_TagString: Untagged
@@ -276,15 +280,17 @@ MeshRenderer:
276280
m_ReflectionProbeUsage: 1
277281
m_Materials:
278282
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
279-
m_SubsetIndices:
283+
m_StaticBatchInfo:
284+
firstSubMesh: 0
285+
subMeshCount: 0
280286
m_StaticBatchRoot: {fileID: 0}
281287
m_ProbeAnchor: {fileID: 0}
282288
m_LightProbeVolumeOverride: {fileID: 0}
283289
m_ScaleInLightmap: 1
284290
m_PreserveUVs: 1
285291
m_IgnoreNormalsForChartDetection: 0
286292
m_ImportantGI: 0
287-
m_SelectedWireframeHidden: 0
293+
m_SelectedEditorRenderState: 3
288294
m_MinimumChartSize: 4
289295
m_AutoUVMaxDistance: 0.5
290296
m_AutoUVMaxAngle: 89
@@ -319,19 +325,19 @@ Transform:
319325
m_LocalRotation: {x: -0.19943203, y: -0.19462693, z: -0.27450064, w: 0.9203242}
320326
m_LocalPosition: {x: -1.29, y: 0, z: 2.07}
321327
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
322-
m_LocalEulerAnglesHint: {x: -28.29, y: -16.409, z: -29.054}
323328
m_Children: []
324329
m_Father: {fileID: 0}
325330
m_RootOrder: 2
331+
m_LocalEulerAnglesHint: {x: -28.29, y: -16.409, z: -29.054}
326332
--- !u!1 &663287569
327333
GameObject:
328334
m_ObjectHideFlags: 0
329335
m_PrefabParentObject: {fileID: 0}
330336
m_PrefabInternal: {fileID: 0}
331-
serializedVersion: 4
337+
serializedVersion: 5
332338
m_Component:
333-
- 4: {fileID: 663287571}
334-
- 108: {fileID: 663287570}
339+
- component: {fileID: 663287571}
340+
- component: {fileID: 663287570}
335341
m_Layer: 0
336342
m_Name: Directional Light
337343
m_TagString: Untagged
@@ -382,10 +388,10 @@ Transform:
382388
m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
383389
m_LocalPosition: {x: 0, y: 0.79, z: 0}
384390
m_LocalScale: {x: 1, y: 1, z: 1}
385-
m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0}
386391
m_Children: []
387392
m_Father: {fileID: 1579231735}
388393
m_RootOrder: 0
394+
m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0}
389395
--- !u!1001 &1253289379
390396
Prefab:
391397
m_ObjectHideFlags: 0
@@ -433,13 +439,13 @@ GameObject:
433439
m_ObjectHideFlags: 0
434440
m_PrefabParentObject: {fileID: 0}
435441
m_PrefabInternal: {fileID: 0}
436-
serializedVersion: 4
442+
serializedVersion: 5
437443
m_Component:
438-
- 4: {fileID: 1579231735}
439-
- 20: {fileID: 1579231734}
440-
- 92: {fileID: 1579231733}
441-
- 124: {fileID: 1579231732}
442-
- 81: {fileID: 1579231731}
444+
- component: {fileID: 1579231735}
445+
- component: {fileID: 1579231734}
446+
- component: {fileID: 1579231733}
447+
- component: {fileID: 1579231732}
448+
- component: {fileID: 1579231731}
443449
m_Layer: 0
444450
m_Name: Main Camera
445451
m_TagString: MainCamera
@@ -511,8 +517,8 @@ Transform:
511517
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
512518
m_LocalPosition: {x: 0, y: 0.12, z: 0}
513519
m_LocalScale: {x: 1, y: 1, z: 1}
514-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
515520
m_Children:
516521
- {fileID: 663287571}
517522
m_Father: {fileID: 0}
518523
m_RootOrder: 0
524+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/HoloToolkit-Examples/GameControllerManipulator/Example.unity.meta renamed to Assets/HoloToolkit-Examples/GameControllerManipulator/GameControllerManipulatorTest.unity.meta

File renamed without changes.

0 commit comments

Comments
 (0)