Skip to content

Commit c36933e

Browse files
StephenHodgsonStephenHodgson
committed
Merge branch 'mrtk_development' into vNEXT-InputActionRules
2 parents 1873a6f + 7c6aba0 commit c36933e

38 files changed

+10081
-69
lines changed

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers.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.

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/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.

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/Prefabs/ChaseSource.prefab‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
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: 1307245229378308}
13+
m_IsPrefabParent: 1
14+
--- !u!1 &1307245229378308
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: 4730916243282228}
22+
- component: {fileID: 114229151188300204}
23+
- component: {fileID: 114604167685196832}
24+
- component: {fileID: 33503633605293008}
25+
- component: {fileID: 23066390738997328}
26+
m_Layer: 0
27+
m_Name: ChaseSource
28+
m_TagString: Untagged
29+
m_Icon: {fileID: 0}
30+
m_NavMeshLayer: 0
31+
m_StaticEditorFlags: 0
32+
m_IsActive: 1
33+
--- !u!4 &4730916243282228
34+
Transform:
35+
m_ObjectHideFlags: 1
36+
m_PrefabParentObject: {fileID: 0}
37+
m_PrefabInternal: {fileID: 100100000}
38+
m_GameObject: {fileID: 1307245229378308}
39+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
40+
m_LocalPosition: {x: 0, y: 0, z: 0}
41+
m_LocalScale: {x: 0.025, y: 0.025, z: 0.025}
42+
m_Children: []
43+
m_Father: {fileID: 0}
44+
m_RootOrder: 0
45+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
46+
--- !u!23 &23066390738997328
47+
MeshRenderer:
48+
m_ObjectHideFlags: 1
49+
m_PrefabParentObject: {fileID: 0}
50+
m_PrefabInternal: {fileID: 100100000}
51+
m_GameObject: {fileID: 1307245229378308}
52+
m_Enabled: 1
53+
m_CastShadows: 1
54+
m_ReceiveShadows: 1
55+
m_DynamicOccludee: 1
56+
m_MotionVectors: 1
57+
m_LightProbeUsage: 1
58+
m_ReflectionProbeUsage: 1
59+
m_RenderingLayerMask: 4294967295
60+
m_Materials:
61+
- {fileID: 2100000, guid: c4a1b7475a654dd0acaa0cfdfba2e20c, type: 2}
62+
m_StaticBatchInfo:
63+
firstSubMesh: 0
64+
subMeshCount: 0
65+
m_StaticBatchRoot: {fileID: 0}
66+
m_ProbeAnchor: {fileID: 0}
67+
m_LightProbeVolumeOverride: {fileID: 0}
68+
m_ScaleInLightmap: 1
69+
m_PreserveUVs: 0
70+
m_IgnoreNormalsForChartDetection: 0
71+
m_ImportantGI: 0
72+
m_StitchLightmapSeams: 0
73+
m_SelectedEditorRenderState: 3
74+
m_MinimumChartSize: 4
75+
m_AutoUVMaxDistance: 0.5
76+
m_AutoUVMaxAngle: 89
77+
m_LightmapParameters: {fileID: 0}
78+
m_SortingLayerID: 0
79+
m_SortingLayer: 0
80+
m_SortingOrder: 0
81+
--- !u!33 &33503633605293008
82+
MeshFilter:
83+
m_ObjectHideFlags: 1
84+
m_PrefabParentObject: {fileID: 0}
85+
m_PrefabInternal: {fileID: 100100000}
86+
m_GameObject: {fileID: 1307245229378308}
87+
m_Mesh: {fileID: 4300000, guid: 841b5755ac02dbc439bd347f414de999, type: 3}
88+
--- !u!114 &114229151188300204
89+
MonoBehaviour:
90+
m_ObjectHideFlags: 1
91+
m_PrefabParentObject: {fileID: 0}
92+
m_PrefabInternal: {fileID: 100100000}
93+
m_GameObject: {fileID: 1307245229378308}
94+
m_Enabled: 1
95+
m_EditorHideFlags: 0
96+
m_Script: {fileID: 11500000, guid: b55691ad5b034fe6966763a6e23818d2, type: 3}
97+
m_Name:
98+
m_EditorClassIdentifier:
99+
handedness: 1
100+
trackedObjectToReference: 2
101+
additionalOffset: {x: 0, y: 0, z: 0}
102+
additionalRotation: {x: 0, y: 0, z: 0}
103+
transformTarget: {fileID: 0}
104+
updateSolvers: 1
105+
--- !u!114 &114604167685196832
106+
MonoBehaviour:
107+
m_ObjectHideFlags: 1
108+
m_PrefabParentObject: {fileID: 0}
109+
m_PrefabInternal: {fileID: 100100000}
110+
m_GameObject: {fileID: 1307245229378308}
111+
m_Enabled: 1
112+
m_EditorHideFlags: 0
113+
m_Script: {fileID: 11500000, guid: 4684083f6dff4a1d8a790bccc354fcf4, type: 3}
114+
m_Name:
115+
m_EditorClassIdentifier:
116+
updateLinkedTransform: 0
117+
moveLerpTime: 0.1
118+
rotateLerpTime: 0.1
119+
scaleLerpTime: 0
120+
maintainScale: 1
121+
smoothing: 1
122+
lifetime: 0
123+
SolverHandler: {fileID: 114229151188300204}
124+
referenceDirection: 0
125+
minDistance: 0.1
126+
maxDistance: 0.1
127+
minViewDegrees: 0
128+
maxViewDegrees: 0
129+
aspectV: 1
130+
ignoreAngleClamp: 0
131+
ignoreDistanceClamp: 0
132+
orientToReferenceDirection: 0

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/Prefabs/ChaseSource.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.

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/Prefabs/ChaseSourceWithOffset.prefab‎

Lines changed: 205 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,205 @@
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: 1108371264373750}
13+
m_IsPrefabParent: 1
14+
--- !u!1 &1081535205414756
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: 4523406418122248}
22+
- component: {fileID: 33800930495665972}
23+
- component: {fileID: 23713399949199268}
24+
m_Layer: 0
25+
m_Name: Offset of -3
26+
m_TagString: Untagged
27+
m_Icon: {fileID: 0}
28+
m_NavMeshLayer: 0
29+
m_StaticEditorFlags: 0
30+
m_IsActive: 1
31+
--- !u!1 &1108371264373750
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: 4526610178519342}
39+
- component: {fileID: 114911825043747796}
40+
- component: {fileID: 114318995609163506}
41+
- component: {fileID: 33336251020598190}
42+
- component: {fileID: 23798581092926046}
43+
m_Layer: 0
44+
m_Name: ChaseSourceWithOffset
45+
m_TagString: Untagged
46+
m_Icon: {fileID: 0}
47+
m_NavMeshLayer: 0
48+
m_StaticEditorFlags: 0
49+
m_IsActive: 1
50+
--- !u!4 &4523406418122248
51+
Transform:
52+
m_ObjectHideFlags: 1
53+
m_PrefabParentObject: {fileID: 0}
54+
m_PrefabInternal: {fileID: 100100000}
55+
m_GameObject: {fileID: 1081535205414756}
56+
m_LocalRotation: {x: 1, y: 0, z: 0, w: 0}
57+
m_LocalPosition: {x: -3, y: 0, z: -0.03}
58+
m_LocalScale: {x: 1, y: 1, z: 1}
59+
m_Children: []
60+
m_Father: {fileID: 4526610178519342}
61+
m_RootOrder: 0
62+
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 180}
63+
--- !u!4 &4526610178519342
64+
Transform:
65+
m_ObjectHideFlags: 1
66+
m_PrefabParentObject: {fileID: 0}
67+
m_PrefabInternal: {fileID: 100100000}
68+
m_GameObject: {fileID: 1108371264373750}
69+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
70+
m_LocalPosition: {x: 0, y: 0, z: 0}
71+
m_LocalScale: {x: 0.025, y: 0.025, z: 0.025}
72+
m_Children:
73+
- {fileID: 4523406418122248}
74+
m_Father: {fileID: 0}
75+
m_RootOrder: 0
76+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
77+
--- !u!23 &23713399949199268
78+
MeshRenderer:
79+
m_ObjectHideFlags: 1
80+
m_PrefabParentObject: {fileID: 0}
81+
m_PrefabInternal: {fileID: 100100000}
82+
m_GameObject: {fileID: 1081535205414756}
83+
m_Enabled: 1
84+
m_CastShadows: 1
85+
m_ReceiveShadows: 1
86+
m_DynamicOccludee: 1
87+
m_MotionVectors: 1
88+
m_LightProbeUsage: 1
89+
m_ReflectionProbeUsage: 1
90+
m_RenderingLayerMask: 4294967295
91+
m_Materials:
92+
- {fileID: 2100000, guid: 00665e2a669d4b0fab1965843b4c914b, type: 2}
93+
m_StaticBatchInfo:
94+
firstSubMesh: 0
95+
subMeshCount: 0
96+
m_StaticBatchRoot: {fileID: 0}
97+
m_ProbeAnchor: {fileID: 0}
98+
m_LightProbeVolumeOverride: {fileID: 0}
99+
m_ScaleInLightmap: 1
100+
m_PreserveUVs: 0
101+
m_IgnoreNormalsForChartDetection: 0
102+
m_ImportantGI: 0
103+
m_StitchLightmapSeams: 0
104+
m_SelectedEditorRenderState: 3
105+
m_MinimumChartSize: 4
106+
m_AutoUVMaxDistance: 0.5
107+
m_AutoUVMaxAngle: 89
108+
m_LightmapParameters: {fileID: 0}
109+
m_SortingLayerID: 0
110+
m_SortingLayer: 0
111+
m_SortingOrder: 0
112+
--- !u!23 &23798581092926046
113+
MeshRenderer:
114+
m_ObjectHideFlags: 1
115+
m_PrefabParentObject: {fileID: 0}
116+
m_PrefabInternal: {fileID: 100100000}
117+
m_GameObject: {fileID: 1108371264373750}
118+
m_Enabled: 1
119+
m_CastShadows: 1
120+
m_ReceiveShadows: 1
121+
m_DynamicOccludee: 1
122+
m_MotionVectors: 1
123+
m_LightProbeUsage: 1
124+
m_ReflectionProbeUsage: 1
125+
m_RenderingLayerMask: 4294967295
126+
m_Materials:
127+
- {fileID: 2100000, guid: c4a1b7475a654dd0acaa0cfdfba2e20c, type: 2}
128+
m_StaticBatchInfo:
129+
firstSubMesh: 0
130+
subMeshCount: 0
131+
m_StaticBatchRoot: {fileID: 0}
132+
m_ProbeAnchor: {fileID: 0}
133+
m_LightProbeVolumeOverride: {fileID: 0}
134+
m_ScaleInLightmap: 1
135+
m_PreserveUVs: 0
136+
m_IgnoreNormalsForChartDetection: 0
137+
m_ImportantGI: 0
138+
m_StitchLightmapSeams: 0
139+
m_SelectedEditorRenderState: 3
140+
m_MinimumChartSize: 4
141+
m_AutoUVMaxDistance: 0.5
142+
m_AutoUVMaxAngle: 89
143+
m_LightmapParameters: {fileID: 0}
144+
m_SortingLayerID: 0
145+
m_SortingLayer: 0
146+
m_SortingOrder: 0
147+
--- !u!33 &33336251020598190
148+
MeshFilter:
149+
m_ObjectHideFlags: 1
150+
m_PrefabParentObject: {fileID: 0}
151+
m_PrefabInternal: {fileID: 100100000}
152+
m_GameObject: {fileID: 1108371264373750}
153+
m_Mesh: {fileID: 4300000, guid: 841b5755ac02dbc439bd347f414de999, type: 3}
154+
--- !u!33 &33800930495665972
155+
MeshFilter:
156+
m_ObjectHideFlags: 1
157+
m_PrefabParentObject: {fileID: 0}
158+
m_PrefabInternal: {fileID: 100100000}
159+
m_GameObject: {fileID: 1081535205414756}
160+
m_Mesh: {fileID: 4300000, guid: dc6c0266b7f350f40b24b8ddfae317b4, type: 3}
161+
--- !u!114 &114318995609163506
162+
MonoBehaviour:
163+
m_ObjectHideFlags: 1
164+
m_PrefabParentObject: {fileID: 0}
165+
m_PrefabInternal: {fileID: 100100000}
166+
m_GameObject: {fileID: 1108371264373750}
167+
m_Enabled: 1
168+
m_EditorHideFlags: 0
169+
m_Script: {fileID: 11500000, guid: 4684083f6dff4a1d8a790bccc354fcf4, type: 3}
170+
m_Name:
171+
m_EditorClassIdentifier:
172+
updateLinkedTransform: 0
173+
moveLerpTime: 0.1
174+
rotateLerpTime: 0.1
175+
scaleLerpTime: 0
176+
maintainScale: 1
177+
smoothing: 1
178+
lifetime: 0
179+
SolverHandler: {fileID: 114911825043747796}
180+
referenceDirection: 0
181+
minDistance: 0.1
182+
maxDistance: 0.1
183+
minViewDegrees: 0
184+
maxViewDegrees: 0
185+
aspectV: 1
186+
ignoreAngleClamp: 0
187+
ignoreDistanceClamp: 0
188+
orientToReferenceDirection: 0
189+
--- !u!114 &114911825043747796
190+
MonoBehaviour:
191+
m_ObjectHideFlags: 1
192+
m_PrefabParentObject: {fileID: 0}
193+
m_PrefabInternal: {fileID: 100100000}
194+
m_GameObject: {fileID: 1108371264373750}
195+
m_Enabled: 1
196+
m_EditorHideFlags: 0
197+
m_Script: {fileID: 11500000, guid: b55691ad5b034fe6966763a6e23818d2, type: 3}
198+
m_Name:
199+
m_EditorClassIdentifier:
200+
handedness: 1
201+
trackedObjectToReference: 2
202+
additionalOffset: {x: 0, y: 0, z: 0}
203+
additionalRotation: {x: 0, y: 0, z: 0}
204+
transformTarget: {fileID: 0}
205+
updateSolvers: 1

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/Prefabs/ChaseSourceWithOffset.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)