Skip to content

Commit c31019a

Browse files
authored
Merge pull request #3380 from killerantz/feature/mrtk_interactable_devMerge
[vNext][UX] Feature/mrtk interactable dev merge
2 parents bbd0129 + 4b90689 commit c31019a

File tree

303 files changed

+48016
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

303 files changed

+48016
-27
lines changed

Assets/MixedRealityToolkit.Examples/Demos/UX/Interactables.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"name": "MixedRealityToolkit-Examples.Demos.UX.Interactables",
3+
"references": [
4+
"Microsoft.MixedReality.Toolkit.SDK",
5+
"Microsoft.MixedReality.Toolkit",
6+
"Microsoft.MixedReality.Toolkit.SDK.Inspectors"
7+
],
8+
"optionalUnityReferences": [],
9+
"includePlatforms": [],
10+
"excludePlatforms": [],
11+
"allowUnsafeCode": false
12+
}

Assets/MixedRealityToolkit.Examples/Demos/UX/Interactables/MixedRealityToolkit-Examples.Demos.UX.Interactables.asmdef.meta

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

Assets/MixedRealityToolkit.Examples/Demos/UX/Interactables/Prefabs.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
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: 1976327359951936}
13+
m_IsPrefabParent: 1
14+
--- !u!1 &1513309078028022
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: 4463254989225456}
22+
- component: {fileID: 33406258692433058}
23+
- component: {fileID: 23197364594414254}
24+
m_Layer: 0
25+
m_Name: Cheese
26+
m_TagString: Untagged
27+
m_Icon: {fileID: 0}
28+
m_NavMeshLayer: 0
29+
m_StaticEditorFlags: 0
30+
m_IsActive: 1
31+
--- !u!1 &1976327359951936
32+
GameObject:
33+
m_ObjectHideFlags: 0
34+
m_PrefabParentObject: {fileID: 0}
35+
m_PrefabInternal: {fileID: 100100000}
36+
serializedVersion: 5
37+
m_Component:
38+
- component: {fileID: 4538655477204070}
39+
- component: {fileID: 65785153276639906}
40+
- component: {fileID: 114528208345280030}
41+
m_Layer: 0
42+
m_Name: Cheese
43+
m_TagString: Untagged
44+
m_Icon: {fileID: 0}
45+
m_NavMeshLayer: 0
46+
m_StaticEditorFlags: 0
47+
m_IsActive: 1
48+
--- !u!4 &4463254989225456
49+
Transform:
50+
m_ObjectHideFlags: 1
51+
m_PrefabParentObject: {fileID: 0}
52+
m_PrefabInternal: {fileID: 100100000}
53+
m_GameObject: {fileID: 1513309078028022}
54+
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
55+
m_LocalPosition: {x: -0, y: 0, z: 0}
56+
m_LocalScale: {x: 1, y: 1, z: 1}
57+
m_Children: []
58+
m_Father: {fileID: 4538655477204070}
59+
m_RootOrder: 0
60+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
61+
--- !u!4 &4538655477204070
62+
Transform:
63+
m_ObjectHideFlags: 1
64+
m_PrefabParentObject: {fileID: 0}
65+
m_PrefabInternal: {fileID: 100100000}
66+
m_GameObject: {fileID: 1976327359951936}
67+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
68+
m_LocalPosition: {x: 0, y: 0, z: 0}
69+
m_LocalScale: {x: 0.047473792, y: 0.047473792, z: 0.047473792}
70+
m_Children:
71+
- {fileID: 4463254989225456}
72+
m_Father: {fileID: 0}
73+
m_RootOrder: 0
74+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
75+
--- !u!23 &23197364594414254
76+
MeshRenderer:
77+
m_ObjectHideFlags: 1
78+
m_PrefabParentObject: {fileID: 0}
79+
m_PrefabInternal: {fileID: 100100000}
80+
m_GameObject: {fileID: 1513309078028022}
81+
m_Enabled: 1
82+
m_CastShadows: 1
83+
m_ReceiveShadows: 1
84+
m_DynamicOccludee: 1
85+
m_MotionVectors: 1
86+
m_LightProbeUsage: 1
87+
m_ReflectionProbeUsage: 1
88+
m_RenderingLayerMask: 4294967295
89+
m_Materials:
90+
- {fileID: 2100000, guid: 71d471797c0e430783230146721c3fcb, type: 2}
91+
- {fileID: 2100000, guid: 71d471797c0e430783230146721c3fcb, type: 2}
92+
m_StaticBatchInfo:
93+
firstSubMesh: 0
94+
subMeshCount: 0
95+
m_StaticBatchRoot: {fileID: 0}
96+
m_ProbeAnchor: {fileID: 0}
97+
m_LightProbeVolumeOverride: {fileID: 0}
98+
m_ScaleInLightmap: 1
99+
m_PreserveUVs: 0
100+
m_IgnoreNormalsForChartDetection: 0
101+
m_ImportantGI: 0
102+
m_StitchLightmapSeams: 0
103+
m_SelectedEditorRenderState: 3
104+
m_MinimumChartSize: 4
105+
m_AutoUVMaxDistance: 0.5
106+
m_AutoUVMaxAngle: 89
107+
m_LightmapParameters: {fileID: 0}
108+
m_SortingLayerID: 0
109+
m_SortingLayer: 0
110+
m_SortingOrder: 0
111+
--- !u!33 &33406258692433058
112+
MeshFilter:
113+
m_ObjectHideFlags: 1
114+
m_PrefabParentObject: {fileID: 0}
115+
m_PrefabInternal: {fileID: 100100000}
116+
m_GameObject: {fileID: 1513309078028022}
117+
m_Mesh: {fileID: 4300000, guid: 3f8a3164171bcba42b1e2b051b994a3c, type: 3}
118+
--- !u!65 &65785153276639906
119+
BoxCollider:
120+
m_ObjectHideFlags: 1
121+
m_PrefabParentObject: {fileID: 0}
122+
m_PrefabInternal: {fileID: 100100000}
123+
m_GameObject: {fileID: 1976327359951936}
124+
m_Material: {fileID: 0}
125+
m_IsTrigger: 0
126+
m_Enabled: 1
127+
serializedVersion: 2
128+
m_Size: {x: 4.1451945, y: 2.7606258, z: 3.7189484}
129+
m_Center: {x: 3.3503172, y: 1.2563689, z: -1.3594743}
130+
--- !u!114 &114528208345280030
131+
MonoBehaviour:
132+
m_ObjectHideFlags: 1
133+
m_PrefabParentObject: {fileID: 0}
134+
m_PrefabInternal: {fileID: 100100000}
135+
m_GameObject: {fileID: 1976327359951936}
136+
m_Enabled: 1
137+
m_EditorHideFlags: 0
138+
m_Script: {fileID: 11500000, guid: 1410eac1ae94b4d4492a09cc368e152c, type: 3}
139+
m_Name:
140+
m_EditorClassIdentifier:
141+
Enabled: 1
142+
States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
143+
InputAction:
144+
id: 0
145+
description:
146+
axisConstraint: 0
147+
InputActionId: 0
148+
IsGlobal: 0
149+
Dimensions: 1
150+
CanSelect: 1
151+
CanDeselect: 1
152+
VoiceCommand:
153+
RequiresGaze: 1
154+
Profiles:
155+
- Target: {fileID: 1513309078028022}
156+
Themes:
157+
- {fileID: 11400000, guid: 1872be27ce323c54f93896976d90d5c4, type: 2}
158+
HadDefaultTheme: 1
159+
OnClick:
160+
m_PersistentCalls:
161+
m_Calls: []
162+
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
163+
Culture=neutral, PublicKeyToken=null
164+
Events: []

Assets/MixedRealityToolkit.Examples/Demos/UX/Interactables/Prefabs/Cheese.prefab.meta

Lines changed: 8 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)