From 82707417a278cda3b16d3b2e57aa5988d25028fc Mon Sep 17 00:00:00 2001
From: katboi01 <59540382+katboi01@users.noreply.github.com>
Date: Mon, 31 Oct 2022 12:11:09 +0100
Subject: [PATCH] Added access to face_type_data
---
Assets/Scripts/UmaContainer.cs | 7 ++--
Assets/Scripts/UmaDatabase/UmaDataTypes.cs | 7 ++++
.../UmaDatabase/UmaDatabaseController.cs | 41 ++++++++++++++-----
Assets/Scripts/UmaViewerBuilder.cs | 7 ++--
Assets/Scripts/UmaViewerMain.cs | 1 +
5 files changed, 44 insertions(+), 19 deletions(-)
diff --git a/Assets/Scripts/UmaContainer.cs b/Assets/Scripts/UmaContainer.cs
index cbc44b7..6caa125 100644
--- a/Assets/Scripts/UmaContainer.cs
+++ b/Assets/Scripts/UmaContainer.cs
@@ -52,7 +52,7 @@ public class UmaContainer : MonoBehaviour
var child = Body.transform.GetChild(0);
child.SetParent(transform);
}
- Destroy(Body);
+ Body.SetActive(false); //for debugging
//MergeHead
@@ -70,8 +70,7 @@ public class UmaContainer : MonoBehaviour
var child = Head.transform.GetChild(0);
child.SetParent(child.name.Contains("info") ? eyes.transform : transform);
}
- Destroy(Head);
-
+ Head.SetActive(false); //for debugging
}
@@ -85,7 +84,7 @@ public class UmaContainer : MonoBehaviour
var child = Tail.transform.GetChild(0);
child.SetParent(transform);
}
- Destroy(Tail);
+ Tail.SetActive(false); //for debugging
emptyBones.ForEach(a => { if (a) Destroy(a.gameObject); });
}
diff --git a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs
index 83f674f..ca4c401 100644
--- a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs
+++ b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs
@@ -30,6 +30,13 @@ public class UmaLyricsData
public string text;
}
+[System.Serializable]
+public class FaceTypeData
+{
+ public string label, eyebrow_l, eyebrow_r, eye_l, eye_r, mouth, inverce_face_type;
+ public int mouth_shape_type, set_face_group;
+}
+
public enum UmaFileType
{
_3d_cutt,
diff --git a/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs b/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs
index 87e4e09..dda07ce 100644
--- a/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs
+++ b/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs
@@ -6,6 +6,7 @@ using System.Text;
using System.Threading.Tasks;
using Mono.Data.Sqlite;
using System.IO;
+using UnityEngine.XR;
public class UmaDatabaseController
{
@@ -39,20 +40,16 @@ public class UmaDatabaseController
public static string MotionPath = "3d/motion/";
/// 3d/chara/
public static string CharaPath = "3d/chara/";
+
public IEnumerable MetaEntries;
public IEnumerable CharaData;
+ public IEnumerable FaceTypeData;
- ///
- /// Meta Database Connection
- ///
+ /// Meta Database Connection
private SqliteConnection metaDb;
- ///
- /// Master Database Connection
- ///
+ /// Master Database Connection
private SqliteConnection masterDb;
- ///
- /// Loads the file database
- ///
+ /// Loads the file database
public UmaDatabaseController()
{
try
@@ -71,6 +68,7 @@ public class UmaDatabaseController
MetaEntries = ReadMeta(metaDb);
masterDb.Open();
CharaData = ReadMaster(masterDb);
+ FaceTypeData = ReadFaceTypeData(masterDb);
}
catch
{
@@ -102,7 +100,6 @@ public class UmaDatabaseController
catch(Exception e) { Debug.LogError("Error caught: " + e); }
}
return entries;
- //conn.Close();
}
static IEnumerable ReadMaster(SqliteConnection conn)
@@ -119,7 +116,29 @@ public class UmaDatabaseController
};
yield return entry;
}
- //conn.Close();
+ }
+
+ static IEnumerable ReadFaceTypeData(SqliteConnection conn)
+ {
+ SqliteCommand sqlite_cmd = conn.CreateCommand();
+ sqlite_cmd.CommandText = "SELECT * FROM face_type_data";
+ SqliteDataReader sqlite_datareader = sqlite_cmd.ExecuteReader();
+ while (sqlite_datareader.Read())
+ {
+ FaceTypeData entry = new FaceTypeData()
+ {
+ label = sqlite_datareader.GetString(0),
+ eyebrow_l = sqlite_datareader.GetString(1),
+ eyebrow_r = sqlite_datareader.GetString(2),
+ eye_l = sqlite_datareader.GetString(3),
+ eye_r = sqlite_datareader.GetString(4),
+ mouth = sqlite_datareader.GetString(5),
+ mouth_shape_type = sqlite_datareader.GetInt32(6),
+ inverce_face_type = sqlite_datareader.GetString(7),
+ set_face_group = sqlite_datareader.GetInt32(8),
+ };
+ yield return entry;
+ }
}
public static string GetABPath(UmaDatabaseEntry entry)
diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs
index b9e9a18..8071388 100644
--- a/Assets/Scripts/UmaViewerBuilder.cs
+++ b/Assets/Scripts/UmaViewerBuilder.cs
@@ -298,7 +298,7 @@ public class UmaViewerBuilder : MonoBehaviour
{
costumeIdShort = costumeId.Remove(costumeId.LastIndexOf('_'));
string body = $"3d/chara/mini/body/mbdy{costumeIdShort}/pfb_mbdy{costumeId}_0";
- asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == body);
+ asset = UmaViewerMain.Instance.AbChara.FirstOrDefault(a => a.Name == body);
}
else asset = UmaViewerMain.Instance.AbChara.FirstOrDefault(a => a.Name == $"3d/chara/mini/body/mbdy{id}_{costumeId}/pfb_mbdy{id}_{costumeId}");
if (asset == null)
@@ -330,7 +330,7 @@ public class UmaViewerBuilder : MonoBehaviour
RecursiveLoadAsset(asset);
string hair = $"3d/chara/mini/head/mchr{id}_{costumeId}/pfb_mchr{id}_{costumeId}_hair";
- asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == hair);
+ asset = UmaViewerMain.Instance.AbChara.FirstOrDefault(a => a.Name == hair);
if (costumeId != "00" && asset == null)
{
customHead = false;
@@ -359,7 +359,7 @@ public class UmaViewerBuilder : MonoBehaviour
}
string head = $"3d/chara/mini/head/mchr0001_00/pfb_mchr0001_00_face0";
- asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == head);
+ asset = UmaViewerMain.Instance.AbChara.FirstOrDefault(a => a.Name == head);
if (asset != null)
{
//Load Head Textures
@@ -639,7 +639,6 @@ public class UmaViewerBuilder : MonoBehaviour
if (asset == null) { continue; }
Debug.Log("Bundle:" + bundle.name + "/" + name + $" ({asset.GetType()})");
- Type aType = asset.GetType();
switch (asset)
{
case AnimationClip aClip:
diff --git a/Assets/Scripts/UmaViewerMain.cs b/Assets/Scripts/UmaViewerMain.cs
index fa26489..cb61fa9 100644
--- a/Assets/Scripts/UmaViewerMain.cs
+++ b/Assets/Scripts/UmaViewerMain.cs
@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
+using System.Reflection;
using System.Collections;
using System.Collections.Generic;
using System.IO;