diff --git a/Assets/07.RKTools/RunTime/TrackedImage/ARTrackedImageEvoObj.cs b/Assets/07.RKTools/RunTime/TrackedImage/ARTrackedImageEvoObj.cs index 9f5e33b..f6f33d6 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 0df7131..b5699f7 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 6f22b10..a1e6124 100644 --- a/Assets/07.RKTools/package.json +++ b/Assets/07.RKTools/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.rktools", - "version": "1.1.1", + "version": "1.1.2", "displayName": "07.RKTools", "description": "Rokid工具", "unity": "2021.3",