v1.8.9

Updated/bugfix Quest support added quest specific error screen added an initialization script added Movie Button script
UdonVR · Jul 3, 2021 · 8ffaafc · 8ffaafc
1 parent 4c4349f
commit 8ffaafc
Show file tree

Hide file tree

Showing 4 changed files with 231 additions and 68 deletions.
diff --git a/Emission.cs b/Emission.cs
@@ -11,6 +11,11 @@ namespace UdonVR.Childofthebeast
 {
     public class Emission : UdonSharpBehaviour
     {
+        #if UNITY_ANDROID
+        private bool isQuest = true;
+        #else
+        private bool isQuest = false;
+        #endif
         public MeshRenderer ScreenMesh;
         public int Material_Index;
         public bool SharedMerial = false;
@@ -24,10 +29,12 @@ public class Emission : UdonSharpBehaviour
         private float _CurrentEmission = 1;
         private bool _IsOn = true;
         private int _Frame = 0;
-        private InputField _FrameSkipFeild;
+        public InputField FrameSkipFeild;
+        public Text FramSkipText;
 
         private void Start()
         {
+            if (!isQuest) InitPC();
             if (ScreenMesh == null) ScreenMesh = gameObject.GetComponent<MeshRenderer>();
             if (SharedMerial)
             {
@@ -45,7 +52,6 @@ private void Start()
             if (UpdateRealtimeGI)
             {
                 FrameSkipUI.SetActive(true);
-                _FrameSkipFeild = FrameSkipUI.GetComponentInChildren<InputField>();
             }
         }
         public void SetHide()
@@ -130,23 +136,40 @@ private void Update()
         public void FrameUp()
         {
             FrameSkip++;
-            _FrameSkipFeild.text = FrameSkip.ToString();
+            UpdateFeild(FrameSkip.ToString());
         }
 
         public void FrameDown()
         {
             if (FrameSkip <= 0) return;
             FrameSkip--;
-            _FrameSkipFeild.text = FrameSkip.ToString();
+            UpdateFeild(FrameSkip.ToString());
         }
 
         public void FrameSet()
         {
             int _var = 0;
-            int.TryParse(_FrameSkipFeild.text, out _var);
+            int.TryParse(FrameSkipFeild.text, out _var);
             if (_var <= 0) _var = 0;
             FrameSkip = _var;
-            _FrameSkipFeild.text = FrameSkip.ToString();
+            UpdateFeild(FrameSkip.ToString());
+        }
+
+        private void UpdateFeild(string _str)
+        {
+            if (isQuest)
+            {
+                FramSkipText.text = _str;
+            }
+            else
+            {
+                FrameSkipFeild.text = _str;
+            }
+        }
+
+        private void InitPC()
+        {
+            FrameSkipFeild.interactable = true;
         }
     }
 }
diff --git a/InitPlayerScripts.cs b/InitPlayerScripts.cs
@@ -0,0 +1,19 @@
+
+using UdonSharp;
+using UnityEngine;
+using VRC.SDKBase;
+using VRC.Udon;
+
+namespace UdonVR.Takato.VideoPlayer
+{
+    public class InitPlayerScripts : UdonSharpBehaviour
+    {
+        public UdonSyncVideoPlayer Player;
+        public LoopToggle LoopToggle;
+        void Start()
+        {
+            Player.Init();
+            LoopToggle.Init();
+        }
+    }
+}
diff --git a/PlayMovie.cs b/PlayMovie.cs
@@ -0,0 +1,21 @@
+
+using UdonSharp;
+using UnityEngine;
+using VRC.SDKBase;
+using VRC.Udon;
+
+namespace UdonVR.Takato.VideoPlayer
+{
+    public class PlayMovie : UdonSharpBehaviour
+    {
+        public UdonSyncVideoPlayer Player;
+        public VRCUrl URL;
+
+        public override void Interact()
+        {
+            Player.TakeOwner();
+            Player.ChangeVideoUrlVRC(URL);
+        }
+    }
+
+}