Skip to content

Commit 66ec8ce

Browse files
authored
Merge pull request #65 from vrctxl/dev
Screen manager perf improvements, minor source manager UI fixes
2 parents acbb255 + 00a9451 commit 66ec8ce

File tree

12 files changed

+2163
-1153
lines changed

12 files changed

+2163
-1153
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## [2.5.0] - 02-25-25
44

5+
### [2.5.0-beta.4]
6+
7+
- Fixed video source UI auomatically selecting active playing source (again)
8+
- Added highlight for button of selected source
9+
- Screen Manager performance improvements
10+
511
### [2.5.0-beta.3]
612

713
- Audio Manager now uses ReservedAudioSource for AudioLink as last resort

Packages/com.texelsaur.video/Runtime/Prefabs/Other Video Players/Base/Sync Video Player Base.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ MonoBehaviour:
176176
holdLoadedVideos: 0
177177
syncFrequency: 5
178178
syncThreshold: 1
179-
autoInternalAVSync: 0
179+
autoInternalAVSync: 1
180180
defaultScreenFit: 0
181181
defaultVideoSource: 0
182182
debugLogging: 1

Packages/com.texelsaur.video/Runtime/Prefabs/UI/Internal/Video Source Button.prefab

Lines changed: 83 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ GameObject:
1212
- component: {fileID: 8909954318353848641}
1313
- component: {fileID: 7011057556609560090}
1414
m_Layer: 0
15-
m_Name: Text (Legacy)
15+
m_Name: TextInactive
1616
m_TagString: Untagged
1717
m_Icon: {fileID: 0}
1818
m_NavMeshLayer: 0
@@ -79,6 +79,85 @@ MonoBehaviour:
7979
m_VerticalOverflow: 0
8080
m_LineSpacing: 1
8181
m_Text: Playlist
82+
--- !u!1 &2258692883967313728
83+
GameObject:
84+
m_ObjectHideFlags: 0
85+
m_CorrespondingSourceObject: {fileID: 0}
86+
m_PrefabInstance: {fileID: 0}
87+
m_PrefabAsset: {fileID: 0}
88+
serializedVersion: 6
89+
m_Component:
90+
- component: {fileID: 243121411807781707}
91+
- component: {fileID: 1185957604748816993}
92+
- component: {fileID: 825816627948460935}
93+
m_Layer: 0
94+
m_Name: TextActive
95+
m_TagString: Untagged
96+
m_Icon: {fileID: 0}
97+
m_NavMeshLayer: 0
98+
m_StaticEditorFlags: 0
99+
m_IsActive: 1
100+
--- !u!224 &243121411807781707
101+
RectTransform:
102+
m_ObjectHideFlags: 0
103+
m_CorrespondingSourceObject: {fileID: 0}
104+
m_PrefabInstance: {fileID: 0}
105+
m_PrefabAsset: {fileID: 0}
106+
m_GameObject: {fileID: 2258692883967313728}
107+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
108+
m_LocalPosition: {x: 0, y: 0, z: 0}
109+
m_LocalScale: {x: 1, y: 1, z: 1}
110+
m_ConstrainProportionsScale: 0
111+
m_Children: []
112+
m_Father: {fileID: 2905875688588066613}
113+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
114+
m_AnchorMin: {x: 0, y: 0}
115+
m_AnchorMax: {x: 1, y: 1}
116+
m_AnchoredPosition: {x: 0, y: 0}
117+
m_SizeDelta: {x: 0, y: 0}
118+
m_Pivot: {x: 0.5, y: 0.5}
119+
--- !u!222 &1185957604748816993
120+
CanvasRenderer:
121+
m_ObjectHideFlags: 0
122+
m_CorrespondingSourceObject: {fileID: 0}
123+
m_PrefabInstance: {fileID: 0}
124+
m_PrefabAsset: {fileID: 0}
125+
m_GameObject: {fileID: 2258692883967313728}
126+
m_CullTransparentMesh: 1
127+
--- !u!114 &825816627948460935
128+
MonoBehaviour:
129+
m_ObjectHideFlags: 0
130+
m_CorrespondingSourceObject: {fileID: 0}
131+
m_PrefabInstance: {fileID: 0}
132+
m_PrefabAsset: {fileID: 0}
133+
m_GameObject: {fileID: 2258692883967313728}
134+
m_Enabled: 1
135+
m_EditorHideFlags: 0
136+
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
137+
m_Name:
138+
m_EditorClassIdentifier:
139+
m_Material: {fileID: 0}
140+
m_Color: {r: 0, g: 1, b: 0.5019608, a: 0.69803923}
141+
m_RaycastTarget: 1
142+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
143+
m_Maskable: 1
144+
m_OnCullStateChanged:
145+
m_PersistentCalls:
146+
m_Calls: []
147+
m_FontData:
148+
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
149+
m_FontSize: 14
150+
m_FontStyle: 0
151+
m_BestFit: 0
152+
m_MinSize: 10
153+
m_MaxSize: 40
154+
m_Alignment: 4
155+
m_AlignByGeometry: 0
156+
m_RichText: 1
157+
m_HorizontalOverflow: 0
158+
m_VerticalOverflow: 0
159+
m_LineSpacing: 1
160+
m_Text: Playlist
82161
--- !u!1 &8190466635317583904
83162
GameObject:
84163
m_ObjectHideFlags: 0
@@ -112,6 +191,7 @@ RectTransform:
112191
m_LocalScale: {x: 1, y: 1, z: 1}
113192
m_ConstrainProportionsScale: 0
114193
m_Children:
194+
- {fileID: 243121411807781707}
115195
- {fileID: 3004699447096981126}
116196
m_Father: {fileID: 0}
117197
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -237,6 +317,8 @@ MonoBehaviour:
237317
PrefabModifications: []
238318
SerializationNodes: []
239319
_udonSharpBackingUdonBehaviour: {fileID: 5919192626130368546}
320+
activeText: {fileID: 2258692883967313728}
321+
inactiveText: {fileID: 997241349679804842}
240322
sourceUI: {fileID: 0}
241323
sourceIndex: -1
242324
--- !u!114 &5919192626130368546

Packages/com.texelsaur.video/Runtime/Prefabs/UI/Options Panel.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5483,7 +5483,7 @@ MonoBehaviour:
54835483
m_HorizontalOverflow: 0
54845484
m_VerticalOverflow: 0
54855485
m_LineSpacing: 1
5486-
m_Text: VideoTXL 2.5.0-b3
5486+
m_Text: VideoTXL 2.5.0-b4
54875487
--- !u!1 &4893902363205926727
54885488
GameObject:
54895489
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)