Skip to content

Commit 19645ea

Browse files
MerlinVRMerlinVR
authored
Merge pull request #1 from MerlinVR/0.2-dev
Stream player support
2 parents bc90db5 + 24bfcbd commit 19645ea

37 files changed

+13234
-2302
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,4 @@ crashlytics-build.properties
7575
/Assets/SerializedUdonPrograms/
7676
/Assets/SerializedUdonPrograms.meta
7777

78+
bakery_times.log

‎Assets/USharpVideo/Animations.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/USharpVideo/Animations/InterpTo0.anim‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: InterpTo0
10+
serializedVersion: 6
11+
m_Legacy: 0
12+
m_Compressed: 0
13+
m_UseHighQualityCurve: 1
14+
m_RotationCurves: []
15+
m_CompressedRotationCurves: []
16+
m_EulerCurves: []
17+
m_PositionCurves: []
18+
m_ScaleCurves: []
19+
m_FloatCurves:
20+
- curve:
21+
serializedVersion: 2
22+
m_Curve:
23+
- serializedVersion: 3
24+
time: 0
25+
value: 64
26+
inSlope: 0
27+
outSlope: 0
28+
tangentMode: 136
29+
weightedMode: 0
30+
inWeight: 0.33333334
31+
outWeight: 0.33333334
32+
- serializedVersion: 3
33+
time: 1
34+
value: 0
35+
inSlope: 0
36+
outSlope: 0
37+
tangentMode: 136
38+
weightedMode: 0
39+
inWeight: 0.33333334
40+
outWeight: 0.33333334
41+
m_PreInfinity: 2
42+
m_PostInfinity: 2
43+
m_RotationOrder: 4
44+
attribute: m_AnchoredPosition.x
45+
path: ModeSlider
46+
classID: 224
47+
script: {fileID: 0}
48+
m_PPtrCurves: []
49+
m_SampleRate: 60
50+
m_WrapMode: 0
51+
m_Bounds:
52+
m_Center: {x: 0, y: 0, z: 0}
53+
m_Extent: {x: 0, y: 0, z: 0}
54+
m_ClipBindingConstant:
55+
genericBindings:
56+
- serializedVersion: 2
57+
path: 4287812482
58+
attribute: 1460864421
59+
script: {fileID: 0}
60+
typeID: 224
61+
customType: 28
62+
isPPtrCurve: 0
63+
pptrCurveMapping: []
64+
m_AnimationClipSettings:
65+
serializedVersion: 2
66+
m_AdditiveReferencePoseClip: {fileID: 0}
67+
m_AdditiveReferencePoseTime: 0
68+
m_StartTime: 0
69+
m_StopTime: 1
70+
m_OrientationOffsetY: 0
71+
m_Level: 0
72+
m_CycleOffset: 0
73+
m_HasAdditiveReferencePose: 0
74+
m_LoopTime: 0
75+
m_LoopBlend: 0
76+
m_LoopBlendOrientation: 0
77+
m_LoopBlendPositionY: 0
78+
m_LoopBlendPositionXZ: 0
79+
m_KeepOriginalOrientation: 0
80+
m_KeepOriginalPositionY: 1
81+
m_KeepOriginalPositionXZ: 0
82+
m_HeightFromFeet: 0
83+
m_Mirror: 0
84+
m_EditorCurves:
85+
- curve:
86+
serializedVersion: 2
87+
m_Curve:
88+
- serializedVersion: 3
89+
time: 0
90+
value: 64
91+
inSlope: 0
92+
outSlope: 0
93+
tangentMode: 136
94+
weightedMode: 0
95+
inWeight: 0.33333334
96+
outWeight: 0.33333334
97+
- serializedVersion: 3
98+
time: 1
99+
value: 0
100+
inSlope: 0
101+
outSlope: 0
102+
tangentMode: 136
103+
weightedMode: 0
104+
inWeight: 0.33333334
105+
outWeight: 0.33333334
106+
m_PreInfinity: 2
107+
m_PostInfinity: 2
108+
m_RotationOrder: 4
109+
attribute: m_AnchoredPosition.x
110+
path: ModeSlider
111+
classID: 224
112+
script: {fileID: 0}
113+
m_EulerEditorCurves: []
114+
m_HasGenericRootTransform: 0
115+
m_HasMotionFloatCurves: 0
116+
m_Events: []

‎Assets/USharpVideo/Animations/InterpTo0.anim.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/USharpVideo/Animations/InterpTo1.anim‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: InterpTo1
10+
serializedVersion: 6
11+
m_Legacy: 0
12+
m_Compressed: 0
13+
m_UseHighQualityCurve: 1
14+
m_RotationCurves: []
15+
m_CompressedRotationCurves: []
16+
m_EulerCurves: []
17+
m_PositionCurves: []
18+
m_ScaleCurves: []
19+
m_FloatCurves:
20+
- curve:
21+
serializedVersion: 2
22+
m_Curve:
23+
- serializedVersion: 3
24+
time: 0
25+
value: 0
26+
inSlope: 0
27+
outSlope: 0
28+
tangentMode: 136
29+
weightedMode: 0
30+
inWeight: 0.33333334
31+
outWeight: 0.33333334
32+
- serializedVersion: 3
33+
time: 1
34+
value: 64
35+
inSlope: 0
36+
outSlope: 0
37+
tangentMode: 136
38+
weightedMode: 0
39+
inWeight: 0.33333334
40+
outWeight: 0.33333334
41+
m_PreInfinity: 2
42+
m_PostInfinity: 2
43+
m_RotationOrder: 4
44+
attribute: m_AnchoredPosition.x
45+
path: ModeSlider
46+
classID: 224
47+
script: {fileID: 0}
48+
m_PPtrCurves: []
49+
m_SampleRate: 60
50+
m_WrapMode: 0
51+
m_Bounds:
52+
m_Center: {x: 0, y: 0, z: 0}
53+
m_Extent: {x: 0, y: 0, z: 0}
54+
m_ClipBindingConstant:
55+
genericBindings:
56+
- serializedVersion: 2
57+
path: 4287812482
58+
attribute: 1460864421
59+
script: {fileID: 0}
60+
typeID: 224
61+
customType: 28
62+
isPPtrCurve: 0
63+
pptrCurveMapping: []
64+
m_AnimationClipSettings:
65+
serializedVersion: 2
66+
m_AdditiveReferencePoseClip: {fileID: 0}
67+
m_AdditiveReferencePoseTime: 0
68+
m_StartTime: 0
69+
m_StopTime: 1
70+
m_OrientationOffsetY: 0
71+
m_Level: 0
72+
m_CycleOffset: 0
73+
m_HasAdditiveReferencePose: 0
74+
m_LoopTime: 0
75+
m_LoopBlend: 0
76+
m_LoopBlendOrientation: 0
77+
m_LoopBlendPositionY: 0
78+
m_LoopBlendPositionXZ: 0
79+
m_KeepOriginalOrientation: 0
80+
m_KeepOriginalPositionY: 1
81+
m_KeepOriginalPositionXZ: 0
82+
m_HeightFromFeet: 0
83+
m_Mirror: 0
84+
m_EditorCurves:
85+
- curve:
86+
serializedVersion: 2
87+
m_Curve:
88+
- serializedVersion: 3
89+
time: 0
90+
value: 0
91+
inSlope: 0
92+
outSlope: 0
93+
tangentMode: 136
94+
weightedMode: 0
95+
inWeight: 0.33333334
96+
outWeight: 0.33333334
97+
- serializedVersion: 3
98+
time: 1
99+
value: 64
100+
inSlope: 0
101+
outSlope: 0
102+
tangentMode: 136
103+
weightedMode: 0
104+
inWeight: 0.33333334
105+
outWeight: 0.33333334
106+
m_PreInfinity: 2
107+
m_PostInfinity: 2
108+
m_RotationOrder: 4
109+
attribute: m_AnchoredPosition.x
110+
path: ModeSlider
111+
classID: 224
112+
script: {fileID: 0}
113+
m_EulerEditorCurves: []
114+
m_HasGenericRootTransform: 0
115+
m_HasMotionFloatCurves: 0
116+
m_Events: []

‎Assets/USharpVideo/Animations/InterpTo1.anim.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)