From 2f0f823924c8709f3458203abe7e46327f1de134 Mon Sep 17 00:00:00 2001 From: Momo The Monster Date: Wed, 15 Feb 2023 17:13:55 -0800 Subject: [PATCH] Removes commas from Captions, adds index.html --- Assets/_Project/Frame/FrameDataLoader.asset | 106 +++++++++++++++----- Assets/_Project/Frame/FrameDataLoader.cs | 29 ++++-- Assets/_Project/Gallery.unity | 4 +- Web/captions.csv | 18 ++-- Web/index.html | 16 +++ 5 files changed, 129 insertions(+), 44 deletions(-) create mode 100644 Web/index.html diff --git a/Assets/_Project/Frame/FrameDataLoader.asset b/Assets/_Project/Frame/FrameDataLoader.asset index 9bb9660..a8732eb 100644 --- a/Assets/_Project/Frame/FrameDataLoader.asset +++ b/Assets/_Project/Frame/FrameDataLoader.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 8 + Data: 9 - Name: Entry: 7 Data: @@ -116,7 +116,7 @@ MonoBehaviour: Data: 6|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.Udon.UdonBehaviour, VRC.Udon + Data: VRC.Udon.Common.Interfaces.IUdonEventReceiver, VRC.Udon.Common - Name: Entry: 8 Data: @@ -134,7 +134,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 Data: 7|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -220,11 +220,17 @@ MonoBehaviour: Entry: 1 Data: stringUrl - Name: k__BackingField - Entry: 9 - Data: 9 + Entry: 7 + Data: 12|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCUrl, VRCSDKBase + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 9 + Data: 12 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -239,7 +245,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -263,13 +269,13 @@ MonoBehaviour: Data: renderer - Name: $v Entry: 7 - Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: renderer - Name: k__BackingField Entry: 7 - Data: 14|System.RuntimeType, mscorlib + Data: 15|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Renderer, UnityEngine.CoreModule @@ -278,7 +284,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 14 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -293,7 +299,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -317,13 +323,13 @@ MonoBehaviour: Data: field - Name: $v Entry: 7 - Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: field - Name: k__BackingField Entry: 7 - Data: 17|System.RuntimeType, mscorlib + Data: 18|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.UI.Text, UnityEngine.UI @@ -332,7 +338,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 17 + Data: 18 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -347,7 +353,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -371,13 +377,13 @@ MonoBehaviour: Data: photoDurationSeconds - Name: $v Entry: 7 - Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: photoDurationSeconds - Name: k__BackingField Entry: 7 - Data: 20|System.RuntimeType, mscorlib + Data: 21|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -386,7 +392,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 20 + Data: 21 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -401,7 +407,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -425,13 +431,13 @@ MonoBehaviour: Data: _loadedIndex - Name: $v Entry: 7 - Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _loadedIndex - Name: k__BackingField Entry: 7 - Data: 23|System.RuntimeType, mscorlib + Data: 24|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -440,7 +446,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 23 + Data: 24 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -455,7 +461,61 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: captions + - Name: $v + Entry: 7 + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: captions + - Name: k__BackingField + Entry: 7 + Data: 27|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String[], mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 27 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/_Project/Frame/FrameDataLoader.cs b/Assets/_Project/Frame/FrameDataLoader.cs index 7d547bd..e14a4a6 100644 --- a/Assets/_Project/Frame/FrameDataLoader.cs +++ b/Assets/_Project/Frame/FrameDataLoader.cs @@ -4,22 +4,26 @@ using UnityEngine.UI; using VRC.SDK3.Image; using VRC.SDK3.StringLoading; using VRC.SDKBase; -using VRC.Udon; +using VRC.Udon.Common.Interfaces; public class FrameDataLoader : UdonSharpBehaviour { private VRCImageDownloader _imageDownloader; - public UdonBehaviour udonEventReceiver; + private IUdonEventReceiver udonEventReceiver; public VRCUrl[] rgbUrl; - public VRCUrl[] stringUrl; + public VRCUrl stringUrl; public Renderer renderer; public Text field; public float photoDurationSeconds = 10f; private int _loadedIndex = -1; + + public string[] captions = new string[0]; void Start() { + udonEventReceiver = (IUdonEventReceiver)this; _imageDownloader = new VRCImageDownloader(); + VRCStringDownloader.LoadUrl(stringUrl, udonEventReceiver); LoadNextRecursive(); } @@ -31,23 +35,28 @@ public class FrameDataLoader : UdonSharpBehaviour private void LoadNext() { - // _loadedIndex++; - // if(_loadedIndex >= rgbUrl.Length) - // { - // _loadedIndex = 0; - // } _loadedIndex = (int)(Networking.GetServerTimeInMilliseconds() / 1000f / photoDurationSeconds) % rgbUrl.Length; var rgbInfo = new TextureInfo(); rgbInfo.WrapModeU = TextureWrapMode.Mirror; rgbInfo.WrapModeV = TextureWrapMode.Mirror; _imageDownloader.DownloadImage(rgbUrl[_loadedIndex], renderer.material, udonEventReceiver, rgbInfo); - VRCStringDownloader.LoadUrl(stringUrl[_loadedIndex], udonEventReceiver); + + // Set caption if one is provided + if (_loadedIndex < captions.Length) + { + field.text = captions[_loadedIndex]; + } + else + { + field.text = ""; + } } public override void OnStringLoadSuccess(IVRCStringDownload result) { - field.text = result.Result; + Debug.Log($"Loaded String, making Captions from {result.Result}"); + captions = result.Result.Split('\n'); } public override void OnStringLoadError(IVRCStringDownload result) diff --git a/Assets/_Project/Gallery.unity b/Assets/_Project/Gallery.unity index 41e6065..ea22bf4 100644 --- a/Assets/_Project/Gallery.unity +++ b/Assets/_Project/Gallery.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5371c881457d883dbf200da8a3f1485d0bde8502d5688690d9961f709460973c -size 50505 +oid sha256:51b98c47e7a7bc8a0df8d4068b0cdf4ebb2ba1fcc3776216bb6d7e0519f30cc8 +size 50307 diff --git a/Web/captions.csv b/Web/captions.csv index 5ef2f5f..983ec04 100644 --- a/Web/captions.csv +++ b/Web/captions.csv @@ -1,10 +1,10 @@ -Rocktopus and Fins NYE Testing, -Talox Chillin in Orels' Dev Space, -Just a Fish Surfing on a Turtle, -Momo at Sanrio Virtual Festival, -Udon Boxes, -Spookality Team Test, -Cubed and DJ by the Fire, -Sepia Momo in a Painting, -That's a Dizzy Tiger, +Rocktopus and Fins NYE Testing +Talox Chillin in Orels' Dev Space +Just a Fish Surfing on a Turtle +Momo at Sanrio Virtual Festival +Udon Boxes +Spookality Team Test +Cubed and DJ by the Fire +Sepia Momo in a Painting +That's a Dizzy Tiger Wait How Did We Get Like This \ No newline at end of file diff --git a/Web/index.html b/Web/index.html new file mode 100644 index 0000000..a6fe848 --- /dev/null +++ b/Web/index.html @@ -0,0 +1,16 @@ + +VRChat Remote Image Loading Assets + + Image Captions + + + + + + + + + + + + \ No newline at end of file