Added access to face_type_data

This commit is contained in:
katboi01
2022-10-31 12:11:09 +01:00
parent 3892bbb6a9
commit 82707417a2
5 changed files with 44 additions and 19 deletions
+3 -4
View File
@@ -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); });
}
@@ -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,
@@ -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/";
/// <summary> 3d/chara/ </summary>
public static string CharaPath = "3d/chara/";
public IEnumerable<UmaDatabaseEntry> MetaEntries;
public IEnumerable<UmaCharaData> CharaData;
public IEnumerable<FaceTypeData> FaceTypeData;
/// <summary>
/// Meta Database Connection
/// </summary>
/// <summary> Meta Database Connection </summary>
private SqliteConnection metaDb;
/// <summary>
/// Master Database Connection
/// </summary>
/// <summary> Master Database Connection </summary>
private SqliteConnection masterDb;
/// <summary>
/// Loads the file database
/// </summary>
/// <summary> Loads the file database </summary>
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<UmaCharaData> ReadMaster(SqliteConnection conn)
@@ -119,7 +116,29 @@ public class UmaDatabaseController
};
yield return entry;
}
//conn.Close();
}
static IEnumerable<FaceTypeData> 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)
+3 -4
View File
@@ -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:
+1
View File
@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using System.Reflection;
using System.Collections;
using System.Collections.Generic;
using System.IO;