diff --git a/Assets/07.RKTools/Editor/ARTrackedImageEvoObjEditor.cs b/Assets/07.RKTools/Editor/ARTrackedImageEvoObjEditor.cs index ad50bdb..224ba34 100644 --- a/Assets/07.RKTools/Editor/ARTrackedImageEvoObjEditor.cs +++ b/Assets/07.RKTools/Editor/ARTrackedImageEvoObjEditor.cs @@ -1,52 +1,52 @@ -using Stary.Evo.Editor; -using UnityEditor; -using UnityEngine; - -namespace Stary.Evo.RKTools -{ - [CustomEditor(typeof(ARTrackedImageEvoObj))] - public class ARTrackedImageEvoObjEditor : UnityEditor.Editor - { - /// - /// 序列化属性,在OnEnable中获取 - /// - private SerializedProperty domain; - - private SerializedProperty trackedTransform; - - /// - private string[] domainNames; - - private void OnEnable() - { - domain = serializedObject.FindProperty("domain"); - trackedTransform = serializedObject.FindProperty("trackedTransform"); - domainNames = CreatAssetWindow.GetCreatDomainAllName(); - } - - public override void OnInspectorGUI() - { - serializedObject.Update(); - - // 获取当前选中的索引 - int selectedIndex = System.Array.IndexOf(domainNames, domain.stringValue); - if (selectedIndex < 0) selectedIndex = 0; // 默认选中第一个 - - // 绘制下拉选择框 - selectedIndex = EditorGUILayout.Popup("Domain", selectedIndex, domainNames); - - // 更新选择的域名 - domain.stringValue = domainNames[selectedIndex]; - - EditorGUI.BeginChangeCheck(); - var newTrackedTransform - = EditorGUILayout.ObjectField(new GUIContent("Tracked Transform"), trackedTransform.objectReferenceValue, typeof(Transform), true) as Transform; - if (EditorGUI.EndChangeCheck()) - { - trackedTransform.objectReferenceValue = newTrackedTransform; - } - serializedObject.ApplyModifiedProperties(); - base.OnInspectorGUI(); - } - } -} \ No newline at end of file +// using Stary.Evo.Editor; +// using UnityEditor; +// using UnityEngine; +// +// namespace Stary.Evo.RKTools +// { +// [CustomEditor(typeof(ARTrackedImageEvoObj))] +// public class ARTrackedImageEvoObjEditor : UnityEditor.Editor +// { +// /// +// /// 序列化属性,在OnEnable中获取 +// /// +// private SerializedProperty domain; +// +// private SerializedProperty trackedTransform; +// +// /// +// private string[] domainNames; +// +// private void OnEnable() +// { +// domain = serializedObject.FindProperty("domain"); +// trackedTransform = serializedObject.FindProperty("trackedTransform"); +// domainNames = CreatAssetWindow.GetCreatDomainAllName(); +// } +// +// public override void OnInspectorGUI() +// { +// serializedObject.Update(); +// +// // 获取当前选中的索引 +// int selectedIndex = System.Array.IndexOf(domainNames, domain.stringValue); +// if (selectedIndex < 0) selectedIndex = 0; // 默认选中第一个 +// +// // 绘制下拉选择框 +// selectedIndex = EditorGUILayout.Popup("Domain", selectedIndex, domainNames); +// +// // 更新选择的域名 +// domain.stringValue = domainNames[selectedIndex]; +// +// EditorGUI.BeginChangeCheck(); +// var newTrackedTransform +// = EditorGUILayout.ObjectField(new GUIContent("Tracked Transform"), trackedTransform.objectReferenceValue, typeof(Transform), true) as Transform; +// if (EditorGUI.EndChangeCheck()) +// { +// trackedTransform.objectReferenceValue = newTrackedTransform; +// } +// serializedObject.ApplyModifiedProperties(); +// base.OnInspectorGUI(); +// } +// } +// } \ No newline at end of file diff --git a/Assets/07.RKTools/RunTime/TrackedImage/ARTrackedImageEvoObj.cs b/Assets/07.RKTools/RunTime/TrackedImage/ARTrackedImageEvoObj.cs index f6f33d6..9f5e33b 100644 --- a/Assets/07.RKTools/RunTime/TrackedImage/ARTrackedImageEvoObj.cs +++ b/Assets/07.RKTools/RunTime/TrackedImage/ARTrackedImageEvoObj.cs @@ -1,37 +1,37 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using Rokid.UXR.Module; -using UnityEngine; - -namespace Stary.Evo.RKTools -{ - public class ARTrackedImageEvoObj : ARTrackedImageObj - { - [HideInInspector] - public string domain; - [HideInInspector] - public Transform trackedTransform; - - public void Awake() - { - if (trackedTransform == null) - { - trackedTransform=this.transform; - Debug.Log("StaryEvo:TrackedImageEvoObj: trackedTransform 未赋值,以自动赋值为自身"); - } - OnARTrackedImageAdded.AddListener(OnARTrackedImageAddedEvent); ; - } - - private void OnARTrackedImageAddedEvent(ARTrackedImageObj obj) - { - TrackedImageEvoManager trackedImageEvoManager = ARTrackedImageManager.Instance as TrackedImageEvoManager; - trackedImageEvoManager.SetTrackedImageEvoData(trackedImageIndex,domain,trackedTransform); - } - - public void OnDestroy() - { - OnARTrackedImageAdded.RemoveListener(OnARTrackedImageAddedEvent); - } - } -} \ No newline at end of file +// using System; +// using System.Collections; +// using System.Collections.Generic; +// using Rokid.UXR.Module; +// using UnityEngine; +// +// namespace Stary.Evo.RKTools +// { +// public class ARTrackedImageEvoObj : ARTrackedImageObj +// { +// [HideInInspector] +// public string domain; +// [HideInInspector] +// public Transform trackedTransform; +// +// public void Awake() +// { +// if (trackedTransform == null) +// { +// trackedTransform=this.transform; +// Debug.Log("StaryEvo:TrackedImageEvoObj: trackedTransform 未赋值,以自动赋值为自身"); +// } +// OnARTrackedImageAdded.AddListener(OnARTrackedImageAddedEvent); ; +// } +// +// private void OnARTrackedImageAddedEvent(ARTrackedImageObj obj) +// { +// TrackedImageEvoManager trackedImageEvoManager = ARTrackedImageManager.Instance as TrackedImageEvoManager; +// trackedImageEvoManager.SetTrackedImageEvoData(trackedImageIndex,domain,trackedTransform); +// } +// +// public void OnDestroy() +// { +// OnARTrackedImageAdded.RemoveListener(OnARTrackedImageAddedEvent); +// } +// } +// } \ No newline at end of file diff --git a/Assets/07.RKTools/RunTime/TrackedImage/TrackedImageEvoManager.cs b/Assets/07.RKTools/RunTime/TrackedImage/TrackedImageEvoManager.cs index b5699f7..0df7131 100644 --- a/Assets/07.RKTools/RunTime/TrackedImage/TrackedImageEvoManager.cs +++ b/Assets/07.RKTools/RunTime/TrackedImage/TrackedImageEvoManager.cs @@ -1,81 +1,81 @@ -using System; -using System.Collections.Generic; -using Rokid.UXR.Module; -using Sirenix.OdinInspector; -using UnityEngine; - -namespace Stary.Evo.RKTools -{ - public class TrackedImageEvoManager : ARTrackedImageManager - { - [TableList] public List TrackedImages; - - private void Start() - { - TrackedImages = new List(); - } - - public TarkedImageEvoData GetTrackedImageEvoData(int imageIndex) - { - foreach (var imageEvoData in TrackedImages) - { - if (imageEvoData.imageIndex == imageIndex) - { - return imageEvoData; - } - } - Debug.LogError($"StaryEvo:未找到对应的图片的id数据,请检查是否进行前置识别 index:{imageIndex}"); - return null; - } - - public void SetTrackedImageEvoData(int imageIndex,string domain, Transform transform) - { - foreach (var imageEvoData in TrackedImages) - { - if (imageEvoData.imageIndex == imageIndex) - { - imageEvoData.position = transform.position; - imageEvoData.rotation = transform.eulerAngles; - imageEvoData.scale = transform.localScale; - } - } - } - - public TarkedImageEvoData GetTrackedImageEvoData(string domain) - { - foreach (var imageEvoData in TrackedImages) - { - if (imageEvoData.domain == domain) - { - return imageEvoData; - } - } - Debug.LogError($"StaryEvo:未找到对应的domain的id数据,请检查是否进行前置识别 domain:{domain}"); - return null; - } - - public void SetTrackedImageEvoData(string domain, Transform transform) - { - foreach (var imageEvoData in TrackedImages) - { - if (imageEvoData.domain == domain) - { - imageEvoData.position = transform.position; - imageEvoData.rotation = transform.eulerAngles; - imageEvoData.scale = transform.localScale; - } - } - } - } - - [Serializable] - public class TarkedImageEvoData - { - [VerticalGroup("key")] public string domain; - [VerticalGroup("key")] public int imageIndex; - - [VerticalGroup("transform")] public Vector3 position; - [VerticalGroup("transform")] public Vector3 rotation; - [VerticalGroup("transform")] public Vector3 scale; - } -} \ No newline at end of file +// using System; +// using System.Collections.Generic; +// using Rokid.UXR.Module; +// using Sirenix.OdinInspector; +// using UnityEngine; +// +// namespace Stary.Evo.RKTools +// { +// public class TrackedImageEvoManager : ARTrackedImageManager +// { +// [TableList] public List TrackedImages; +// +// private void Start() +// { +// TrackedImages = new List(); +// } +// +// public TarkedImageEvoData GetTrackedImageEvoData(int imageIndex) +// { +// foreach (var imageEvoData in TrackedImages) +// { +// if (imageEvoData.imageIndex == imageIndex) +// { +// return imageEvoData; +// } +// } +// Debug.LogError($"StaryEvo:未找到对应的图片的id数据,请检查是否进行前置识别 index:{imageIndex}"); +// return null; +// } +// +// public void SetTrackedImageEvoData(int imageIndex,string domain, Transform transform) +// { +// foreach (var imageEvoData in TrackedImages) +// { +// if (imageEvoData.imageIndex == imageIndex) +// { +// imageEvoData.position = transform.position; +// imageEvoData.rotation = transform.eulerAngles; +// imageEvoData.scale = transform.localScale; +// } +// } +// } +// +// public TarkedImageEvoData GetTrackedImageEvoData(string domain) +// { +// foreach (var imageEvoData in TrackedImages) +// { +// if (imageEvoData.domain == domain) +// { +// return imageEvoData; +// } +// } +// Debug.LogError($"StaryEvo:未找到对应的domain的id数据,请检查是否进行前置识别 domain:{domain}"); +// return null; +// } +// +// public void SetTrackedImageEvoData(string domain, Transform transform) +// { +// foreach (var imageEvoData in TrackedImages) +// { +// if (imageEvoData.domain == domain) +// { +// imageEvoData.position = transform.position; +// imageEvoData.rotation = transform.eulerAngles; +// imageEvoData.scale = transform.localScale; +// } +// } +// } +// } +// +// [Serializable] +// public class TarkedImageEvoData +// { +// [VerticalGroup("key")] public string domain; +// [VerticalGroup("key")] public int imageIndex; +// +// [VerticalGroup("transform")] public Vector3 position; +// [VerticalGroup("transform")] public Vector3 rotation; +// [VerticalGroup("transform")] public Vector3 scale; +// } +// } \ No newline at end of file diff --git a/Assets/07.RKTools/package.json b/Assets/07.RKTools/package.json index 048a987..c3214f3 100644 --- a/Assets/07.RKTools/package.json +++ b/Assets/07.RKTools/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.rktools", - "version": "1.0.7", + "version": "1.1.0", "displayName": "07.RKTools", "description": "Rokid工具", "unity": "2021.3",