diff --git a/Assets/Material/Mesh/PulseMesh.mat b/Assets/Material/Mesh/PulseMesh.mat index 00547fd..4c2bf02 100644 --- a/Assets/Material/Mesh/PulseMesh.mat +++ b/Assets/Material/Mesh/PulseMesh.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PulseMesh m_Shader: {fileID: 4800000, guid: 328d97e479ecdff41a40e36724da6158, type: 3} - m_ShaderKeywords: _AUTO_PULSE__ON _PULSE_ENABLED__ON + m_ValidKeywords: [] + m_InvalidKeywords: + - _AUTO_PULSE__ON + - _PULSE_ENABLED__ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -59,6 +62,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Auto_Pulse_: 1 - _BlendOp: 0 diff --git a/Assets/MixedRealityToolkit.Generated/CustomProfiles/CYL MixedRealitySpatialAwarenessMeshObserverProfile.asset b/Assets/MixedRealityToolkit.Generated/CustomProfiles/CYL MixedRealitySpatialAwarenessMeshObserverProfile.asset index d1afffb..8dab5f8 100644 --- a/Assets/MixedRealityToolkit.Generated/CustomProfiles/CYL MixedRealitySpatialAwarenessMeshObserverProfile.asset +++ b/Assets/MixedRealityToolkit.Generated/CustomProfiles/CYL MixedRealitySpatialAwarenessMeshObserverProfile.asset @@ -17,7 +17,7 @@ MonoBehaviour: isStationaryObserver: 0 observationExtents: {x: 3, y: 3, z: 3} observerVolumeType: 1 - updateInterval: 3.5 + updateInterval: 0.5 meshPhysicsLayer: 31 levelOfDetail: 2 trianglesPerCubicMeter: 5 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index da63f55..d88fca4 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -3855,6 +3855,37 @@ Transform: m_Father: {fileID: 800842342} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &287071670 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 287071671} + m_Layer: 0 + m_Name: Arm DT + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &287071671 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 287071670} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 468126875} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &291195841 GameObject: m_ObjectHideFlags: 0 @@ -7251,6 +7282,40 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &468126874 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 468126875} + m_Layer: 0 + m_Name: DigitalTwin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &468126875 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 468126874} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.772965, y: 0.05668476, z: 0.03922975} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2091765661} + - {fileID: 1526536843} + - {fileID: 287071671} + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &487591692 GameObject: m_ObjectHideFlags: 0 @@ -17532,6 +17597,51 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1518746321} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1526536842 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1526536843} + - component: {fileID: 1526536844} + m_Layer: 0 + m_Name: Env DT + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1526536843 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1526536842} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 468126875} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1526536844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1526536842} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 895f3bab7181f7340a30b55bf570f3c1, type: 3} + m_Name: + m_EditorClassIdentifier: + Initialized: 0 --- !u!1 &1549906062 GameObject: m_ObjectHideFlags: 0 @@ -22811,6 +22921,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2085561438} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &2091765660 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2091765661} + m_Layer: 0 + m_Name: Human DT + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2091765661 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2091765660} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 468126875} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2103495091 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/DT.meta b/Assets/Script/DT.meta new file mode 100644 index 0000000..ed90d7d --- /dev/null +++ b/Assets/Script/DT.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 630fdb228fe221b41ab36e2a9412c7e3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/DT/EnvDT.cs b/Assets/Script/DT/EnvDT.cs new file mode 100644 index 0000000..7933937 --- /dev/null +++ b/Assets/Script/DT/EnvDT.cs @@ -0,0 +1,30 @@ +using Microsoft.MixedReality.Toolkit; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EnvDT : MonoBehaviour +{ + public bool Initialized = false; + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + if (!Initialized) + { + try + { + Transform dt = GameObject.Find("MixedRealityPlayspace").transform.Find("Spatial Awareness System"); + dt.SetParent(transform); + Initialized = true; + } + catch { } + + } + } +} diff --git a/Assets/Script/DT/EnvDT.cs.meta b/Assets/Script/DT/EnvDT.cs.meta new file mode 100644 index 0000000..770f769 --- /dev/null +++ b/Assets/Script/DT/EnvDT.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 895f3bab7181f7340a30b55bf570f3c1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: