aarov/VRCBoard-Udon
1
0
Fork 0
mirror of https://git.aaro.dev/VRCBoard/vrcboard-udon.git synced 2026-03-17 04:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enhance VRCBoardImage component with renderer initialization and property block handling

Browse Source
This commit is contained in:
Aaro Varis
2024-10-16 10:20:54 +03:00
parent 4224e17432
commit 5d0d1b8f37
2 changed files with 79 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Components/VRCBoardImage.cs
View File

@@ -5,6 +5,7 @@ using UnityEngine.Serialization;
using VRC.SDK3.Data;
using UnityEditor;
using VRC.SDKBase;
namespace VRCBoard.Components
{
@@ -25,9 +26,17 @@ namespace VRCBoard.Components
private string _mainType = "";
private string _uploaderId = "";
private Renderer _renderer;
private void Start()
{
_renderer = GetComponent<Renderer>();
}
protected override void OnRegister()
{
Debug.Log("Registering image component");
OnImageLoaded();
}
@@ -87,6 +96,8 @@ namespace VRCBoard.Components
string imageId = imageIds[i];
RequestImageLoad(imageId, _uploaderId);
}
OnImageLoaded();
}
protected override void OnInitialize()
{
@@ -104,7 +115,7 @@ namespace VRCBoard.Components
protected override void OnImageLoaded()
{
Debug.Log("Image loaded VRCBoardImage");
//Debug.Log("Image loaded VRCBoardImage");
//bool textureSuccess = GetImageAtlasTexture(albedoImageId, _uploaderId, out Texture2D texture, out int atlasPosition, out int atlasSize, out string type1);
@@ -114,6 +125,7 @@ namespace VRCBoard.Components
for (int i = 0; i < imageIds.Length; i++)
{
if (i >= texturePropertyMappings.Length) continue;
if (i >= defaultTextures.Length) continue;
string propertyName = texturePropertyMappings[i];
Texture2D texture = manager.GetTexture2D(_uploaderId, imageIds[i]);
@@ -121,16 +133,14 @@ namespace VRCBoard.Components
if (texture == null)
{
texture = defaultTextures[i];
if (texture == null) continue;
}
if (string.IsNullOrEmpty(propertyName)) continue;
propertyBlock.SetTexture(propertyName, texture);
if (texture != null) propertyBlock.SetTexture(propertyName, texture);
if (materialOverride != null) materialOverride.SetTexture(propertyName, texture);
}
GetComponent<Renderer>().SetPropertyBlock(propertyBlock);
if (materialOverride== null && _renderer) _renderer.SetPropertyBlock(propertyBlock);
}
}
#if UNITY_EDITOR && !COMPILER_UDONSHARP
@@ -139,19 +149,23 @@ namespace VRCBoard.Components
{
public override void OnInspectorGUI()
{
base.OnInspectorGUI();
VRCBoardImage script = (VRCBoardImage)target;
Renderer renderer = script.GetComponent<Renderer>();
Material material = renderer.sharedMaterial;
if (script.materialOverride)
{
EditorGUILayout.HelpBox("Material override enabled", MessageType.Info);
EditorGUILayout.HelpBox("Material override enabled, material may behave in odd ways", MessageType.Warning);
material = script.materialOverride;
} else if (renderer == null)
{
EditorGUILayout.HelpBox("No renderer, did you intend to use material override?", MessageType.Warning);
return;
}
string[] materialPropertyNames = material.GetPropertyNames(MaterialPropertyType.Texture);
base.OnInspectorGUI();
bool equals =
Equals(script.imageIds.Length, script.defaultTextures.Length) &&
Equals(script.imageIds.Length, script.defaultTextures.Length);
@@ -229,8 +243,7 @@ namespace VRCBoard.Components
}
GUILayout.EndVertical();
}
renderer.SetPropertyBlock(propertyBlock);
if (script.materialOverride== null && renderer) renderer.SetPropertyBlock(propertyBlock);
EditorGUILayout.EndHorizontal();
}