Skip to content

Commit d4130e0

Browse files
authored
Merge pull request #796 from keveleigh/AddControllerScene
[RS2] Add controller visualization test scene
2 parents 47ed9c1 + 329ed8a commit d4130e0

File tree

7 files changed

+682
-2
lines changed

7 files changed

+682
-2
lines changed
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1001 &100100000
4+
Prefab:
5+
m_ObjectHideFlags: 1
6+
serializedVersion: 2
7+
m_Modification:
8+
m_TransformParent: {fileID: 0}
9+
m_Modifications: []
10+
m_RemovedComponents: []
11+
m_ParentPrefab: {fileID: 0}
12+
m_RootGameObject: {fileID: 1530297684732174}
13+
m_IsPrefabParent: 1
14+
--- !u!1 &1530297684732174
15+
GameObject:
16+
m_ObjectHideFlags: 0
17+
m_PrefabParentObject: {fileID: 0}
18+
m_PrefabInternal: {fileID: 100100000}
19+
serializedVersion: 5
20+
m_Component:
21+
- component: {fileID: 4101394502355204}
22+
- component: {fileID: 114014424083103802}
23+
- component: {fileID: 114750748633442924}
24+
m_Layer: 0
25+
m_Name: Controllers
26+
m_TagString: Untagged
27+
m_Icon: {fileID: 0}
28+
m_NavMeshLayer: 0
29+
m_StaticEditorFlags: 0
30+
m_IsActive: 1
31+
--- !u!4 &4101394502355204
32+
Transform:
33+
m_ObjectHideFlags: 1
34+
m_PrefabParentObject: {fileID: 0}
35+
m_PrefabInternal: {fileID: 100100000}
36+
m_GameObject: {fileID: 1530297684732174}
37+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
38+
m_LocalPosition: {x: 0, y: 0, z: 0}
39+
m_LocalScale: {x: 1, y: 1, z: 1}
40+
m_Children: []
41+
m_Father: {fileID: 0}
42+
m_RootOrder: 0
43+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
44+
--- !u!114 &114014424083103802
45+
MonoBehaviour:
46+
m_ObjectHideFlags: 1
47+
m_PrefabParentObject: {fileID: 0}
48+
m_PrefabInternal: {fileID: 100100000}
49+
m_GameObject: {fileID: 1530297684732174}
50+
m_Enabled: 1
51+
m_EditorHideFlags: 0
52+
m_Script: {fileID: 11500000, guid: cae8f3c88e9704a4393cb8d904b62372, type: 3}
53+
m_Name:
54+
m_EditorClassIdentifier:
55+
--- !u!114 &114750748633442924
56+
MonoBehaviour:
57+
m_ObjectHideFlags: 1
58+
m_PrefabParentObject: {fileID: 0}
59+
m_PrefabInternal: {fileID: 100100000}
60+
m_GameObject: {fileID: 1530297684732174}
61+
m_Enabled: 1
62+
m_EditorHideFlags: 0
63+
m_Script: {fileID: 11500000, guid: 03314f8008ae1ed4fbd45c95a7ed5182, type: 3}
64+
m_Name:
65+
m_EditorClassIdentifier:
66+
controllerModel: {fileID: 1097318689274706, guid: 869d340c69dbcef459070c1a159d38ac,
67+
type: 2}

Assets/HoloToolkit/Input/Prefabs/Controllers.prefab.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1001 &100100000
4+
Prefab:
5+
m_ObjectHideFlags: 1
6+
serializedVersion: 2
7+
m_Modification:
8+
m_TransformParent: {fileID: 0}
9+
m_Modifications: []
10+
m_RemovedComponents: []
11+
m_ParentPrefab: {fileID: 0}
12+
m_RootGameObject: {fileID: 1097318689274706}
13+
m_IsPrefabParent: 1
14+
--- !u!1 &1097318689274706
15+
GameObject:
16+
m_ObjectHideFlags: 0
17+
m_PrefabParentObject: {fileID: 0}
18+
m_PrefabInternal: {fileID: 100100000}
19+
serializedVersion: 5
20+
m_Component:
21+
- component: {fileID: 4645468740117468}
22+
- component: {fileID: 33702392996686854}
23+
- component: {fileID: 23126613584028500}
24+
m_Layer: 0
25+
m_Name: ControllerRect
26+
m_TagString: Untagged
27+
m_Icon: {fileID: 0}
28+
m_NavMeshLayer: 0
29+
m_StaticEditorFlags: 0
30+
m_IsActive: 1
31+
--- !u!4 &4645468740117468
32+
Transform:
33+
m_ObjectHideFlags: 1
34+
m_PrefabParentObject: {fileID: 0}
35+
m_PrefabInternal: {fileID: 100100000}
36+
m_GameObject: {fileID: 1097318689274706}
37+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
38+
m_LocalPosition: {x: 0, y: 0, z: 0}
39+
m_LocalScale: {x: 0.1, y: 0.1, z: 0.3}
40+
m_Children: []
41+
m_Father: {fileID: 0}
42+
m_RootOrder: 0
43+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
44+
--- !u!23 &23126613584028500
45+
MeshRenderer:
46+
m_ObjectHideFlags: 1
47+
m_PrefabParentObject: {fileID: 0}
48+
m_PrefabInternal: {fileID: 100100000}
49+
m_GameObject: {fileID: 1097318689274706}
50+
m_Enabled: 1
51+
m_CastShadows: 1
52+
m_ReceiveShadows: 1
53+
m_MotionVectors: 1
54+
m_LightProbeUsage: 1
55+
m_ReflectionProbeUsage: 1
56+
m_Materials:
57+
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
58+
m_StaticBatchInfo:
59+
firstSubMesh: 0
60+
subMeshCount: 0
61+
m_StaticBatchRoot: {fileID: 0}
62+
m_ProbeAnchor: {fileID: 0}
63+
m_LightProbeVolumeOverride: {fileID: 0}
64+
m_ScaleInLightmap: 1
65+
m_PreserveUVs: 1
66+
m_IgnoreNormalsForChartDetection: 0
67+
m_ImportantGI: 0
68+
m_SelectedEditorRenderState: 3
69+
m_MinimumChartSize: 4
70+
m_AutoUVMaxDistance: 0.5
71+
m_AutoUVMaxAngle: 89
72+
m_LightmapParameters: {fileID: 0}
73+
m_SortingLayerID: 0
74+
m_SortingLayer: 0
75+
m_SortingOrder: 0
76+
--- !u!33 &33702392996686854
77+
MeshFilter:
78+
m_ObjectHideFlags: 1
79+
m_PrefabParentObject: {fileID: 0}
80+
m_PrefabInternal: {fileID: 100100000}
81+
m_GameObject: {fileID: 1097318689274706}
82+
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}

Assets/HoloToolkit/Input/Tests/Prefabs/ControllerRect.prefab.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)