Fix Sidekick tool startup and path handling
This commit is contained in:
@@ -230,6 +230,42 @@ namespace Synty.SidekickCharacters.API
|
||||
await runtime.PopulatePresetLibrary();
|
||||
}
|
||||
|
||||
private static List<string> GetSidekickPartFiles()
|
||||
{
|
||||
string packageRootPath = DatabaseManager.GetPackageRootAbsolutePath();
|
||||
if (!string.IsNullOrEmpty(packageRootPath))
|
||||
{
|
||||
string meshesRootPath = Path.Combine(packageRootPath, "Resources", "Meshes");
|
||||
if (Directory.Exists(meshesRootPath))
|
||||
{
|
||||
return Directory
|
||||
.GetFiles(meshesRootPath, "SK_*_*_*_*_*.fbx", SearchOption.AllDirectories)
|
||||
.Select(ToAssetPath)
|
||||
.ToList();
|
||||
}
|
||||
}
|
||||
|
||||
return Directory.GetFiles("Assets", "SK_*_*_*_*_*.fbx", SearchOption.AllDirectories).ToList();
|
||||
}
|
||||
|
||||
private static string ToAssetPath(string fullPath)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(fullPath))
|
||||
{
|
||||
return fullPath;
|
||||
}
|
||||
|
||||
string normalizedFullPath = fullPath.Replace('\\', '/');
|
||||
string normalizedAssetsPath = Application.dataPath.Replace('\\', '/');
|
||||
|
||||
if (!normalizedFullPath.StartsWith(normalizedAssetsPath, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return normalizedFullPath;
|
||||
}
|
||||
|
||||
return "Assets" + normalizedFullPath.Substring(normalizedAssetsPath.Length);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Takes all the parts selected in the window, and combines them into a single model in the scene.
|
||||
/// </summary>
|
||||
@@ -512,7 +548,7 @@ namespace Synty.SidekickCharacters.API
|
||||
_partOutfitToggleMap = new Dictionary<string, bool>();
|
||||
_partCount = 0;
|
||||
|
||||
List<string> files = Directory.GetFiles("Assets", "SK_*_*_*_*_*.fbx", SearchOption.AllDirectories).ToList();
|
||||
List<string> files = GetSidekickPartFiles();
|
||||
|
||||
foreach (CharacterPartType partType in Enum.GetValues(typeof(CharacterPartType)))
|
||||
{
|
||||
@@ -610,7 +646,7 @@ namespace Synty.SidekickCharacters.API
|
||||
_speciesDictionary = new Dictionary<string, SidekickSpecies>();
|
||||
_partCount = 0;
|
||||
|
||||
List<string> files = Directory.GetFiles("Assets", "SK_*_*_*_*_*.fbx", SearchOption.AllDirectories).ToList();
|
||||
List<string> files = GetSidekickPartFiles();
|
||||
Dictionary<string, string> filesOnDisk = new Dictionary<string, string>();
|
||||
foreach (string file in files)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user