katboi01/UniversalViewer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eversoul:

Browse Source 
-compatibility improvements
Core:
-new settings class
This commit is contained in:
Katboi01
2024-04-25 02:16:49 +02:00
parent fc64500158
commit c922584d38
39 changed files with 4302 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Scripts/ModelViewerBase/UI/HandleSettingsPanel.cs
View File

@@ -1,10 +1,11 @@
using System;
using UnityEngine;
using UnityEngine.UI;
using static SerializableBone;
namespace KF3.UI.Panels
{
public class HandleSettingsPanel : UIPanels.UIToolbarPanel
public class HandleSettingsPanel : MonoBehaviour
{
public ScrollRect HandleVisibilityToggles;

12
Assets/Scripts/ModelViewerBase/UI/UICameraSettingsPanel.cs
View File

@@ -1,12 +0,0 @@
using UIPanels;
using UnityEngine;
using UnityEngine.UI;
namespace UIPanels
{
public class UICameraSettingsPanel : UIToolbarPanel
{
}
}

1
Assets/Scripts/ModelViewerBase/UI/UIDraggableProxy.cs
View File

@@ -1,4 +1,3 @@
using UIPanels;
using UnityEngine;
using UnityEngine.EventSystems;

191
Assets/Scripts/ModelViewerBase/UI/UISaveLoadPanel.cs
View File

@@ -8,113 +8,110 @@ using System.Linq;
using UnityEngine;
using UnityEngine.UI;
namespace UIPanels
public class UISaveLoadPanel : MonoBehaviour
{
public class UISaveLoadPanel : UIToolbarPanel
public ScrollRect ScrollScene;
public ScrollRect ScrollPose;
public Button ButtonScene;
public Button ButtonPose;
public List<UISceneContainer> ScenePresetEntries = new List<UISceneContainer>();
public List<UIPoseContainer> PosePresetEntries = new List<UIPoseContainer>();
public void AddPose(UIPoseContainer pose)
{
public ScrollRect ScrollScene;
public ScrollRect ScrollPose;
PosePresetEntries.Add(pose);
}
public Button ButtonScene;
public Button ButtonPose;
public void AddScene(UISceneContainer scene)
{
ScenePresetEntries.Add(scene);
}
public List<UISceneContainer> ScenePresetEntries = new List<UISceneContainer>();
public List<UIPoseContainer> PosePresetEntries = new List<UIPoseContainer>();
public void OnPoseButton()
{
ButtonScene.interactable = true;
ButtonPose.interactable = false;
ScrollScene.gameObject.SetActive(false);
ScrollPose.gameObject.SetActive(true);
}
public void AddPose(UIPoseContainer pose)
public void OnSceneButton()
{
ButtonScene.interactable = false;
ButtonPose.interactable = true;
ScrollScene.gameObject.SetActive(true);
ScrollPose.gameObject.SetActive(false);
}
public bool GetPoseByName(string name, out UIPoseContainer pose)
{
pose = PosePresetEntries.FirstOrDefault(p => p.PoseName == name);
return pose != null;
}
public bool GetSceneByName(string name, out UISceneContainer scene)
{
scene = ScenePresetEntries.FirstOrDefault(p => p.SceneData.Filename == name);
return scene != null;
}
public void Init()
{
InitPoses();
InitScenes();
}
private void InitPoses()
{
string path = Settings.SavePoseDirectory;
foreach (var fileName in Directory.GetFiles(path).Where(f => f.EndsWith(".pose")))
{
PosePresetEntries.Add(pose);
}
public void AddScene(UISceneContainer scene)
{
ScenePresetEntries.Add(scene);
}
public void OnPoseButton()
{
ButtonScene.interactable = true;
ButtonPose.interactable = false;
ScrollScene.gameObject.SetActive(false);
ScrollPose.gameObject.SetActive(true);
}
public void OnSceneButton()
{
ButtonScene.interactable = false;
ButtonPose.interactable = true;
ScrollScene.gameObject.SetActive(true);
ScrollPose.gameObject.SetActive(false);
}
public bool GetPoseByName(string name, out UIPoseContainer pose)
{
pose = PosePresetEntries.FirstOrDefault(p => p.PoseName == name);
return pose != null;
}
public bool GetSceneByName(string name, out UISceneContainer scene)
{
scene = ScenePresetEntries.FirstOrDefault(p => p.SceneData.Filename == name);
return scene != null;
}
public void Init()
{
InitPoses();
InitScenes();
}
private void InitPoses()
{
string path = Settings.SavePoseDirectory;
foreach (var fileName in Directory.GetFiles(path).Where(f => f.EndsWith(".pose")))
try
{
try
{
string fName = Path.GetFileNameWithoutExtension(fileName);
var settings = new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.Auto };
var bc = JsonConvert.DeserializeObject<KeyframeData>(File.ReadAllText(fileName), settings);
UIPoseContainer.CreateNew(fName, bc, false);
}
catch (Exception e)
{
Debug.LogWarning(e);
Error.Log(Color.red, "Loading " + fileName + " failed!");
}
string fName = Path.GetFileNameWithoutExtension(fileName);
var settings = new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.Auto };
var bc = JsonConvert.DeserializeObject<KeyframeData>(File.ReadAllText(fileName), settings);
UIPoseContainer.CreateNew(fName, bc, false);
}
}
private void InitScenes()
{
string path = Settings.SaveSceneDirectory;
List<SceneSerializable> scenes = new List<SceneSerializable>();
foreach (var fileName in Directory.GetFiles(path).Where(f => f.EndsWith(".scene")))
catch (Exception e)
{
try
{
string fName = Path.GetFileNameWithoutExtension(fileName);
var settings = new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.Auto };
var bc = JsonConvert.DeserializeObject<SceneSerializable>(File.ReadAllText(fileName), settings);
if (string.IsNullOrEmpty(bc.Date))
{
bc.Date = "1990-01-01 00:00";
}
scenes.Add(bc);
}
catch (Exception e)
{
Debug.LogWarning(e);
Error.Log(Color.red, "Loading " + fileName + " failed!");
}
}
foreach(var scene in scenes.OrderBy(s => DateTime.ParseExact(s.Date, "yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture)).ThenBy(s=>s.Filename))
{
UISceneContainer.CreateNew(scene, false);
Debug.LogWarning(e);
Error.Log(Color.red, "Loading " + fileName + " failed!");
}
}
}
private void InitScenes()
{
string path = Settings.SaveSceneDirectory;
List<SceneSerializable> scenes = new List<SceneSerializable>();
foreach (var fileName in Directory.GetFiles(path).Where(f => f.EndsWith(".scene")))
{
try
{
string fName = Path.GetFileNameWithoutExtension(fileName);
var settings = new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.Auto };
var bc = JsonConvert.DeserializeObject<SceneSerializable>(File.ReadAllText(fileName), settings);
if (string.IsNullOrEmpty(bc.Date))
{
bc.Date = "1990-01-01 00:00";
}
scenes.Add(bc);
}
catch (Exception e)
{
Debug.LogWarning(e);
Error.Log(Color.red, "Loading " + fileName + " failed!");
}
}
foreach (var scene in scenes.OrderBy(s => DateTime.ParseExact(s.Date, "yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture)).ThenBy(s => s.Filename))
{
UISceneContainer.CreateNew(scene, false);
}
}
}

43
Assets/Scripts/ModelViewerBase/UI/UISettingsPanel.cs Normal file
View File

@@ -0,0 +1,43 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class UISettingsPanel : MonoBehaviour
{
public Transform Content;
private void Start()
{
ModelViewerSettings.OnSettingsSaved += UpdateSettings;
}
private void OnEnable()
{
if(ModelViewerSettings.Instance != null)
{
UpdateSettings(ModelViewerSettings.Instance);
}
}
public void UpdateSettings(ModelViewerSettings settings)
{
Debug.Log("Updating");
for(int i = Content.childCount -1; i >= 0; i--)
{
Destroy(Content.GetChild(i).gameObject);
}
foreach(var entry in settings.Settings)
{
var setting = entry.Value;
var inputMode = setting.Type == ModelViewerSettings.SettingType.FilePath ? UITextInput.InputMode.FilePicker
: setting.Type == ModelViewerSettings.SettingType.FolderPath ? UITextInput.InputMode.FolderPicker
: UITextInput.InputMode.Text;
UITextInput.Create(entry.Key, setting.Value, setting.Editable, Content, inputMode).SetOnTextChanged((value) =>
{
ModelViewerSettings.Set(entry.Key, value, true);
});
}
}
}

2
Assets/Scripts/ModelViewerBase/UI/UICameraSettingsPanel.cs.meta → Assets/Scripts/ModelViewerBase/UI/UISettingsPanel.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3825ca5014b129b41995262f1d361a57
guid: 4220394708fad7d4782a9f356cb06010
MonoImporter:
externalObjects: {}
serializedVersion: 2

67
Assets/Scripts/ModelViewerBase/UI/UITextInput.cs Normal file
View File

@@ -0,0 +1,67 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Events;
public class UITextInput : MonoBehaviour
{
public bool Editable => InputField.interactable;
public TMPro.TMP_Text Label;
public TMPro.TMP_InputField InputField;
public InputMode Mode;
public enum InputMode
{
Text,
FilePicker,
FolderPicker
}
public static UITextInput Create(string name, string defaultText, bool editable, Transform parent, InputMode mode = InputMode.Text)
{
var input = Instantiate(SharedResources.Instance.UITextInput, parent);
input.Init(name, defaultText, editable, mode);
return input;
}
public void Init(string name, string defaultText, bool editable, InputMode mode)
{
Mode = mode;
Label.text = name;
InputField.text = defaultText;
InputField.interactable = editable;
switch (mode)
{
case InputMode.FilePicker:
{
InputField.onSelect.AddListener(
(text) =>
{
var result = SFB.StandaloneFileBrowser.OpenFilePanel(name, InputField.text, "", false);
if (result.Length == 0) return;
InputField.text = result[0];
}
);
break;
}
case InputMode.FolderPicker:
{
InputField.onSelect.AddListener(
(text) =>
{
var result = SFB.StandaloneFileBrowser.OpenFolderPanel(name, InputField.text, false);
if (result.Length == 0) return;
InputField.text = result[0] + "//";
}
);
break;
}
}
}
public void SetOnTextChanged(UnityAction<string> action)
{
InputField.onEndEdit.RemoveAllListeners();
InputField.onEndEdit.AddListener(action);
}
}

2
Assets/Scripts/ModelViewerBase/UI/UIToolbarPanel.cs.meta → Assets/Scripts/ModelViewerBase/UI/UITextInput.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 075750077de5e3b4088ca0c9f1fdb524
guid: ce06bef1f916b3d45882cede8f8b1a07
MonoImporter:
externalObjects: {}
serializedVersion: 2

20
Assets/Scripts/ModelViewerBase/UI/UIToolbarPanel.cs
View File

@@ -1,20 +0,0 @@
using UnityEngine;
namespace UIPanels
{
public class UIToolbarPanel : MonoBehaviour
{
public bool IsOpen => gameObject.activeSelf;
public virtual void Open()
{
gameObject.SetActive(true);
}
public virtual void Close()
{
gameObject.SetActive(false);
}
}
}