Skip to content

Commit dd120bb

Browse files
Merge branch 'MRTK-Version-Next' of https://github.com/Microsoft/MixedRealityToolkit-Unity into MRTK-Version-Next_OpenVRDevice
2 parents fa46bd9 + e887b0a commit dd120bb

File tree

160 files changed

+21667
-74
lines changed

Some content is hidden

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

160 files changed

+21667
-74
lines changed

Assets/MixedRealityToolkit-Examples/Demos.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/StandardShader.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/StandardShader/Animations.meta

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
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!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_PrefabParentObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 0}
8+
m_Name: ClippingPlane
9+
serializedVersion: 6
10+
m_Legacy: 0
11+
m_Compressed: 0
12+
m_UseHighQualityCurve: 1
13+
m_RotationCurves: []
14+
m_CompressedRotationCurves: []
15+
m_EulerCurves: []
16+
m_PositionCurves:
17+
- curve:
18+
serializedVersion: 2
19+
m_Curve:
20+
- serializedVersion: 2
21+
time: 0
22+
value: {x: 0, y: 0, z: 0.5}
23+
inSlope: {x: 0, y: -0.26666668, z: 0}
24+
outSlope: {x: 0, y: -0.26666668, z: 0}
25+
tangentMode: 0
26+
- serializedVersion: 2
27+
time: 1.5
28+
value: {x: 0, y: -0.4, z: 0.5}
29+
inSlope: {x: 0, y: 0, z: 0}
30+
outSlope: {x: 0, y: 0, z: 0}
31+
tangentMode: 0
32+
- serializedVersion: 2
33+
time: 3
34+
value: {x: 0, y: 0, z: 0.5}
35+
inSlope: {x: 0, y: 0.26666668, z: 0}
36+
outSlope: {x: 0, y: 0.26666668, z: 0}
37+
tangentMode: 0
38+
- serializedVersion: 2
39+
time: 4.5
40+
value: {x: 0, y: 0.4, z: 0.5}
41+
inSlope: {x: 0, y: 0, z: 0}
42+
outSlope: {x: 0, y: 0, z: 0}
43+
tangentMode: 0
44+
- serializedVersion: 2
45+
time: 6
46+
value: {x: 0, y: 0, z: 0.5}
47+
inSlope: {x: 0, y: -0.26666668, z: 0}
48+
outSlope: {x: 0, y: -0.26666668, z: 0}
49+
tangentMode: 0
50+
m_PreInfinity: 2
51+
m_PostInfinity: 2
52+
m_RotationOrder: 4
53+
path:
54+
m_ScaleCurves: []
55+
m_FloatCurves: []
56+
m_PPtrCurves: []
57+
m_SampleRate: 60
58+
m_WrapMode: 0
59+
m_Bounds:
60+
m_Center: {x: 0, y: 0, z: 0}
61+
m_Extent: {x: 0, y: 0, z: 0}
62+
m_ClipBindingConstant:
63+
genericBindings:
64+
- serializedVersion: 2
65+
path: 0
66+
attribute: 1
67+
script: {fileID: 0}
68+
typeID: 4
69+
customType: 0
70+
isPPtrCurve: 0
71+
pptrCurveMapping: []
72+
m_AnimationClipSettings:
73+
serializedVersion: 2
74+
m_AdditiveReferencePoseClip: {fileID: 0}
75+
m_AdditiveReferencePoseTime: 0
76+
m_StartTime: 0
77+
m_StopTime: 6
78+
m_OrientationOffsetY: 0
79+
m_Level: 0
80+
m_CycleOffset: 0
81+
m_HasAdditiveReferencePose: 0
82+
m_LoopTime: 1
83+
m_LoopBlend: 0
84+
m_LoopBlendOrientation: 0
85+
m_LoopBlendPositionY: 0
86+
m_LoopBlendPositionXZ: 0
87+
m_KeepOriginalOrientation: 0
88+
m_KeepOriginalPositionY: 1
89+
m_KeepOriginalPositionXZ: 0
90+
m_HeightFromFeet: 0
91+
m_Mirror: 0
92+
m_EditorCurves:
93+
- curve:
94+
serializedVersion: 2
95+
m_Curve:
96+
- serializedVersion: 2
97+
time: 0
98+
value: 0
99+
inSlope: 0
100+
outSlope: 0
101+
tangentMode: 136
102+
- serializedVersion: 2
103+
time: 3
104+
value: 0
105+
inSlope: 0
106+
outSlope: 0
107+
tangentMode: 136
108+
- serializedVersion: 2
109+
time: 4.5
110+
value: 0
111+
inSlope: 0
112+
outSlope: 0
113+
tangentMode: 136
114+
- serializedVersion: 2
115+
time: 6
116+
value: 0
117+
inSlope: 0
118+
outSlope: 0
119+
tangentMode: 34
120+
m_PreInfinity: 2
121+
m_PostInfinity: 2
122+
m_RotationOrder: 4
123+
attribute: m_LocalPosition.x
124+
path:
125+
classID: 4
126+
script: {fileID: 0}
127+
- curve:
128+
serializedVersion: 2
129+
m_Curve:
130+
- serializedVersion: 2
131+
time: 0
132+
value: 0
133+
inSlope: -0.26666668
134+
outSlope: -0.26666668
135+
tangentMode: 34
136+
- serializedVersion: 2
137+
time: 1.5
138+
value: -0.4
139+
inSlope: 0
140+
outSlope: 0
141+
tangentMode: 136
142+
- serializedVersion: 2
143+
time: 3
144+
value: 0
145+
inSlope: 0.26666668
146+
outSlope: 0.26666668
147+
tangentMode: 136
148+
- serializedVersion: 2
149+
time: 4.5
150+
value: 0.4
151+
inSlope: 0
152+
outSlope: 0
153+
tangentMode: 136
154+
- serializedVersion: 2
155+
time: 6
156+
value: 0
157+
inSlope: -0.26666668
158+
outSlope: -0.26666668
159+
tangentMode: 34
160+
m_PreInfinity: 2
161+
m_PostInfinity: 2
162+
m_RotationOrder: 4
163+
attribute: m_LocalPosition.y
164+
path:
165+
classID: 4
166+
script: {fileID: 0}
167+
- curve:
168+
serializedVersion: 2
169+
m_Curve:
170+
- serializedVersion: 2
171+
time: 0
172+
value: 0.5
173+
inSlope: 0
174+
outSlope: 0
175+
tangentMode: 136
176+
- serializedVersion: 2
177+
time: 3
178+
value: 0.5
179+
inSlope: 0
180+
outSlope: 0
181+
tangentMode: 136
182+
- serializedVersion: 2
183+
time: 4.5
184+
value: 0.5
185+
inSlope: 0
186+
outSlope: 0
187+
tangentMode: 136
188+
- serializedVersion: 2
189+
time: 6
190+
value: 0.5
191+
inSlope: 0
192+
outSlope: 0
193+
tangentMode: 136
194+
m_PreInfinity: 2
195+
m_PostInfinity: 2
196+
m_RotationOrder: 4
197+
attribute: m_LocalPosition.z
198+
path:
199+
classID: 4
200+
script: {fileID: 0}
201+
m_EulerEditorCurves: []
202+
m_HasGenericRootTransform: 1
203+
m_HasMotionFloatCurves: 0
204+
m_GenerateMotionCurves: 0
205+
m_Events: []

Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Animations/ClippingPlane.anim.meta

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!91 &9100000
4+
AnimatorController:
5+
m_ObjectHideFlags: 0
6+
m_PrefabParentObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 0}
8+
m_Name: ClippingPlane
9+
serializedVersion: 5
10+
m_AnimatorParameters: []
11+
m_AnimatorLayers:
12+
- serializedVersion: 5
13+
m_Name: Base Layer
14+
m_StateMachine: {fileID: 1107867203428925380}
15+
m_Mask: {fileID: 0}
16+
m_Motions: []
17+
m_Behaviours: []
18+
m_BlendingMode: 0
19+
m_SyncedLayerIndex: -1
20+
m_DefaultWeight: 0
21+
m_IKPass: 0
22+
m_SyncedLayerAffectsTiming: 0
23+
m_Controller: {fileID: 9100000}
24+
--- !u!1102 &1102590431941135274
25+
AnimatorState:
26+
serializedVersion: 5
27+
m_ObjectHideFlags: 1
28+
m_PrefabParentObject: {fileID: 0}
29+
m_PrefabInternal: {fileID: 0}
30+
m_Name: ClippingPlane
31+
m_Speed: 1
32+
m_CycleOffset: 0
33+
m_Transitions: []
34+
m_StateMachineBehaviours: []
35+
m_Position: {x: 50, y: 50, z: 0}
36+
m_IKOnFeet: 0
37+
m_WriteDefaultValues: 1
38+
m_Mirror: 0
39+
m_SpeedParameterActive: 0
40+
m_MirrorParameterActive: 0
41+
m_CycleOffsetParameterActive: 0
42+
m_TimeParameterActive: 0
43+
m_Motion: {fileID: 7400000, guid: c6ed5a10c7d1b3c4cac9ca7899417236, type: 2}
44+
m_Tag:
45+
m_SpeedParameter:
46+
m_MirrorParameter:
47+
m_CycleOffsetParameter:
48+
m_TimeParameter:
49+
--- !u!1107 &1107867203428925380
50+
AnimatorStateMachine:
51+
serializedVersion: 5
52+
m_ObjectHideFlags: 1
53+
m_PrefabParentObject: {fileID: 0}
54+
m_PrefabInternal: {fileID: 0}
55+
m_Name: Base Layer
56+
m_ChildStates:
57+
- serializedVersion: 1
58+
m_State: {fileID: 1102590431941135274}
59+
m_Position: {x: 340, y: 367, z: 0}
60+
m_ChildStateMachines: []
61+
m_AnyStateTransitions: []
62+
m_EntryTransitions: []
63+
m_StateMachineTransitions: {}
64+
m_StateMachineBehaviours: []
65+
m_AnyStatePosition: {x: 50, y: 20, z: 0}
66+
m_EntryPosition: {x: 50, y: 120, z: 0}
67+
m_ExitPosition: {x: 800, y: 120, z: 0}
68+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
69+
m_DefaultState: {fileID: 1102590431941135274}

Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Animations/ClippingPlane.controller.meta

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