diff --git a/labs/EasyARDemo/Assembly-CSharp-Editor.csproj b/labs/EasyARDemo/Assembly-CSharp-Editor.csproj index 8dc76947..87322542 100644 --- a/labs/EasyARDemo/Assembly-CSharp-Editor.csproj +++ b/labs/EasyARDemo/Assembly-CSharp-Editor.csproj @@ -45,6 +45,7 @@ false + diff --git a/labs/EasyARDemo/Assembly-CSharp.csproj b/labs/EasyARDemo/Assembly-CSharp.csproj index 9461167c..0dc88410 100644 --- a/labs/EasyARDemo/Assembly-CSharp.csproj +++ b/labs/EasyARDemo/Assembly-CSharp.csproj @@ -45,6 +45,28 @@ false + + + + + + + + + + + + + + + + + + + + + + @@ -74,6 +96,7 @@ + @@ -104,6 +127,7 @@ + diff --git a/labs/EasyARDemo/Assets/ImageTargetManager.cs b/labs/EasyARDemo/Assets/ImageTargetManager.cs new file mode 100644 index 00000000..40169d0e --- /dev/null +++ b/labs/EasyARDemo/Assets/ImageTargetManager.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using easyar; +public class ImageTargetManager : MonoBehaviour +{ + public ImageTrackerFrameFilter Tracker; + void Start() + { + Debug.Log("ImageTargetManager Start"); + GameObject imageTarget = (GameObject)Resources.Load("ImageTarget");//"Assets/EasyAR/Prefabs/Primitives/ImageTarget.prefab" + imageTarget.name="ImageTarget-idback"; + imageTarget.transform.position = new Vector3(0.1f,0,0.3f); + imageTarget.transform.localScale=new Vector3(0.0856f,0.0856f,0.0856f); + //imageTarget.gameObject.AddComponent< + ImageTargetController controller = imageTarget.GetComponent(); + controller.ActiveControl= easyar.TargetController.ActiveControlStrategy.HideWhenNotTracking; + //controller.SourceType + //controller.ImageFileSource.PathType + controller.ImageFileSource.Path="idback.jpg"; + controller.ImageFileSource.Name="idback"; + controller.ImageFileSource.Scale=0.0856f; + controller.Tracker=Tracker; + Instantiate(imageTarget); + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/labs/EasyARDemo/Assets/ImageTargetManager.cs.meta b/labs/EasyARDemo/Assets/ImageTargetManager.cs.meta new file mode 100644 index 00000000..8e9636b7 --- /dev/null +++ b/labs/EasyARDemo/Assets/ImageTargetManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fd5197fc55d7887439686e23e0e12163 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/labs/EasyARDemo/Assets/Resources.meta b/labs/EasyARDemo/Assets/Resources.meta new file mode 100644 index 00000000..1dcb3e21 --- /dev/null +++ b/labs/EasyARDemo/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 36f475b10cbea9846adf5c2a305677bf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/labs/EasyARDemo/Assets/Resources/ImageTarget.prefab b/labs/EasyARDemo/Assets/Resources/ImageTarget.prefab new file mode 100644 index 00000000..8d74f391 --- /dev/null +++ b/labs/EasyARDemo/Assets/Resources/ImageTarget.prefab @@ -0,0 +1,58 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1949775762591570 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4758729880223678} + - component: {fileID: 114749822420515666} + m_Layer: 0 + m_Name: ImageTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4758729880223678 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1949775762591570} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &114749822420515666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1949775762591570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7f8c7feab99e861479c02aee5b54b004, type: 3} + m_Name: + m_EditorClassIdentifier: + ActiveControl: 0 + HorizontalFlip: 0 + SourceType: 0 + ImageFileSource: + PathType: 1 + Path: + Name: + Scale: 0.1 + TargetDataFileSource: + PathType: 1 + Path: + trackerHasSet: 0 + tracker: {fileID: 0} diff --git a/labs/EasyARDemo/Assets/Resources/ImageTarget.prefab.meta b/labs/EasyARDemo/Assets/Resources/ImageTarget.prefab.meta new file mode 100644 index 00000000..e6e45119 --- /dev/null +++ b/labs/EasyARDemo/Assets/Resources/ImageTarget.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 08135ab0e50f31f44a23bbb46c9efc8e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/labs/EasyARDemo/Assets/Samples/Scenes/ObjectSensing/MultiTarget_SingleTracker.unity b/labs/EasyARDemo/Assets/Samples/Scenes/ObjectSensing/MultiTarget_SingleTracker.unity index 82c1482d..6d8049bf 100644 --- a/labs/EasyARDemo/Assets/Samples/Scenes/ObjectSensing/MultiTarget_SingleTracker.unity +++ b/labs/EasyARDemo/Assets/Samples/Scenes/ObjectSensing/MultiTarget_SingleTracker.unity @@ -882,6 +882,10 @@ PrefabInstance: propertyPath: m_Name value: ImageTarget-idback objectReference: {fileID: 0} + - target: {fileID: 1949775762591570, guid: 40be5343836efc449af67e54876afb62, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4758729880223678, guid: 40be5343836efc449af67e54876afb62, type: 3} propertyPath: m_LocalPosition.x value: 0.1 @@ -1041,6 +1045,25 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1178765509} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1217219030 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1180761479238358, guid: 5a99091c6aef6cd4191c57f9eac6486a, + type: 3} + m_PrefabInstance: {fileID: 2012137840} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1217219032 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1217219030} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fd5197fc55d7887439686e23e0e12163, type: 3} + m_Name: + m_EditorClassIdentifier: + Tracker: {fileID: 2012137841} --- !u!1001 &1276776370 PrefabInstance: m_ObjectHideFlags: 0