Moved shaders to UmaAssetManager

Fixed remaining loading/unloading issues
This commit is contained in:
Katboi01
2023-08-20 21:47:39 +02:00
parent 39f1c1a305
commit 9bb4539095
5 changed files with 61 additions and 111 deletions
+32 -58
View File
@@ -4,6 +4,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using UnityEngine;
using static UnityEngine.Rendering.VirtualTexturing.Debugging;
public class UmaAssetManager : MonoBehaviour
@@ -11,9 +12,18 @@ public class UmaAssetManager : MonoBehaviour
public static UmaAssetManager instance;
private Dictionary<string, AssetBundle> LoadedBundles = new Dictionary<string, AssetBundle>();
private Dictionary<string, AssetBundle> NeverUnload = new Dictionary<string, AssetBundle>();
private Dictionary<string, AssetBundle> NeverUnload = new Dictionary<string, AssetBundle>();
public static event Action <UmaDatabaseEntry> OnLoadedBundleUpdate;
public static Shader HairShader,
FaceShader,
EyeShader,
CheekShader,
EyebrowShader,
AlphaShader,
BodyAlphaShader,
BodyBehindAlphaShader;
public static event Action<UmaDatabaseEntry> OnLoadedBundleUpdate;
public static event Action OnLoadedBundleClear;
public static event Action<int, int, string> OnLoadProgressChange;
@@ -44,8 +54,8 @@ public class UmaAssetManager : MonoBehaviour
{
SearchAB(Main, entry, ref result);
}
for(int i = 0; i < result.Count; i++)
for (int i = 0; i < result.Count; i++)
{
var exist = LoadAB(result[i]);
if (!exist)
@@ -62,7 +72,7 @@ public class UmaAssetManager : MonoBehaviour
public static AssetBundle LoadAssetBundle(UmaDatabaseEntry entry, bool neverUnload = false, bool isRecursive = true)
{
if (Exist(entry)) return Get(entry);
if (Exist(entry)) return Get(entry);
if (isRecursive)
{
var Main = UmaViewerMain.Instance;
@@ -94,7 +104,18 @@ public class UmaAssetManager : MonoBehaviour
Debug.Log(filePath + " exists and doesn't work");
UmaViewerUI.Instance?.ShowMessage(filePath + " exists and doesn't work", UIMessageType.Error);
}
LoadEntryData(entry, bundle);
if (bundle.name == "shader.a")
{
neverUnload = true;
EyeShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertooneyet.shader");
FaceShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertoonfacetser.shader");
HairShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertoonhairtser.shader");
AlphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoonhairtser.shader");
CheekShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactermultiplycheek.shader");
EyebrowShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertoonmayu.shader");
BodyAlphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoontser.shader");
BodyBehindAlphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoonbehindtser.shader");
}
AddOrUpdate(entry.Name, bundle, neverUnload);
if (!neverUnload)
{
@@ -109,7 +130,7 @@ public class UmaAssetManager : MonoBehaviour
return false;
}
private static void SearchAB(UmaViewerMain Main, UmaDatabaseEntry entry,ref List<UmaDatabaseEntry> result)
private static void SearchAB(UmaViewerMain Main, UmaDatabaseEntry entry, ref List<UmaDatabaseEntry> result)
{
if (!string.IsNullOrEmpty(entry.Prerequisites))
{
@@ -125,7 +146,7 @@ public class UmaAssetManager : MonoBehaviour
public static AssetBundle Get(UmaDatabaseEntry entry) => Get(entry.Name);
public static void AddOrUpdate(string name, AssetBundle bundle, bool neverUnload = false)
public static void AddOrUpdate(string name, AssetBundle bundle, bool neverUnload = false)
{
if (instance.LoadedBundles.ContainsKey(name))
{
@@ -155,21 +176,9 @@ public class UmaAssetManager : MonoBehaviour
public static bool Exist(AssetBundle bundle) => instance.LoadedBundles.ContainsValue(bundle);
public static void UnloadBundle(UmaDatabaseEntry entry, bool unloadAllObjects)
{
if (instance.NeverUnload.ContainsValue(entry.LoadedBundle)) return;
var abEntry = instance.LoadedBundles.FirstOrDefault(b => b.Value == entry.LoadedBundle);
if (abEntry.Key != null)
{
instance.LoadedBundles.Remove(abEntry.Key);
}
UnloadEntryData(entry, abEntry.Value);
entry.Unload(unloadAllObjects);
}
private static void UnloadBundle(AssetBundle bundle, bool unloadAllObjects)
{
if(instance.NeverUnload.ContainsValue(bundle)) return;
if (instance.NeverUnload.ContainsValue(bundle)) return;
var entry = instance.LoadedBundles.FirstOrDefault(b => b.Value == bundle);
if (entry.Key != null)
{
@@ -195,52 +204,17 @@ public class UmaAssetManager : MonoBehaviour
{
if (builder.CurrentUMAContainer)
builder.UnloadUma();
if (builder.CurrentOtherContainer)
if (builder.CurrentOtherContainer)
Destroy(builder.CurrentOtherContainer.gameObject);
}
}
instance.LoadedBundles.Clear();
foreach(var bundle in instance.NeverUnload)
foreach (var bundle in instance.NeverUnload)
{
instance.LoadedBundles.Add(bundle.Key, bundle.Value);
}
OnLoadedBundleClear?.Invoke();
}
private static void LoadEntryData(UmaDatabaseEntry entry, AssetBundle bundle)
{
entry.LoadedBundle = bundle;
if (bundle.name == "shader.a")
{
var builder = UmaViewerBuilder.Instance;
builder.hairShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertoonhairtser.shader");
builder.faceShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertoonfacetser.shader");
builder.eyeShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertooneyet.shader");
builder.cheekShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactermultiplycheek.shader");
builder.eyebrowShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertoonmayu.shader");
builder.alphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoonhairtser.shader");
builder.bodyAlphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoontser.shader");
builder.bodyBehindAlphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoonbehindtser.shader");
}
foreach (var name in bundle.GetAllAssetNames())
{
var asset = bundle.LoadAsset(name);
if (asset != null)
{
entry.Assets.Add(asset);
entry.AssetNames[asset] = name;
}
}
}
private static void UnloadEntryData(UmaDatabaseEntry entry, AssetBundle bundle)
{
entry.LoadedBundle = null;
entry.Assets.Clear();
entry.AssetNames.Clear();
}
}
+18 -19
View File
@@ -15,8 +15,7 @@ public class UmaContainerCharacter : UmaContainer
{
public void LoadTextures(UmaDatabaseEntry entry)
{
entry.Load();
foreach(Texture2D tex2D in entry.Assets)
foreach(Texture2D tex2D in entry.GetAll<Texture2D>())
{
if (entry.Name.Contains("/mini/head"))
{
@@ -40,7 +39,7 @@ public class UmaContainerCharacter : UmaContainer
public void LoadBody(UmaDatabaseEntry entry)
{
GameObject go = entry.Load().Get<GameObject>();
GameObject go = entry.Get<GameObject>();
Body = Instantiate(go, transform);
UmaAnimator = Body.GetComponent<Animator>();
@@ -90,7 +89,7 @@ public class UmaContainerCharacter : UmaContainer
{
if (m.name.Contains("Alpha"))
{
m.shader = Builder.bodyAlphaShader;
m.shader = UmaAssetManager.BodyAlphaShader;
}
else
{
@@ -179,7 +178,7 @@ public class UmaContainerCharacter : UmaContainer
//BodyAlapha's shader need to change manually.
if (m.name.Contains("bdy") && m.name.Contains("Alpha"))
{
m.shader = Builder.bodyAlphaShader;
m.shader = UmaAssetManager.BodyAlphaShader;
}
}
}
@@ -188,7 +187,7 @@ public class UmaContainerCharacter : UmaContainer
public void LoadHead(UmaDatabaseEntry entry)
{
GameObject go = entry.Load().Get<GameObject>();
GameObject go = entry.Get<GameObject>();
var textures = MobHeadTextures;
GameObject head = Instantiate(go, transform);
Head = head;
@@ -261,7 +260,7 @@ public class UmaContainerCharacter : UmaContainer
//Glasses's shader need to change manually.
if (r.name.Contains("Hair") && r.name.Contains("Alpha"))
{
m.shader = Builder.alphaShader;
m.shader = UmaAssetManager.AlphaShader;
}
//Blush Setting
@@ -283,23 +282,23 @@ public class UmaContainerCharacter : UmaContainer
switch (m.shader.name)
{
case "Gallop/3D/Chara/MultiplyCheek":
m.shader = Builder.cheekShader; ;
m.shader = UmaAssetManager.CheekShader; ;
break;
case "Gallop/3D/Chara/ToonFace/TSER":
m.shader = Builder.faceShader;
m.shader = UmaAssetManager.FaceShader;
m.SetFloat("_CylinderBlend", 0.25f);
m.SetColor("_RimColor", new Color(0, 0, 0, 0));
break;
case "Gallop/3D/Chara/ToonEye/T":
m.shader = Builder.eyeShader;
m.shader = UmaAssetManager.EyeShader;
m.SetFloat("_CylinderBlend", 0.25f);
break;
case "Gallop/3D/Chara/ToonHair/TSER":
m.shader = Builder.hairShader;
m.shader = UmaAssetManager.HairShader;
m.SetFloat("_CylinderBlend", 0.25f);
break;
case "Gallop/3D/Chara/ToonMayu":
m.shader = Builder.eyebrowShader;
m.shader = UmaAssetManager.EyebrowShader;
break;
default:
Debug.Log(m.shader.name);
@@ -324,7 +323,7 @@ public class UmaContainerCharacter : UmaContainer
public void LoadHair(UmaDatabaseEntry entry)
{
GameObject go = entry.Load().Get<GameObject>();
GameObject go = entry.Get<GameObject>();
GameObject hair = Instantiate(go, transform);
Hair = hair;
var textures = MobHeadTextures;
@@ -336,7 +335,7 @@ public class UmaContainerCharacter : UmaContainer
//Glasses's shader need to change manually.
if (r.name.Contains("Hair") && r.name.Contains("Alpha"))
{
m.shader = Builder.alphaShader;
m.shader = UmaAssetManager.AlphaShader;
}
if (m.name.EndsWith("_hair"))
@@ -352,7 +351,7 @@ public class UmaContainerCharacter : UmaContainer
switch (m.shader.name)
{
case "Gallop/3D/Chara/ToonHair/TSER":
m.shader = Builder.hairShader;
m.shader = UmaAssetManager.HairShader;
m.SetFloat("_CylinderBlend", 0.25f);
break;
default:
@@ -366,7 +365,7 @@ public class UmaContainerCharacter : UmaContainer
public void LoadTail(UmaDatabaseEntry entry)
{
GameObject go = entry.Load().Get<GameObject>();
GameObject go = entry.Get<GameObject>();
Tail = Instantiate(go, transform);
var textures = TailTextures;
foreach (Renderer r in Tail.GetComponentsInChildren<Renderer>())
@@ -387,7 +386,7 @@ public class UmaContainerCharacter : UmaContainer
public void LoadTear(UmaDatabaseEntry entry)
{
GameObject go = entry.Load().Get<GameObject>();
GameObject go = entry.Get<GameObject>();
if (go.name.EndsWith("000"))
{
TearPrefab_0 = go;
@@ -483,7 +482,7 @@ public class UmaContainerCharacter : UmaContainer
public void LoadPhysics(UmaDatabaseEntry entry)
{
GameObject go = entry.Load().Get<GameObject>();
GameObject go = entry.Get<GameObject>();
if (!PhysicsContainer)
{
PhysicsContainer = new GameObject("PhysicsController");
@@ -499,7 +498,7 @@ public class UmaContainerCharacter : UmaContainer
return;
}
var aClip = entry.Load().Get<AnimationClip>();
var aClip = entry.Get<AnimationClip>();
if (UmaAnimator)
{
+1 -1
View File
@@ -8,7 +8,7 @@ public class UmaContainerProp : UmaContainer
{
public void LoadProp(UmaDatabaseEntry entry, Transform SetParent = null)
{
var go = entry.Load().Get<GameObject>();
var go = entry.Get<GameObject>();
var prop = Instantiate(go, SetParent ? SetParent : this.transform);
/*
+9 -23
View File
@@ -2,6 +2,7 @@
using UnityEngine;
using System.Linq;
using System.Collections.Generic;
using static UnityEngine.Rendering.VirtualTexturing.Debugging;
public class UmaDatabaseEntry
{
@@ -10,24 +11,6 @@ public class UmaDatabaseEntry
public string Url;
public string Checksum;
public string Prerequisites;
public AssetBundle LoadedBundle;
public List<Object> Assets = new List<Object>();
public Dictionary<Object, string> AssetNames = new Dictionary<Object, string>();
public bool IsLoaded()
{
return UmaAssetManager.Exist(this);
}
public Object Get(string name)
{
return Assets.FirstOrDefault(a => a.name == name);
}
public T Get<T>()
{
return (T)System.Convert.ChangeType(Assets.FirstOrDefault(a => a.GetType() == typeof(T)), typeof(T));
}
public string FilePath
{
@@ -42,15 +25,18 @@ public class UmaDatabaseEntry
}
}
public UmaDatabaseEntry Load(bool withtDependencies = true)
public T Get<T>(bool withDependencies = true)
{
UmaAssetManager.LoadAssetBundle(this, isRecursive: withtDependencies);
return this;
UmaAssetManager.LoadAssetBundle(this, isRecursive: withDependencies);
Object asset = UmaAssetManager.Get(this).LoadAllAssets().FirstOrDefault(a=>a.GetType() == typeof(T));
return (T)System.Convert.ChangeType(asset, typeof(T));
}
public void Unload(bool unloadAllObjects)
public IEnumerable<T> GetAll<T>(bool withDependencies = true)
{
UmaAssetManager.UnloadBundle(this, unloadAllObjects);
UmaAssetManager.LoadAssetBundle(this, isRecursive: withDependencies);
IEnumerable<Object> assets = UmaAssetManager.Get(this).LoadAllAssets().Where(a => a.GetType() == typeof(T));
return assets.Select(asset => (T)System.Convert.ChangeType(asset, typeof(T)));
}
//TODO Make it async
+1 -10
View File
@@ -29,15 +29,6 @@ public class UmaViewerBuilder : MonoBehaviour
public UmaHeadData CurrentHead;
public Shader hairShader;
public Shader faceShader;
public Shader eyeShader;
public Shader cheekShader;
public Shader eyebrowShader;
public Shader alphaShader;
public Shader bodyAlphaShader;
public Shader bodyBehindAlphaShader;
public List<AudioSource> CurrentAudioSources = new List<AudioSource>();
public List<UmaLyricsData> CurrentLyrics = new List<UmaLyricsData>();
@@ -844,7 +835,7 @@ public class UmaViewerBuilder : MonoBehaviour
public void LoadAssetPath(string path, Transform SetParent)
{
Instantiate(UmaViewerMain.Instance.AbList[path].Load().Get<GameObject>(), SetParent);
Instantiate(UmaViewerMain.Instance.AbList[path].Get<GameObject>(), SetParent);
}
private void LoadFaceMorph(int id, string costumeId)