diff --git a/.gitattributes b/.gitattributes index 2ed6d1279aa..9e47d9e3d22 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,13 +1,11 @@ *.cs text diff=csharp - +.gitattributes text *.txt text *.md text +*.asset eol=lf +*.controller eol=lf *.prefab eol=lf *.meta eol=lf *.mat eol=lf *.anim eol=lf -*.controller eol=lf -*.asset eol=lf - -.gitattributes text \ No newline at end of file diff --git a/.gitignore b/.gitignore index 6ca3cb43bd0..4b13e1a330b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,8 +11,11 @@ UWP/ WindowsStoreApp/ UnityGenerated/ +UnityPackageManager/ project.json project.lock.json +WSATestCertificate.pfx +WSATestCertificate.pfx.meta # ===================================== # # Visual Studio / MonoDevelop generated # @@ -38,5 +41,5 @@ obj/ *.idb *.opendb -WSATestCertificate.pfx -WSATestCertificate.pfx.meta +Assets/ThirdParty/ +Assets/ThirdParty.meta diff --git a/Assets/HoloToolkit-Examples/Boundary/Materials/Highlight.mat b/Assets/HoloToolkit-Examples/Boundary/Materials/Highlight.mat index eb1aa62b440..5b5fb2649b8 100644 --- a/Assets/HoloToolkit-Examples/Boundary/Materials/Highlight.mat +++ b/Assets/HoloToolkit-Examples/Boundary/Materials/Highlight.mat @@ -7,8 +7,8 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Highlight - m_Shader: {fileID: 4800000, guid: f326278a838e87c499393f30a8e72127, type: 3} - m_ShaderKeywords: ETC1_EXTERNAL_ALPHA _EMISSION + m_Shader: {fileID: 4800000, guid: 06790e211e4a6df409b1e04bc91c4810, type: 3} + m_ShaderKeywords: ETC1_EXTERNAL_ALPHA _EMISSION _USECOLOR_ON _USEMAINTEX_ON m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -60,6 +60,8 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 + - _ColorWriteMask: 15 + - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 @@ -76,6 +78,9 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 + - _UseColor: 1 + - _UseMainTex: 1 + - _ZTest: 4 - _ZWrite: 1 m_Colors: - _Color: {r: 0.69225776, g: 0.88096607, b: 0.9705882, a: 1} diff --git a/Assets/HoloToolkit-Examples/Boundary/Scenes/BoundaryTest.unity b/Assets/HoloToolkit-Examples/Boundary/Scenes/BoundaryTest.unity index 506a226d7a2..c0a7007e66d 100644 --- a/Assets/HoloToolkit-Examples/Boundary/Scenes/BoundaryTest.unity +++ b/Assets/HoloToolkit-Examples/Boundary/Scenes/BoundaryTest.unity @@ -567,7 +567,7 @@ GameObject: - component: {fileID: 1061324850} - component: {fileID: 1061324849} m_Layer: 0 - m_Name: Cube_0,10,0 + m_Name: Cube_0,11,0 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -644,7 +644,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1061324848} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 10, z: 0} + m_LocalPosition: {x: 0, y: 11, z: 0} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/HoloToolkit-Examples/Boundary/Scripts/BoundaryTest.cs b/Assets/HoloToolkit-Examples/Boundary/Scripts/BoundaryTest.cs index dd865dbbbcc..cf54c102c2c 100644 --- a/Assets/HoloToolkit-Examples/Boundary/Scripts/BoundaryTest.cs +++ b/Assets/HoloToolkit-Examples/Boundary/Scripts/BoundaryTest.cs @@ -19,13 +19,22 @@ private void Start() if (BoundaryManager.Instance.ContainsObject(gameObject.transform.position)) { - Debug.LogFormat("Object is within established boundary. Position: {0}", gameObject.transform.position); + Debug.LogFormat("Object {0} is within established boundary. Position: {1}", name, gameObject.transform.position); for (int i = 0; i < defaultMaterials.Length; i++) { // Color the cube green if object is within specified boundary. - Color highlightColor = Color.green; - defaultMaterials[i].SetColor("_Color", highlightColor); + defaultMaterials[i].SetColor("_Color", Color.green); + } + } + else + { + Debug.LogFormat("Object {0} is outside established boundary. Position: {1}", name, gameObject.transform.position); + + for (int i = 0; i < defaultMaterials.Length; i++) + { + // Color the cube red if object is outside specified boundary. + defaultMaterials[i].SetColor("_Color", Color.red); } } #else diff --git a/Assets/HoloToolkit-Examples/FastConfigurableShader/Models/MapTest.fbx.meta b/Assets/HoloToolkit-Examples/FastConfigurableShader/Models/MapTest.fbx.meta index 4f830259150..ef7de1dbb68 100644 --- a/Assets/HoloToolkit-Examples/FastConfigurableShader/Models/MapTest.fbx.meta +++ b/Assets/HoloToolkit-Examples/FastConfigurableShader/Models/MapTest.fbx.meta @@ -39,13 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 1 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 diff --git a/Assets/HoloToolkit-Examples/FastConfigurableShader/Models/VertexColorCube.fbx.meta b/Assets/HoloToolkit-Examples/FastConfigurableShader/Models/VertexColorCube.fbx.meta index 730021014c8..778dae0adc9 100644 --- a/Assets/HoloToolkit-Examples/FastConfigurableShader/Models/VertexColorCube.fbx.meta +++ b/Assets/HoloToolkit-Examples/FastConfigurableShader/Models/VertexColorCube.fbx.meta @@ -47,13 +47,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 1 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 diff --git a/Assets/HoloToolkit-Examples/FastConfigurableShader/Models/dial.FBX.meta b/Assets/HoloToolkit-Examples/FastConfigurableShader/Models/dial.FBX.meta index d67c07422b3..9d48f06ade4 100644 --- a/Assets/HoloToolkit-Examples/FastConfigurableShader/Models/dial.FBX.meta +++ b/Assets/HoloToolkit-Examples/FastConfigurableShader/Models/dial.FBX.meta @@ -39,13 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -55,7 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/GazeRuler/Scripts/LineManager.cs b/Assets/HoloToolkit-Examples/GazeRuler/Scripts/LineManager.cs index b82798a999a..2c700b7238c 100644 --- a/Assets/HoloToolkit-Examples/GazeRuler/Scripts/LineManager.cs +++ b/Assets/HoloToolkit-Examples/GazeRuler/Scripts/LineManager.cs @@ -9,7 +9,7 @@ namespace HoloToolkit.Examples.GazeRuler { /// - /// mananger all lines in the scene + /// Manages all lines in the scene /// public class LineManager : Singleton, IGeometry { diff --git a/Assets/HoloToolkit-Examples/Input/Meshes/button_test_msh.fbx.meta b/Assets/HoloToolkit-Examples/Input/Meshes/button_test_msh.fbx.meta index 3c8a8b4c81e..1219326fced 100644 --- a/Assets/HoloToolkit-Examples/Input/Meshes/button_test_msh.fbx.meta +++ b/Assets/HoloToolkit-Examples/Input/Meshes/button_test_msh.fbx.meta @@ -32,6 +32,8 @@ ModelImporter: resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -55,7 +57,7 @@ ModelImporter: useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -65,9 +67,10 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: + serializedVersion: 2 human: [] skeleton: [] armTwist: 0.5 @@ -78,7 +81,10 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 0 humanoidOversampling: 1 diff --git a/Assets/HoloToolkit-Examples/Input/Scenes/GamepadTest.unity b/Assets/HoloToolkit-Examples/Input/Scenes/GamepadTest.unity index e974814f036..e0272d7517c 100644 --- a/Assets/HoloToolkit-Examples/Input/Scenes/GamepadTest.unity +++ b/Assets/HoloToolkit-Examples/Input/Scenes/GamepadTest.unity @@ -262,7 +262,7 @@ Transform: - {fileID: 2095686945} - {fileID: 293671890} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &509293012 MonoBehaviour: @@ -275,59 +275,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 906323c940a3fad4f8f7e9e4fcd747f4, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &648067039 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 648067040} - - component: {fileID: 648067041} - m_Layer: 0 - m_Name: Managers - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &648067040 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 648067039} - 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_Children: - - {fileID: 844015981} - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &648067041 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 648067039} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 03314f8008ae1ed4fbd45c95a7ed5182, type: 3} - m_Name: - m_EditorClassIdentifier: - AnimateControllerModel: 1 - AlwaysUseAlternateLeftModel: 0 - AlwaysUseAlternateRightModel: 0 - AlternateLeftController: {fileID: 0} - AlternateRightController: {fileID: 0} - TouchpadTouchedOverride: {fileID: 0} - GLTFMaterial: {fileID: 0} ---- !u!4 &844015981 stripped -Transform: - m_PrefabParentObject: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, - type: 2} - m_PrefabInternal: {fileID: 1873443075} + containerObject: {fileID: 0} + alignmentType: 0 + stationarySpaceTypePosition: {x: 0, y: 0, z: 0} + roomScaleSpaceTypePosition: {x: 0, y: 0, z: 0} --- !u!1 &1020433839 GameObject: m_ObjectHideFlags: 0 @@ -391,7 +342,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &1173812366 Prefab: @@ -467,6 +418,26 @@ Prefab: propertyPath: JoystickSupported value: 1 objectReference: {fileID: 0} + - target: {fileID: 114812681035175298, guid: d29bc40b7f3df26479d6a0aac211c355, + type: 2} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114812681035175298, guid: d29bc40b7f3df26479d6a0aac211c355, + type: 2} + propertyPath: EnableTeleport + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114812681035175298, guid: d29bc40b7f3df26479d6a0aac211c355, + type: 2} + propertyPath: EnableRotation + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114812681035175298, guid: d29bc40b7f3df26479d6a0aac211c355, + type: 2} + propertyPath: EnableStrafe + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} m_IsPrefabParent: 0 @@ -507,7 +478,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4000013535415816, guid: b2db04283121ca74495c2ee000fb4243, type: 2} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 114000013851064060, guid: b2db04283121ca74495c2ee000fb4243, type: 2} @@ -517,12 +488,18 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: b2db04283121ca74495c2ee000fb4243, type: 2} m_IsPrefabParent: 0 +--- !u!114 &1662233529 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 114000013851064060, guid: b2db04283121ca74495c2ee000fb4243, + type: 2} + m_PrefabInternal: {fileID: 1662233528} + m_Script: {fileID: 11500000, guid: afa1ae235bc6cfa43addd1435e2fd822, type: 3} --- !u!1001 &1873443075 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 648067040} + m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} propertyPath: m_LocalPosition.x @@ -538,15 +515,15 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} propertyPath: m_LocalRotation.w @@ -554,15 +531,14 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} propertyPath: m_RootOrder - value: 0 + value: 4 objectReference: {fileID: 0} - - target: {fileID: 114708646396671696, guid: 3eddd1c29199313478dd3f912bfab2ab, + - target: {fileID: 114742747811649402, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 114708646396671696, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} + propertyPath: Cursor + value: + objectReference: {fileID: 1662233529} + m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} m_IsPrefabParent: 0 --- !u!1 &1956520457 stripped @@ -570,26 +546,6 @@ GameObject: m_PrefabParentObject: {fileID: 1000011070707148, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} m_PrefabInternal: {fileID: 1873443075} ---- !u!114 &1956520458 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1956520457} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: acb07a2de49ca4d478750eedc4858f17, type: 3} - m_Name: - m_EditorClassIdentifier: - pointingExtent: 10 - pointingRaycastLayerMasks: - - serializedVersion: 2 - m_Bits: 4294967291 - registeredPointers: [] - autoRegisterGazePointerIfNoneFound: 1 - debugDrawPointingRays: 0 - debugDrawPointingRayColors: [] - uiRaycastCamera: {fileID: 0} --- !u!1 &2095686941 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/HoloToolkit-Examples/Input/Scenes/InputManagerTest.unity b/Assets/HoloToolkit-Examples/Input/Scenes/InputManagerTest.unity index 9fc8353aa43..eb23955cfa6 100644 --- a/Assets/HoloToolkit-Examples/Input/Scenes/InputManagerTest.unity +++ b/Assets/HoloToolkit-Examples/Input/Scenes/InputManagerTest.unity @@ -327,6 +327,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 906323c940a3fad4f8f7e9e4fcd747f4, type: 3} m_Name: m_EditorClassIdentifier: + containerObject: {fileID: 0} --- !u!1 &134179067 GameObject: m_ObjectHideFlags: 0 @@ -1415,7 +1416,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 432117531} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.049999237, y: 0.47200012, z: 1.1980001} + m_LocalPosition: {x: 0, y: 0, z: 1.1980001} m_LocalScale: {x: 0.003, y: 0.003, z: 0.003} m_Children: - {fileID: 1034968948} diff --git a/Assets/HoloToolkit-Examples/Input/Scenes/InputTapTest.unity b/Assets/HoloToolkit-Examples/Input/Scenes/InputTapTest.unity index c2e1e17b6c7..3b578478ce3 100644 --- a/Assets/HoloToolkit-Examples/Input/Scenes/InputTapTest.unity +++ b/Assets/HoloToolkit-Examples/Input/Scenes/InputTapTest.unity @@ -274,6 +274,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 906323c940a3fad4f8f7e9e4fcd747f4, type: 3} m_Name: m_EditorClassIdentifier: + containerObject: {fileID: 0} + alignmentType: 0 + stationarySpaceTypePosition: {x: 0, y: 0, z: 0} + roomScaleSpaceTypePosition: {x: 0, y: 0, z: 0} --- !u!1001 &520673732 Prefab: m_ObjectHideFlags: 0 diff --git a/Assets/HoloToolkit-Examples/Input/Scenes/MotionControllerTest.unity b/Assets/HoloToolkit-Examples/Input/Scenes/MotionControllerTest.unity index a2260f3ba21..70b444dbbf8 100644 --- a/Assets/HoloToolkit-Examples/Input/Scenes/MotionControllerTest.unity +++ b/Assets/HoloToolkit-Examples/Input/Scenes/MotionControllerTest.unity @@ -1153,12 +1153,12 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 293671886} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 2} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 2} m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 7 + m_Father: {fileID: 613472660} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &293671891 MonoBehaviour: @@ -2088,6 +2088,54 @@ Transform: m_Father: {fileID: 1463513600} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &613472659 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 613472660} + - component: {fileID: 613472661} + m_Layer: 0 + m_Name: SceneContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &613472660 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 613472659} + 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_Children: + - {fileID: 1819716937} + - {fileID: 1322951683} + - {fileID: 1463513600} + - {fileID: 293671890} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &613472661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 613472659} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 906323c940a3fad4f8f7e9e4fcd747f4, type: 3} + m_Name: + m_EditorClassIdentifier: + containerObject: {fileID: 0} + alignmentType: 0 + stationarySpaceTypePosition: {x: 0, y: 0, z: 0} + roomScaleSpaceTypePosition: {x: 0, y: 0, z: 0} --- !u!1 &630688233 GameObject: m_ObjectHideFlags: 0 @@ -4604,8 +4652,8 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1322951682} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.979, y: 2.046, z: 2.0096436} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.979, y: 1.046, z: 2.0096436} m_LocalScale: {x: 1.5565684, y: 1.5565687, z: 1.5565687} m_Children: - {fileID: 1835177425} @@ -4614,8 +4662,8 @@ Transform: - {fileID: 247594331} - {fileID: 823003686} - {fileID: 2131677962} - m_Father: {fileID: 0} - m_RootOrder: 5 + m_Father: {fileID: 613472660} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1361861878 GameObject: @@ -5058,8 +5106,8 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1463513599} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.175, y: 2.046, z: 2.0096436} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.175, y: 1.046, z: 2.0096436} m_LocalScale: {x: 1.5565684, y: 1.5565687, z: 1.5565687} m_Children: - {fileID: 912657599} @@ -5068,8 +5116,8 @@ Transform: - {fileID: 1016200897} - {fileID: 601090447} - {fileID: 482625260} - m_Father: {fileID: 0} - m_RootOrder: 6 + m_Father: {fileID: 613472660} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1488963448 GameObject: @@ -5896,13 +5944,13 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1819716936} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.004, y: 2.378, z: 2} + m_LocalPosition: {x: 1.004, y: 1.378, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 985072502} - {fileID: 1095093713} - m_Father: {fileID: 0} - m_RootOrder: 4 + m_Father: {fileID: 613472660} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1835177424 GameObject: diff --git a/Assets/HoloToolkit-Examples/Input/Scenes/XboxControllerExample.unity b/Assets/HoloToolkit-Examples/Input/Scenes/XboxControllerExample.unity index c024c3ef7df..d597a2a1b91 100644 --- a/Assets/HoloToolkit-Examples/Input/Scenes/XboxControllerExample.unity +++ b/Assets/HoloToolkit-Examples/Input/Scenes/XboxControllerExample.unity @@ -112,6 +112,12 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &332498722 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 114000010164638790, guid: 022450106439a8946ae18a9e20cc92d8, + type: 2} + m_PrefabInternal: {fileID: 1246058044} + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} --- !u!1001 &340683729 Prefab: m_ObjectHideFlags: 0 @@ -151,6 +157,11 @@ Prefab: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} + - target: {fileID: 114812681035175298, guid: d29bc40b7f3df26479d6a0aac211c355, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} m_IsPrefabParent: 0 @@ -180,9 +191,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1635556075} - - {fileID: 1895018971} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &473449477 GameObject: @@ -215,10 +225,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsGlobalListener: 1 + HoldStartedInterval: 2 + HoldCompletedInterval: 3 + SelectButton: 10 + HorizontalNavigationAxis: 1 movementSpeedMultiplier: 0.01 rotationSpeedMultiplier: 1 resetButton: 13 - DebugText: {fileID: 1246058048} + debugText: {fileID: 332498722} --- !u!23 &473449479 MeshRenderer: m_ObjectHideFlags: 0 @@ -377,6 +391,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 906323c940a3fad4f8f7e9e4fcd747f4, type: 3} m_Name: m_EditorClassIdentifier: + containerObject: {fileID: 0} + alignmentType: 0 + stationarySpaceTypePosition: {x: 0, y: 0, z: 0} + roomScaleSpaceTypePosition: {x: 0, y: 0, z: 0} --- !u!4 &1131149986 Transform: m_ObjectHideFlags: 0 @@ -412,7 +430,7 @@ Prefab: - target: {fileID: 224000011042862180, guid: 022450106439a8946ae18a9e20cc92d8, type: 2} propertyPath: m_LocalPosition.z - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224000011042862180, guid: 022450106439a8946ae18a9e20cc92d8, type: 2} @@ -551,12 +569,12 @@ MonoBehaviour: m_EditorClassIdentifier: PivotAxis: 0 TargetTransform: {fileID: 0} ---- !u!114 &1246058048 stripped +--- !u!114 &1523391984 stripped MonoBehaviour: - m_PrefabParentObject: {fileID: 114000010164638790, guid: 022450106439a8946ae18a9e20cc92d8, + m_PrefabParentObject: {fileID: 114611684728110934, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2} - m_PrefabInternal: {fileID: 1246058044} - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_PrefabInternal: {fileID: 1802791002} + m_Script: {fileID: 11500000, guid: 0decd33ba8702954885a62b5bc1a778e, type: 3} --- !u!1001 &1635556074 Prefab: m_ObjectHideFlags: 0 @@ -600,12 +618,7 @@ Prefab: type: 2} propertyPath: Cursor value: - objectReference: {fileID: 1763047399} - - target: {fileID: 114708646396671696, guid: 3eddd1c29199313478dd3f912bfab2ab, - type: 2} - propertyPath: debugDrawPointingRays - value: 1 - objectReference: {fileID: 0} + objectReference: {fileID: 1523391984} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} m_IsPrefabParent: 0 @@ -619,7 +632,7 @@ Camera: m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2} m_PrefabInternal: {fileID: 1635556074} ---- !u!1001 &1763047398 +--- !u!1001 &1802791002 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -656,100 +669,8 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4000011792100794, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2} m_IsPrefabParent: 0 ---- !u!114 &1763047399 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 114611684728110934, guid: a611e772ef8ddf64d8106a9cbb70f31c, - type: 2} - m_PrefabInternal: {fileID: 1763047398} - m_Script: {fileID: 11500000, guid: 0decd33ba8702954885a62b5bc1a778e, type: 3} ---- !u!1 &1895018970 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1895018971} - - component: {fileID: 1895018972} - m_Layer: 0 - m_Name: XboxControllerInputSource - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1895018971 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1895018970} - 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_Children: [] - m_Father: {fileID: 402900810} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1895018972 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1895018970} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f53e0243d951df74baba23d966f61986, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceRefreshInterval: 3 - horizontalAxis: 3 - verticalAxis: 4 - submitButton: 10 - cancelButton: 11 - mapping: - - Type: 0 - Value: - - Type: 1 - Value: - - Type: 2 - Value: - - Type: 3 - Value: - - Type: 4 - Value: - - Type: 5 - Value: - - Type: 6 - Value: - - Type: 7 - Value: - - Type: 8 - Value: - - Type: 9 - Value: - - Type: 10 - Value: - - Type: 11 - Value: - - Type: 12 - Value: - - Type: 13 - Value: - - Type: 14 - Value: - - Type: 15 - Value: - - Type: 16 - Value: - - Type: 17 - Value: - - Type: 18 - Value: - - Type: 19 - Value: diff --git a/Assets/HoloToolkit-Examples/Input/Scripts/GazeResponder.cs b/Assets/HoloToolkit-Examples/Input/Scripts/GazeResponder.cs index 79365eb8d22..d229ada6f5a 100644 --- a/Assets/HoloToolkit-Examples/Input/Scripts/GazeResponder.cs +++ b/Assets/HoloToolkit-Examples/Input/Scripts/GazeResponder.cs @@ -23,7 +23,7 @@ public void OnFocusEnter() for (int i = 0; i < defaultMaterials.Length; i++) { // Highlight the material when gaze enters using the shader property. - defaultMaterials[i].SetFloat("_Highlight", .35f); + defaultMaterials[i].SetFloat("_Gloss", 10.0f); } } @@ -32,7 +32,7 @@ public void OnFocusExit() for (int i = 0; i < defaultMaterials.Length; i++) { // Remove highlight on material when gaze exits. - defaultMaterials[i].SetFloat("_Highlight", 0f); + defaultMaterials[i].SetFloat("_Gloss", 1.0f); } } diff --git a/Assets/HoloToolkit-Examples/Input/Scripts/InputTest.cs b/Assets/HoloToolkit-Examples/Input/Scripts/InputTest.cs index 703fd8e7782..c11b433f521 100644 --- a/Assets/HoloToolkit-Examples/Input/Scripts/InputTest.cs +++ b/Assets/HoloToolkit-Examples/Input/Scripts/InputTest.cs @@ -7,7 +7,7 @@ namespace HoloToolkit.Unity.InputModule.Tests { /// - /// Test behaviour that simply prints out a message very time a supported event is received from the input module. + /// Test MonoBehaviour that simply prints out a message very time a supported event is received from the input module. /// This is used to make sure that the input module routes events appropriately to game objects. /// public class InputTest : MonoBehaviour, IInputHandler, IInputClickHandler, IFocusable, ISourceStateHandler, IHoldHandler, IManipulationHandler, INavigationHandler, IPointerClickHandler diff --git a/Assets/HoloToolkit-Examples/Input/Scripts/MicrophoneHelperSample.cs b/Assets/HoloToolkit-Examples/Input/Scripts/MicrophoneHelperSample.cs new file mode 100644 index 00000000000..a66f13e6b63 --- /dev/null +++ b/Assets/HoloToolkit-Examples/Input/Scripts/MicrophoneHelperSample.cs @@ -0,0 +1,34 @@ +//********************************************************* +// +// Copyright (c) Microsoft. All rights reserved. +// +// Licensed under the MIT License. See LICENSE in the project root for license information. +// +//********************************************************* + +using UnityEngine; + +namespace HoloToolkit.Unity.Examples +{ + public class MicrophoneHelperSample : MonoBehaviour + { + [Tooltip("Assign key to quickly test the microphone helper code")] + public KeyCode checkMicrophoneKey = KeyCode.M; +#if ENABLE_WINMD_SUPPORT + private async void Update() +#else + private void Update() +#endif + { + if(Input.GetKeyDown(checkMicrophoneKey)) + { +#if ENABLE_WINMD_SUPPORT + var status = await MicrophoneHelper.GetMicrophoneStatus(); +#else + var status = MicrophoneHelper.GetMicrophoneStatus(); +#endif + Debug.LogFormat("Microphone status: {0}", status); + } + } + } +} diff --git a/Assets/HoloToolkit-Examples/Input/Scripts/MicrophoneHelperSample.cs.meta b/Assets/HoloToolkit-Examples/Input/Scripts/MicrophoneHelperSample.cs.meta new file mode 100644 index 00000000000..999f594cf0f --- /dev/null +++ b/Assets/HoloToolkit-Examples/Input/Scripts/MicrophoneHelperSample.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 6c0764cefe2ea864081fdc8217d32a3c +timeCreated: 1510613478 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HoloToolkit-Examples/Input/Scripts/PopupMenu.cs b/Assets/HoloToolkit-Examples/Input/Scripts/PopupMenu.cs index bfc51275f2b..d55c33eac86 100644 --- a/Assets/HoloToolkit-Examples/Input/Scripts/PopupMenu.cs +++ b/Assets/HoloToolkit-Examples/Input/Scripts/PopupMenu.cs @@ -21,7 +21,7 @@ public class PopupMenu : MonoBehaviour, IInputHandler private bool closeOnNonTargetedTap; /// - /// alled when 'place' is selected + /// Called when 'place' is selected /// private Action activatedCallback; diff --git a/Assets/HoloToolkit-Examples/Input/Scripts/VoiceChat/MicStream.cs b/Assets/HoloToolkit-Examples/Input/Scripts/VoiceChat/MicStream.cs index 359b5e13ecd..3175fab79a5 100644 --- a/Assets/HoloToolkit-Examples/Input/Scripts/VoiceChat/MicStream.cs +++ b/Assets/HoloToolkit-Examples/Input/Scripts/VoiceChat/MicStream.cs @@ -30,7 +30,7 @@ public enum ErrorCodes { ALREADY_RUNNING = -10, NO_AUDIO_DEVICE, NO_INPUT_DEVICE /// /// Called before calling MicStartStream or MicstartRecording to initialize microphone /// - /// One of the entries in the StreamCategory enumeratio + /// One of the entries in the StreamCategory enumeration /// error code or 0 [DllImport("MicStreamSelector", ExactSpelling = true)] public static extern int MicInitializeDefault(int category); @@ -47,7 +47,7 @@ public enum ErrorCodes { ALREADY_RUNNING = -10, NO_AUDIO_DEVICE, NO_INPUT_DEVICE /// /// Call this to start receiving data from a microphone. Then, each frame, call MicGetFrame. /// - /// If true, all data will stay in the queue, if the client code is running behind. This can lead to significant audio lag, so is not appropriate for low-latency situations like reall-time voice chat. + /// If true, all data will stay in the queue, if the client code is running behind. This can lead to significant audio lag, so is not appropriate for low-latency situations like real-time voice chat. /// If true, the audio from the microphone will be played through your speakers. /// Optional (can be null): This callback will be called when data is ready for MicGetFrame /// error code or 0 @@ -57,7 +57,7 @@ public enum ErrorCodes { ALREADY_RUNNING = -10, NO_AUDIO_DEVICE, NO_INPUT_DEVICE /// /// Call this to start receiving data from a microphone. Then, each frame, call MicGetFrame. /// - /// If true, all data will stay in the queue, if the client code is running behind. This can lead to significant audio lag, so is not appropriate for low-latency situations like reall-time voice chat. + /// If true, all data will stay in the queue, if the client code is running behind. This can lead to significant audio lag, so is not appropriate for low-latency situations like real-time voice chat. /// If true, the audio from the microphone will be played through your speakers. /// error code or 0 public static int MicStartStream(bool keepData, bool previewOnDevice) @@ -76,7 +76,7 @@ public static int MicStartStream(bool keepData, bool previewOnDevice) /// Begins recording microphone data to the specified file. /// /// The file will be saved to this name. Specify only the wav file's name with extensions, aka "myfile.wav", not full path - /// If true, will play micstream in speakers + /// If true, will play mic stream in speakers /// [DllImport("MicStreamSelector", ExactSpelling = true)] public static extern int MicStartRecording(string filename, bool previewOnDevice); @@ -122,7 +122,7 @@ public static string MicStopRecording() public static extern int MicResume(); /// - /// Sets apmlification factor for microphone samples returned by MicGetFrame (and/or file specified with MicStartRecording) + /// Sets amplification factor for microphone samples returned by MicGetFrame (and/or file specified with MicStartRecording) /// /// gain factor /// error code or 0 @@ -132,7 +132,7 @@ public static string MicStopRecording() /// /// Queries the default microphone audio frame sample size. Useful if doing default initializations with callbacks to know how much data it wants to hand you. /// - /// the number of samles in the default audio buffer + /// the number of samples in the default audio buffer [DllImport("MicStreamSelector", ExactSpelling = true)] private static extern int MicGetDefaultBufferSize(); diff --git a/Assets/HoloToolkit-Examples/Input/Scripts/VoiceChat/MicStreamDemo.cs b/Assets/HoloToolkit-Examples/Input/Scripts/VoiceChat/MicStreamDemo.cs index 7ce639a60be..91a0f115a02 100644 --- a/Assets/HoloToolkit-Examples/Input/Scripts/VoiceChat/MicStreamDemo.cs +++ b/Assets/HoloToolkit-Examples/Input/Scripts/VoiceChat/MicStreamDemo.cs @@ -111,7 +111,7 @@ private void Awake() print("press Q to start stream to audio source, W will stop that stream"); print("press A to start a recording and S to stop that recording and save it to a wav file."); print("Since this all goes through the AudioSource, you can mute the mic while using it there, or do anything else you would do with an AudioSource"); - print("In this demo, we start the stream automatically, and then change the size of the gameobject based on microphone signal amplitude"); + print("In this demo, we start the stream automatically, and then change the size of the GameObject based on microphone signal amplitude"); isRunning = true; } diff --git a/Assets/HoloToolkit-Examples/Input/Scripts/VoiceChat/MicrophoneTransmitter.cs b/Assets/HoloToolkit-Examples/Input/Scripts/VoiceChat/MicrophoneTransmitter.cs index d552263572e..7096bfb94c4 100644 --- a/Assets/HoloToolkit-Examples/Input/Scripts/VoiceChat/MicrophoneTransmitter.cs +++ b/Assets/HoloToolkit-Examples/Input/Scripts/VoiceChat/MicrophoneTransmitter.cs @@ -165,7 +165,7 @@ private void Update() audioDataMutex.ReleaseMutex(); } - #region debuginfo + #region DebugInfo if (SaveTestClip && testCircularBuffer.UsedCapacity == testCircularBuffer.TotalCapacity) { float[] testBuffer = new float[testCircularBuffer.UsedCapacity / 4]; @@ -210,7 +210,7 @@ private void SendFixedSizedChunk(NetworkConnection connection, byte[] data, int if (ShowInterPacketTime) { - Debug.LogFormat("Microphone: Millisecs since last sent: {0}, Worst: {1}", + Debug.LogFormat("Microphone: Milliseconds since last sent: {0}, Worst: {1}", (seconds * 1000.0).ToString(CultureInfo.InvariantCulture), (worstTimeBetweenPackets * 1000.0).ToString(CultureInfo.InvariantCulture)); } diff --git a/Assets/HoloToolkit-Examples/Input/Scripts/XboxControllerHandlerTest.cs b/Assets/HoloToolkit-Examples/Input/Scripts/XboxControllerHandlerTest.cs index bad03bab20b..fe11528896b 100644 --- a/Assets/HoloToolkit-Examples/Input/Scripts/XboxControllerHandlerTest.cs +++ b/Assets/HoloToolkit-Examples/Input/Scripts/XboxControllerHandlerTest.cs @@ -8,7 +8,7 @@ namespace HoloToolkit.Unity.InputModule.Tests { public class XboxControllerHandlerTest : XboxControllerHandlerBase { - + [Header("Xbox Controller Test Options")] [SerializeField] private float movementSpeedMultiplier = 1f; @@ -18,52 +18,56 @@ public class XboxControllerHandlerTest : XboxControllerHandlerBase [SerializeField] private XboxControllerMappingTypes resetButton = XboxControllerMappingTypes.XboxY; - public Text DebugText; + [SerializeField] + private Text debugText; + private Vector3 initialPosition; private Vector3 newPosition; private Vector3 newRotation; - protected override void Start() + protected virtual void Start() { - base.Start(); initialPosition = transform.position; } - public override void OnGamePadDetected(GamePadEventData eventData) + public override void OnSourceLost(SourceStateEventData eventData) { - base.OnGamePadDetected(eventData); - Debug.LogFormat("Joystick \"{0}\" Connected with id: {1}", eventData.GamePadName, eventData.SourceId); + Debug.LogFormat("Joystick {0} with id: \"{1}\" Disconnected", GamePadName, eventData.SourceId); + base.OnSourceLost(eventData); + debugText.text = "No Controller Connected"; } - public override void OnGamePadLost(GamePadEventData eventData) + public override void OnXboxInputUpdate(XboxControllerEventData eventData) { - base.OnGamePadLost(eventData); - Debug.LogFormat("Joystick \"{0}\" Disconnected with id: {1}", eventData.GamePadName, eventData.SourceId); - DebugText.text = "No Controller Connected"; - } + if (string.IsNullOrEmpty(GamePadName)) + { + Debug.LogFormat("Joystick {0} with id: \"{1}\" Connected", eventData.GamePadName, eventData.SourceId); + } - public override void OnXboxAxisUpdate(XboxControllerEventData eventData) - { - base.OnXboxAxisUpdate(eventData); + base.OnXboxInputUpdate(eventData); + + // Reset our new vectors newPosition = Vector3.zero; newRotation = Vector3.zero; + // Assign new Position Data newPosition.x += eventData.XboxLeftStickHorizontalAxis * movementSpeedMultiplier; newPosition.z += eventData.XboxLeftStickVerticalAxis * movementSpeedMultiplier; newPosition.y += eventData.XboxSharedTriggerAxis * movementSpeedMultiplier; transform.position += newPosition; + // Assign new rotation data newRotation.y += eventData.XboxRightStickHorizontalAxis * rotationSpeedMultiplier; transform.rotation *= Quaternion.Euler(newRotation); - if (OnButton_Up(resetButton, eventData)) + if (XboxControllerMapping.GetButton_Up(resetButton, eventData)) { transform.position = initialPosition; } - DebugText.text = + debugText.text = string.Format( "{19}\n" + "LS Horizontal: {0:0.000} Vertical: {1:0.000}\n" + diff --git a/Assets/HoloToolkit-Examples/Medical/Scripts/RestrictToBounds.cs b/Assets/HoloToolkit-Examples/Medical/Scripts/RestrictToBounds.cs index efe6efbafa0..09d53725656 100644 --- a/Assets/HoloToolkit-Examples/Medical/Scripts/RestrictToBounds.cs +++ b/Assets/HoloToolkit-Examples/Medical/Scripts/RestrictToBounds.cs @@ -6,7 +6,7 @@ namespace HoloToolkit.Unity { /// - /// Keeps a game object within configured boudns + /// Keeps a game object within configured bounds /// [RequireComponent(typeof(Transform))] public class RestrictToBounds : MonoBehaviour diff --git a/Assets/HoloToolkit-Examples/Medical/Scripts/SlicingPlaneController.cs b/Assets/HoloToolkit-Examples/Medical/Scripts/SlicingPlaneController.cs index b3f565be61d..d3a711d8ab6 100644 --- a/Assets/HoloToolkit-Examples/Medical/Scripts/SlicingPlaneController.cs +++ b/Assets/HoloToolkit-Examples/Medical/Scripts/SlicingPlaneController.cs @@ -8,7 +8,7 @@ namespace HoloToolkit.Unity { /// /// Controls slicing planes for use in volumetric rendering - /// Planes represent maniuplatable viewable regions of the volume + /// Planes represent manipulatable viewable regions of the volume /// public class SlicingPlaneController : MonoBehaviour, IManipulationHandler { diff --git a/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scenes/GrabMechanics.unity b/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scenes/GrabMechanics.unity index f940c6b17a3..e91bb21e6c6 100644 --- a/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scenes/GrabMechanics.unity +++ b/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scenes/GrabMechanics.unity @@ -1879,6 +1879,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 906323c940a3fad4f8f7e9e4fcd747f4, type: 3} m_Name: m_EditorClassIdentifier: + containerObject: {fileID: 0} + alignmentType: 1 + stationarySpaceTypePosition: {x: 0, y: 0, z: 1} + roomScaleSpaceTypePosition: {x: 0, y: 0.949095, z: 0} --- !u!4 &1926473061 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/BaseGrabbable.cs b/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/BaseGrabbable.cs index 34c3579e564..a9091d4a9dc 100644 --- a/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/BaseGrabbable.cs +++ b/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/BaseGrabbable.cs @@ -103,7 +103,7 @@ public GrabStateEnum ContactState public virtual bool TryGrabWith(BaseGrabber grabber) { - // TODO error checking, mult-grab checking + // TODO error checking, multi-grab checking if (GrabState != GrabStateEnum.Inactive) { switch (grabStyle) @@ -113,7 +113,7 @@ public virtual bool TryGrabWith(BaseGrabber grabber) BaseGrabber primary = GrabberPrimary; if (GrabberPrimary.CanTransferOwnershipTo(this, grabber)) { - // Remove from grabbable list and detatch + // Remove from grabbable list and detach activeGrabbers.Remove(primary); DetachFromGrabber(primary); } @@ -150,7 +150,7 @@ public void RemoveContact(BaseGrabber availableObject) availableGrabbers.Remove(availableObject); } - //the next three functions provide basic behaviour. Extend from this base script in order to provide more specific functionality. + // The next three functions provide basic behavior. Extend from this base script in order to provide more specific functionality. protected virtual void AttachToGrabber(BaseGrabber grabber) { diff --git a/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/BaseGrabber.cs b/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/BaseGrabber.cs index 750b124b97d..5b76a949cc8 100644 --- a/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/BaseGrabber.cs +++ b/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/BaseGrabber.cs @@ -133,7 +133,7 @@ protected virtual void GrabStart() /// /// If the correct grabbing button is pressed, we set the GrabState. - /// Grab behaviour depends on the combination of GrabState, and a grabbable trigger entered + /// Grab behavior depends on the combination of GrabState, and a grabbable trigger entered /// protected virtual void GrabEnd() { diff --git a/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/BaseThrowable.cs b/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/BaseThrowable.cs index 0e7e4f49fa1..276fea45947 100644 --- a/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/BaseThrowable.cs +++ b/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/BaseThrowable.cs @@ -86,7 +86,7 @@ protected virtual void OnThrowCanceled() } /// - /// throw behaviour should be over ridden in a non-abstract class + /// Throw behavior should be overridden in a non-abstract class /// /// public virtual void Throw(BaseGrabbable grabber) diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/Pyramid3side.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/Pyramid3side.fbx.meta index cbbc7651fac..7a3dad08ed3 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/Pyramid3side.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/Pyramid3side.fbx.meta @@ -3,7 +3,7 @@ guid: 36216af31d415c944ba63d4cdd73854d timeCreated: 1478210457 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/Pyramid4side.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/Pyramid4side.fbx.meta index 18a9b7c6b5a..129478bc0fc 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/Pyramid4side.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/Pyramid4side.fbx.meta @@ -3,7 +3,7 @@ guid: d6782d58ed10d2d41b658095e8210316 timeCreated: 1478210459 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/Pyramid5side.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/Pyramid5side.fbx.meta index 4a92f46c1ef..5754cf877b1 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/Pyramid5side.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/Pyramid5side.fbx.meta @@ -3,7 +3,7 @@ guid: eaa02ef705f753148940b0dd9ec6baee timeCreated: 1478212088 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/angleThick.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/angleThick.fbx.meta index 1d8aeb5d6dc..3c537cd058b 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/angleThick.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/angleThick.fbx.meta @@ -3,7 +3,7 @@ guid: 74c0003f403e7164f9d32219155683a7 timeCreated: 1478210458 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/angleThickThin.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/angleThickThin.fbx.meta index e75cd400b5f..ffd58a57c98 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/angleThickThin.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/angleThickThin.fbx.meta @@ -3,7 +3,7 @@ guid: 31fd6c10a0509a34bb482e9989726959 timeCreated: 1478210457 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/angleThin.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/angleThin.fbx.meta index 94eb0419d2a..fdabc1e61c2 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/angleThin.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/angleThin.fbx.meta @@ -3,7 +3,7 @@ guid: 360dede9e54e9ac4aba8f81c080aa346 timeCreated: 1478210457 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/arrow.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/arrow.fbx.meta index 23d83691fed..504e83e5227 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/arrow.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/arrow.fbx.meta @@ -3,7 +3,7 @@ guid: efa4a78ba3eb4644ca145ba484c33708 timeCreated: 1478210459 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/arrowPointer.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/arrowPointer.fbx.meta index bb626d6797e..579b3cd7cf7 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/arrowPointer.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/arrowPointer.fbx.meta @@ -3,7 +3,7 @@ guid: 14d4b1e79784b934881a553bc269cec0 timeCreated: 1478210457 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/cheveron.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/cheveron.fbx.meta index 99f3c515346..3b024155076 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/cheveron.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/cheveron.fbx.meta @@ -3,7 +3,7 @@ guid: 5fd3a4f2c8cf22e40b653f213cdf785b timeCreated: 1478210458 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/cone.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/cone.fbx.meta index f78656cecf0..45561e3968c 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/cone.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/cone.fbx.meta @@ -3,7 +3,7 @@ guid: 5702f2aa065381d489668e5042b2d92c timeCreated: 1478210458 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/crosshair.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/crosshair.fbx.meta index c1a7872b540..b7d76cf16d7 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/crosshair.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/crosshair.fbx.meta @@ -3,7 +3,7 @@ guid: cfc7ae536a82e74488e85d55a7ad552a timeCreated: 1478210458 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/crosshairSmall.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/crosshairSmall.fbx.meta index 9c27bb7c489..ef339cdead7 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/crosshairSmall.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/crosshairSmall.fbx.meta @@ -3,7 +3,7 @@ guid: 997b957ad7d5cef40a5b78fe0c57d701 timeCreated: 1478210458 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamond.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamond.fbx.meta index 9b7c93a0280..2bb9fcd816c 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamond.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamond.fbx.meta @@ -3,7 +3,7 @@ guid: 9d068d96aeb69094f8d508f3b1801c2b timeCreated: 1478210458 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamond3side.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamond3side.fbx.meta index 780e62a8fc3..78bd67ef75c 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamond3side.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamond3side.fbx.meta @@ -3,7 +3,7 @@ guid: 53d5ad68b35b3964680f594bbcda43f3 timeCreated: 1478210457 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamond4side.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamond4side.fbx.meta index d02c659dbea..7a6dbb3a436 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamond4side.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamond4side.fbx.meta @@ -3,7 +3,7 @@ guid: 9bde2593efb2c17498aa125ba9025e4a timeCreated: 1478210458 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamond5side.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamond5side.fbx.meta index 0f268b2f555..96c36aafee2 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamond5side.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamond5side.fbx.meta @@ -3,7 +3,7 @@ guid: 14f027811261f994db4bafdb882453ea timeCreated: 1478210457 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamondCone.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamondCone.fbx.meta index 596fc6db7f6..bea2271fffb 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamondCone.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diamondCone.fbx.meta @@ -3,7 +3,7 @@ guid: 005d02e887411044aa6f4307a61f0847 timeCreated: 1478210456 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/disk.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/disk.fbx.meta index b33d19f0731..b8910675ea1 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/disk.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/disk.fbx.meta @@ -3,7 +3,7 @@ guid: 13e4799638d711e41bd26a1a30ee5daf timeCreated: 1478210457 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diskLarge.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diskLarge.fbx.meta index a938a2f8d5d..9189d087999 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diskLarge.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diskLarge.fbx.meta @@ -3,7 +3,7 @@ guid: 03f7a5dd26810e14e9fbd5926a320b0b timeCreated: 1478210456 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diskMedium.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diskMedium.fbx.meta index f4b628c57d0..791d2c8d717 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diskMedium.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diskMedium.fbx.meta @@ -3,7 +3,7 @@ guid: f83b5c1ef0cdbb941b29432f5eeb9592 timeCreated: 1478210459 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diskSmall.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diskSmall.fbx.meta index 9448d324681..e79714ade13 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diskSmall.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/diskSmall.fbx.meta @@ -3,7 +3,7 @@ guid: 4cc31a7cdfe4b1c4ca074fd9e70fc574 timeCreated: 1478210457 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/sqCrosshair.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/sqCrosshair.fbx.meta index 5676fd2b0a1..b7ed82e9dda 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/sqCrosshair.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/sqCrosshair.fbx.meta @@ -3,7 +3,7 @@ guid: 35dadc8dd71318c4789b97e45782a21e timeCreated: 1478210457 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/sqCrosshairSmall.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/sqCrosshairSmall.fbx.meta index 03e0bdc981e..e17d0324f2b 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/sqCrosshairSmall.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/sqCrosshairSmall.fbx.meta @@ -3,7 +3,7 @@ guid: d8359d8b7800dec46985e835ac9f69c3 timeCreated: 1478210459 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/torus.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/torus.fbx.meta index eab9b2d76c8..0ea6bd9e4af 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/torus.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/torus.fbx.meta @@ -3,7 +3,7 @@ guid: 9b6255bee01ca4e41afc83e20b7a143c timeCreated: 1478210458 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/triangle.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/triangle.fbx.meta index c301783278e..a65aaf23eea 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/triangle.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/triangle.fbx.meta @@ -3,7 +3,7 @@ guid: 12b3473719aef0b45bb21d52c0160442 timeCreated: 1478210457 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/wedge.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/wedge.fbx.meta index 0672bc29a27..f6a3114f797 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/wedge.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/wedge.fbx.meta @@ -3,7 +3,7 @@ guid: 703cf294947fd9e48a73ef1135d37fab timeCreated: 1478210458 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/wedgeOpen.fbx.meta b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/wedgeOpen.fbx.meta index af8cade89cf..5d27650cd94 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/wedgeOpen.fbx.meta +++ b/Assets/HoloToolkit-Examples/Prototyping/Primitives/Models/wedgeOpen.fbx.meta @@ -3,7 +3,7 @@ guid: caffdf4251ca1914086374ce3ab9637e timeCreated: 1478211842 licenseType: Pro ModelImporter: - serializedVersion: 21 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -32,7 +32,6 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -40,16 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -59,8 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 0 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/ColorTransition.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/ColorTransition.cs index 2788ca5fbc7..b5cba1d6529 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/ColorTransition.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/ColorTransition.cs @@ -43,7 +43,7 @@ private struct ColorTransitionData private void Awake() { - // set the tartget game object if not set already + // set the target game object if not set already if (TargetObject == null) { TargetObject = this.gameObject; diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleArray.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleArray.cs index cbddd85fcef..e796c278d3b 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleArray.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleArray.cs @@ -8,9 +8,9 @@ namespace HoloToolkit.Examples.Prototyping { /// - /// CycleArray is a class for incramenting through component properties sequentially or assigning specific elements in the array. - /// A good use-case is updating visuals on a gameobject easily through the UnityEditor. - /// Use with Interactive or InteractiveEffects for consistant visual feedback patterns + /// CycleArray is a class for incrementing through component properties sequentially or assigning specific elements in the array. + /// A good use-case is updating visuals on a GameObject easily through the UnityEditor. + /// Use with Interactive or InteractiveEffects for consistent visual feedback patterns /// public class CycleArray : MonoBehaviour, ICycle { @@ -31,7 +31,7 @@ public class CycleArray : MonoBehaviour, ICycle public int DefaultIndex = 0; /// - /// the current index of the appied item in the array + /// the current index of the applied item in the array /// public int Index { get; set;} @@ -108,7 +108,7 @@ public virtual void MoveNext() } /// - /// Move to the previsou item in the array + /// Move to the previous item in the array /// public virtual void MovePrevious() { diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleColors.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleColors.cs index abd2b285c57..ec6d00ac627 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleColors.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleColors.cs @@ -9,7 +9,7 @@ namespace HoloToolkit.Examples.Prototyping { /// /// Cycle through a list of colors and apply the current color to the material - /// Supports ColorTransition for animaiton and easing. Auto detected, just add it to the component + /// Supports ColorTransition for animation and easing. Auto detected, just add it to the component /// public class CycleColors : CycleArray { diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleRotation.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleRotation.cs index 9615549d870..bc39b8d51c5 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleRotation.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleRotation.cs @@ -8,8 +8,8 @@ namespace HoloToolkit.Examples.Prototyping { /// - /// sets the rotation (eulerAngles) of an object to the selected value in the array. - /// Add RotateToValue for animaiton and easing, auto detected. + /// Sets the rotation (eulerAngles) of an object to the selected value in the array. + /// Add RotateToValue for animation and easing, auto detected. /// public class CycleRotation : CycleArray { @@ -26,7 +26,7 @@ protected override void Awake() } /// - /// set the rotation from the vector 3 euler angle + /// Set the rotation from the Vector3 Euler angles /// /// public override void SetIndex(int index) diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleScale.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleScale.cs index c6d48dc03b0..4c57541ec8e 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleScale.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleScale.cs @@ -9,7 +9,7 @@ namespace HoloToolkit.Examples.Prototyping { /// /// scales an object based on the selected value in the array - /// Supports ScaletoValue for animaiton and easing, ...auto detected. + /// Supports ScaleToValue for animation and easing, ...auto detected. /// public class CycleScale : CycleArray { diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleShowHideObjects.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleShowHideObjects.cs index 85fec198bce..9288103e9f9 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleShowHideObjects.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleShowHideObjects.cs @@ -7,7 +7,7 @@ namespace HoloToolkit.Examples.Prototyping { /// - /// Active and detactivate objects based on the selected item in the array. + /// Activate and deactivate objects based on the selected item in the array. /// Only shows the currently selected item. /// public class CycleShowHideObjects : CycleArray diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleStatusDisplay.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleStatusDisplay.cs index 49b9928bd5a..eaf8f103915 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleStatusDisplay.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleStatusDisplay.cs @@ -13,7 +13,7 @@ namespace HoloToolkit.Examples.Prototyping /// public class CycleStatusDisplay : MonoBehaviour { - [Tooltip("A GameObject containing a component that impliments ICycle")] + [Tooltip("A GameObject containing a component that implements ICycle")] public GameObject CycleHost; private ICycle mCycleHost; diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleText.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleText.cs index 1f64349d63b..9c58c334147 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleText.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/CycleText.cs @@ -25,7 +25,7 @@ protected override void Awake() if (mTextMesh == null && mText == null) { - Debug.LogError("Textmesh or Text is not set in CycleText!"); + Debug.LogError("TextMesh or Text is not set in CycleText!"); Destroy(this); } } diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/FadeColors.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/FadeColors.cs index 3032b17f847..106fc9de494 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/FadeColors.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/FadeColors.cs @@ -247,7 +247,7 @@ public static float QuadEaseInOut(float s, float e, float v) } /// - /// Animate the fadeing + /// Animate the fading /// private void Update() { diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/ICycle.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/ICycle.cs index 8f0149c1647..5a347048b7b 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/ICycle.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/ICycle.cs @@ -27,7 +27,7 @@ public interface ICycle void MoveNext(); /// - /// Move to the previsou item in the array + /// Move to the previous item in the array /// void MovePrevious(); diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/Layout/PanelTransformPosition.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/Layout/PanelTransformPosition.cs index 44685701f40..8cc04e51fe6 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/Layout/PanelTransformPosition.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/Layout/PanelTransformPosition.cs @@ -8,7 +8,7 @@ namespace HoloToolkit.Examples.Prototyping { /// - /// Takes size values, similar to RectTransorm position values or pixel values used in desiger tools and applies them to primitive objects. + /// Takes size values, similar to RectTransorm position values or pixel values used in designer tools and applies them to primitive objects. /// /// A quick way to align and anchor 3D objects in Unity for mocking up UI and click-throughs. /// This solution is not as robust as Unity's RectTransform layout system, diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/Layout/PanelTransformSize.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/Layout/PanelTransformSize.cs index 5fa6978875b..828e6b9a395 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/Layout/PanelTransformSize.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/Layout/PanelTransformSize.cs @@ -8,9 +8,9 @@ namespace HoloToolkit.Examples.Prototyping { /// - /// Takes size values, similar to RectTransorm size values or pixel values used in desiger tools and applies them to primitive objects. + /// Takes size values, similar to RectTransorm size values or pixel values used in designer tools and applies them to primitive objects. /// - /// Turns Unity premitive shapes, like the Quad or Cube, into panels, buttons and other basic UI elements. + /// Turns Unity primitive shapes, like the Quad or Cube, into panels, buttons and other basic UI elements. /// It's a solution to mocking up UI and building click-throughs. /// /// For prototyping, a designer can export some art as a texture (PNG/TIFF/TRG) and apply it to a quad. diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/Layout/PanelTransformSizeOffset.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/Layout/PanelTransformSizeOffset.cs index 4a85976d114..c0f44f633df 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/Layout/PanelTransformSizeOffset.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/Layout/PanelTransformSizeOffset.cs @@ -8,7 +8,7 @@ namespace HoloToolkit.Examples.Prototyping { /// - /// Adds margins or buffers using size values, similar to RectTransorm size values or pixel values used in desiger tools. + /// Adds margins or buffers using size values, similar to RectTransorm size values or pixel values used in designer tools. /// /// A quick way to size and position sub elements in a UI mock up. /// Use to stack elements and create more interesting designs. @@ -55,7 +55,7 @@ private void UpdatePosition() } /// - /// Set the size based on the Achor's size and the buffers + /// Set the size based on the Anchor's size and the buffers /// private void UpdateSize() { diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/Layout/SizeToRectTransform.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/Layout/SizeToRectTransform.cs index 68ea2f54845..80d3ed7ef4d 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/Layout/SizeToRectTransform.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/Layout/SizeToRectTransform.cs @@ -11,11 +11,11 @@ namespace HoloToolkit.Examples.Prototyping /// A sizing and layout system for RectTransforms that help in building and laying out UI /// /// Unity has a robust layout system using RectTransforms, Grids and LayoutGroups. - /// This componet helps to layout 3D primitive objects into the RectTransform system for building more complex layouts. + /// This component helps to layout 3D primitive objects into the RectTransform system for building more complex layouts. /// /// For best results, scale the canvas parent element to 0.0005, 0.0005, 0.0005. /// Create a child RectTransform and position and size as needed. - /// Place a regular Transform based element inside the child RectTransform with this componet to automatically size and anchor + /// Place a regular Transform based element inside the child RectTransform with this component to automatically size and anchor /// this element based on it's parent RectTransform settings. /// /// This component also adds depth controls. diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/MoveToPosition.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/MoveToPosition.cs index dc7275da1e9..234f10be7da 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/MoveToPosition.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/MoveToPosition.cs @@ -55,7 +55,7 @@ public enum LerpTypes { Linear, EaseIn, EaseOut, EaseInOut, Free } // animation ticker private float mLerpTimeCounter; - // cached start value, updates everytime a new animation starts + // cached start value, updates every time a new animation starts private Vector3 mStartValue; /// diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/MoveWithObject.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/MoveWithObject.cs index 4d251e2e832..33b52851a46 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/MoveWithObject.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/MoveWithObject.cs @@ -17,12 +17,12 @@ namespace HoloToolkit.Examples.Prototyping /// Call Start Running(); /// /// Features: - /// - Independant adjustment speeds of position and rotation, feels really cool. + /// - Independent adjustment speeds of position and rotation, feels really cool. /// - Force the object to remain vertical or lock the x axis rotation. /// - Link to an interactive object to add manual controls. /// - Force the object to face to reference object or maintain it's existing direction /// - Force the object to be in front or at the reference object's transform.forward. - /// - Add magnitism to bring the object closer to the reference object + /// - Add magnetism to bring the object closer to the reference object /// public class MoveWithObject : MonoBehaviour { @@ -53,10 +53,10 @@ public class MoveWithObject : MonoBehaviour [Tooltip("Force the object to keep relative to the reference object's transform.forward")] public bool KeepInFront = true; - [Tooltip("Magnitism speed to move closer to the reference object")] + [Tooltip("Magnetism speed to move closer to the reference object")] public float Magnetism = 0; - [Tooltip("Minimum distance to stay away from the reference object if magnitism is used")] + [Tooltip("Minimum distance to stay away from the reference object if magnetism is used")] public float MagnetismPaddingDistance = 1f; // the position different between the objects position and the reference object's transform.forward @@ -71,7 +71,7 @@ public class MoveWithObject : MonoBehaviour // the offset distance at start private float mOffsetDistance = 0; - // the amount of magnitism to apply + // the amount of magnetism to apply private float mMagnetismPercentage = 1; private Vector3 mNormalzedOffsetDirection; diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scripts/OrbitPoint.cs b/Assets/HoloToolkit-Examples/Prototyping/Scripts/OrbitPoint.cs index 1db4308e3bd..95e02d4d4a8 100644 --- a/Assets/HoloToolkit-Examples/Prototyping/Scripts/OrbitPoint.cs +++ b/Assets/HoloToolkit-Examples/Prototyping/Scripts/OrbitPoint.cs @@ -26,7 +26,7 @@ public class OrbitPoint : MonoBehaviour [Tooltip("starting position based on 360 degrees")] public float StartAngle = 0; - [Tooltip("Limit the amount or revolutions, set to zero for infinit")] + [Tooltip("Limit the amount or revolutions, set to zero for infinite")] public float Revolutions = 0; [Tooltip("Orbit the other way")] diff --git a/Assets/HoloToolkit-Examples/Sharing/SharingService/Scripts/ImportExportAnchorManager.cs b/Assets/HoloToolkit-Examples/Sharing/SharingService/Scripts/ImportExportAnchorManager.cs index 22809575753..4944b400db8 100644 --- a/Assets/HoloToolkit-Examples/Sharing/SharingService/Scripts/ImportExportAnchorManager.cs +++ b/Assets/HoloToolkit-Examples/Sharing/SharingService/Scripts/ImportExportAnchorManager.cs @@ -492,7 +492,7 @@ private void ResetState() } /// - /// Initializes the room api. + /// Initializes the room API. /// private IEnumerator InitRoomApi() { @@ -755,12 +755,12 @@ private bool AttachToCachedAnchor(string anchorName) { if (SharingStage.Instance.ShowDetailedLogs) { - Debug.LogFormat("Anchor Manager: Looking for cahced anchor {0}...", anchorName); + Debug.LogFormat("Anchor Manager: Looking for cached anchor {0}...", anchorName); } if (AnchorDebugText != null) { - AnchorDebugText.text += string.Format("\nLooking for cahced anchor {0}...", anchorName); + AnchorDebugText.text += string.Format("\nLooking for cached anchor {0}...", anchorName); } string[] ids = anchorStore.GetAllIds(); diff --git a/Assets/HoloToolkit-Examples/SpatialMapping/Meshes/FakeSpatialMappingMesh.fbx.meta b/Assets/HoloToolkit-Examples/SpatialMapping/Meshes/FakeSpatialMappingMesh.fbx.meta index 895adfa5643..5d42fb4a076 100644 --- a/Assets/HoloToolkit-Examples/SpatialMapping/Meshes/FakeSpatialMappingMesh.fbx.meta +++ b/Assets/HoloToolkit-Examples/SpatialMapping/Meshes/FakeSpatialMappingMesh.fbx.meta @@ -32,6 +32,8 @@ ModelImporter: resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -49,7 +51,7 @@ ModelImporter: globalScale: 100 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -65,7 +67,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/SpatialMapping/Meshes/MediumRoomWithHomeFurniture.fbx.meta b/Assets/HoloToolkit-Examples/SpatialMapping/Meshes/MediumRoomWithHomeFurniture.fbx.meta index c9bea1e9071..aefb8bf98df 100644 --- a/Assets/HoloToolkit-Examples/SpatialMapping/Meshes/MediumRoomWithHomeFurniture.fbx.meta +++ b/Assets/HoloToolkit-Examples/SpatialMapping/Meshes/MediumRoomWithHomeFurniture.fbx.meta @@ -34,6 +34,8 @@ ModelImporter: resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -51,7 +53,7 @@ ModelImporter: globalScale: 100 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -67,7 +69,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/SpatialMapping/Meshes/SRMesh.obj.meta b/Assets/HoloToolkit-Examples/SpatialMapping/Meshes/SRMesh.obj.meta index cb75f6f83c0..ceef386a2b6 100644 --- a/Assets/HoloToolkit-Examples/SpatialMapping/Meshes/SRMesh.obj.meta +++ b/Assets/HoloToolkit-Examples/SpatialMapping/Meshes/SRMesh.obj.meta @@ -29,6 +29,8 @@ ModelImporter: resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -46,7 +48,7 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -60,9 +62,9 @@ ModelImporter: useFileScale: 1 tangentSpace: normalSmoothAngle: 60 - normalImportMode: 0 + normalImportMode: 1 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/SpatialMapping/Scripts/PlaneFindingTest.cs b/Assets/HoloToolkit-Examples/SpatialMapping/Scripts/PlaneFindingTest.cs index 8b61b9b8a8a..e92003aeeeb 100644 --- a/Assets/HoloToolkit-Examples/SpatialMapping/Scripts/PlaneFindingTest.cs +++ b/Assets/HoloToolkit-Examples/SpatialMapping/Scripts/PlaneFindingTest.cs @@ -9,7 +9,7 @@ namespace HoloToolkit.Unity.SpatialMapping.Tests /// /// Attach this component to a GameObject that contains some meshes (i.e.: the FakeSpatialMappingMesh.fbx). /// When running in the Unity editor, the planes are then visualized via editor gizmos. You can then - /// play with the API parameters in realtime to see how the impact the plane finding algorithm. + /// play with the API parameters in real-time to see how the impact the plane finding algorithm. /// public class PlaneFindingTest : MonoBehaviour { diff --git a/Assets/HoloToolkit-Examples/SpatialUnderstanding/Scripts/LineDrawer.cs b/Assets/HoloToolkit-Examples/SpatialUnderstanding/Scripts/LineDrawer.cs index 8184e3ee59b..77c0eeced38 100644 --- a/Assets/HoloToolkit-Examples/SpatialUnderstanding/Scripts/LineDrawer.cs +++ b/Assets/HoloToolkit-Examples/SpatialUnderstanding/Scripts/LineDrawer.cs @@ -127,7 +127,7 @@ private void SetupAnimation() return; } - // Calc the forward distance for the animation start point + // Calculate the forward distance for the animation start point Vector3 rayPos = CameraCache.Main.transform.position; Vector3 rayVec = CameraCache.Main.transform.forward * InitialPositionForwardMaxDistance; IntPtr raycastResultPtr = HoloToolkit.Unity.SpatialUnderstanding.Instance.UnderstandingDLL.GetStaticRaycastResultPtr(); @@ -267,7 +267,7 @@ protected bool Draw_AnimatedBox(AnimatedBox box) return Draw_Box(box.Center, box.Rotation, box.Color, box.HalfSize, box.LineWidth); } - // Draw it using the current anim state + // Draw it using the current animation state return Draw_Box( box.AnimPosition.Evaluate(box.Time), box.Rotation * Quaternion.AngleAxis(360.0f * box.AnimRotation.Evaluate(box.Time), Vector3.up), @@ -347,7 +347,7 @@ protected bool Draw_TransformBasis(Transform transformToDraw, float basisLength private void Lines_LineDataToMesh() { - // Alloc them up + // Allocate them up Vector3[] verts = new Vector3[lineData.Lines.Count * 8]; int[] tris = new int[lineData.Lines.Count * 12 * 3]; Color[] colors = new Color[verts.Length]; @@ -355,7 +355,7 @@ private void Lines_LineDataToMesh() // Build the data for (int i = 0; i < lineData.Lines.Count; ++i) { - // Base index calcs + // Base index calculations int vert = i * 8; int v0 = vert; int tri = i * 12 * 3; @@ -365,7 +365,7 @@ private void Lines_LineDataToMesh() Vector3 normX = Vector3.Cross((Mathf.Abs(dirUnit.y) >= 0.99f) ? Vector3.right : Vector3.up, dirUnit).normalized; Vector3 normy = Vector3.Cross(normX, dirUnit); - // Verts + // Vertices verts[vert] = lineData.Lines[i].p0 + normX * lineData.Lines[i].lineWidth + normy * lineData.Lines[i].lineWidth; colors[vert] = lineData.Lines[i].c0; ++vert; verts[vert] = lineData.Lines[i].p0 - normX * lineData.Lines[i].lineWidth + normy * lineData.Lines[i].lineWidth; colors[vert] = lineData.Lines[i].c0; ++vert; verts[vert] = lineData.Lines[i].p0 - normX * lineData.Lines[i].lineWidth - normy * lineData.Lines[i].lineWidth; colors[vert] = lineData.Lines[i].c0; ++vert; @@ -429,7 +429,7 @@ private void Lines_LineDataToMesh() lineData.Filter.mesh = mesh; - // If no tris, hide it + // If no triangles, hide it lineData.Renderer.enabled = (lineData.Lines.Count == 0) ? false : true; // Line index reset diff --git a/Assets/HoloToolkit-Examples/UX/Materials/Balloon.fbx.meta b/Assets/HoloToolkit-Examples/UX/Materials/Balloon.fbx.meta index 46e3fc4b141..4b19cb0fc97 100644 --- a/Assets/HoloToolkit-Examples/UX/Materials/Balloon.fbx.meta +++ b/Assets/HoloToolkit-Examples/UX/Materials/Balloon.fbx.meta @@ -18,6 +18,8 @@ ModelImporter: resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -41,7 +43,7 @@ ModelImporter: useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -51,9 +53,10 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 4 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: + serializedVersion: 2 human: [] skeleton: [] armTwist: 0.5 @@ -64,7 +67,10 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 0 humanoidOversampling: 1 diff --git a/Assets/HoloToolkit-Examples/UX/Models/Buttons.FBX.meta b/Assets/HoloToolkit-Examples/UX/Models/Buttons.FBX.meta index fb0bfde80b0..125c0b25133 100644 --- a/Assets/HoloToolkit-Examples/UX/Models/Buttons.FBX.meta +++ b/Assets/HoloToolkit-Examples/UX/Models/Buttons.FBX.meta @@ -87,6 +87,8 @@ ModelImporter: resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -104,13 +106,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -120,9 +122,10 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: + serializedVersion: 2 human: [] skeleton: [] armTwist: 0.5 @@ -133,7 +136,10 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 0 humanoidOversampling: 1 diff --git a/Assets/HoloToolkit-Examples/UX/Models/CoffeeCup.fbx.meta b/Assets/HoloToolkit-Examples/UX/Models/CoffeeCup.fbx.meta index 1ae74d8d19c..48b71425f96 100644 --- a/Assets/HoloToolkit-Examples/UX/Models/CoffeeCup.fbx.meta +++ b/Assets/HoloToolkit-Examples/UX/Models/CoffeeCup.fbx.meta @@ -47,13 +47,13 @@ ModelImporter: globalScale: 100 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -63,7 +63,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 @@ -79,10 +79,10 @@ ModelImporter: rootMotionBoneName: rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 2 + animationType: 0 humanoidOversampling: 1 additionalBone: 0 userData: diff --git a/Assets/HoloToolkit-Examples/UX/Models/Model_Bucky.fbx.meta b/Assets/HoloToolkit-Examples/UX/Models/Model_Bucky.fbx.meta index ab91310c532..93d20d76fce 100644 --- a/Assets/HoloToolkit-Examples/UX/Models/Model_Bucky.fbx.meta +++ b/Assets/HoloToolkit-Examples/UX/Models/Model_Bucky.fbx.meta @@ -44,13 +44,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -60,7 +60,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 @@ -76,10 +76,10 @@ ModelImporter: rootMotionBoneName: rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 2 + animationType: 0 humanoidOversampling: 1 additionalBone: 0 userData: diff --git a/Assets/HoloToolkit-Examples/UX/Models/Model_Icosa.fbx.meta b/Assets/HoloToolkit-Examples/UX/Models/Model_Icosa.fbx.meta index a25bf8c5c7c..680d4bd8f8e 100644 --- a/Assets/HoloToolkit-Examples/UX/Models/Model_Icosa.fbx.meta +++ b/Assets/HoloToolkit-Examples/UX/Models/Model_Icosa.fbx.meta @@ -44,13 +44,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -60,7 +60,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 @@ -76,10 +76,10 @@ ModelImporter: rootMotionBoneName: rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 2 + animationType: 0 humanoidOversampling: 1 additionalBone: 0 userData: diff --git a/Assets/HoloToolkit-Examples/UX/Models/Model_Octa.fbx.meta b/Assets/HoloToolkit-Examples/UX/Models/Model_Octa.fbx.meta index 4e65c7c1d54..fbb07323bc0 100644 --- a/Assets/HoloToolkit-Examples/UX/Models/Model_Octa.fbx.meta +++ b/Assets/HoloToolkit-Examples/UX/Models/Model_Octa.fbx.meta @@ -44,13 +44,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -60,7 +60,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 @@ -76,10 +76,10 @@ ModelImporter: rootMotionBoneName: rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 2 + animationType: 0 humanoidOversampling: 1 additionalBone: 0 userData: diff --git a/Assets/HoloToolkit-Examples/UX/Models/Model_Platonic.fbx.meta b/Assets/HoloToolkit-Examples/UX/Models/Model_Platonic.fbx.meta index 4113e87b987..ebaac730bb5 100644 --- a/Assets/HoloToolkit-Examples/UX/Models/Model_Platonic.fbx.meta +++ b/Assets/HoloToolkit-Examples/UX/Models/Model_Platonic.fbx.meta @@ -39,13 +39,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -55,7 +55,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/UX/Models/Model_PushButton.fbx.meta b/Assets/HoloToolkit-Examples/UX/Models/Model_PushButton.fbx.meta index 2555d6e03b6..9cb3256d3a3 100644 --- a/Assets/HoloToolkit-Examples/UX/Models/Model_PushButton.fbx.meta +++ b/Assets/HoloToolkit-Examples/UX/Models/Model_PushButton.fbx.meta @@ -46,13 +46,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -62,7 +62,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/UX/Models/MouseandCheese.fbx.meta b/Assets/HoloToolkit-Examples/UX/Models/MouseandCheese.fbx.meta index 1b368b9a2ec..7fe258d74f0 100644 --- a/Assets/HoloToolkit-Examples/UX/Models/MouseandCheese.fbx.meta +++ b/Assets/HoloToolkit-Examples/UX/Models/MouseandCheese.fbx.meta @@ -53,13 +53,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -69,7 +69,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/UX/Models/balloon.fbx.meta b/Assets/HoloToolkit-Examples/UX/Models/balloon.fbx.meta index 37789c18c8d..d90f718b517 100644 --- a/Assets/HoloToolkit-Examples/UX/Models/balloon.fbx.meta +++ b/Assets/HoloToolkit-Examples/UX/Models/balloon.fbx.meta @@ -59,13 +59,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -75,7 +75,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 @@ -91,10 +91,10 @@ ModelImporter: rootMotionBoneName: rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 2 + animationType: 0 humanoidOversampling: 1 additionalBone: 0 userData: diff --git a/Assets/HoloToolkit-Examples/UX/Scenes/InteractableObjectExample.unity b/Assets/HoloToolkit-Examples/UX/Scenes/InteractableObjectExample.unity index 02b39a87211..3fdb0639d09 100644 --- a/Assets/HoloToolkit-Examples/UX/Scenes/InteractableObjectExample.unity +++ b/Assets/HoloToolkit-Examples/UX/Scenes/InteractableObjectExample.unity @@ -185,85 +185,6 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!21 &51591473 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: ButtonIconMaterial - m_Shader: {fileID: 4800000, guid: 5c2339e78c48ab14bb095cea2be5fb1a, type: 3} - m_ShaderKeywords: _USECOLOR_ON _USEMAINTEX_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3100 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 844c611d8989e904cba0fd67b9536d11, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorWriteMask: 15 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _UVSec: 0 - - _UseColor: 1 - - _UseMainTex: 1 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} --- !u!1001 &57866393 Prefab: m_ObjectHideFlags: 0 @@ -460,7 +381,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4000010330146594, guid: bfdc7f60d7205c84f82a4806a5352d60, type: 2} propertyPath: m_LocalPosition.y - value: -0.02 + value: 0.25 objectReference: {fileID: 0} - target: {fileID: 4000010330146594, guid: bfdc7f60d7205c84f82a4806a5352d60, type: 2} propertyPath: m_LocalPosition.z @@ -513,6 +434,11 @@ Transform: m_PrefabParentObject: {fileID: 4000010330146594, guid: bfdc7f60d7205c84f82a4806a5352d60, type: 2} m_PrefabInternal: {fileID: 338549268} +--- !u!4 &473483176 stripped +Transform: + m_PrefabParentObject: {fileID: 4000010330146594, guid: bfdc7f60d7205c84f82a4806a5352d60, + type: 2} + m_PrefabInternal: {fileID: 1053558615} --- !u!1001 &560723945 Prefab: m_ObjectHideFlags: 0 @@ -619,11 +545,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4562275514082094, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4931155170010354, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1372541880982678, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} propertyPath: m_Name @@ -635,14 +561,14 @@ Prefab: value: objectReference: {fileID: 1097318689274706, guid: 869d340c69dbcef459070c1a159d38ac, type: 2} + - target: {fileID: 114129378875773704, guid: d29bc40b7f3df26479d6a0aac211c355, + type: 2} + propertyPath: opaqueTrackingSpaceType + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2} m_IsPrefabParent: 0 ---- !u!20 &726125727 stripped -Camera: - m_PrefabParentObject: {fileID: 20770519707920992, guid: d29bc40b7f3df26479d6a0aac211c355, - type: 2} - m_PrefabInternal: {fileID: 726125720} --- !u!1 &760868132 GameObject: m_ObjectHideFlags: 0 @@ -755,6 +681,85 @@ GameObject: m_PrefabParentObject: {fileID: 1976805537069254, guid: 44cf321bbff3de04689ca73162fd797c, type: 2} m_PrefabInternal: {fileID: 814155957} +--- !u!21 &855991380 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: ButtonIconMaterial + m_Shader: {fileID: 4800000, guid: 5c2339e78c48ab14bb095cea2be5fb1a, type: 3} + m_ShaderKeywords: _USECOLOR_ON _USEMAINTEX_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3100 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 844c611d8989e904cba0fd67b9536d11, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorWriteMask: 15 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _UVSec: 0 + - _UseColor: 1 + - _UseMainTex: 1 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} --- !u!1001 &933880011 Prefab: m_ObjectHideFlags: 0 @@ -808,6 +813,55 @@ GameObject: m_PrefabParentObject: {fileID: 1765319154685436, guid: 245cbaa07105c2d4e9dc492bf0287a4a, type: 2} m_PrefabInternal: {fileID: 933880011} +--- !u!1 &959309012 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 959309014} + - component: {fileID: 959309013} + m_Layer: 0 + m_Name: SceneContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &959309013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 959309012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 906323c940a3fad4f8f7e9e4fcd747f4, type: 3} + m_Name: + m_EditorClassIdentifier: + containerObject: {fileID: 0} + alignmentType: 1 + stationarySpaceTypePosition: {x: 0.05, y: -0.790905, z: 1.65} + roomScaleSpaceTypePosition: {x: 0.05, y: 0.359095, z: 1.08} +--- !u!4 &959309014 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 959309012} + 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_Children: + - {fileID: 1644802406} + - {fileID: 2068683753} + - {fileID: 473483176} + - {fileID: 1793044256} + - {fileID: 1809538459} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &962191100 Prefab: m_ObjectHideFlags: 0 @@ -856,7 +910,7 @@ Prefab: type: 2} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 51591473} + objectReference: {fileID: 855991380} - target: {fileID: 33078583375533282, guid: dc25f30298e5957498e67017b4d85807, type: 2} propertyPath: m_Mesh @@ -917,7 +971,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 959309014} m_Modifications: - target: {fileID: 4000010330146594, guid: bfdc7f60d7205c84f82a4806a5352d60, type: 2} propertyPath: m_LocalPosition.x @@ -925,7 +979,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4000010330146594, guid: bfdc7f60d7205c84f82a4806a5352d60, type: 2} propertyPath: m_LocalPosition.y - value: 1.609 + value: 0.848 objectReference: {fileID: 0} - target: {fileID: 4000010330146594, guid: bfdc7f60d7205c84f82a4806a5352d60, type: 2} propertyPath: m_LocalPosition.z @@ -949,7 +1003,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4000010330146594, guid: bfdc7f60d7205c84f82a4806a5352d60, type: 2} propertyPath: m_RootOrder - value: 7 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1000013198843976, guid: bfdc7f60d7205c84f82a4806a5352d60, type: 2} propertyPath: m_Name @@ -1019,90 +1073,6 @@ GameObject: m_PrefabParentObject: {fileID: 1723860127229764, guid: f96fd98222a1e2243ba69ffd9b371279, type: 2} m_PrefabInternal: {fileID: 1151705701} ---- !u!1 &1220807826 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1220807830} - - component: {fileID: 1220807829} - - component: {fileID: 1220807828} - - component: {fileID: 1220807827} - m_Layer: 0 - m_Name: Floor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!23 &1220807827 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1220807826} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 81ff155e07ab0354aba86ea7712860cc, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!65 &1220807828 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1220807826} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1220807829 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1220807826} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1220807830 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1220807826} - m_LocalRotation: {x: -0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 1.836667, y: -1.0596081, z: -0.0036052298} - m_LocalScale: {x: 315.46173, y: 1.3923892, z: 1166.667} - m_Children: [] - m_Father: {fileID: 1644802406} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1292422853 Prefab: m_ObjectHideFlags: 0 @@ -1183,7 +1153,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 959309014} m_Modifications: - target: {fileID: 4000010330146594, guid: bfdc7f60d7205c84f82a4806a5352d60, type: 2} propertyPath: m_LocalPosition.x @@ -1191,7 +1161,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4000010330146594, guid: bfdc7f60d7205c84f82a4806a5352d60, type: 2} propertyPath: m_LocalPosition.y - value: 1.538 + value: 0.777 objectReference: {fileID: 0} - target: {fileID: 4000010330146594, guid: bfdc7f60d7205c84f82a4806a5352d60, type: 2} propertyPath: m_LocalPosition.z @@ -1215,7 +1185,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4000010330146594, guid: bfdc7f60d7205c84f82a4806a5352d60, type: 2} propertyPath: m_RootOrder - value: 8 + value: 3 objectReference: {fileID: 0} - target: {fileID: 1000013198843976, guid: bfdc7f60d7205c84f82a4806a5352d60, type: 2} propertyPath: m_Name @@ -1238,49 +1208,6 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: bfdc7f60d7205c84f82a4806a5352d60, type: 2} m_IsPrefabParent: 0 ---- !u!1 &1438943822 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1438943824} - - component: {fileID: 1438943823} - m_Layer: 0 - m_Name: DeviceTypeManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1438943823 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1438943822} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dec4bbd4a2c26fc47bf2abf31ae24321, type: 3} - m_Name: - m_EditorClassIdentifier: - containerObject: {fileID: 2068683752} - environmentObject: {fileID: 1644802401} - cameraObject: {fileID: 726125727} ---- !u!4 &1438943824 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1438943822} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.046461314, y: 1.2057573, z: 1.0754747} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1556280860 stripped Transform: m_PrefabParentObject: {fileID: 4450975380623070, guid: f96fd98222a1e2243ba69ffd9b371279, @@ -1444,13 +1371,12 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1644802401} m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0.008, y: 0.761, z: 1.102} - m_LocalScale: {x: 0.59999996, y: 0.71818995, z: 2.21897} + m_LocalPosition: {x: 0.008, y: 0, z: 1.102} + m_LocalScale: {x: 0.6000002, y: 0.71818995, z: 2.218971} m_Children: - {fileID: 37407854} - - {fileID: 1220807830} - m_Father: {fileID: 0} - m_RootOrder: 6 + m_Father: {fileID: 959309014} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!114 &1644802407 MonoBehaviour: @@ -1465,6 +1391,11 @@ MonoBehaviour: m_EditorClassIdentifier: OpaqueDisplay: 1 TransparentDisplay: 0 +--- !u!4 &1793044256 stripped +Transform: + m_PrefabParentObject: {fileID: 4000010330146594, guid: bfdc7f60d7205c84f82a4806a5352d60, + type: 2} + m_PrefabInternal: {fileID: 1408270225} --- !u!1 &1809538457 GameObject: m_ObjectHideFlags: 0 @@ -1503,7 +1434,7 @@ MonoBehaviour: - {fileID: 1636696636} - {fileID: 814155958} Targets: [] - _LockFocus: 0 + lockFocus: 0 textObjectState: {fileID: 338549269} --- !u!4 &1809538459 Transform: @@ -1511,12 +1442,12 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1809538457} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.31819636, y: 1.382771, z: 0.72402936} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.31819636, y: 0.621771, z: 0.72402936} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 9 + m_Father: {fileID: 959309014} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1852965631 GameObject: @@ -1662,8 +1593,8 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2068683752} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.05, y: 1.2, z: 1.08} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.05, y: 0.439, z: 1.08} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 338549270} @@ -1677,8 +1608,8 @@ Transform: - {fileID: 1033331347} - {fileID: 2033084411} - {fileID: 1852965633} - m_Father: {fileID: 0} - m_RootOrder: 5 + m_Father: {fileID: 959309014} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &2118113975 stripped Transform: diff --git a/Assets/HoloToolkit-Examples/UX/Scripts/Controls/ButtonThemeWidget.cs b/Assets/HoloToolkit-Examples/UX/Scripts/Controls/ButtonThemeWidget.cs index 3609b674100..c2bf40e0a56 100644 --- a/Assets/HoloToolkit-Examples/UX/Scripts/Controls/ButtonThemeWidget.cs +++ b/Assets/HoloToolkit-Examples/UX/Scripts/Controls/ButtonThemeWidget.cs @@ -25,7 +25,7 @@ public class ButtonThemeWidget : InteractiveThemeWidget [Tooltip("Color transition animation component: optional")] public ColorTransition ColorBlender; - [Tooltip("position animaiton component: optional")] + [Tooltip("position animation component: optional")] public MoveToPosition MovePosition; [Tooltip("scale animation component: optional")] @@ -44,7 +44,7 @@ public class ButtonThemeWidget : InteractiveThemeWidget private string mCheckScaleThemeTag = ""; /// - /// Get animaiton components + /// Get animation components /// private void Awake() { @@ -99,7 +99,7 @@ public override void SetTheme() } /// - /// set states or start animaitons + /// set states or start animations /// /// public override void SetState(Interactive.ButtonStateEnum state) diff --git a/Assets/HoloToolkit-Examples/UX/Scripts/ExampleData/NoteDataProvider.cs b/Assets/HoloToolkit-Examples/UX/Scripts/ExampleData/NoteDataProvider.cs index c870d49e82e..87b61302d8b 100644 --- a/Assets/HoloToolkit-Examples/UX/Scripts/ExampleData/NoteDataProvider.cs +++ b/Assets/HoloToolkit-Examples/UX/Scripts/ExampleData/NoteDataProvider.cs @@ -17,7 +17,7 @@ public class NoteDataProvider : MonoBehaviour public InteractiveSet SourceSet; /// - /// some test data - imagine this comming from a web-service + /// some test data - imagine this coming from a web-service /// or some input menu /// public Dictionary> Data = new Dictionary> diff --git a/Assets/HoloToolkit-Examples/UX/Scripts/GestureInteractive.cs b/Assets/HoloToolkit-Examples/UX/Scripts/GestureInteractive.cs index 2f5524282a7..6d0bb9b3252 100644 --- a/Assets/HoloToolkit-Examples/UX/Scripts/GestureInteractive.cs +++ b/Assets/HoloToolkit-Examples/UX/Scripts/GestureInteractive.cs @@ -30,7 +30,7 @@ public enum GestureManipulationState { None, Start, Update, Lost } private IInputSource mCurrentInputSource; private uint mCurrentInputSourceId; - [Tooltip("Sets the time before the gesture starts after a press has occured, handy when a select event is also being used")] + [Tooltip("Sets the time before the gesture starts after a press has occurred, handy when a select event is also being used")] public float StartDelay; [Tooltip("The GestureInteractiveControl to send gesture updates to")] @@ -127,8 +127,6 @@ private IEnumerator Ticker(float seconds) /// /// Start the gesture /// - /// - /// private void HandleStartGesture() { InputManager.Instance.ClearModalInputStack(); @@ -208,8 +206,7 @@ private void HandleRelease(bool lost) { mTempInputSource = null; - Vector3 handPosition; - mCurrentInputSource.TryGetGripPosition(mCurrentInputSourceId, out handPosition); + Vector3 handPosition = GetCurrentHandPosition(); mCurrentHandPosition = handPosition; Control.ManipulationUpdate( @@ -266,8 +263,11 @@ public override void OnFocusEnter() private Vector3 GetCurrentHandPosition() { Vector3 handPosition; +#if UNITY_2017_2_OR_NEWER mCurrentInputSource.TryGetGripPosition(mCurrentInputSourceId, out handPosition); - +#else + mCurrentInputSource.TryGetPointerPosition(mCurrentInputSourceId, out handPosition); +#endif return handPosition; } diff --git a/Assets/HoloToolkit-Examples/UX/Scripts/GestureInteractiveControl.cs b/Assets/HoloToolkit-Examples/UX/Scripts/GestureInteractiveControl.cs index f0777856912..6be36054d05 100644 --- a/Assets/HoloToolkit-Examples/UX/Scripts/GestureInteractiveControl.cs +++ b/Assets/HoloToolkit-Examples/UX/Scripts/GestureInteractiveControl.cs @@ -8,10 +8,10 @@ namespace HoloToolkit.Examples.InteractiveElements { /// - /// GestureInteractiveControl receiveds gesture updates from GestureInteractive. + /// GestureInteractiveControl receives gesture updates from GestureInteractive. /// /// We take raw gesture data and convert it into simple values that can be acted on, like - /// perctage dragged from origin position, angle or vector from origin point, and distance from origin point. + /// percentage dragged from origin position, angle or vector from origin point, and distance from origin point. /// /// These values can be flattened for 2D UI elements and rotated based on user orientation /// @@ -59,14 +59,14 @@ public enum GestureDataType { Raw, Camera, Aligned } /// /// The amount we expect the user to drag from the origin point of the gesture. - /// This value calulates the CurrentPercent, based on the gesture's CurrentDistance compared the the MaxGestureDistance. + /// This value calculates the CurrentPercent, based on the gesture's CurrentDistance compared the MaxGestureDistance. /// [Tooltip("The distance in world space to compare the gesture's delta to")] public float MaxGestureDistance = 0.15f; /// /// The Vector to align the gesture to, uses the dot product of the gesture direction and this vector. - /// Use this to restric the basic values that are returned to a specific direction or range of directions. + /// Use this to restrict the basic values that are returned to a specific direction or range of directions. /// [Tooltip("The vector to align the gesture to, only used when the Aligned GestureDataType is selected.")] public Vector3 AlignmentVector = new Vector3(1,1,1); @@ -166,7 +166,7 @@ virtual protected void Awake() /// the current gesture position /// the origin of the camera when the gesture started /// the camera forward when the gesture started - /// curent gesture state + /// current gesture state public virtual void ManipulationUpdate(Vector3 startGesturePosition, Vector3 currentGesturePosition, Vector3 startHeadOrigin, Vector3 startHeadRay, GestureInteractive.GestureManipulationState gestureState) { if (gestureState == GestureInteractive.GestureManipulationState.Start || (!GestureStarted && gestureState != GestureInteractive.GestureManipulationState.Start)) @@ -194,7 +194,7 @@ public virtual void ManipulationUpdate(Vector3 startGesturePosition, Vector3 cur /// /// Returns a data set about the current gesture information compared to a specific vector. /// For instance, to compare if the gesture is moving vertically or horizontally, - /// create two isntances of this data set and compare the distance for each. + /// create two instances of this data set and compare the distance for each. /// If the vertical percentage is greater than the horizontal percentage then the gesture is moving vertically. /// /// @@ -225,7 +225,7 @@ public GestureInteractiveData GetGestureData(Vector3 alignmentVector, float maxD /// Matix4x4 public Matrix4x4 GetCameraMatrix() { - // get the preferred body direciton + // get the preferred body direction Vector3 up = Vector3.up; Vector3 forward = MainCamera.transform.forward; // protecting from a weird cross value @@ -279,7 +279,7 @@ public Vector3 WorldForwardVector(Vector3 direction, Vector3 orientation, bool f } /// - /// A way to programatically override a gesture, used for keywork gestures. + /// A way to programmatically override a gesture, used for keyword gestures. /// /// public void SetGestureVector(Vector3 gestureVector) @@ -303,13 +303,13 @@ public void SetGestureVector(Vector3 gestureVector) /// /// a place holder function for taking value and settings a gesture direction. - /// Used by the keywork gesture system so that we can have multiple keywords for a single control. + /// Used by the keyword gesture system so that we can have multiple keywords for a single control. /// For instance: forward/backward or Min/Center/Max /// /// public virtual void setGestureValue(int gestureValue) { - // override to convert keywork index to vectors. + // override to convert keyword index to vectors. switch (gestureValue) { case 0: @@ -336,7 +336,7 @@ public virtual void setGestureValue(int gestureValue) /// protected Vector3 DirectionVectorToZPlane(Vector3 directionVector, bool flipX, bool flipY) { - // set the direciton based on camera and gesture updates + // set the direction based on camera and gesture updates float cameraDirectionX = flipX ? -directionVector.x : directionVector.x; float cameraDirectionY = flipY ? -directionVector.y : directionVector.y; return MainCamera.transform.forward * cameraDirectionY + MainCamera.transform.right * cameraDirectionX; @@ -350,7 +350,7 @@ protected Vector3 DirectionVectorToZPlane(Vector3 directionVector, bool flipX, b /// public Vector3 GesturePosition(Vector3 gesturePosition) { - // rotate the screen space mouse position to world space, based on the camera direciton and compress pixels to world + // rotate the screen space mouse position to world space, based on the camera direction and compress pixels to world // get current angle from forward - returns an absolute value of 0 - 180 float angleDiff = Vector3.Angle(Vector3.forward, MainCamera.transform.forward); // make sure angle works 360 degrees, find the left or right side diff --git a/Assets/HoloToolkit-Examples/UX/Scripts/InteractiveGroup.cs b/Assets/HoloToolkit-Examples/UX/Scripts/InteractiveGroup.cs index a24383fd6cf..50e138af6f6 100644 --- a/Assets/HoloToolkit-Examples/UX/Scripts/InteractiveGroup.cs +++ b/Assets/HoloToolkit-Examples/UX/Scripts/InteractiveGroup.cs @@ -83,13 +83,13 @@ public void UpdateData() for (int i = 0; i < Interactives.Count; i++) { - // set title + // Set title string title = Titles[i]; Interactive interactive = Interactives[i]; interactive.SetTitle(title); interactive.Keyword = title; - // layouting + // For setting the layout int j = i % rows; Vector2 Distance = new Vector2(Offsets.x, Offsets.y); @@ -114,9 +114,9 @@ private void OnDestroy() /// - /// remove unused Interactives from scene + /// Remove unused Interactives from scene /// - /// number of Iteractives that will NOT be deleted + /// Number of Interactives that will NOT be deleted private void RemoveInteractives(int keep = 0) { for (int i = Interactives.Count - 1; i >= keep; i--) diff --git a/Assets/HoloToolkit-Examples/UX/Scripts/InteractiveSet.cs b/Assets/HoloToolkit-Examples/UX/Scripts/InteractiveSet.cs index 7e59716f11d..155041016b2 100644 --- a/Assets/HoloToolkit-Examples/UX/Scripts/InteractiveSet.cs +++ b/Assets/HoloToolkit-Examples/UX/Scripts/InteractiveSet.cs @@ -24,7 +24,7 @@ public class InteractiveSet : MonoBehaviour [Tooltip("Interactives that will be managed by this controller")] public List Interactives; - [Tooltip("Currently selected indeices or default starting indices")] + [Tooltip("Currently selected indices or default starting indices")] public List SelectedIndices = new List() { 0 }; [Tooltip("exposed selection changed event")] diff --git a/Assets/HoloToolkit-Examples/UX/Scripts/InteractiveToggleButton.cs b/Assets/HoloToolkit-Examples/UX/Scripts/InteractiveToggleButton.cs index f7f034c5883..5ef7193a609 100644 --- a/Assets/HoloToolkit-Examples/UX/Scripts/InteractiveToggleButton.cs +++ b/Assets/HoloToolkit-Examples/UX/Scripts/InteractiveToggleButton.cs @@ -11,7 +11,7 @@ namespace HoloToolkit.Examples.InteractiveElements /// /// InteractiveToggleButton expands InteractiveToggle to expose a gaze, down and up state events in the inspector. /// - /// Beyong the basic button functionality, Interactive also maintains the notion of selection and enabled, which allow for more robust UI features. + /// Beyond the basic button functionality, Interactive also maintains the notion of selection and enabled, which allow for more robust UI features. /// InteractiveEffects are behaviors that listen for updates from Interactive, which allows for visual feedback to be customized and placed on /// individual elements of the Interactive GameObject /// diff --git a/Assets/HoloToolkit-Examples/UX/Scripts/OptimizeSceneforDeviceType.cs b/Assets/HoloToolkit-Examples/UX/Scripts/OptimizeSceneforDeviceType.cs index 7ba67189dd2..e154f4c2e11 100644 --- a/Assets/HoloToolkit-Examples/UX/Scripts/OptimizeSceneforDeviceType.cs +++ b/Assets/HoloToolkit-Examples/UX/Scripts/OptimizeSceneforDeviceType.cs @@ -2,35 +2,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. // -using HoloToolkit.Unity; -using System.Collections.Generic; + +using System; using UnityEngine; -using UnityEngine.XR.WSA; namespace HoloToolkit.Unity.Examples { + [Obsolete("Use SceneContentAdjuster")] public class OptimizeSceneforDeviceType : MonoBehaviour { public GameObject containerObject; - - void Start() - { - // Check if the device type is HoloLens or Immersive HMD - if (HolographicSettings.IsDisplayOpaque) - { - // Optimize the default postion of the objects for Immersive HMD - containerObject.transform.position = new Vector3(0.05f, 1.2f, 1.08f); - - } - else - { - // Optimize the default postion of the objects for HoloLens - containerObject.transform.position = new Vector3(0.05f, -0.65f, 1.65f); - - // Remove skybox for HoloLens - RenderSettings.skybox = null; - } - } - } } diff --git a/Assets/HoloToolkit-Examples/UX/Scripts/Themes/InteractiveTheme.cs b/Assets/HoloToolkit-Examples/UX/Scripts/Themes/InteractiveTheme.cs index a171329edd4..fc2edc354ba 100644 --- a/Assets/HoloToolkit-Examples/UX/Scripts/Themes/InteractiveTheme.cs +++ b/Assets/HoloToolkit-Examples/UX/Scripts/Themes/InteractiveTheme.cs @@ -35,7 +35,7 @@ public class InteractiveTheme : MonoBehaviour [Tooltip("Current value : read only")] public Type CurrentValue; - [Tooltip("Interactive host : opional")] + [Tooltip("Interactive host : optional")] public Interactive Button; private void Awake() { diff --git a/Assets/HoloToolkit-Examples/UX/Scripts/Widgets/InteractiveWidget.cs b/Assets/HoloToolkit-Examples/UX/Scripts/Widgets/InteractiveWidget.cs index 17ccca403b0..5b40c8e346f 100644 --- a/Assets/HoloToolkit-Examples/UX/Scripts/Widgets/InteractiveWidget.cs +++ b/Assets/HoloToolkit-Examples/UX/Scripts/Widgets/InteractiveWidget.cs @@ -30,7 +30,7 @@ protected virtual void OnEnable() } /// - /// un register when disabled + /// Unregister when disabled /// protected virtual void OnDisable() { diff --git a/Assets/HoloToolkit-Examples/UX/Scripts/Widgets/MaterialColorThemeWidget.cs b/Assets/HoloToolkit-Examples/UX/Scripts/Widgets/MaterialColorThemeWidget.cs index ae918882e8c..3eeab497503 100644 --- a/Assets/HoloToolkit-Examples/UX/Scripts/Widgets/MaterialColorThemeWidget.cs +++ b/Assets/HoloToolkit-Examples/UX/Scripts/Widgets/MaterialColorThemeWidget.cs @@ -27,7 +27,7 @@ public class MaterialColorThemeWidget : InteractiveThemeWidget void Awake() { - // get the color tweener + // get the color blender if (ColorBlender == null) { ColorBlender = GetComponent(); @@ -93,7 +93,7 @@ private void Update() } /// - /// Clean up the materal is created dynamically + /// Clean up the material is created dynamically /// private void OnDestroy() { diff --git a/Assets/HoloToolkit-Examples/UX/Scripts/Widgets/TextMeshColorThemeWidget.cs b/Assets/HoloToolkit-Examples/UX/Scripts/Widgets/TextMeshColorThemeWidget.cs index ec40aa6ff1d..ce2e0cc1dde 100644 --- a/Assets/HoloToolkit-Examples/UX/Scripts/Widgets/TextMeshColorThemeWidget.cs +++ b/Assets/HoloToolkit-Examples/UX/Scripts/Widgets/TextMeshColorThemeWidget.cs @@ -10,7 +10,7 @@ namespace HoloToolkit.Examples.InteractiveElements { /// - /// An InteractiveThemeWidget for swaping colors on a TextMesh based on Interactive state + /// An InteractiveThemeWidget for swapping colors on a TextMesh based on Interactive state /// public class TextMeshColorThemeWidget : InteractiveThemeWidget { diff --git a/Assets/HoloToolkit-Examples/Utilities/Scripts/ApplicationViewManagerEditButton.cs b/Assets/HoloToolkit-Examples/Utilities/Scripts/ApplicationViewManagerEditButton.cs index 91c993a8ad1..045ddb4a942 100644 --- a/Assets/HoloToolkit-Examples/Utilities/Scripts/ApplicationViewManagerEditButton.cs +++ b/Assets/HoloToolkit-Examples/Utilities/Scripts/ApplicationViewManagerEditButton.cs @@ -13,7 +13,7 @@ public class ApplicationViewManagerEditButton : MonoBehaviour public delegate void LaunchXmlView(string result); /// - /// Event to subscribe to when a text result is returned from the xml view. + /// Event to subscribe to when a text result is returned from the XML view. /// public event LaunchXmlView OnResult; diff --git a/Assets/HoloToolkit/Boundary/Scripts/BoundaryManager.cs b/Assets/HoloToolkit/Boundary/Scripts/BoundaryManager.cs index 3fd842bdc1c..5f28ad415b4 100644 --- a/Assets/HoloToolkit/Boundary/Scripts/BoundaryManager.cs +++ b/Assets/HoloToolkit/Boundary/Scripts/BoundaryManager.cs @@ -5,8 +5,8 @@ #if UNITY_WSA && UNITY_2017_2_OR_NEWER using System.Collections.Generic; -using UnityEngine.XR.WSA; using UnityEngine.XR; +using UnityEngine.XR.WSA; #endif namespace HoloToolkit.Unity.Boundary @@ -20,23 +20,34 @@ public class BoundaryManager : Singleton [Tooltip("Quad prefab to display as the floor.")] public GameObject FloorQuad; private GameObject floorQuadInstance; - public float CurrentFloorHeightOffset { get { return newFloorHeight.y; } } - private Vector3 newFloorHeight; #if UNITY_WSA && UNITY_2017_2_OR_NEWER [SerializeField] [Tooltip("Approximate max Y height of your space.")] private float boundaryHeight = 10f; + private Bounds boundaryBounds; + + [SerializeField] + // Defaulting coordinate system to RoomScale in immersive headsets. + // This puts the origin (0, 0, 0) on the floor if a floor has been established during setup via MixedRealityPortal. + private TrackingSpaceType opaqueTrackingSpaceType = TrackingSpaceType.RoomScale; + + [SerializeField] + // Defaulting coordinate system to Stationary for transparent headsets, like HoloLens. + // This puts the origin (0, 0, 0) at the first place where the user started the application. + private TrackingSpaceType transparentTrackingSpaceType = TrackingSpaceType.Stationary; #endif + // Testing in the editor found that this moved the floor out of the way enough, and it is only + // used in the case where a headset isn't attached. Otherwise, the floor is positioned like normal. + private readonly Vector3 floorPositionInEditor = new Vector3(0f, -3f, 0f); + + [SerializeField] private bool renderFloor = true; public bool RenderFloor { - get - { - return renderFloor; - } + get { return renderFloor; } set { if (renderFloor != value) @@ -47,21 +58,11 @@ public bool RenderFloor } } - private void SetFloorRendering() - { - if (floorQuadInstance != null) - { - floorQuadInstance.SetActive(renderFloor); - } - } - + [SerializeField] private bool renderBoundary = true; public bool RenderBoundary { - get - { - return renderBoundary; - } + get { return renderBoundary; } set { if (renderBoundary != value) @@ -72,23 +73,23 @@ public bool RenderBoundary } } - private void SetBoundaryRendering() - { -#if UNITY_2017_2_OR_NEWER - // TODO: BUG: Unity: configured bool always returns false. - if (UnityEngine.Experimental.XR.Boundary.configured) - { - UnityEngine.Experimental.XR.Boundary.visible = renderBoundary; - } -#endif - } - protected override void Awake() { base.Awake(); - newFloorHeight = Vector3.zero; #if UNITY_WSA && UNITY_2017_2_OR_NEWER + if (HolographicSettings.IsDisplayOpaque) + { + XRDevice.SetTrackingSpaceType(opaqueTrackingSpaceType); + } + else + { + // Removed for now, until the HoloLens tracking space type story is more clear. + //XRDevice.SetTrackingSpaceType(transparentTrackingSpaceType); + + Destroy(this); + return; + } // Render the floor based on if you are in editor or immersive device. RenderFloorQuad(); @@ -101,51 +102,43 @@ protected override void Awake() #endif } -#if UNITY_WSA && UNITY_2017_2_OR_NEWER - private void RenderFloorQuad() + private void SetFloorRendering() { - if (HolographicSettings.IsDisplayOpaque) + if (floorQuadInstance != null) { - // Defaulting coordinate system to RoomScale in immersive headsets. - // This puts the origin 0, 0, 0 on the floor if a floor has been established during RunSetup via MixedRealityPortal - XRDevice.SetTrackingSpaceType(TrackingSpaceType.RoomScale); + floorQuadInstance.SetActive(renderFloor); } - else + } + + private void SetBoundaryRendering() + { +#if UNITY_2017_2_OR_NEWER + // TODO: BUG: Unity: configured bool always returns false in 2017.2.0p2-MRTP5. + if (UnityEngine.Experimental.XR.Boundary.configured) { - // Defaulting coordinate system to Stationary for HoloLens. - // This puts the origin 0, 0, 0 at the first place where the user started the application. - XRDevice.SetTrackingSpaceType(TrackingSpaceType.Stationary); + UnityEngine.Experimental.XR.Boundary.visible = renderBoundary; } +#endif + } - if (FloorQuad != null && HolographicSettings.IsDisplayOpaque) +#if UNITY_WSA && UNITY_2017_2_OR_NEWER + private void RenderFloorQuad() + { + if (FloorQuad != null && XRDevice.GetTrackingSpaceType() == TrackingSpaceType.RoomScale) { floorQuadInstance = Instantiate(FloorQuad); if (!XRDevice.isPresent) { // So the floor quad does not occlude in editor testing, draw it lower. - floorQuadInstance.transform.localPosition = new Vector3(0, -3, 0); + floorQuadInstance.transform.position = floorPositionInEditor; } else { - // Inside immersive headset draw floor quad at Y value of dimensions. - Vector3 dimensions; - // TODO: BUG: Unity: TryGetDimensions does not return true in 2017.2.0f3 MRTP3 - if (UnityEngine.Experimental.XR.Boundary.TryGetDimensions(out dimensions, UnityEngine.Experimental.XR.Boundary.Type.TrackedArea)) - { - newFloorHeight.y = dimensions.y; - Debug.Log("Got dimensions of tracked area. Drawing floor at height offset: " + CurrentFloorHeightOffset); - } - else - { - Debug.Log("Drawing floor at 0,0,0."); - newFloorHeight = Vector3.zero; - } - - floorQuadInstance.transform.localPosition = newFloorHeight; + floorQuadInstance.transform.position = Vector3.zero; } - floorQuadInstance.SetActive(true); + SetFloorRendering(); } } @@ -158,12 +151,7 @@ private void RenderFloorQuad() public bool ContainsObject(Vector3 gameObjectPosition) { // Check if the supplied game object's position is within the bounds volume. - if (HolographicSettings.IsDisplayOpaque) - { - return boundaryBounds.Contains(gameObjectPosition); - } - - return false; + return boundaryBounds.Contains(gameObjectPosition); } /// @@ -172,7 +160,7 @@ public bool ContainsObject(Vector3 gameObjectPosition) public void CalculateBoundaryVolume() { // TODO: BUG: Unity: Should return true if a floor and boundary has been established by user. - // But this always returns false with in 2017.2.0f3 MRTP3. + // But this always returns false with in 2017.2.0p2-MRTP5. //if (!UnityEngine.Experimental.XR.Boundary.configured) //{ // Debug.Log("Boundary not configured."); @@ -181,13 +169,16 @@ public void CalculateBoundaryVolume() if (XRDevice.GetTrackingSpaceType() != TrackingSpaceType.RoomScale) { - Debug.Log("No boundary for stationary scale experiences."); + Debug.Log("No boundary for non-room scale experiences."); return; } boundaryBounds = new Bounds(); + // Get all the bounds setup by the user. var boundaryGeometry = new List(0); + // TODO: BUG: Unity: Should return true if a floor and boundary has been established by user. + // But this always returns false with in 2017.2.0p2-MRTP5. if (UnityEngine.Experimental.XR.Boundary.TryGetGeometry(boundaryGeometry)) { if (boundaryGeometry.Count > 0) diff --git a/Assets/HoloToolkit/Boundary/Scripts/SceneContentAdjuster.cs b/Assets/HoloToolkit/Boundary/Scripts/SceneContentAdjuster.cs index 870ea7e534a..e8894a69f49 100644 --- a/Assets/HoloToolkit/Boundary/Scripts/SceneContentAdjuster.cs +++ b/Assets/HoloToolkit/Boundary/Scripts/SceneContentAdjuster.cs @@ -1,44 +1,106 @@ -using HoloToolkit.Unity.Boundary; +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + using UnityEngine; #if UNITY_2017_2_OR_NEWER +using System.Collections; using UnityEngine.XR; #else using UnityEngine.VR; #endif -public class SceneContentAdjuster : MonoBehaviour +namespace HoloToolkit.Unity.Boundary { - private Vector3 lastFloorHeight; - private float floorHeightOffset = 1f; - - private void Awake() + /// + /// Use this script on GameObjects you wish to be aligned in certain ways depending on the application space type. + /// For example, if you want to place an object at the height of the user's head in a room scale application, check alignWithHeadHeight. + /// In a stationary scale application, this is equivalent to placing the object at a height of 0. + /// You can also specify specific locations to place the object based on space type. + /// + /// This script runs once, on GameObject creation. + /// + /// See https://developer.microsoft.com/en-us/windows/mixed-reality/coordinate_systems_in_unity for more information. + /// for TrackingSpaceType settings. + /// + public class SceneContentAdjuster : MonoBehaviour { -#if UNITY_2017_2_OR_NEWER - if (Application.isEditor && XRDevice.isPresent) + private enum AlignmentType { - lastFloorHeight.y = floorHeightOffset; - transform.position = lastFloorHeight; + AlignWithHeadHeight, + UsePresetPositions, + UsePresetXAndZWithHeadHeight } -#else - if (VRDevice.isPresent) + + private int frameWaitHack = 0; + + [SerializeField] + [Tooltip("Optional container object reference. If null, this script will move the object it's attached to.")] + private Transform containerObject; + + [SerializeField] + [Tooltip("Select this if the container should be placed in front of the head on app launch in a room scale app.")] + private AlignmentType alignmentType = AlignmentType.AlignWithHeadHeight; + + [SerializeField] + [Tooltip("Use this to set the desired position of the container in a stationary app. This will be ignored if AlignWithHeadHeight is set.")] + private Vector3 stationarySpaceTypePosition = Vector3.zero; + + [SerializeField] + [Tooltip("Use this to set the desired position of the container in a room scale app. This will be ignored if AlignWithHeadHeight is set.")] + private Vector3 roomScaleSpaceTypePosition = Vector3.zero; + + private Vector3 contentPosition = Vector3.zero; + + private void Awake() { + if (containerObject == null) + { + containerObject = transform; + } + +#if UNITY_2017_2_OR_NEWER + // If no XR device is present, the editor will default to (0, 0, 0) and no adjustment is needed. + // This script runs on both opaque and transparent display devices, since the floor offset is based on + // TrackingSpaceType and not display type. + if (XRDevice.isPresent) + { + StartCoroutine(SetContentHeight()); + return; + } +#endif Destroy(this); } -#endif - } - private void Update() - { #if UNITY_2017_2_OR_NEWER - if (!Application.isEditor && XRDevice.isPresent) + private IEnumerator SetContentHeight() { - floorHeightOffset = BoundaryManager.Instance.CurrentFloorHeightOffset; + if (frameWaitHack < 1) + { + // Not waiting a frame often caused the camera's position to be incorrect at this point. This seems like a Unity bug. + frameWaitHack++; + yield return null; + } + + if (alignmentType == AlignmentType.UsePresetPositions || alignmentType == AlignmentType.UsePresetXAndZWithHeadHeight) + { + if (XRDevice.GetTrackingSpaceType() == TrackingSpaceType.RoomScale) + { + containerObject.position = roomScaleSpaceTypePosition; + } + else if (XRDevice.GetTrackingSpaceType() == TrackingSpaceType.Stationary) + { + containerObject.position = stationarySpaceTypePosition; + } + } - if (lastFloorHeight.y != floorHeightOffset) + if (alignmentType == AlignmentType.AlignWithHeadHeight || alignmentType == AlignmentType.UsePresetXAndZWithHeadHeight) { - lastFloorHeight.y = floorHeightOffset; - transform.position = lastFloorHeight; + contentPosition.x = containerObject.position.x; + contentPosition.y = containerObject.position.y + CameraCache.Main.transform.position.y; + contentPosition.z = containerObject.position.z; + + containerObject.position = contentPosition; } } #endif diff --git a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployPortal.cs b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployPortal.cs index 7d518a5b0e9..fe10df1d2c9 100644 --- a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployPortal.cs +++ b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployPortal.cs @@ -202,7 +202,7 @@ public static bool InstallApp(string appFullPath, ConnectInfo connectInfo, bool { try { - // Calc the cert and dep paths + // Calculate the cert and dependency paths string fileName = Path.GetFileName(appFullPath); string certFullPath = Path.ChangeExtension(appFullPath, ".cer"); string certName = Path.GetFileName(certFullPath); diff --git a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployTools.cs b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployTools.cs index 2bc0a2b39ec..57418888c1b 100644 --- a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployTools.cs +++ b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployTools.cs @@ -134,7 +134,7 @@ public static string CalcMSBuildPath(string msBuildVersion) // For MSBuild 15+ we should to use vswhere to give us the correct instance string output = @"/C vswhere -version " + msBuildVersion + " -products * -requires Microsoft.Component.MSBuild -property installationPath"; - // get the right program files path based on whether the pc is x86 or x64 + // get the right program files path based on whether the PC is x86 or x64 string programFiles = @"C:\Program Files (x86)\Microsoft Visual Studio\Installer"; var vswherePInfo = new ProcessStartInfo diff --git a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs index 7b10db67048..2aabb6b9273 100644 --- a/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs +++ b/Assets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs @@ -18,7 +18,7 @@ namespace HoloToolkit.Unity { /// /// Build window - supports SLN creation, APPX from SLN, Deploy on device, and misc helper utilities associated with the build/deploy/test iteration loop - /// Requires the device to be set in developer mode & to have secure connections disabled (in the security tab in the device portal) + /// Requires the device to be set in developer mode and to have secure connections disabled (in the security tab in the device portal) /// public class BuildDeployWindow : EditorWindow { diff --git a/Assets/HoloToolkit/BuildAndDeploy/Editor/UwpProjectPostProcess.cs b/Assets/HoloToolkit/BuildAndDeploy/Editor/UwpProjectPostProcess.cs index ad9786b8976..73f9ab1b350 100644 --- a/Assets/HoloToolkit/BuildAndDeploy/Editor/UwpProjectPostProcess.cs +++ b/Assets/HoloToolkit/BuildAndDeploy/Editor/UwpProjectPostProcess.cs @@ -39,7 +39,7 @@ private static void UpdateProjectFile(string filename) if (!File.Exists(filename)) { - UnityEngine.Debug.LogWarningFormat("Unabled to find file \"{0}\", double check that the build suceeded and that the C# Projects are set to be generated.", filename); + UnityEngine.Debug.LogWarningFormat("Unable to find file \"{0}\", double check that the build succeeded and that the C# Projects are set to be generated.", filename); return; } @@ -48,7 +48,7 @@ private static void UpdateProjectFile(string filename) if (projectDocument.DocumentElement == null) { - UnityEngine.Debug.LogWarningFormat("Unabled to load file \"{0}\", double check that the build suceeded and that the C# Projects are set to be generated.", filename); + UnityEngine.Debug.LogWarningFormat("Unable to load file \"{0}\", double check that the build succeeded and that the C# Projects are set to be generated.", filename); return; } @@ -65,7 +65,7 @@ private static void UpdateProjectFile(string filename) if (node.Attributes.Count == 0 && node["Configuration"] != null && node["Platform"] != null) { - // Update the defaults to Release and x86 so that we can run NuGet restore ok. + // Update the defaults to Release and x86 so that we can run NuGet restore. node["Configuration"].InnerText = "Release"; node["Platform"].InnerText = "x86"; } diff --git a/Assets/HoloToolkit/Input/Materials/FadeMaterial.mat b/Assets/HoloToolkit/Input/Materials/FadeMaterial.mat index 5d0bc385cac..d159880e983 100644 --- a/Assets/HoloToolkit/Input/Materials/FadeMaterial.mat +++ b/Assets/HoloToolkit/Input/Materials/FadeMaterial.mat @@ -7,12 +7,15 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: FadeMaterial - m_Shader: {fileID: 4800000, guid: 5c2339e78c48ab14bb095cea2be5fb1a, type: 3} - m_ShaderKeywords: ETC1_EXTERNAL_ALPHA _USECOLOR_ON + m_Shader: {fileID: 4800000, guid: f1f3948b20c230044bda31b620ddd37f, type: 3} + m_ShaderKeywords: ETC1_EXTERNAL_ALPHA _SPECULARHIGHLIGHTS_ON _USEAMBIENT_ON _USECOLOR_ON + _USEDIFFUSE_ON _USEMAINCOLOR_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -21,6 +24,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CubeMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -37,6 +44,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _GlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -53,28 +64,56 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecularMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: + - _AlphaTest: 0 + - _BlendOp: 0 - _BumpScale: 1 + - _CalibrationSpaceReflections: 0 - _ColorWriteMask: 15 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _ForcePerPixel: 0 + - _Gloss: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - _Metallic: 0 - - _Mode: 0 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _ReflectionScale: 2 + - _RimPower: 0.7 + - _Shade4: 0 - _SmoothnessTextureChannel: 0 + - _Specular: 10 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 + - _UseAmbient: 1 + - _UseBumpMap: 0 - _UseColor: 1 + - _UseDiffuse: 1 + - _UseEmissionColor: 0 + - _UseEmissionMap: 0 + - _UseGlossMap: 0 + - _UseMainColor: 1 - _UseMainTex: 0 + - _UseOcclusionMap: 0 + - _UseReflections: 0 + - _UseRimLighting: 0 + - _UseSpecularMap: 0 + - _UseVertexColor: 0 - _ZTest: 4 - - _ZWrite: 0 + - _ZWrite: 1 m_Colors: - _Color: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _TextureScaleOffset: {r: 1, g: 1, b: 0, a: 0} diff --git a/Assets/HoloToolkit/Input/Models/Cursor/Cursor.fbx.meta b/Assets/HoloToolkit/Input/Models/Cursor/Cursor.fbx.meta index 4d81cf8f60b..deebd29827a 100644 --- a/Assets/HoloToolkit/Input/Models/Cursor/Cursor.fbx.meta +++ b/Assets/HoloToolkit/Input/Models/Cursor/Cursor.fbx.meta @@ -110,6 +110,8 @@ ModelImporter: resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -127,13 +129,13 @@ ModelImporter: globalScale: 100 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -146,6 +148,7 @@ ModelImporter: importAnimation: 0 copyAvatar: 0 humanDescription: + serializedVersion: 2 human: [] skeleton: [] armTwist: 0.5 @@ -156,7 +159,10 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 2 humanoidOversampling: 1 diff --git a/Assets/HoloToolkit/Input/Models/Cursor/InteractiveMeshCursor.fbx.meta b/Assets/HoloToolkit/Input/Models/Cursor/InteractiveMeshCursor.fbx.meta index edf01b24d96..992ee6808be 100644 --- a/Assets/HoloToolkit/Input/Models/Cursor/InteractiveMeshCursor.fbx.meta +++ b/Assets/HoloToolkit/Input/Models/Cursor/InteractiveMeshCursor.fbx.meta @@ -46,7 +46,7 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -62,7 +62,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit/Input/Models/Cursor/cursor_hand_ready.fbx.meta b/Assets/HoloToolkit/Input/Models/Cursor/cursor_hand_ready.fbx.meta index 6a33a50a06f..36b2bfdac16 100644 --- a/Assets/HoloToolkit/Input/Models/Cursor/cursor_hand_ready.fbx.meta +++ b/Assets/HoloToolkit/Input/Models/Cursor/cursor_hand_ready.fbx.meta @@ -3,7 +3,7 @@ guid: 20553dcf305b52a4e84f5e4f56e5afdc timeCreated: 1444068346 licenseType: Pro ModelImporter: - serializedVersion: 18 + serializedVersion: 19 fileIDToRecycleName: 100000: cursor_cross_root 100002: //RootNode @@ -33,16 +33,19 @@ ModelImporter: animations: legacyGenerateAnimations: 4 bakeSimulation: 0 + resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 animationCompression: 1 - animationRotationError: .5 - animationPositionError: .5 - animationScaleError: .5 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] clipAnimations: [] @@ -52,13 +55,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -66,24 +69,29 @@ ModelImporter: useFileScale: 1 tangentSpace: normalSmoothAngle: 60 - splitTangentsAcrossUV: 1 normalImportMode: 0 - tangentImportMode: 1 - importAnimation: 1 + tangentImportMode: 4 + importAnimation: 0 copyAvatar: 0 humanDescription: + serializedVersion: 2 human: [] skeleton: [] - armTwist: .5 - foreArmTwist: .5 - upperLegTwist: .5 - legTwist: .5 - armStretch: .0500000007 - legStretch: .0500000007 + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 feetSpacing: 0 rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 0 + humanoidOversampling: 1 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/HoloToolkit/Input/Models/Cursor/cursor_ready.fbx.meta b/Assets/HoloToolkit/Input/Models/Cursor/cursor_ready.fbx.meta index 7b86f69eb3c..52c030d5941 100644 --- a/Assets/HoloToolkit/Input/Models/Cursor/cursor_ready.fbx.meta +++ b/Assets/HoloToolkit/Input/Models/Cursor/cursor_ready.fbx.meta @@ -46,6 +46,8 @@ ModelImporter: resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -63,13 +65,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -79,9 +81,10 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: + serializedVersion: 2 human: [] skeleton: [] armTwist: 0.5 @@ -92,7 +95,10 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 0 humanoidOversampling: 1 diff --git a/Assets/HoloToolkit/Input/Models/TeleportMarker.FBX.meta b/Assets/HoloToolkit/Input/Models/TeleportMarker.FBX.meta index b7488e9c748..df44a03b275 100644 --- a/Assets/HoloToolkit/Input/Models/TeleportMarker.FBX.meta +++ b/Assets/HoloToolkit/Input/Models/TeleportMarker.FBX.meta @@ -28,7 +28,7 @@ ModelImporter: 4300004: Marker_Ring003 4300006: Arrow materials: - importMaterials: 1 + importMaterials: 0 materialName: 0 materialSearch: 1 animations: @@ -56,13 +56,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -72,7 +72,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 diff --git a/Assets/HoloToolkit-Examples/Input/Prefabs/ControllerRect.prefab b/Assets/HoloToolkit/Input/Prefabs/ControllerRect.prefab similarity index 100% rename from Assets/HoloToolkit-Examples/Input/Prefabs/ControllerRect.prefab rename to Assets/HoloToolkit/Input/Prefabs/ControllerRect.prefab diff --git a/Assets/HoloToolkit-Examples/Input/Prefabs/ControllerRect.prefab.meta b/Assets/HoloToolkit/Input/Prefabs/ControllerRect.prefab.meta similarity index 100% rename from Assets/HoloToolkit-Examples/Input/Prefabs/ControllerRect.prefab.meta rename to Assets/HoloToolkit/Input/Prefabs/ControllerRect.prefab.meta diff --git a/Assets/HoloToolkit/Input/Prefabs/InputManager.prefab b/Assets/HoloToolkit/Input/Prefabs/InputManager.prefab index 07ed2b6873e..9272cfb2789 100644 --- a/Assets/HoloToolkit/Input/Prefabs/InputManager.prefab +++ b/Assets/HoloToolkit/Input/Prefabs/InputManager.prefab @@ -64,6 +64,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1329858366469352 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4187953886819872} + - component: {fileID: 114367590399833948} + - component: {fileID: 114512526664342106} + m_Layer: 0 + m_Name: XboxControllerInputSource + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1715063577476300 GameObject: m_ObjectHideFlags: 1 @@ -132,13 +149,14 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000011070707148} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Children: - {fileID: 4000013985985722} - {fileID: 4000010261267946} - {fileID: 4532035439910448} + - {fileID: 4187953886819872} - {fileID: 4521646291090770} m_Father: {fileID: 0} m_RootOrder: 0 @@ -156,6 +174,19 @@ Transform: m_Father: {fileID: 4000011656901714} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4187953886819872 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1329858366469352} + 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_Children: [] + m_Father: {fileID: 4000011656901714} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4521646291090770 Transform: m_ObjectHideFlags: 1 @@ -168,7 +199,7 @@ Transform: m_Children: - {fileID: 4977849313536866} m_Father: {fileID: 4000011656901714} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4532035439910448 Transform: @@ -317,6 +348,63 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: StoredStabilitySamples: 60 +--- !u!114 &114367590399833948 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1329858366469352} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f53e0243d951df74baba23d966f61986, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceRefreshInterval: 3 + horizontalAxis: 5 + verticalAxis: 6 + submitButton: 10 + cancelButton: 11 + mapping: + - Type: 0 + Value: + - Type: 1 + Value: + - Type: 2 + Value: + - Type: 3 + Value: + - Type: 4 + Value: + - Type: 5 + Value: + - Type: 6 + Value: + - Type: 7 + Value: + - Type: 8 + Value: + - Type: 9 + Value: + - Type: 10 + Value: + - Type: 11 + Value: + - Type: 12 + Value: + - Type: 13 + Value: + - Type: 14 + Value: + - Type: 15 + Value: + - Type: 16 + Value: + - Type: 17 + Value: + - Type: 18 + Value: + - Type: 19 + Value: --- !u!114 &114431424514551254 MonoBehaviour: m_ObjectHideFlags: 1 @@ -335,6 +423,22 @@ MonoBehaviour: m_InputActionsPerSecond: 10 m_RepeatDelay: 0.5 m_ForceModuleActive: 0 +--- !u!114 &114512526664342106 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1329858366469352} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03fe91f227bf8af44afc939d2303cbb0, type: 3} + m_Name: + m_EditorClassIdentifier: + IsGlobalListener: 1 + HoldStartedInterval: 2 + HoldCompletedInterval: 3 + SelectButton: 10 + HorizontalNavigationAxis: 1 --- !u!114 &114708646396671696 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/HoloToolkit/Input/Prefabs/MixedRealityCameraParent.prefab b/Assets/HoloToolkit/Input/Prefabs/MixedRealityCameraParent.prefab index 106fc9007e5..fe765fd8546 100644 --- a/Assets/HoloToolkit/Input/Prefabs/MixedRealityCameraParent.prefab +++ b/Assets/HoloToolkit/Input/Prefabs/MixedRealityCameraParent.prefab @@ -538,8 +538,8 @@ MeshRenderer: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1586147040494190} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 @@ -667,6 +667,10 @@ MonoBehaviour: m_EditorClassIdentifier: FloorQuad: {fileID: 1520281459093612, guid: 08d25ccfbbc595b4a820c7edd551d095, type: 2} boundaryHeight: 10 + opaqueTrackingSpaceType: 1 + transparentTrackingSpaceType: 0 + renderFloor: 1 + renderBoundary: 1 --- !u!114 &114225625019075894 MonoBehaviour: m_ObjectHideFlags: 1 @@ -809,6 +813,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1bc175d33f66e6647aabac1b65e7e632, type: 3} m_Name: m_EditorClassIdentifier: + HorizontalStrafe: 1 + ForwardMovement: 2 + HorizontalRotation: 3 + VerticalRotation: 4 LeftThumbstickX: CONTROLLER_LEFT_STICK_HORIZONTAL LeftThumbstickY: CONTROLLER_LEFT_STICK_VERTICAL RightThumbstickX: CONTROLLER_RIGHT_STICK_HORIZONTAL @@ -820,6 +828,7 @@ MonoBehaviour: StrafeAmount: 0.5 teleportMarker: {fileID: 1503526479864244, guid: 10d95b99055c6ad40b735cc8b3593745, type: 2} + useCustomMapping: 0 --- !u!114 &114828096048444974 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/HoloToolkit/Input/Scripts/Cursor/AnimatedCursor.cs b/Assets/HoloToolkit/Input/Scripts/Cursor/AnimatedCursor.cs index 7faf9d09295..a86f991343d 100644 --- a/Assets/HoloToolkit/Input/Scripts/Cursor/AnimatedCursor.cs +++ b/Assets/HoloToolkit/Input/Scripts/Cursor/AnimatedCursor.cs @@ -41,14 +41,14 @@ public class AnimatedCursor : Cursor public AnimatorParameter InputDisabledParameter; /// - /// Link the the cursor animator + /// Link the cursor animator /// [SerializeField] [Tooltip("Animator for the cursor")] protected Animator CursorAnimator; /// - /// Change anim state when enabling input + /// Change animation state when enabling input /// public override void OnInputEnabled() { @@ -57,7 +57,7 @@ public override void OnInputEnabled() } /// - /// Change anim state when disabling input + /// Change animation state when disabling input /// public override void OnInputDisabled() { @@ -66,7 +66,7 @@ public override void OnInputDisabled() } /// - /// Override to set the cursor anim trigger + /// Override to set the cursor animation trigger /// /// protected override void OnActiveModifier(CursorModifier modifier) diff --git a/Assets/HoloToolkit/Input/Scripts/Cursor/CursorModifier.cs b/Assets/HoloToolkit/Input/Scripts/Cursor/CursorModifier.cs index db3eda645d2..8863e81efef 100644 --- a/Assets/HoloToolkit/Input/Scripts/Cursor/CursorModifier.cs +++ b/Assets/HoloToolkit/Input/Scripts/Cursor/CursorModifier.cs @@ -30,7 +30,7 @@ public class CursorModifier : MonoBehaviour, ICursorModifier "instead of the targeted object's normal at point of contact.")] public bool UseGazeBasedNormal = false; - [Tooltip("Should the cursor be hidding when this object is focused.")] + [Tooltip("Should the cursor be hiding when this object is focused.")] public bool HideCursorOnFocus = false; [Tooltip("Cursor animation parameters to set when this object is focused. Leave empty for none.")] diff --git a/Assets/HoloToolkit/Input/Scripts/Cursor/ICursor.cs b/Assets/HoloToolkit/Input/Scripts/Cursor/ICursor.cs index ded9e01cf71..2af32016f57 100644 --- a/Assets/HoloToolkit/Input/Scripts/Cursor/ICursor.cs +++ b/Assets/HoloToolkit/Input/Scripts/Cursor/ICursor.cs @@ -6,7 +6,7 @@ namespace HoloToolkit.Unity.InputModule { /// - /// Cursor Interface for handling input events and setting visiblity. + /// Cursor Interface for handling input events and setting visibility. /// public interface ICursor : IInputHandler, IInputClickHandler, ISourceStateHandler { diff --git a/Assets/HoloToolkit/Input/Scripts/Cursor/ICursorModifier.cs b/Assets/HoloToolkit/Input/Scripts/Cursor/ICursorModifier.cs index 3d70128bedc..101506a763d 100644 --- a/Assets/HoloToolkit/Input/Scripts/Cursor/ICursorModifier.cs +++ b/Assets/HoloToolkit/Input/Scripts/Cursor/ICursorModifier.cs @@ -6,7 +6,7 @@ namespace HoloToolkit.Unity.InputModule { /// - /// Cursor Modifier Interface that provides basic overrides for cursor behaviour. + /// Cursor Modifier Interface that provides basic overrides for cursor behavior. /// public interface ICursorModifier { diff --git a/Assets/HoloToolkit/Input/Scripts/Cursor/InteractiveMeshCursor.cs b/Assets/HoloToolkit/Input/Scripts/Cursor/InteractiveMeshCursor.cs index 8cecf9111a4..0784c920062 100644 --- a/Assets/HoloToolkit/Input/Scripts/Cursor/InteractiveMeshCursor.cs +++ b/Assets/HoloToolkit/Input/Scripts/Cursor/InteractiveMeshCursor.cs @@ -19,7 +19,7 @@ public class InteractiveMeshCursor : Cursor [Tooltip("Point light")] public GameObject Light; - [Tooltip("The scale factor to soften the distance scaling, we want the cursor to scale in the distance, but not disapprear.")] + [Tooltip("The scale factor to soften the distance scaling, we want the cursor to scale in the distance, but not disappear.")] public float DistanceScaleFactor = 0.3f; [Tooltip("The scale both elements will be at their default state")] diff --git a/Assets/HoloToolkit/Input/Scripts/Editor/MixedRealityTeleportEditor.cs b/Assets/HoloToolkit/Input/Scripts/Editor/MixedRealityTeleportEditor.cs new file mode 100644 index 00000000000..35922ced5b2 --- /dev/null +++ b/Assets/HoloToolkit/Input/Scripts/Editor/MixedRealityTeleportEditor.cs @@ -0,0 +1,88 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using UnityEditor; +using UnityEngine; + +namespace HoloToolkit.Unity.InputModule +{ + [CustomEditor(typeof(MixedRealityTeleport))] + public class MixedRealityTeleportEditor : Editor + { + private readonly GUIContent verticalRotationLabel = new GUIContent("Vertical Rotation", "Used to check the Horizontal Rotation and the intent of the user to rotate in that direction"); + + private static MixedRealityTeleport mixedRealityTeleport; + private static SerializedProperty teleportMakerPrefab; + private static SerializedProperty useCustomMappingProperty; + private static bool useCustomMapping; + private static bool mappingOverride; + + private void OnEnable() + { + mixedRealityTeleport = (MixedRealityTeleport)target; + + + teleportMakerPrefab = serializedObject.FindProperty("teleportMarker"); + useCustomMappingProperty = serializedObject.FindProperty("useCustomMapping"); + } + + public override void OnInspectorGUI() + { + serializedObject.Update(); + + useCustomMapping = useCustomMappingProperty.boolValue; + + EditorGUILayout.LabelField("Teleport Options", new GUIStyle("Label") { fontStyle = FontStyle.Bold }); + + mixedRealityTeleport.EnableTeleport = EditorGUILayout.Toggle("Enable Teleport", mixedRealityTeleport.EnableTeleport); + + mixedRealityTeleport.EnableStrafe = EditorGUILayout.Toggle("Enable Strafe", mixedRealityTeleport.EnableStrafe); + mixedRealityTeleport.StrafeAmount = EditorGUILayout.FloatField("Strafe Amount", mixedRealityTeleport.StrafeAmount); + + mixedRealityTeleport.EnableRotation = EditorGUILayout.Toggle("Enable Rotation", mixedRealityTeleport.EnableRotation); + mixedRealityTeleport.RotationSize = EditorGUILayout.FloatField("Rotation Amount", mixedRealityTeleport.RotationSize); + + EditorGUILayout.PropertyField(teleportMakerPrefab); + + EditorGUILayout.LabelField("Teleport Controller Mappings", new GUIStyle("Label") { fontStyle = FontStyle.Bold }); + + // Use custom mappings if users have already edited their axis mappings + if (!mappingOverride && + (mixedRealityTeleport.LeftThumbstickX != InputMappingAxisUtility.CONTROLLER_LEFT_STICK_HORIZONTAL && mixedRealityTeleport.LeftThumbstickX != string.Empty || + mixedRealityTeleport.LeftThumbstickY != InputMappingAxisUtility.CONTROLLER_LEFT_STICK_VERTICAL && mixedRealityTeleport.LeftThumbstickY != string.Empty || + mixedRealityTeleport.RightThumbstickX != InputMappingAxisUtility.CONTROLLER_RIGHT_STICK_HORIZONTAL && mixedRealityTeleport.RightThumbstickX != string.Empty || + mixedRealityTeleport.RightThumbstickY != InputMappingAxisUtility.CONTROLLER_RIGHT_STICK_VERTICAL && mixedRealityTeleport.RightThumbstickY != string.Empty)) + { + useCustomMapping = true; + } + + EditorGUI.BeginChangeCheck(); + + useCustomMapping = EditorGUILayout.Toggle("Use Custom Mappings", useCustomMapping); + + if (EditorGUI.EndChangeCheck()) + { + mappingOverride = !useCustomMapping; + } + + useCustomMappingProperty.boolValue = useCustomMapping; + + if (useCustomMapping) + { + mixedRealityTeleport.LeftThumbstickX = EditorGUILayout.TextField("Horizontal Strafe", mixedRealityTeleport.LeftThumbstickX); + mixedRealityTeleport.LeftThumbstickY = EditorGUILayout.TextField("Forward Movement", mixedRealityTeleport.LeftThumbstickY); + mixedRealityTeleport.RightThumbstickX = EditorGUILayout.TextField("Horizontal Rotation", mixedRealityTeleport.RightThumbstickX); + mixedRealityTeleport.RightThumbstickY = EditorGUILayout.TextField(verticalRotationLabel, mixedRealityTeleport.RightThumbstickY); + } + else + { + mixedRealityTeleport.HorizontalStrafe = (XboxControllerMappingTypes)EditorGUILayout.EnumPopup("Horizontal Strafe", mixedRealityTeleport.HorizontalStrafe); + mixedRealityTeleport.ForwardMovement = (XboxControllerMappingTypes)EditorGUILayout.EnumPopup("Forward Movement", mixedRealityTeleport.ForwardMovement); + mixedRealityTeleport.HorizontalRotation = (XboxControllerMappingTypes)EditorGUILayout.EnumPopup("Horizontal Rotation", mixedRealityTeleport.HorizontalRotation); + mixedRealityTeleport.VerticalRotation = (XboxControllerMappingTypes)EditorGUILayout.EnumPopup(verticalRotationLabel, mixedRealityTeleport.VerticalRotation); + } + + serializedObject.ApplyModifiedProperties(); + } + } +} diff --git a/Assets/HoloToolkit/Input/Scripts/Editor/MixedRealityTeleportEditor.cs.meta b/Assets/HoloToolkit/Input/Scripts/Editor/MixedRealityTeleportEditor.cs.meta new file mode 100644 index 00000000000..14c64e161dc --- /dev/null +++ b/Assets/HoloToolkit/Input/Scripts/Editor/MixedRealityTeleportEditor.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 4fe3fbb5066fb4c4e9f90c072f61b451 +timeCreated: 1512603745 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HoloToolkit/Input/Scripts/Focus/FocusManager.cs b/Assets/HoloToolkit/Input/Scripts/Focus/FocusManager.cs index 85a19402520..d0a2b9b6dec 100644 --- a/Assets/HoloToolkit/Input/Scripts/Focus/FocusManager.cs +++ b/Assets/HoloToolkit/Input/Scripts/Focus/FocusManager.cs @@ -649,7 +649,7 @@ private void RaycastUnityUI(PointerData pointer, LayerMask[] prioritizedLayerMas private bool RaycastUnityUIStep(PointerData pointer, RayStep step, LayerMask[] prioritizedLayerMasks, out bool overridePhysicsRaycast, out RaycastResult uiRaycastResult) { - // Move the uiRaycast camera to the the current pointer's position. + // Move the uiRaycast camera to the current pointer's position. UIRaycastCamera.transform.position = step.origin; UIRaycastCamera.transform.forward = step.direction; @@ -694,7 +694,7 @@ private bool RaycastUnityUIStep(PointerData pointer, RayStep step, LayerMask[] p } } } - // If we've hit somthing, no need to go further + // If we've hit something, no need to go further return true; } // If we haven't hit something, keep going diff --git a/Assets/HoloToolkit/Input/Scripts/GamePad/GamePadHandlerBase.cs b/Assets/HoloToolkit/Input/Scripts/GamePad/GamePadHandlerBase.cs new file mode 100644 index 00000000000..e4142b1ae80 --- /dev/null +++ b/Assets/HoloToolkit/Input/Scripts/GamePad/GamePadHandlerBase.cs @@ -0,0 +1,39 @@ +using UnityEngine; + +namespace HoloToolkit.Unity.InputModule +{ + public class GamePadHandlerBase : MonoBehaviour, ISourceStateHandler + { + [SerializeField] + [Tooltip("True, if gaze is not required for Input")] + protected bool IsGlobalListener = true; + + protected string GamePadName = string.Empty; + + private void OnEnable() + { + if (IsGlobalListener) + { + InputManager.Instance.AddGlobalListener(gameObject); + } + } + + protected virtual void OnDisable() + { + if (IsGlobalListener && InputManager.Instance != null) + { + InputManager.Instance.RemoveGlobalListener(gameObject); + } + } + + public virtual void OnSourceDetected(SourceStateEventData eventData) + { + // Override and name your GamePad source. + } + + public virtual void OnSourceLost(SourceStateEventData eventData) + { + GamePadName = string.Empty; + } + } +} diff --git a/Assets/HoloToolkit/Input/Scripts/GamePad/GamePadHandlerBase.cs.meta b/Assets/HoloToolkit/Input/Scripts/GamePad/GamePadHandlerBase.cs.meta new file mode 100644 index 00000000000..24982de03d0 --- /dev/null +++ b/Assets/HoloToolkit/Input/Scripts/GamePad/GamePadHandlerBase.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 1e9d3ccd88546c04295a3070f5c15a06 +timeCreated: 1508964783 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HoloToolkit/Input/Scripts/GamePad/XboxController/XboxControllerData.cs b/Assets/HoloToolkit/Input/Scripts/GamePad/XboxController/XboxControllerData.cs index 8b580620479..54d76b241ac 100644 --- a/Assets/HoloToolkit/Input/Scripts/GamePad/XboxController/XboxControllerData.cs +++ b/Assets/HoloToolkit/Input/Scripts/GamePad/XboxController/XboxControllerData.cs @@ -8,6 +8,8 @@ namespace HoloToolkit.Unity.InputModule /// public struct XboxControllerData { + public string GamePadName { get; set; } + public float XboxLeftStickHorizontalAxis { get; set; } public float XboxLeftStickVerticalAxis { get; set; } public float XboxRightStickHorizontalAxis { get; set; } diff --git a/Assets/HoloToolkit/Input/Scripts/GamePad/XboxController/XboxControllerHandlerBase.cs b/Assets/HoloToolkit/Input/Scripts/GamePad/XboxController/XboxControllerHandlerBase.cs index 63d031be4cf..473af40cce1 100644 --- a/Assets/HoloToolkit/Input/Scripts/GamePad/XboxController/XboxControllerHandlerBase.cs +++ b/Assets/HoloToolkit/Input/Scripts/GamePad/XboxController/XboxControllerHandlerBase.cs @@ -2,131 +2,161 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. using System; +using System.Collections; using UnityEngine; namespace HoloToolkit.Unity.InputModule { - public class XboxControllerHandlerBase : MonoBehaviour, IXboxControllerHandler + public class XboxControllerHandlerBase : GamePadHandlerBase, IXboxControllerHandler { + protected enum GestureState + { + SelectButtonUnpressed, + SelectButtonPressed, + NavigationStarted, + HoldStarted + } + + [SerializeField] + [Tooltip("Elapsed time for hold started gesture in seconds.")] + protected float HoldStartedInterval = 2.0f; + + [SerializeField] + [Tooltip("Elapsed time for hold completed gesture in seconds.")] + protected float HoldCompletedInterval = 3.0f; + [SerializeField] - [Tooltip("Is Gaze required for controller input?")] - protected bool IsGlobalListener = true; + [Tooltip("The action button that is used to select. Analogous to air tap on HoloLens and trigger press with motion controllers.")] + protected XboxControllerMappingTypes SelectButton = XboxControllerMappingTypes.XboxA; - protected string GamePadName; + [SerializeField] + [Tooltip("The Horizontal Axis that navigation events take place")] + protected XboxControllerMappingTypes HorizontalNavigationAxis = XboxControllerMappingTypes.XboxLeftStickHorizontal; + + [Tooltip("The Vertical Axis that navigation events take place")] + protected XboxControllerMappingTypes VerticalNavigationAxis = XboxControllerMappingTypes.XboxLeftStickVertical; + + protected GestureState CurrentGestureState = GestureState.SelectButtonUnpressed; + + protected Vector3 NormalizedOffset; - protected virtual void Start() + protected Coroutine HoldStartedRoutine; + + public virtual void OnXboxInputUpdate(XboxControllerEventData eventData) { - if (IsGlobalListener) + if (string.IsNullOrEmpty(GamePadName)) + { + GamePadName = eventData.GamePadName; + } + + if (XboxControllerMapping.GetButton_Down(SelectButton, eventData)) + { + CurrentGestureState = GestureState.SelectButtonPressed; + + InputManager.Instance.RaiseSourceDown(eventData.InputSource, eventData.SourceId, InteractionSourcePressInfo.Select); + + HoldStartedRoutine = StartCoroutine(HandleHoldStarted(eventData)); + } + + if (XboxControllerMapping.GetButton_Pressed(SelectButton, eventData)) + { + HandleNavigation(eventData); + } + + if (XboxControllerMapping.GetButton_Up(SelectButton, eventData)) { - InputManager.Instance.AddGlobalListener(gameObject); + HandleSelectButtonReleased(eventData); } + + // Consume this event + eventData.Use(); } - public virtual void OnGamePadDetected(GamePadEventData eventData) + protected virtual void HandleSelectButtonReleased(XboxControllerEventData eventData) { - GamePadName = eventData.GamePadName; + InputManager.Instance.RaiseSourceUp(eventData.InputSource, eventData.SourceId, InteractionSourcePressInfo.Select); + + if (HoldStartedRoutine != null) + { + StopCoroutine(HoldStartedRoutine); + } + + switch (CurrentGestureState) + { + case GestureState.NavigationStarted: + InputManager.Instance.RaiseNavigationCompleted(eventData.InputSource, eventData.SourceId, Vector3.zero); + break; + case GestureState.HoldStarted: + InputManager.Instance.RaiseHoldCompleted(eventData.InputSource, eventData.SourceId); + break; + default: + InputManager.Instance.RaiseInputClicked(eventData.InputSource, eventData.SourceId, InteractionSourcePressInfo.Select, 1); + break; + } + + CurrentGestureState = GestureState.SelectButtonUnpressed; } - public virtual void OnGamePadLost(GamePadEventData eventData) + protected virtual IEnumerator HandleHoldStarted(XboxControllerEventData eventData) { - GamePadName = string.Empty; + yield return new WaitForSeconds(HoldStartedInterval); + + if (CurrentGestureState == GestureState.HoldStarted || CurrentGestureState == GestureState.NavigationStarted) + { + yield break; + } + + CurrentGestureState = GestureState.HoldStarted; + + InputManager.Instance.RaiseHoldStarted(eventData.InputSource, eventData.SourceId); } - public virtual void OnXboxAxisUpdate(XboxControllerEventData eventData) + protected virtual void HandleNavigation(XboxControllerEventData eventData) { + float displacementAlongX = XboxControllerMapping.GetAxis(HorizontalNavigationAxis, eventData); + float displacementAlongY = XboxControllerMapping.GetAxis(VerticalNavigationAxis, eventData); + + if (displacementAlongX == 0.0f && displacementAlongY == 0.0f && CurrentGestureState != GestureState.NavigationStarted) { return; } + + NormalizedOffset.x = displacementAlongX; + NormalizedOffset.y = displacementAlongY; + NormalizedOffset.z = 0f; + + if (CurrentGestureState != GestureState.NavigationStarted) + { + if (CurrentGestureState == GestureState.HoldStarted) + { + InputManager.Instance.RaiseHoldCanceled(eventData.InputSource, eventData.SourceId); + } + + CurrentGestureState = GestureState.NavigationStarted; + + // Raise navigation started event. + InputManager.Instance.RaiseNavigationStarted(eventData.InputSource, eventData.SourceId); + } + else + { + // Raise navigation updated event. + InputManager.Instance.RaiseNavigationUpdated(eventData.InputSource, eventData.SourceId, NormalizedOffset); + } } + [Obsolete("Use XboxControllerMapping.GetButton_Up")] protected static bool OnButton_Up(XboxControllerMappingTypes buttonType, XboxControllerEventData eventData) { - switch (buttonType) - { - case XboxControllerMappingTypes.None: - return false; - case XboxControllerMappingTypes.XboxA: - return eventData.XboxA_Up; - case XboxControllerMappingTypes.XboxB: - return eventData.XboxB_Up; - case XboxControllerMappingTypes.XboxX: - return eventData.XboxX_Up; - case XboxControllerMappingTypes.XboxY: - return eventData.XboxY_Up; - case XboxControllerMappingTypes.XboxView: - return eventData.XboxView_Up; - case XboxControllerMappingTypes.XboxMenu: - return eventData.XboxMenu_Up; - case XboxControllerMappingTypes.XboxLeftBumper: - return eventData.XboxLeftBumper_Up; - case XboxControllerMappingTypes.XboxRightBumper: - return eventData.XboxRightBumper_Up; - case XboxControllerMappingTypes.XboxLeftStickClick: - return eventData.XboxLeftStick_Up; - case XboxControllerMappingTypes.XboxRightStickClick: - return eventData.XboxRightStick_Up; - default: - throw new ArgumentOutOfRangeException("buttonType", buttonType, null); - } + return XboxControllerMapping.GetButton_Up(buttonType, eventData); } + [Obsolete("Use XboxControllerMapping.GetButton_Pressed")] protected static bool OnButton_Pressed(XboxControllerMappingTypes buttonType, XboxControllerEventData eventData) { - switch (buttonType) - { - case XboxControllerMappingTypes.None: - return false; - case XboxControllerMappingTypes.XboxA: - return eventData.XboxA_Pressed; - case XboxControllerMappingTypes.XboxB: - return eventData.XboxB_Pressed; - case XboxControllerMappingTypes.XboxX: - return eventData.XboxX_Pressed; - case XboxControllerMappingTypes.XboxY: - return eventData.XboxY_Pressed; - case XboxControllerMappingTypes.XboxView: - return eventData.XboxView_Pressed; - case XboxControllerMappingTypes.XboxMenu: - return eventData.XboxMenu_Pressed; - case XboxControllerMappingTypes.XboxLeftBumper: - return eventData.XboxLeftBumper_Pressed; - case XboxControllerMappingTypes.XboxRightBumper: - return eventData.XboxRightBumper_Pressed; - case XboxControllerMappingTypes.XboxLeftStickClick: - return eventData.XboxLeftStick_Pressed; - case XboxControllerMappingTypes.XboxRightStickClick: - return eventData.XboxRightStick_Pressed; - default: - throw new ArgumentOutOfRangeException("buttonType", buttonType, null); - } + return XboxControllerMapping.GetButton_Pressed(buttonType, eventData); } + [Obsolete("Use XboxControllerMapping.GetButton_Down")] protected static bool OnButton_Down(XboxControllerMappingTypes buttonType, XboxControllerEventData eventData) { - switch (buttonType) - { - case XboxControllerMappingTypes.None: - return false; - case XboxControllerMappingTypes.XboxA: - return eventData.XboxA_Down; - case XboxControllerMappingTypes.XboxB: - return eventData.XboxB_Down; - case XboxControllerMappingTypes.XboxX: - return eventData.XboxX_Down; - case XboxControllerMappingTypes.XboxY: - return eventData.XboxY_Down; - case XboxControllerMappingTypes.XboxView: - return eventData.XboxView_Down; - case XboxControllerMappingTypes.XboxMenu: - return eventData.XboxMenu_Down; - case XboxControllerMappingTypes.XboxLeftBumper: - return eventData.XboxLeftBumper_Down; - case XboxControllerMappingTypes.XboxRightBumper: - return eventData.XboxRightBumper_Down; - case XboxControllerMappingTypes.XboxLeftStickClick: - return eventData.XboxLeftStick_Down; - case XboxControllerMappingTypes.XboxRightStickClick: - return eventData.XboxRightStick_Down; - default: - throw new ArgumentOutOfRangeException("buttonType", buttonType, null); - } + return XboxControllerMapping.GetButton_Down(buttonType, eventData); } } } diff --git a/Assets/HoloToolkit/Input/Scripts/GamePad/XboxController/XboxControllerMapping.cs b/Assets/HoloToolkit/Input/Scripts/GamePad/XboxController/XboxControllerMapping.cs index e567c7427a6..7f76aa5a8fe 100644 --- a/Assets/HoloToolkit/Input/Scripts/GamePad/XboxController/XboxControllerMapping.cs +++ b/Assets/HoloToolkit/Input/Scripts/GamePad/XboxController/XboxControllerMapping.cs @@ -84,67 +84,187 @@ public static void SetMapping(XboxControllerMappingTypes type, string value) switch (type) { case XboxControllerMappingTypes.None: - return; + break; case XboxControllerMappingTypes.XboxLeftStickHorizontal: - XboxLeftStickHorizontal = string.IsNullOrEmpty(value) ? "CONTROLLER_LEFT_STICK_HORIZONTAL" : value; + XboxLeftStickHorizontal = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.CONTROLLER_LEFT_STICK_HORIZONTAL : value; break; case XboxControllerMappingTypes.XboxLeftStickVertical: - XboxLeftStickVertical = string.IsNullOrEmpty(value) ? "CONTROLLER_LEFT_STICK_VERTICAL" : value; + XboxLeftStickVertical = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.CONTROLLER_LEFT_STICK_VERTICAL : value; break; case XboxControllerMappingTypes.XboxRightStickHorizontal: - XboxRightStickHorizontal = string.IsNullOrEmpty(value) ? "CONTROLLER_RIGHT_STICK_HORIZONTAL" : value; + XboxRightStickHorizontal = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.CONTROLLER_RIGHT_STICK_HORIZONTAL : value; break; case XboxControllerMappingTypes.XboxRightStickVertical: - XboxRightStickVertical = string.IsNullOrEmpty(value) ? "CONTROLLER_RIGHT_STICK_VERTICAL" : value; + XboxRightStickVertical = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.CONTROLLER_RIGHT_STICK_VERTICAL : value; break; case XboxControllerMappingTypes.XboxDpadHorizontal: - XboxDpadHorizontal = string.IsNullOrEmpty(value) ? "XBOX_DPAD_HORIZONTAL" : value; + XboxDpadHorizontal = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.XBOX_DPAD_HORIZONTAL : value; break; case XboxControllerMappingTypes.XboxDpadVertical: - XboxDpadVertical = string.IsNullOrEmpty(value) ? "XBOX_DPAD_VERTICAL" : value; + XboxDpadVertical = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.XBOX_DPAD_VERTICAL : value; break; case XboxControllerMappingTypes.XboxLeftTrigger: - XboxLeftTrigger = string.IsNullOrEmpty(value) ? "CONTROLLER_LEFT_TRIGGER" : value; + XboxLeftTrigger = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.CONTROLLER_LEFT_TRIGGER : value; break; case XboxControllerMappingTypes.XboxRightTrigger: - XboxRightTrigger = string.IsNullOrEmpty(value) ? "CONTROLLER_RIGHT_TRIGGER" : value; + XboxRightTrigger = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.CONTROLLER_RIGHT_TRIGGER : value; break; case XboxControllerMappingTypes.XboxSharedTrigger: - XboxSharedTrigger = string.IsNullOrEmpty(value) ? "XBOX_SHARED_TRIGGER" : value; + XboxSharedTrigger = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.XBOX_SHARED_TRIGGER : value; break; case XboxControllerMappingTypes.XboxA: - XboxA = string.IsNullOrEmpty(value) ? "XBOX_A" : value; + XboxA = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.XBOX_A : value; break; case XboxControllerMappingTypes.XboxB: - XboxB = string.IsNullOrEmpty(value) ? "XBOX_B" : value; + XboxB = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.XBOX_B : value; break; case XboxControllerMappingTypes.XboxX: - XboxX = string.IsNullOrEmpty(value) ? "XBOX_X" : value; + XboxX = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.XBOX_X : value; break; case XboxControllerMappingTypes.XboxY: - XboxY = string.IsNullOrEmpty(value) ? "XBOX_Y" : value; + XboxY = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.XBOX_Y : value; break; case XboxControllerMappingTypes.XboxView: - XboxView = string.IsNullOrEmpty(value) ? "XBOX_VIEW" : value; + XboxView = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.CONTROLLER_LEFT_MENU : value; break; case XboxControllerMappingTypes.XboxMenu: - XboxMenu = string.IsNullOrEmpty(value) ? "CONTROLLER_MENU" : value; + XboxMenu = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.CONTROLLER_RIGHT_MENU : value; break; case XboxControllerMappingTypes.XboxLeftBumper: - XboxLeftBumper = string.IsNullOrEmpty(value) ? "XBOX_LEFT_BUMPER" : value; + XboxLeftBumper = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.CONTROLLER_LEFT_BUMPER_OR_GRIP : value; break; case XboxControllerMappingTypes.XboxRightBumper: - XboxRightBumper = string.IsNullOrEmpty(value) ? "XBOX_RIGHT_BUMPER" : value; + XboxRightBumper = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.CONTROLLER_RIGHT_BUMPER_OR_GRIP : value; break; case XboxControllerMappingTypes.XboxLeftStickClick: - XboxLeftStickClick = string.IsNullOrEmpty(value) ? "CONTROLLER_LEFT_STICK_CLICK" : value; + XboxLeftStickClick = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.CONTROLLER_LEFT_STICK_CLICK : value; break; case XboxControllerMappingTypes.XboxRightStickClick: - XboxRightStickClick = string.IsNullOrEmpty(value) ? "CONTROLLER_RIGHT_STICK_CLICK" : value; + XboxRightStickClick = string.IsNullOrEmpty(value) ? InputMappingAxisUtility.CONTROLLER_RIGHT_STICK_CLICK : value; break; default: throw new ArgumentOutOfRangeException("type", type, null); } } + + public static float GetAxis(XboxControllerMappingTypes axisType, XboxControllerEventData eventData) + { + switch (axisType) + { + case XboxControllerMappingTypes.XboxLeftStickHorizontal: + return eventData.XboxLeftStickHorizontalAxis; + case XboxControllerMappingTypes.XboxLeftStickVertical: + return eventData.XboxLeftStickVerticalAxis; + case XboxControllerMappingTypes.XboxRightStickHorizontal: + return eventData.XboxRightStickHorizontalAxis; + case XboxControllerMappingTypes.XboxRightStickVertical: + return eventData.XboxRightStickVerticalAxis; + case XboxControllerMappingTypes.XboxDpadHorizontal: + return eventData.XboxDpadHorizontalAxis; + case XboxControllerMappingTypes.XboxDpadVertical: + return eventData.XboxDpadVerticalAxis; + case XboxControllerMappingTypes.XboxLeftTrigger: + return eventData.XboxLeftTriggerAxis; + case XboxControllerMappingTypes.XboxRightTrigger: + return eventData.XboxRightTriggerAxis; + case XboxControllerMappingTypes.XboxSharedTrigger: + return eventData.XboxSharedTriggerAxis; + default: + throw new ArgumentOutOfRangeException("axisType", axisType, null); + } + } + + public static bool GetButton_Down(XboxControllerMappingTypes buttonType, XboxControllerEventData eventData) + { + switch (buttonType) + { + case XboxControllerMappingTypes.None: + return false; + case XboxControllerMappingTypes.XboxA: + return eventData.XboxA_Down; + case XboxControllerMappingTypes.XboxB: + return eventData.XboxB_Down; + case XboxControllerMappingTypes.XboxX: + return eventData.XboxX_Down; + case XboxControllerMappingTypes.XboxY: + return eventData.XboxY_Down; + case XboxControllerMappingTypes.XboxView: + return eventData.XboxView_Down; + case XboxControllerMappingTypes.XboxMenu: + return eventData.XboxMenu_Down; + case XboxControllerMappingTypes.XboxLeftBumper: + return eventData.XboxLeftBumper_Down; + case XboxControllerMappingTypes.XboxRightBumper: + return eventData.XboxRightBumper_Down; + case XboxControllerMappingTypes.XboxLeftStickClick: + return eventData.XboxLeftStick_Down; + case XboxControllerMappingTypes.XboxRightStickClick: + return eventData.XboxRightStick_Down; + default: + throw new ArgumentOutOfRangeException("buttonType", buttonType, null); + } + } + + public static bool GetButton_Pressed(XboxControllerMappingTypes buttonType, XboxControllerEventData eventData) + { + switch (buttonType) + { + case XboxControllerMappingTypes.None: + return false; + case XboxControllerMappingTypes.XboxA: + return eventData.XboxA_Pressed; + case XboxControllerMappingTypes.XboxB: + return eventData.XboxB_Pressed; + case XboxControllerMappingTypes.XboxX: + return eventData.XboxX_Pressed; + case XboxControllerMappingTypes.XboxY: + return eventData.XboxY_Pressed; + case XboxControllerMappingTypes.XboxView: + return eventData.XboxView_Pressed; + case XboxControllerMappingTypes.XboxMenu: + return eventData.XboxMenu_Pressed; + case XboxControllerMappingTypes.XboxLeftBumper: + return eventData.XboxLeftBumper_Pressed; + case XboxControllerMappingTypes.XboxRightBumper: + return eventData.XboxRightBumper_Pressed; + case XboxControllerMappingTypes.XboxLeftStickClick: + return eventData.XboxLeftStick_Pressed; + case XboxControllerMappingTypes.XboxRightStickClick: + return eventData.XboxRightStick_Pressed; + default: + throw new ArgumentOutOfRangeException("buttonType", buttonType, null); + } + } + + public static bool GetButton_Up(XboxControllerMappingTypes buttonType, XboxControllerEventData eventData) + { + switch (buttonType) + { + case XboxControllerMappingTypes.None: + return false; + case XboxControllerMappingTypes.XboxA: + return eventData.XboxA_Up; + case XboxControllerMappingTypes.XboxB: + return eventData.XboxB_Up; + case XboxControllerMappingTypes.XboxX: + return eventData.XboxX_Up; + case XboxControllerMappingTypes.XboxY: + return eventData.XboxY_Up; + case XboxControllerMappingTypes.XboxView: + return eventData.XboxView_Up; + case XboxControllerMappingTypes.XboxMenu: + return eventData.XboxMenu_Up; + case XboxControllerMappingTypes.XboxLeftBumper: + return eventData.XboxLeftBumper_Up; + case XboxControllerMappingTypes.XboxRightBumper: + return eventData.XboxRightBumper_Up; + case XboxControllerMappingTypes.XboxLeftStickClick: + return eventData.XboxLeftStick_Up; + case XboxControllerMappingTypes.XboxRightStickClick: + return eventData.XboxRightStick_Up; + default: + throw new ArgumentOutOfRangeException("buttonType", buttonType, null); + } + } } -} \ No newline at end of file +} diff --git a/Assets/HoloToolkit/Input/Scripts/GamePad/XboxController/XboxControllerMappingTypes.cs b/Assets/HoloToolkit/Input/Scripts/GamePad/XboxController/XboxControllerMappingTypes.cs index e7b36ef30d6..6aa00e16cd2 100644 --- a/Assets/HoloToolkit/Input/Scripts/GamePad/XboxController/XboxControllerMappingTypes.cs +++ b/Assets/HoloToolkit/Input/Scripts/GamePad/XboxController/XboxControllerMappingTypes.cs @@ -6,7 +6,7 @@ namespace HoloToolkit.Unity.InputModule { /// - /// Controller axis and button types. + /// Xbox Controller axis and button types. /// [Flags] public enum XboxControllerMappingTypes diff --git a/Assets/HoloToolkit/Input/Scripts/Gaze/GazeStabilizer.cs b/Assets/HoloToolkit/Input/Scripts/Gaze/GazeStabilizer.cs index 0139679ba41..017d8935fd5 100644 --- a/Assets/HoloToolkit/Input/Scripts/Gaze/GazeStabilizer.cs +++ b/Assets/HoloToolkit/Input/Scripts/Gaze/GazeStabilizer.cs @@ -56,17 +56,17 @@ public override Ray StableRay private const float DirectionStandardDeviationReset = 0.1f; /// - /// We must have at least this many samples with a standard deviation below the above constants to stabalize + /// We must have at least this many samples with a standard deviation below the above constants to stabilize /// private const int MinimumSamplesRequiredToStabalize = 30; /// - /// When not stabalizing this is the 'lerp' applied to the position and direction of the gaze to smooth it over time. + /// When not stabilizing this is the 'lerp' applied to the position and direction of the gaze to smooth it over time. /// private const float UnstabalizedLerpFactor = 0.3f; /// - /// When stabalizing we will use the standard deviation of the position and direction to create the lerp value. + /// When stabilizing we will use the standard deviation of the position and direction to create the lerp value. /// By default this value will be low and the cursor will be too sluggish, so we 'boost' it by this value. /// private const float StabalizedLerpBoost = 10.0f; @@ -79,7 +79,7 @@ private void Awake() /// /// Updates the StablePosition and StableRotation based on GazeSample values. - /// Call this method with Raycasthit parameters to get stable values. + /// Call this method with RaycastHit parameters to get stable values. /// /// Position value from a RaycastHit point. /// Direction value from a RaycastHit rotation. @@ -93,14 +93,14 @@ public override void UpdateStability(Vector3 gazePosition, Vector3 gazeDirection (positionRollingStats.CurrentStandardDeviation > PositionStandardDeviationReset || // the standard deviation of positions is high or... directionRollingStats.CurrentStandardDeviation > DirectionStandardDeviationReset)) // the standard deviation of directions is high { - // We've detected that the user's gaze is no longer fixed, so stop stabalizing so that gaze is responsive. + // We've detected that the user's gaze is no longer fixed, so stop stabilizing so that gaze is responsive. //Debug.LogFormat("Reset {0} {1} {2} {3}", positionRollingStats.standardDeviation, positionRollingStats.standardDeviationsAway, directionRollignStats.standardDeviation, directionRollignStats.standardDeviationsAway); positionRollingStats.Reset(); directionRollingStats.Reset(); } else if (positionRollingStats.ActualSampleCount > MinimumSamplesRequiredToStabalize) { - // We've detected that the user's gaze is fairly fixed, so start stabalizing. The more fixed the gaze the less the cursor will move. + // We've detected that the user's gaze is fairly fixed, so start stabilizing. The more fixed the gaze the less the cursor will move. lerpPower = StabalizedLerpBoost * (positionRollingStats.CurrentStandardDeviation + directionRollingStats.CurrentStandardDeviation); } diff --git a/Assets/HoloToolkit/Input/Scripts/InputEventData/GamePadEventData.cs b/Assets/HoloToolkit/Input/Scripts/InputEventData/GamePadEventData.cs index 4ea339a7c58..0d063fc3924 100644 --- a/Assets/HoloToolkit/Input/Scripts/InputEventData/GamePadEventData.cs +++ b/Assets/HoloToolkit/Input/Scripts/InputEventData/GamePadEventData.cs @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. +using System; using UnityEngine.EventSystems; namespace HoloToolkit.Unity.InputModule { + [Obsolete("Use SourceEventData")] public class GamePadEventData : InputEventData { public string GamePadName { get; private set; } diff --git a/Assets/HoloToolkit/Input/Scripts/InputEventData/XboxControllerEventData.cs b/Assets/HoloToolkit/Input/Scripts/InputEventData/XboxControllerEventData.cs index c7b8c6bd7d3..cbb4122a92e 100644 --- a/Assets/HoloToolkit/Input/Scripts/InputEventData/XboxControllerEventData.cs +++ b/Assets/HoloToolkit/Input/Scripts/InputEventData/XboxControllerEventData.cs @@ -5,8 +5,10 @@ namespace HoloToolkit.Unity.InputModule { - public class XboxControllerEventData : GamePadEventData + public class XboxControllerEventData : SourceStateEventData { + public string GamePadName { get; private set; } + public float XboxLeftStickHorizontalAxis { get; private set; } public float XboxLeftStickVerticalAxis { get; private set; } public float XboxRightStickHorizontalAxis { get; private set; } @@ -56,6 +58,8 @@ public void Initialize(IInputSource inputSource, uint sourceId, XboxControllerDa { BaseInitialize(inputSource, sourceId, tag); + GamePadName = inputData.GamePadName; + XboxLeftStickHorizontalAxis = inputData.XboxLeftStickHorizontalAxis; XboxLeftStickVerticalAxis = inputData.XboxLeftStickVerticalAxis; XboxRightStickHorizontalAxis = inputData.XboxRightStickHorizontalAxis; diff --git a/Assets/HoloToolkit/Input/Scripts/InputHandlers/IGamePadHandler.cs b/Assets/HoloToolkit/Input/Scripts/InputHandlers/IGamePadHandler.cs index 6560384c251..2753fad4259 100644 --- a/Assets/HoloToolkit/Input/Scripts/InputHandlers/IGamePadHandler.cs +++ b/Assets/HoloToolkit/Input/Scripts/InputHandlers/IGamePadHandler.cs @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. +using System; using UnityEngine.EventSystems; namespace HoloToolkit.Unity.InputModule { + [Obsolete("Use ISourceStateHandler")] public interface IGamePadHandler : IEventSystemHandler { void OnGamePadDetected(GamePadEventData eventData); diff --git a/Assets/HoloToolkit/Input/Scripts/InputHandlers/ISourceStateHandler.cs b/Assets/HoloToolkit/Input/Scripts/InputHandlers/ISourceStateHandler.cs index 33be00e2351..468c1969843 100644 --- a/Assets/HoloToolkit/Input/Scripts/InputHandlers/ISourceStateHandler.cs +++ b/Assets/HoloToolkit/Input/Scripts/InputHandlers/ISourceStateHandler.cs @@ -13,4 +13,4 @@ public interface ISourceStateHandler : IEventSystemHandler void OnSourceDetected(SourceStateEventData eventData); void OnSourceLost(SourceStateEventData eventData); } -} \ No newline at end of file +} diff --git a/Assets/HoloToolkit/Input/Scripts/InputHandlers/IXboxControllerHandler.cs b/Assets/HoloToolkit/Input/Scripts/InputHandlers/IXboxControllerHandler.cs index 040ca16115d..6e5c68ec051 100644 --- a/Assets/HoloToolkit/Input/Scripts/InputHandlers/IXboxControllerHandler.cs +++ b/Assets/HoloToolkit/Input/Scripts/InputHandlers/IXboxControllerHandler.cs @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. +using UnityEngine.EventSystems; + namespace HoloToolkit.Unity.InputModule { - public interface IXboxControllerHandler : IGamePadHandler + public interface IXboxControllerHandler : IEventSystemHandler { - void OnXboxAxisUpdate(XboxControllerEventData eventData); + void OnXboxInputUpdate(XboxControllerEventData eventData); } } diff --git a/Assets/HoloToolkit/Input/Scripts/InputSources/GamePadInputSource.cs b/Assets/HoloToolkit/Input/Scripts/InputSources/GamePadInputSource.cs index 8ace308887a..ac35800cade 100644 --- a/Assets/HoloToolkit/Input/Scripts/InputSources/GamePadInputSource.cs +++ b/Assets/HoloToolkit/Input/Scripts/InputSources/GamePadInputSource.cs @@ -2,27 +2,62 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. using UnityEngine; +using UnityEngine.EventSystems; namespace HoloToolkit.Unity.InputModule { public class GamePadInputSource : BaseInputSource { + protected const string XboxController = "Xbox Controller"; + protected const string XboxOneForWindows = "Xbox One For Windows"; + protected const string XboxBluetoothGamePad = "Xbox Bluetooth Gamepad"; + protected const string XboxWirelessController = "Xbox Wireless Controller"; + protected const string MotionControllerLeft = "Spatial Controller - Left"; + protected const string MotionControllerRight = "Spatial Controller - Right"; + + protected uint SourceId; + [SerializeField] [Tooltip("Time in seconds to determine if an Input Device has been connected or disconnected")] protected float DeviceRefreshInterval = 3.0f; - protected float DeviceRefreshTimer; protected int LastDeviceUpdateCount; protected string[] LastDeviceList; + protected StandaloneInputModule InputModule; + protected const string DefaultHorizontalAxis = "Horizontal"; + protected const string DefaultVerticalAxis = "Vertical"; + protected const string DefaultSubmitButton = "Submit"; + protected const string DefaultCancelButton = "Cancel"; + protected const bool DefaultForceActiveState = false; + + protected string PreviousHorizontalAxis; + protected string PreviousVerticalAxis; + protected string PreviousSubmitButton; + protected string PreviousCancelButton; + protected bool PreviousForceActiveState; + + private float deviceRefreshTimer; + #region Unity methods + protected virtual void Awake() + { + InputModule = FindObjectOfType(); + + if (InputModule == null) + { + Debug.LogError("Missing the Standalone Input Module for GamePad Input Source!\n" + + "Ensure you have an Event System in your scene."); + } + } + protected virtual void Update() { - DeviceRefreshTimer += Time.unscaledDeltaTime; + deviceRefreshTimer += Time.unscaledDeltaTime; - if (DeviceRefreshTimer >= DeviceRefreshInterval) + if (deviceRefreshTimer >= DeviceRefreshInterval) { - DeviceRefreshTimer = 0.0f; + deviceRefreshTimer = 0.0f; RefreshDevices(); } } @@ -35,7 +70,6 @@ protected virtual void RefreshDevices() if (joystickNames.Length <= 0) { return; } - for (var i = 0; i < joystickNames.Length; i++) { Debug.LogWarningFormat("Joystick \"{0}\" has not been setup with the input manager. Create a new class that inherits from \"GamePadInputSource\" and implement it.", joystickNames[i]); diff --git a/Assets/HoloToolkit/Input/Scripts/InputSources/GamepadInput.cs b/Assets/HoloToolkit/Input/Scripts/InputSources/GamepadInput.cs index 63473033e86..9bd5d9a1e26 100644 --- a/Assets/HoloToolkit/Input/Scripts/InputSources/GamepadInput.cs +++ b/Assets/HoloToolkit/Input/Scripts/InputSources/GamepadInput.cs @@ -15,12 +15,12 @@ namespace HoloToolkit.Unity.InputModule { /// - /// GamepadInput class maps Xbox gamepad buttons to the GestureRecognizer. + /// GamepadInput class maps Xbox GamePad buttons to the GestureRecognizer. /// Gamepad button A press and release maps to tap gesture. /// Gamepad button A pressed maps to hold started, completed, canceled gesture. /// Gamepad button A pressed plus left joystick rotate maps to navigation gesture. /// - [Obsolete("Please use GamePadInputSource or XboxControllerInputSource")] + [Obsolete("Please use XboxControllerHandlerBase")] public class GamepadInput : BaseInputSource { [Tooltip("Game pad button to press for air tap.")] @@ -48,7 +48,7 @@ public class GamepadInput : BaseInputSource private InputManager inputManager; - enum GestureState + private enum GestureState { APressed, NavigationStarted, @@ -58,7 +58,7 @@ enum GestureState HoldCanceled } - GestureState currentGestureState; + private GestureState currentGestureState; protected virtual void Start() { @@ -137,9 +137,7 @@ private void HandleNavigation() if (displacementAlongX != 0.0f || displacementAlongY != 0.0f || navigationStarted) { - Vector3 normalizedOffset = new Vector3(displacementAlongX, - displacementAlongY, - 0.0f); + Vector3 normalizedOffset = new Vector3(displacementAlongX, displacementAlongY, 0.0f); if (!navigationStarted) { diff --git a/Assets/HoloToolkit/Input/Scripts/InputSources/IInputSource.cs b/Assets/HoloToolkit/Input/Scripts/InputSources/IInputSource.cs index 53468842ac9..f21b93239f2 100644 --- a/Assets/HoloToolkit/Input/Scripts/InputSources/IInputSource.cs +++ b/Assets/HoloToolkit/Input/Scripts/InputSources/IInputSource.cs @@ -12,7 +12,7 @@ namespace HoloToolkit.Unity.InputModule public interface IInputSource { /// - /// Returns the input info that that the input source can provide. + /// Returns the input info that the input source can provide. /// SupportedInputInfo GetSupportedInputInfo(uint sourceId); diff --git a/Assets/HoloToolkit/Input/Scripts/InputSources/InputSourceInfo.cs b/Assets/HoloToolkit/Input/Scripts/InputSources/InputSourceInfo.cs index 13f8a4988dd..757c8a08a58 100644 --- a/Assets/HoloToolkit/Input/Scripts/InputSources/InputSourceInfo.cs +++ b/Assets/HoloToolkit/Input/Scripts/InputSources/InputSourceInfo.cs @@ -12,8 +12,7 @@ public struct InputSourceInfo : IInputSourceInfoProvider public IInputSource InputSource; public uint SourceId; - public InputSourceInfo(IInputSource inputSource, uint sourceId) : - this() + public InputSourceInfo(IInputSource inputSource, uint sourceId) : this() { InputSource = inputSource; SourceId = sourceId; diff --git a/Assets/HoloToolkit/Input/Scripts/InputSources/InteractionInputSource.cs b/Assets/HoloToolkit/Input/Scripts/InputSources/InteractionInputSource.cs index bae1890633b..1a9d2a8d400 100644 --- a/Assets/HoloToolkit/Input/Scripts/InputSources/InteractionInputSource.cs +++ b/Assets/HoloToolkit/Input/Scripts/InputSources/InteractionInputSource.cs @@ -282,18 +282,13 @@ protected virtual void OnDisable() InteractionManager.SourceReleased -= InteractionManager_InteractionSourceReleased; InteractionManager.SourceLost -= InteractionManager_InteractionSourceLost; #endif + InteractionSourceState[] states = InteractionManager.GetCurrentReading(); for (var i = 0; i < states.Length; i++) - { - GetOrAddSourceData(states[i].source); - InputManager.Instance.RaiseSourceLost(this, states[i].source.id); - } - - foreach (InteractionSourceState iss in InteractionManager.GetCurrentReading()) { // NOTE: We don't care whether the source ID previously existed or not, so we blindly call Remove: - sourceIdToData.Remove(iss.source.id); - InputManager.Instance.RaiseSourceLost(this, iss.source.id); + sourceIdToData.Remove(states[i].source.id); + InputManager.Instance.RaiseSourceLost(this, states[i].source.id); } #endif } @@ -379,6 +374,7 @@ public void StopGestureRecognizer() { GestureRecognizer.StopCapturingGestures(); } + if (NavigationGestureRecognizer != null && NavigationGestureRecognizer.IsCapturingGestures()) { NavigationGestureRecognizer.StopCapturingGestures(); @@ -730,6 +726,7 @@ private void UpdateSourceData(InteractionSourceState interactionSourceState, Sou { sourceData.PositionUpdated = !(sourceData.PointerPosition.CurrentReading.Equals(newPointerPosition) && sourceData.GripPosition.CurrentReading.Equals(newGripPosition)); } + sourceData.PointerPosition.CurrentReading = newPointerPosition; sourceData.GripPosition.CurrentReading = newGripPosition; diff --git a/Assets/HoloToolkit/Input/Scripts/InputSources/XboxControllerInputSource.cs b/Assets/HoloToolkit/Input/Scripts/InputSources/XboxControllerInputSource.cs index c7b44d143d6..62d5b8fa6c2 100644 --- a/Assets/HoloToolkit/Input/Scripts/InputSources/XboxControllerInputSource.cs +++ b/Assets/HoloToolkit/Input/Scripts/InputSources/XboxControllerInputSource.cs @@ -4,14 +4,13 @@ using System; using System.Collections.Generic; using UnityEngine; -using UnityEngine.EventSystems; namespace HoloToolkit.Unity.InputModule { /// /// Xbox Controller support. /// Only supports one connected device at a time. - /// Make sure to enable the capability before using. + /// Make sure to enable the capability before using when targeting HoloLens device. /// public class XboxControllerInputSource : GamePadInputSource { @@ -22,21 +21,9 @@ private class MappingEntry public string Value = string.Empty; } - private const string XboxController = "Xbox Controller"; - private const string XboxOneForWindows = "Xbox One For Windows"; - private const string XboxBluetoothGamePad = "Xbox Bluetooth Gamepad"; - private const string XboxWirelessController = "Xbox Wireless Controller"; - private readonly Dictionary gamePadInputDatas = new Dictionary(0); - private uint sourceId; private XboxControllerData controllerData; - private StandaloneInputModule inputModule; - private string previousHorizontalAxis; - private string previousVerticalAxis; - private string previousSubmitButton; - private string previousCancelButton; - private bool previousForceActiveState; public XboxControllerMappingTypes HorizontalAxis { get { return horizontalAxis; } } public XboxControllerMappingTypes VerticalAxis { get { return verticalAxis; } } @@ -50,51 +37,33 @@ private class MappingEntry private XboxControllerMappingTypes verticalAxis = XboxControllerMappingTypes.XboxDpadVertical; [SerializeField] - private XboxControllerMappingTypes submitButton = XboxControllerMappingTypes.None; + private XboxControllerMappingTypes submitButton = XboxControllerMappingTypes.XboxA; [SerializeField] - private XboxControllerMappingTypes cancelButton = XboxControllerMappingTypes.None; + private XboxControllerMappingTypes cancelButton = XboxControllerMappingTypes.XboxB; [SerializeField] private MappingEntry[] mapping; - protected virtual void Awake() - { - inputModule = FindObjectOfType(); - - if (inputModule == null) - { - Debug.LogError("Missing Standalone Input Module for Xbox Controller Source!\n" + - "Ensure you have an Event System in your scene."); - return; - } + private int motionControllerCount = 0; - for (var i = 0; i < Enum.GetNames(typeof(XboxControllerMappingTypes)).Length; i++) - { - XboxControllerMapping.SetMapping((XboxControllerMappingTypes)i, mapping[i].Value); - } - - previousForceActiveState = inputModule.forceModuleActive; - - if (horizontalAxis != XboxControllerMappingTypes.None) - { - previousHorizontalAxis = inputModule.horizontalAxis; - } - - if (verticalAxis != XboxControllerMappingTypes.None) - { - previousVerticalAxis = inputModule.verticalAxis; - } + protected override void Awake() + { + base.Awake(); - if (submitButton != XboxControllerMappingTypes.None) + if (mapping != null) { - previousSubmitButton = inputModule.submitButton; + for (var i = 0; i < Enum.GetNames(typeof(XboxControllerMappingTypes)).Length; i++) + { + XboxControllerMapping.SetMapping((XboxControllerMappingTypes)i, mapping[i].Value); + } } - if (cancelButton != XboxControllerMappingTypes.None) - { - previousCancelButton = inputModule.cancelButton; - } + PreviousForceActiveState = InputModule.forceModuleActive; + PreviousHorizontalAxis = InputModule.horizontalAxis; + PreviousVerticalAxis = InputModule.verticalAxis; + PreviousSubmitButton = InputModule.submitButton; + PreviousCancelButton = InputModule.cancelButton; } protected override void Update() @@ -102,7 +71,8 @@ protected override void Update() base.Update(); // We will only register the first device we find. Input is taken from joystick 1. - if (gamePadInputDatas.Count != 1) { return; } + // If we have motion controllers connected we will not process Xbox controller input. + if (gamePadInputDatas.Count != 1 || motionControllerCount > 0) { return; } controllerData.XboxLeftStickHorizontalAxis = Input.GetAxis(XboxControllerMapping.XboxLeftStickHorizontal); controllerData.XboxLeftStickVerticalAxis = Input.GetAxis(XboxControllerMapping.XboxLeftStickVertical); @@ -147,7 +117,7 @@ protected override void Update() controllerData.XboxLeftStick_Up = Input.GetButtonUp(XboxControllerMapping.XboxLeftStickClick); controllerData.XboxRightStick_Up = Input.GetButtonUp(XboxControllerMapping.XboxRightStickClick); - InputManager.Instance.RaiseXboxInputUpdate(this, sourceId, controllerData); + InputManager.Instance.RaiseXboxInputUpdate(this, SourceId, controllerData); } protected override void RefreshDevices() @@ -177,22 +147,34 @@ protected override void RefreshDevices() { foreach (var gamePadInputSource in gamePadInputDatas) { - // Reset our input module to it's previous state. - inputModule.forceModuleActive = previousForceActiveState; - inputModule.verticalAxis = previousVerticalAxis; - inputModule.horizontalAxis = previousHorizontalAxis; - inputModule.submitButton = previousSubmitButton; - inputModule.cancelButton = previousCancelButton; - - InputManager.Instance.RaiseGamePadLost(this, gamePadInputSource.Key, LastDeviceList[gamePadInputSource.Key]); + InputManager.Instance.RaiseSourceLost(this, gamePadInputSource.Key); } gamePadInputDatas.Clear(); + + if (gamePadInputDatas.Count == 0) + { + // Reset our input module to it's previous state. + InputModule.forceModuleActive = PreviousForceActiveState; + InputModule.verticalAxis = PreviousVerticalAxis; + InputModule.horizontalAxis = PreviousHorizontalAxis; + InputModule.submitButton = PreviousSubmitButton; + InputModule.cancelButton = PreviousCancelButton; + } } + motionControllerCount = 0; + for (var i = 0; i < joystickNames.Length; i++) { - if (string.IsNullOrEmpty(joystickNames[i]) || gamePadInputDatas.ContainsKey((uint)i)) { continue; } + if (joystickNames[i].Contains(MotionControllerLeft) || + joystickNames[i].Contains(MotionControllerRight)) + { + // If we don't have any matching joystick types, continue. + // If we have motion controllers connected we override the xbox input. + motionControllerCount++; + continue; + } if (joystickNames[i].Contains(XboxController) || joystickNames[i].Contains(XboxOneForWindows) || @@ -202,22 +184,34 @@ protected override void RefreshDevices() // We will only register the first device we find. Input is taken from all joysticks. if (gamePadInputDatas.Count != 0) { return; } - sourceId = (uint)i; - controllerData = new XboxControllerData(); - gamePadInputDatas.Add(sourceId, controllerData); + SourceId = (uint)i; + controllerData = new XboxControllerData { GamePadName = joystickNames[i] }; + gamePadInputDatas.Add(SourceId, controllerData); + + InputManager.Instance.RaiseSourceDetected(this, SourceId); // Setup the Input Module to use our custom axis settings. - inputModule.forceModuleActive = true; - inputModule.verticalAxis = XboxControllerMapping.GetMapping(verticalAxis); - inputModule.horizontalAxis = XboxControllerMapping.GetMapping(horizontalAxis); - inputModule.submitButton = XboxControllerMapping.GetMapping(submitButton); - inputModule.cancelButton = XboxControllerMapping.GetMapping(cancelButton); + InputModule.forceModuleActive = true; - InputManager.Instance.RaiseGamePadDetected(this, sourceId, joystickNames[i]); - } - else - { - Debug.LogWarning("Unimplemented Controller type Detected: " + joystickNames[i]); + if (verticalAxis != XboxControllerMappingTypes.None) + { + InputModule.verticalAxis = XboxControllerMapping.GetMapping(verticalAxis); + } + + if (horizontalAxis != XboxControllerMappingTypes.None) + { + InputModule.horizontalAxis = XboxControllerMapping.GetMapping(horizontalAxis); + } + + if (submitButton != XboxControllerMappingTypes.None) + { + InputModule.submitButton = XboxControllerMapping.GetMapping(submitButton); + } + + if (cancelButton != XboxControllerMappingTypes.None) + { + InputModule.cancelButton = XboxControllerMapping.GetMapping(cancelButton); + } } } diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/AttachToController.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/AttachToController.cs index 30afddb1cce..092c95a9f92 100644 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/AttachToController.cs +++ b/Assets/HoloToolkit/Input/Scripts/Utilities/AttachToController.cs @@ -2,10 +2,8 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. using UnityEngine; -#if UNITY_2017_2_OR_NEWER +#if UNITY_WSA && UNITY_2017_2_OR_NEWER using UnityEngine.XR.WSA.Input; -#else -using UnityEngine.VR.WSA.Input; #endif namespace HoloToolkit.Unity.InputModule @@ -15,14 +13,16 @@ namespace HoloToolkit.Unity.InputModule /// public class AttachToController : MonoBehaviour { +#if UNITY_WSA && UNITY_2017_2_OR_NEWER public InteractionSourceHandedness Handedness { get { return handedness; } } - public MotionControllerInfo.ControllerElementEnum Element { get { return element; } } - [Header("AttachToController Elements")] [SerializeField] protected InteractionSourceHandedness handedness = InteractionSourceHandedness.Left; +#endif + public MotionControllerInfo.ControllerElementEnum Element { get { return element; } } + [SerializeField] protected MotionControllerInfo.ControllerElementEnum element = MotionControllerInfo.ControllerElementEnum.PointingPose; @@ -50,6 +50,7 @@ public class AttachToController : MonoBehaviour protected virtual void OnAttachToController() { } protected virtual void OnDetachFromController() { } + protected virtual void OnEnable() { SetChildrenActive(false); @@ -60,7 +61,7 @@ protected virtual void OnEnable() { AttachElementToController(controller); } -#endif +#endif MotionControllerVisualizer.Instance.OnControllerModelLoaded += AttachElementToController; MotionControllerVisualizer.Instance.OnControllerModelUnloaded += DetachElementFromController; @@ -86,8 +87,11 @@ protected virtual void OnDestroy() private void AttachElementToController(MotionControllerInfo newController) { +#if UNITY_WSA && UNITY_2017_2_OR_NEWER + // Check handedness if (!IsAttached && newController.Handedness == handedness) { + // Get specific element of the controller if (!newController.TryGetElement(element, out elementTransform)) { Debug.LogError("Unable to find element of type " + element + " under controller " + newController.ControllerParent.name + "; not attaching."); @@ -112,10 +116,12 @@ private void AttachElementToController(MotionControllerInfo newController) IsAttached = true; } +#endif } private void DetachElementFromController(MotionControllerInfo oldController) { +#if UNITY_WSA && UNITY_2017_2_OR_NEWER if (IsAttached && oldController.Handedness == handedness) { OnDetachFromController(); @@ -127,6 +133,7 @@ private void DetachElementFromController(MotionControllerInfo oldController) IsAttached = false; } +#endif } private void SetChildrenActive(bool isActive) diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/AxisController.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/AxisController.cs index bf6437d633d..e75f1e4e6d1 100644 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/AxisController.cs +++ b/Assets/HoloToolkit/Input/Scripts/Utilities/AxisController.cs @@ -268,12 +268,12 @@ private void OnStartMouseLook() { if (this.buttonType <= ButtonController.ButtonType.Middle) { - // if mousebutton is either left, right or middle + // if mouse button is either left, right or middle SetWantsMouseJumping(true); } else if (this.buttonType <= ButtonController.ButtonType.Focused) { - // if mousebutton is either control, shift or focused + // if mouse button is either control, shift or focused UnityEngine.Cursor.lockState = CursorLockMode.Locked; UnityEngine.Cursor.visible = false; } @@ -285,12 +285,12 @@ private void OnEndMouseLook() { if (this.buttonType <= ButtonController.ButtonType.Middle) { - // if mousebutton is either left, right or middle + // if mouse button is either left, right or middle SetWantsMouseJumping(false); } else if (this.buttonType <= ButtonController.ButtonType.Focused) { - // if mousebutton is either control, shift or focused + // if mouse button is either control, shift or focused UnityEngine.Cursor.lockState = CursorLockMode.None; UnityEngine.Cursor.visible = true; } @@ -505,7 +505,7 @@ private void OnApplicationFocus(bool focusStatus) /// It means that the cursor will be invisible when it is outside of the /// Unity game view window, and visible when it breaches the outer edges. /// - /// Wheter the mouse cursor should be visible over the game window. + /// Whether the mouse cursor should be visible over the game window. private void SetWantsMouseJumping(bool wantsJumping) { if (wantsJumping != this.isMouseJumping) diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/TapToPlace.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/TapToPlace.cs index 01094c6c8b5..a1bf10a48a3 100644 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/TapToPlace.cs +++ b/Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/TapToPlace.cs @@ -92,7 +92,7 @@ private GameObject GetParentToPlace() } /// - /// Ensures an interpolator on either the parent or on the gameobject itself and returns it. + /// Ensures an interpolator on either the parent or on the GameObject itself and returns it. /// private Interpolator EnsureInterpolator() { @@ -200,7 +200,7 @@ private void ToggleSpatialMesh() /// /// If we're using the spatial mapping, check to see if we got a hit, else use the gaze position. /// - /// Placement position infront of the user + /// Placement position in front of the user private static Vector3 GetPlacementPosition(Vector3 headPosition, Vector3 gazeDirection, float defaultGazeDistance) { RaycastHit hitInfo; @@ -216,8 +216,8 @@ private static Vector3 GetPlacementPosition(Vector3 headPosition, Vector3 gazeDi /// /// Origin of the raycast /// Direction of the raycast - /// Result of the raycast when a hit occured - /// Wheter it found a hit or not + /// Result of the raycast when a hit occurred + /// Whether it found a hit or not private static bool SpatialMappingRaycast(Vector3 origin, Vector3 direction, out RaycastHit spatialMapHit) { if (SpatialMappingManager.Instance != null) @@ -234,12 +234,12 @@ private static bool SpatialMappingRaycast(Vector3 origin, Vector3 direction, out } /// - /// Get placement position either from GazeManager hit or infront of the user as backup + /// Get placement position either from GazeManager hit or in front of the user as backup /// /// Position of the users head /// Gaze direction of the user - /// Default placement distance infront of the user - /// Placement position infront of the user + /// Default placement distance in front of the user + /// Placement position in front of the user private static Vector3 GetGazePlacementPosition(Vector3 headPosition, Vector3 gazeDirection, float defaultGazeDistance) { if (GazeManager.Instance.HitObject != null) diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/TriggerButton.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/TriggerButton.cs index d74db506533..1a61b1ac800 100644 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/TriggerButton.cs +++ b/Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/TriggerButton.cs @@ -20,7 +20,7 @@ public class TriggerButton : MonoBehaviour, IInputHandler public event Action ButtonPressed; /// - /// Press the button programatically. + /// Press the button programmatically. /// public void Press() { diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/InputManager.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/InputManager.cs index bee92285c2f..70889473067 100644 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/InputManager.cs +++ b/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/InputManager.cs @@ -43,7 +43,6 @@ public class InputManager : Singleton private ManipulationEventData manipulationEventData; private HoldEventData holdEventData; private NavigationEventData navigationEventData; - private GamePadEventData gamePadEventData; private XboxControllerEventData xboxControllerEventData; private SourceRotationEventData sourceRotationEventData; private SourcePositionEventData sourcePositionEventData; @@ -56,9 +55,13 @@ public class InputManager : Singleton #endif /// - /// List of the input sources as detected by the input manager like hands or motion controllers. + /// List of the Interaction Input Sources as detected by the input manager like hands or motion controllers. + /// + private static readonly List detectedInputSources = new List(0); + + /// + /// List of the Interaction Input Sources as detected by the input manager like hands or motion controllers. /// - private readonly List detectedInputSources = new List(0); public List DetectedInputSources { get { return detectedInputSources; } } /// @@ -207,7 +210,6 @@ private void InitializeEventDatas() selectPressedEventData = new SelectPressedEventData(EventSystem.current); sourceRotationEventData = new SourceRotationEventData(EventSystem.current); sourcePositionEventData = new SourcePositionEventData(EventSystem.current); - gamePadEventData = new GamePadEventData(EventSystem.current); xboxControllerEventData = new XboxControllerEventData(EventSystem.current); #if UNITY_WSA || UNITY_STANDALONE_WIN speechEventData = new SpeechEventData(EventSystem.current); @@ -488,22 +490,7 @@ public void RaiseSourceDown(IInputSource source, uint sourceId, InteractionSourc public void RaiseSourceDetected(IInputSource source, uint sourceId, object[] tags = null) { - // Manage list of detected sources - bool alreadyDetected = false; - - for (int iDetected = 0; iDetected < detectedInputSources.Count; iDetected++) - { - if (detectedInputSources[iDetected].Matches(source, sourceId)) - { - alreadyDetected = true; - break; - } - } - - if (!alreadyDetected) - { - detectedInputSources.Add(new InputSourceInfo(source, sourceId)); - } + AddSource(source, sourceId); // Create input event sourceStateEventData.Initialize(source, sourceId, tags); @@ -521,15 +508,7 @@ public void RaiseSourceDetected(IInputSource source, uint sourceId, object[] tag public void RaiseSourceLost(IInputSource source, uint sourceId, object[] tags = null) { - // Manage list of detected sources - for (int iDetected = 0; iDetected < detectedInputSources.Count; iDetected++) - { - if (detectedInputSources[iDetected].Matches(source, sourceId)) - { - detectedInputSources.RemoveAt(iDetected); - break; - } - } + RemoveSource(source, sourceId); // Create input event sourceStateEventData.Initialize(source, sourceId, tags); @@ -828,47 +807,23 @@ public void RaiseSourceRotationChanged(IInputSource source, uint sourceId, Quate #endregion // Controller Events - #region GamePad Events - - private static readonly ExecuteEvents.EventFunction OnGamePadDetectedEventHandler = - delegate (IGamePadHandler handler, BaseEventData eventData) - { - var casted = ExecuteEvents.ValidateEventData(eventData); - handler.OnGamePadDetected(casted); - }; - + [Obsolete("Use RaiseSourceDetected")] public void RaiseGamePadDetected(IInputSource source, uint sourceId, string gamePadName) { - // Create input event - gamePadEventData.Initialize(source, sourceId, gamePadName); - - // Pass handler through HandleEvent to perform modal/fallback logic - HandleEvent(gamePadEventData, OnGamePadDetectedEventHandler); } - private static readonly ExecuteEvents.EventFunction OnGamePadLostEventHandler = - delegate (IGamePadHandler handler, BaseEventData eventData) - { - var casted = ExecuteEvents.ValidateEventData(eventData); - handler.OnGamePadLost(casted); - }; - + [Obsolete("Use RaiseSourceLost")] public void RaiseGamePadLost(IInputSource source, uint sourceId, string gamePadName) { - // Create input event - gamePadEventData.Initialize(source, sourceId, gamePadName); - - // Pass handler through HandleEvent to perform modal/fallback logic - HandleEvent(gamePadEventData, OnGamePadLostEventHandler); } #region Xbox Controller Events - private static readonly ExecuteEvents.EventFunction OnXboxAxisUpdateHandler = + private static readonly ExecuteEvents.EventFunction OnXboxInputUpdateHandler = delegate (IXboxControllerHandler handler, BaseEventData eventData) { var casted = ExecuteEvents.ValidateEventData(eventData); - handler.OnXboxAxisUpdate(casted); + handler.OnXboxInputUpdate(casted); }; public void RaiseXboxInputUpdate(IInputSource source, uint sourceId, XboxControllerData inputData) @@ -877,13 +832,11 @@ public void RaiseXboxInputUpdate(IInputSource source, uint sourceId, XboxControl xboxControllerEventData.Initialize(source, sourceId, inputData); // Pass handler through HandleEvent to perform modal/fallback logic - HandleEvent(xboxControllerEventData, OnXboxAxisUpdateHandler); + HandleEvent(xboxControllerEventData, OnXboxInputUpdateHandler); } #endregion // Xbox Controller Events - #endregion // GamePad Events - #if UNITY_WSA || UNITY_STANDALONE_WIN #region Speech Events @@ -973,5 +926,40 @@ public void RaiseDictationError(IInputSource source, uint sourceId, string dicta #endregion // Dictation Events #endif + + #region Helpers + + private static void AddSource(IInputSource source, uint sourceId) + { + bool alreadyDetected = false; + + for (int i = 0; i < detectedInputSources.Count; i++) + { + if (detectedInputSources[i].Matches(source, sourceId)) + { + alreadyDetected = true; + break; + } + } + + if (!alreadyDetected) + { + detectedInputSources.Add(new InputSourceInfo(source, sourceId)); + } + } + + private static void RemoveSource(IInputSource source, uint sourceId) + { + for (int iDetected = 0; iDetected < detectedInputSources.Count; iDetected++) + { + if (detectedInputSources[iDetected].Matches(source, sourceId)) + { + detectedInputSources.RemoveAt(iDetected); + break; + } + } + } + + #endregion } } diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/MixedRealityCameraManager.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/MixedRealityCameraManager.cs index 365a4b02c8b..b6f779215aa 100644 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/MixedRealityCameraManager.cs +++ b/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/MixedRealityCameraManager.cs @@ -3,12 +3,8 @@ using UnityEngine; -#if UNITY_WSA -#if UNITY_2017_2_OR_NEWER +#if UNITY_WSA && UNITY_2017_2_OR_NEWER using UnityEngine.XR.WSA; -#else -using UnityEngine.VR.WSA; -#endif #endif namespace HoloToolkit.Unity.InputModule @@ -62,29 +58,29 @@ public enum DisplayType private void Start() { - if (!Application.isEditor) - { + CurrentDisplayType = DisplayType.Opaque; + #if UNITY_WSA #if UNITY_2017_2_OR_NEWER if (!HolographicSettings.IsDisplayOpaque) #endif - { - CurrentDisplayType = DisplayType.Transparent; - ApplySettingsForTransparentDisplay(); - if (OnDisplayDetected != null) - { - OnDisplayDetected(DisplayType.Transparent); - } - return; - } + { + CurrentDisplayType = DisplayType.Transparent; + } #endif + + if (CurrentDisplayType == DisplayType.Opaque) + { + ApplySettingsForOpaqueDisplay(); + } + else + { + ApplySettingsForTransparentDisplay(); } - CurrentDisplayType = DisplayType.Opaque; - ApplySettingsForOpaqueDisplay(); if (OnDisplayDetected != null) { - OnDisplayDetected(DisplayType.Opaque); + OnDisplayDetected(CurrentDisplayType); } } diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/MixedRealityTeleport.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/MixedRealityTeleport.cs index 7a9c4139e8c..98d35d71ad5 100644 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/MixedRealityTeleport.cs +++ b/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/MixedRealityTeleport.cs @@ -27,16 +27,28 @@ namespace HoloToolkit.Unity.InputModule public class MixedRealityTeleport : Singleton, IControllerInputHandler { [Tooltip("Name of the thumbstick axis to check for teleport and strafe.")] - public string LeftThumbstickX = "CONTROLLER_LEFT_STICK_HORIZONTAL"; + public XboxControllerMappingTypes HorizontalStrafe = XboxControllerMappingTypes.XboxLeftStickHorizontal; - [Tooltip("Name of the thumbstick axis to check for teleport and strafe.")] - public string LeftThumbstickY = "CONTROLLER_LEFT_STICK_VERTICAL"; + [Tooltip("Name of the thumbstick axis to check for movement forwards and backwards.")] + public XboxControllerMappingTypes ForwardMovement = XboxControllerMappingTypes.XboxLeftStickVertical; [Tooltip("Name of the thumbstick axis to check for rotation.")] - public string RightThumbstickX = "CONTROLLER_RIGHT_STICK_HORIZONTAL"; + public XboxControllerMappingTypes HorizontalRotation = XboxControllerMappingTypes.XboxRightStickHorizontal; [Tooltip("Name of the thumbstick axis to check for rotation.")] - public string RightThumbstickY = "CONTROLLER_RIGHT_STICK_VERTICAL"; + public XboxControllerMappingTypes VerticalRotation = XboxControllerMappingTypes.XboxRightStickVertical; + + [Tooltip("Custom Input Mapping for horizontal teleport and strafe")] + public string LeftThumbstickX = InputMappingAxisUtility.CONTROLLER_LEFT_STICK_HORIZONTAL; + + [Tooltip("Name of the thumbstick axis to check for movement forwards and backwards.")] + public string LeftThumbstickY = InputMappingAxisUtility.CONTROLLER_LEFT_STICK_VERTICAL; + + [Tooltip("Custom Input Mapping for horizontal rotation")] + public string RightThumbstickX = InputMappingAxisUtility.CONTROLLER_RIGHT_STICK_HORIZONTAL; + + [Tooltip("Custom Input Mapping for vertical rotation")] + public string RightThumbstickY = InputMappingAxisUtility.CONTROLLER_RIGHT_STICK_VERTICAL; public bool EnableTeleport = true; public bool EnableRotation = true; @@ -49,11 +61,14 @@ public class MixedRealityTeleport : Singleton, IController private GameObject teleportMarker; private Animator animationController; + [SerializeField] + private bool useCustomMapping; + /// /// The fade control allows us to fade out and fade in the scene. /// This is done to improve comfort when using an immersive display. /// - private FadeScript fadeControl; + private FadeManager fadeControl; private bool isTeleportValid; private IPointingSource currentPointingSource; @@ -61,8 +76,12 @@ public class MixedRealityTeleport : Singleton, IController private void Start() { - fadeControl = FadeScript.Instance; + FadeManager.AssertIsInitialized(); + + fadeControl = FadeManager.Instance; + // If our FadeManager is missing, or if we're on the HoloLens + // Remove this component. #if UNITY_2017_2_OR_NEWER if (!XRDevice.isPresent || #if UNITY_WSA @@ -73,11 +92,6 @@ private void Start() if (VRDevice.isPresent || fadeControl == null) #endif { - if (fadeControl == null) - { - Debug.LogError("The MixedRealityTeleport script on " + name + " requires a FadeScript object."); - } - Destroy(this); return; } @@ -114,8 +128,8 @@ private void HandleGamepad() { if (EnableTeleport && !fadeControl.Busy) { - float leftX = Input.GetAxis(LeftThumbstickX); - float leftY = Input.GetAxis(LeftThumbstickY); + float leftX = Input.GetAxis(useCustomMapping ? LeftThumbstickX : XboxControllerMapping.GetMapping(HorizontalStrafe)); + float leftY = Input.GetAxis(useCustomMapping ? LeftThumbstickY : XboxControllerMapping.GetMapping(ForwardMovement)); if (currentPointingSource == null && leftY > 0.8 && Math.Abs(leftX) < 0.3) { @@ -132,8 +146,8 @@ private void HandleGamepad() if (EnableStrafe && currentPointingSource == null && !fadeControl.Busy) { - float leftX = Input.GetAxis(LeftThumbstickX); - float leftY = Input.GetAxis(LeftThumbstickY); + float leftX = Input.GetAxis(useCustomMapping ? LeftThumbstickX : XboxControllerMapping.GetMapping(HorizontalStrafe)); + float leftY = Input.GetAxis(useCustomMapping ? LeftThumbstickY : XboxControllerMapping.GetMapping(ForwardMovement)); if (leftX < -0.8 && Math.Abs(leftY) < 0.3) { @@ -151,8 +165,8 @@ private void HandleGamepad() if (EnableRotation && currentPointingSource == null && !fadeControl.Busy) { - float rightX = Input.GetAxis(RightThumbstickX); - float rightY = Input.GetAxis(RightThumbstickY); + float rightX = Input.GetAxis(useCustomMapping ? RightThumbstickX : XboxControllerMapping.GetMapping(HorizontalRotation)); + float rightY = Input.GetAxis(useCustomMapping ? RightThumbstickY : XboxControllerMapping.GetMapping(VerticalRotation)); if (rightX < -0.8 && Math.Abs(rightY) < 0.3) { @@ -316,4 +330,4 @@ private void PositionMarker() animationController.speed = isTeleportValid ? 1 : 0; } } -} \ No newline at end of file +} diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/MicrophoneHelper.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/MicrophoneHelper.cs new file mode 100644 index 00000000000..1c7942b0064 --- /dev/null +++ b/Assets/HoloToolkit/Input/Scripts/Utilities/MicrophoneHelper.cs @@ -0,0 +1,157 @@ + +//********************************************************* +// +// Copyright (c) Microsoft. All rights reserved. +// +// Licensed under the MIT License. See LICENSE in the project root for license information. +// +// This sample code is a modified version of an official UWP sample which can be found on: +// https://github.com/Microsoft/Windows-universal-samples/blob/master/Samples/SpeechRecognitionAndSynthesis/cs/AudioCapturePermissions.cs +// +//********************************************************* + +#if ENABLE_WINMD_SUPPORT +using System; +using System.Threading.Tasks; +using Windows.Media.Capture; +#endif + +namespace HoloToolkit.Unity +{ + public enum MicrophoneStatus + { + MicrophoneReady, + MicrophoneUseNotAuthorized, + MicrophoneNotPresent, + MicrophoneMuted, + MicrophoneUseFailed, + MediaComponentsMissing, + } + + /// + /// Provides a working status information of the default microphone on the system. + /// Class is using UWP APIs. Everything UWP related is wrapped around ENABLE_WINMD_SUPPORT + /// preprocessor definition. The definition is enabled in Unity in the following 2 cases: + /// - IL2CPP backend and .NET 4.6 + /// - .NET backend and Net Core compilation override + /// For full details see unity documentation page + /// https://docs.unity3d.com/Manual/IL2CPP-WindowsRuntimeSupport.html + /// + public class MicrophoneHelper + { +#if ENABLE_WINMD_SUPPORT + + /// + /// Error code returned if there is no audio device in the system + /// + /// + /// If no recording device is attached, attempting to get access to audio capture devices will throw + /// a System.Exception object, with HResult = ‭0xC00DABE0‬ set. + /// + private static int NoCaptureDevicesHResult = -1072845856; + + /// + /// On desktop/tablet systems, users are prompted to give permission to use capture devices on a + /// per-app basis. Along with declaring the microphone DeviceCapability in the package manifest, + /// this method tests the privacy setting for microphone access for this application. + /// Note that this only checks the Settings->Privacy->Microphone setting, it does not handle + /// the Cortana/Dictation privacy check, however (Under Settings->Privacy->Speech, Inking and Typing). + /// + /// Developers should ideally perform a check like this every time their app gains focus, in order to + /// check if the user has changed the setting while the app was suspended or not in focus. + /// + /// + /// Returns a MicrophoneStatus value indicating the specific issue if microphone cannot be used. + /// If everything went well return value is MicrophoneStatus.MicrophoneReady + /// + public async static Task GetMicrophoneStatus() + { + // Request access to the microphone only, to limit the number of capabilities we need + // to request in the package manifest. + MediaCaptureInitializationSettings settings = new MediaCaptureInitializationSettings(); + settings.StreamingCaptureMode = StreamingCaptureMode.Audio; + settings.MediaCategory = MediaCategory.Speech; + MediaCapture capture = new MediaCapture(); + try + { + // If this is the first time we run the app, this will show the + // microphone permissions dialog, where the user is asked if they + // allow the app to use the microphone. If the dialog is dismissed, or not + // accepted, the app will not ask for permissions again. The user will need + // to go to Settings->Privacy->Microphone Settings to allow the app to + // use the microphone + await capture.InitializeAsync(settings); + } + catch (TypeLoadException) + { + // On SKUs without media player (eg, the N SKUs), we may not have access to the Windows.Media.Capture + // namespace unless the media player pack is installed. + return MicrophoneStatus.MediaComponentsMissing; + } + catch (UnauthorizedAccessException) + { + // The user has turned off access to the microphone. If this occurs, we should show an error, or disable + // functionality within the app to ensure that further exceptions aren't generated when + // recognition is attempted. + return MicrophoneStatus.MicrophoneUseNotAuthorized; + } + catch (Exception exception) + { + // In mixed reality this would be the case when your HMD uses headset jack, your host machine does not have connected microphone + // (i.e. desktop with no integrated mic, nothing plugged into mic/headset jack or you disabled all recording endpoints) + // If the HMD has built in microphones, they would be disabled when HMD is not worn and will be enabled when you put the device on. + if (exception.HResult == NoCaptureDevicesHResult) + { + return MicrophoneStatus.MicrophoneNotPresent; + } + else + { + return MicrophoneStatus.MicrophoneUseFailed; + } + } + + // if microphone is muted, speech recognition will not hear anything. + // return appropriate value to indicate that. + if(capture.AudioDeviceController.Muted) + { + return MicrophoneStatus.MicrophoneMuted; + } + + return MicrophoneStatus.MicrophoneReady; + } + + /// + /// This function provides an easier query when one is only interested to know if the microphone + /// can be used or not, without dealing with the specifics of why it may not be working + /// + /// + /// Returns true if the microphone is accessible and ready for use. + /// + public static async Task IsMicrophoneReady() + { + var status = await GetMicrophoneStatus(); + return status == MicrophoneStatus.MicrophoneReady; + } +#else + /// + /// Stub function imitating the original GetMicrophoneStatus + /// + /// + /// Always returns microphone ready. + /// + public static MicrophoneStatus GetMicrophoneStatus() + { + return MicrophoneStatus.MicrophoneReady; + } + + /// + /// Stub function imitating the original IsMicrophoneReady + /// + public static bool IsMicrophoneReady() + { + var status = GetMicrophoneStatus(); + return status == MicrophoneStatus.MicrophoneReady; + } +#endif + } +} diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/MicrophoneHelper.cs.meta b/Assets/HoloToolkit/Input/Scripts/Utilities/MicrophoneHelper.cs.meta new file mode 100644 index 00000000000..fa06d23eb53 --- /dev/null +++ b/Assets/HoloToolkit/Input/Scripts/Utilities/MicrophoneHelper.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: c9ac0991c94b1ab4881803bce4d496de +timeCreated: 1510250600 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/MotionControllerInfo.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/MotionControllerInfo.cs index 37ca7411744..e700e4a7a72 100644 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/MotionControllerInfo.cs +++ b/Assets/HoloToolkit/Input/Scripts/Utilities/MotionControllerInfo.cs @@ -17,7 +17,10 @@ namespace HoloToolkit.Unity.InputModule public class MotionControllerInfo { public readonly GameObject ControllerParent; + +#if UNITY_2017_2_OR_NEWER public readonly InteractionSourceHandedness Handedness; +#endif private GameObject home; private Transform homePressed; @@ -63,10 +66,16 @@ public class MotionControllerInfo private Vector2 lastTouchpadPosition; private double lastSelectPressedAmount; - public MotionControllerInfo(GameObject controllerParent, InteractionSourceHandedness handedness) + public MotionControllerInfo(GameObject controllerParent +#if UNITY_2017_2_OR_NEWER + , InteractionSourceHandedness handedness +#endif + ) { ControllerParent = controllerParent; +#if UNITY_2017_2_OR_NEWER Handedness = handedness; +#endif } public enum ControllerElementEnum diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/MotionControllerVisualizer.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/MotionControllerVisualizer.cs index 90378473240..26ecde40eb0 100644 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/MotionControllerVisualizer.cs +++ b/Assets/HoloToolkit/Input/Scripts/Utilities/MotionControllerVisualizer.cs @@ -32,9 +32,9 @@ public class MotionControllerVisualizer : Singleton [Tooltip("This setting will be used to determine if the model, override or otherwise, should attempt to be animated based on the user's input.")] public bool AnimateControllerModel = true; - [Tooltip("This setting will be used to determine if the model should always be the left alternate. If false, the platform controller models will be prefered, only if they can't be loaded will the alternate be used. Otherwise, it will always use the alternate model.")] + [Tooltip("This setting will be used to determine if the model should always be the left alternate. If false, the platform controller models will be preferred, only if they can't be loaded will the alternate be used. Otherwise, it will always use the alternate model.")] public bool AlwaysUseAlternateLeftModel = false; - [Tooltip("This setting will be used to determine if the model should always be the right alternate. If false, the platform controller models will be prefered, only if they can't be loaded will the alternate be used. Otherwise, it will always use the alternate model.")] + [Tooltip("This setting will be used to determine if the model should always be the right alternate. If false, the platform controller models will be preferred, only if they can't be loaded will the alternate be used. Otherwise, it will always use the alternate model.")] public bool AlwaysUseAlternateRightModel = false; [Tooltip("Use a model with the tip in the positive Z direction and the front face in the positive Y direction. To override the platform left controller model set AlwaysUseAlternateModel to true; otherwise this will be the default if the model can't be found.")] @@ -157,13 +157,13 @@ private void UpdateControllerState() } Vector3 newPosition; - if (sourceState.sourcePose.TryGetPosition(out newPosition, InteractionSourceNode.Grip)) + if (sourceState.sourcePose.TryGetPosition(out newPosition, InteractionSourceNode.Grip) && ValidPosition(newPosition)) { currentController.ControllerParent.transform.localPosition = newPosition; } Quaternion newRotation; - if (sourceState.sourcePose.TryGetRotation(out newRotation, InteractionSourceNode.Grip)) + if (sourceState.sourcePose.TryGetRotation(out newRotation, InteractionSourceNode.Grip) && ValidRotation(newRotation)) { currentController.ControllerParent.transform.localRotation = newRotation; } @@ -171,7 +171,17 @@ private void UpdateControllerState() } #endif } + private bool ValidRotation(Quaternion newRotation) + { + return !float.IsNaN(newRotation.x) && !float.IsNaN(newRotation.y) && !float.IsNaN(newRotation.z) && !float.IsNaN(newRotation.w) && + !float.IsInfinity(newRotation.x) && !float.IsInfinity(newRotation.y) && !float.IsInfinity(newRotation.z) && !float.IsInfinity(newRotation.w); + } + private bool ValidPosition(Vector3 newPosition) + { + return !float.IsNaN(newPosition.x) && !float.IsNaN(newPosition.y) && !float.IsNaN(newPosition.z) && + !float.IsInfinity(newPosition.x) && !float.IsInfinity(newPosition.y) && !float.IsInfinity(newPosition.z); + } #if UNITY_WSA && UNITY_2017_2_OR_NEWER private void InteractionManager_InteractionSourceDetected(InteractionSourceDetectedEventArgs obj) { diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/SetGlobalListener.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/SetGlobalListener.cs index 8092bd94e12..8023e10541c 100644 --- a/Assets/HoloToolkit/Input/Scripts/Utilities/SetGlobalListener.cs +++ b/Assets/HoloToolkit/Input/Scripts/Utilities/SetGlobalListener.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. -using System.Collections; using UnityEngine; namespace HoloToolkit.Unity.InputModule @@ -23,13 +22,5 @@ private void OnDisable() InputManager.Instance.RemoveGlobalListener(gameObject); } } - - private void OnDestroy() - { - if (InputManager.Instance != null) - { - InputManager.Instance.RemoveGlobalListener(gameObject); - } - } } } diff --git a/Assets/HoloToolkit/Sharing/Scripts/SessionUsersTracker.cs b/Assets/HoloToolkit/Sharing/Scripts/SessionUsersTracker.cs index 70a25cbc0ed..fd7b333ad50 100644 --- a/Assets/HoloToolkit/Sharing/Scripts/SessionUsersTracker.cs +++ b/Assets/HoloToolkit/Sharing/Scripts/SessionUsersTracker.cs @@ -154,7 +154,7 @@ private void OnUserLeftSession(Session session, User user) /// /// Clears the current session, removing any users being tracked. /// This should be called whenever the current session changes, to reset this class - /// and handle a new curren session. + /// and handle a new current session. /// private void ClearCurrentSession() { diff --git a/Assets/HoloToolkit/Sharing/Scripts/Spawning/PrefabSpawnManager.cs b/Assets/HoloToolkit/Sharing/Scripts/Spawning/PrefabSpawnManager.cs index e7ef64e7046..10de5b12abb 100644 --- a/Assets/HoloToolkit/Sharing/Scripts/Spawning/PrefabSpawnManager.cs +++ b/Assets/HoloToolkit/Sharing/Scripts/Spawning/PrefabSpawnManager.cs @@ -225,7 +225,7 @@ protected virtual GameObject CreatePrefabInstance(SyncSpawnedObject dataModel, G dataModel.GameObject = instance; - // Set the data model on the various ISyncModelAccessor components of the spawned game obejct + // Set the data model on the various ISyncModelAccessor components of the spawned GameObject ISyncModelAccessor[] syncModelAccessors = instance.GetComponentsInChildren(true); if (syncModelAccessors.Length <= 0) { diff --git a/Assets/HoloToolkit/Sharing/Scripts/Unity/DefaultSyncModelAccessor.cs b/Assets/HoloToolkit/Sharing/Scripts/Unity/DefaultSyncModelAccessor.cs index 534a2292b47..3efddbf820f 100644 --- a/Assets/HoloToolkit/Sharing/Scripts/Unity/DefaultSyncModelAccessor.cs +++ b/Assets/HoloToolkit/Sharing/Scripts/Unity/DefaultSyncModelAccessor.cs @@ -9,7 +9,7 @@ namespace HoloToolkit.Sharing { /// - /// Default implementation of a behaviour that allows other components of a game object access the shared data model + /// Default implementation of a MonoBehaviour that allows other components of a game object access the shared data model /// as a raw SyncObject instance. /// public class DefaultSyncModelAccessor : MonoBehaviour, ISyncModelAccessor diff --git a/Assets/HoloToolkit/Sharing/Scripts/Utilities/ManualIpConfiguration.cs b/Assets/HoloToolkit/Sharing/Scripts/Utilities/ManualIpConfiguration.cs index f1479da8d0d..88a4eba7de4 100644 --- a/Assets/HoloToolkit/Sharing/Scripts/Utilities/ManualIpConfiguration.cs +++ b/Assets/HoloToolkit/Sharing/Scripts/Utilities/ManualIpConfiguration.cs @@ -6,7 +6,7 @@ namespace HoloToolkit.Sharing.Utilities { /// - /// Utility for connecting to Sharing Service by Ip Address from inside application at runtime. + /// Utility for connecting to Sharing Service by IP Address from inside application at runtime. /// public class ManualIpConfiguration : MonoBehaviour { diff --git a/Assets/HoloToolkit/Sharing/Scripts/Utilities/SharingWorldAnchorManager.cs b/Assets/HoloToolkit/Sharing/Scripts/Utilities/SharingWorldAnchorManager.cs index 9ea17c31549..58d3cc41e58 100644 --- a/Assets/HoloToolkit/Sharing/Scripts/Utilities/SharingWorldAnchorManager.cs +++ b/Assets/HoloToolkit/Sharing/Scripts/Utilities/SharingWorldAnchorManager.cs @@ -22,7 +22,7 @@ namespace HoloToolkit.Sharing { /// - /// Wrapper around world anchor store to streamline some of the persistence api busy work. + /// Wrapper around world anchor store to streamline some of the persistence API busy work. /// public class SharingWorldAnchorManager : WorldAnchorManager { diff --git a/Assets/HoloToolkit/SharingWithUNET/Scripts/GenericNetworkTransmitter.cs b/Assets/HoloToolkit/SharingWithUNET/Scripts/GenericNetworkTransmitter.cs index 3053d590204..62b3199d78d 100644 --- a/Assets/HoloToolkit/SharingWithUNET/Scripts/GenericNetworkTransmitter.cs +++ b/Assets/HoloToolkit/SharingWithUNET/Scripts/GenericNetworkTransmitter.cs @@ -214,7 +214,7 @@ private async void RcvNetworkConnectedHandler(IAsyncAction asyncInfo, AsyncStatu int dataSize = networkDataReader.ReadInt32(); if (dataSize < 0) { - Debug.Log("Super bad super big datasize"); + Debug.Log("Super bad super big data size"); } // Need to allocate a new buffer with the dataSize. diff --git a/Assets/HoloToolkit/SharingWithUNET/Scripts/NetworkDiscoveryWithAnchors.cs b/Assets/HoloToolkit/SharingWithUNET/Scripts/NetworkDiscoveryWithAnchors.cs index 3d41d288d88..cf242462fdc 100644 --- a/Assets/HoloToolkit/SharingWithUNET/Scripts/NetworkDiscoveryWithAnchors.cs +++ b/Assets/HoloToolkit/SharingWithUNET/Scripts/NetworkDiscoveryWithAnchors.cs @@ -96,7 +96,7 @@ public bool Connected public string ServerIp { get; private set; } /// - /// Keeps track of the local Ip address. + /// Keeps track of the local IP address. /// public string LocalIp { get; set; } @@ -266,7 +266,7 @@ public void StartListening() } /// - /// Call to join a sessoin + /// Call to join a session /// /// Information about the session to join public void JoinSession(SessionInfo session) diff --git a/Assets/HoloToolkit/SharingWithUNET/Scripts/PlayerController.cs b/Assets/HoloToolkit/SharingWithUNET/Scripts/PlayerController.cs index 01f639e62cc..da200997a37 100644 --- a/Assets/HoloToolkit/SharingWithUNET/Scripts/PlayerController.cs +++ b/Assets/HoloToolkit/SharingWithUNET/Scripts/PlayerController.cs @@ -144,7 +144,7 @@ void PlayerNameChanged(string update) #pragma warning restore 0414 /// - /// Called to set the Ip address + /// Called to set the IP address /// /// [Command] @@ -154,7 +154,7 @@ private void CmdSetPlayerIp(string playerIp) } /// - /// Called when the player Ip address changes + /// Called when the player IP address changes /// /// The updated IP address void PlayerIpChanged(string update) @@ -204,7 +204,7 @@ private void Start() { if (SharedCollection.Instance == null) { - Debug.LogError("This script required a SharedCollection script attached to a gameobject in the scene"); + Debug.LogError("This script required a SharedCollection script attached to a GameObject in the scene"); Destroy(this); return; } @@ -212,7 +212,7 @@ private void Start() if (isLocalPlayer) { // If we are the local player then we want to have airtaps - // sent to this object so that projeciles can be spawned. + // sent to this object so that projectiles can be spawned. InputManager.Instance.AddGlobalListener(gameObject); InitializeLocalPlayer(); } @@ -275,7 +275,7 @@ private void InitializeLocalPlayer() { Debug.Log("Setting instance for local player "); _Instance = this; - Debug.LogFormat("Set local player name {0} ip {1}", networkDiscovery.broadcastData, networkDiscovery.LocalIp); + Debug.LogFormat("Set local player name {0} IP {1}", networkDiscovery.broadcastData, networkDiscovery.LocalIp); CmdSetPlayerName(networkDiscovery.broadcastData); CmdSetPlayerIp(networkDiscovery.LocalIp); #if UNITY_WSA diff --git a/Assets/HoloToolkit/SharingWithUNET/Scripts/UNetAnchorManager.cs b/Assets/HoloToolkit/SharingWithUNET/Scripts/UNetAnchorManager.cs index e732b6c54d8..1ffb609216d 100644 --- a/Assets/HoloToolkit/SharingWithUNET/Scripts/UNetAnchorManager.cs +++ b/Assets/HoloToolkit/SharingWithUNET/Scripts/UNetAnchorManager.cs @@ -382,7 +382,7 @@ private void FindAnchorPosition() } /// - /// Createx and exports the anchor at the specified world position + /// Creates and exports the anchor at the specified world position /// /// The position to place the anchor private void ExportAnchorAtPosition(Vector3 worldPos) @@ -394,7 +394,7 @@ private void ExportAnchorAtPosition(Vector3 worldPos) DestroyImmediate(worldAnchor); } - // Move the object to the specifid place + // Move the object to the specified place objectToAnchor.transform.position = worldPos; // Attach a new anchor diff --git a/Assets/HoloToolkit/SharingWithUNET/UI/Scripts/SessionListButton.cs b/Assets/HoloToolkit/SharingWithUNET/UI/Scripts/SessionListButton.cs index 62e05105fcf..a400c50efd4 100644 --- a/Assets/HoloToolkit/SharingWithUNET/UI/Scripts/SessionListButton.cs +++ b/Assets/HoloToolkit/SharingWithUNET/UI/Scripts/SessionListButton.cs @@ -6,7 +6,7 @@ namespace HoloToolkit.Unity.SharingWithUNET { /// - /// Represents a button on a list of sessions. Tapping the button indicates the selected sessoin + /// Represents a button on a list of sessions. Tapping the button indicates the selected session /// public class SessionListButton : MonoBehaviour, IInputClickHandler { @@ -88,8 +88,8 @@ public void SetSessionInfo(NetworkDiscoveryWithAnchors.SessionInfo sessionInfo) } /// - /// When the user clicks a session this will route that infromation to the - /// scrolling ui control so it knows which session is selected. + /// When the user clicks a session this will route that information to the + /// scrolling UI control so it knows which session is selected. /// /// Information about the click. public void OnInputClicked(InputClickedEventData eventData) diff --git a/Assets/HoloToolkit/SpatialMapping/Scripts/RemoteMapping/SimpleMeshSerializer.cs b/Assets/HoloToolkit/SpatialMapping/Scripts/RemoteMapping/SimpleMeshSerializer.cs index 76136e5e414..adff109d569 100644 --- a/Assets/HoloToolkit/SpatialMapping/Scripts/RemoteMapping/SimpleMeshSerializer.cs +++ b/Assets/HoloToolkit/SpatialMapping/Scripts/RemoteMapping/SimpleMeshSerializer.cs @@ -52,10 +52,12 @@ public static byte[] Serialize(IEnumerable meshes) /// /// Serializes a list of MeshFilter objects into a byte array. /// Transforms vertices into world space before writing to the file. + /// Optionally transforms the vertices into the space of the supplied secondarySpace /// /// List of MeshFilter objects to be serialized. + /// New space to transform the vertices into. /// Binary representation of the Mesh objects. - public static byte[] Serialize(IEnumerable meshes) + public static byte[] Serialize(IEnumerable meshes, Transform secondarySpace = null) { byte[] data = null; @@ -65,7 +67,7 @@ public static byte[] Serialize(IEnumerable meshes) { foreach (MeshFilter meshFilter in meshes) { - WriteMesh(writer, meshFilter.sharedMesh, meshFilter.transform); + WriteMesh(writer, meshFilter.sharedMesh, meshFilter.transform, secondarySpace); } stream.Position = 0; @@ -106,13 +108,14 @@ public static IEnumerable Deserialize(byte[] data) /// BinaryWriter representing the data stream. /// The Mesh object to be written. /// If provided, will transform all vertices into world space before writing. - private static void WriteMesh(BinaryWriter writer, Mesh mesh, Transform transform = null) + /// Secondary space to transform the vertices into. + private static void WriteMesh(BinaryWriter writer, Mesh mesh, Transform transform = null, Transform secondarySpace = null) { SysDiag.Debug.Assert(writer != null); // Write the mesh data. WriteMeshHeader(writer, mesh.vertexCount, mesh.triangles.Length); - WriteVertices(writer, mesh.vertices, transform); + WriteVertices(writer, mesh.vertices, transform, secondarySpace); WriteTriangleIndicies(writer, mesh.triangles); } @@ -178,7 +181,8 @@ private static void ReadMeshHeader(BinaryReader reader, out int vertexCount, out /// BinaryReader representing the data stream. /// Array of Vector3 structures representing each vertex. /// If provided, will convert all vertices into world space before writing. - private static void WriteVertices(BinaryWriter writer, Vector3[] vertices, Transform transform = null) + /// If provided, will convert the vertices local to this space. + private static void WriteVertices(BinaryWriter writer, Vector3[] vertices, Transform transform = null, Transform secondarySpace = null) { SysDiag.Debug.Assert(writer != null); @@ -187,6 +191,10 @@ private static void WriteVertices(BinaryWriter writer, Vector3[] vertices, Trans for (int v = 0, vLength = vertices.Length; v < vLength; ++v) { Vector3 vertex = transform.TransformPoint(vertices[v]); + if (secondarySpace != null) + { + vertex = secondarySpace.InverseTransformPoint(vertex); + } writer.Write(vertex.x); writer.Write(vertex.y); writer.Write(vertex.z); diff --git a/Assets/HoloToolkit/SpatialMapping/Scripts/SpatialMappingObserver.cs b/Assets/HoloToolkit/SpatialMapping/Scripts/SpatialMappingObserver.cs index 8fca32db599..c67293293de 100644 --- a/Assets/HoloToolkit/SpatialMapping/Scripts/SpatialMappingObserver.cs +++ b/Assets/HoloToolkit/SpatialMapping/Scripts/SpatialMappingObserver.cs @@ -164,7 +164,7 @@ public Vector3 Origin } /// - /// The direction of the observed volume, if an oriented box is choosen. + /// The direction of the observed volume, if an oriented box is chosen. /// [SerializeField] [Tooltip("The direction of the observation volume.")] diff --git a/Assets/HoloToolkit/SpatialMapping/Shaders/SpatialMappingTap.shader b/Assets/HoloToolkit/SpatialMapping/Shaders/SpatialMappingTap.shader index aa49e9e42a6..2391d277cfe 100644 --- a/Assets/HoloToolkit/SpatialMapping/Shaders/SpatialMappingTap.shader +++ b/Assets/HoloToolkit/SpatialMapping/Shaders/SpatialMappingTap.shader @@ -1,4 +1,4 @@ -Shader "Spatial Mapping/Spatial Mappping Tap" +Shader "Spatial Mapping/Spatial Mapping Tap" { Properties { @@ -54,11 +54,14 @@ Shader "Spatial Mapping/Spatial Mappping Tap" { half4 viewPos : SV_POSITION; half pulse : COLOR; + UNITY_VERTEX_INPUT_INSTANCE_ID }; v2g vert(appdata_base v) { v2g o; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); o.viewPos = UnityObjectToClipPos(v.vertex); @@ -76,6 +79,8 @@ Shader "Spatial Mapping/Spatial Mappping Tap" float4 viewPos : SV_POSITION; half3 bary : COLOR; half pulse : COLOR1; + UNITY_VERTEX_INPUT_INSTANCE_ID + UNITY_VERTEX_OUTPUT_STEREO }; [maxvertexcount(3)] @@ -93,6 +98,9 @@ Shader "Spatial Mapping/Spatial Mappping Tap" [unroll] for (uint idx = 0; idx < 3; ++idx) { + UNITY_SETUP_INSTANCE_ID(i[idx]); + UNITY_TRANSFER_INSTANCE_ID(i[idx], o); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); o.viewPos = i[idx].viewPos; o.bary = barys[idx]; o.pulse = i[idx].pulse; @@ -102,6 +110,8 @@ Shader "Spatial Mapping/Spatial Mappping Tap" half4 frag(g2f i) : COLOR { + UNITY_SETUP_INSTANCE_ID(i); + half3 result = i.pulse * _PulseColor; if (!_UseWireframe) diff --git a/Assets/HoloToolkit/SpatialSound/Scripts/AudioEmitter.cs b/Assets/HoloToolkit/SpatialSound/Scripts/AudioEmitter.cs index 711ebb50a3e..c828ad11924 100644 --- a/Assets/HoloToolkit/SpatialSound/Scripts/AudioEmitter.cs +++ b/Assets/HoloToolkit/SpatialSound/Scripts/AudioEmitter.cs @@ -55,7 +55,7 @@ private void Awake() audioSource = gameObject.GetComponent(); initialAudioSourceVolume = audioSource.volume; - // Pre-allocate the array that will be used to collect RaycastHit structures. + // Preallocate the array that will be used to collect RaycastHit structures. hits = new RaycastHit[MaxObjects]; } diff --git a/Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/Editor/AudioEventPropertyDrawer.cs b/Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/Editor/AudioEventPropertyDrawer.cs index 12838811d8a..8793cc73859 100644 --- a/Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/Editor/AudioEventPropertyDrawer.cs +++ b/Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/Editor/AudioEventPropertyDrawer.cs @@ -15,7 +15,7 @@ namespace HoloToolkit.Unity public class AudioEventPropertyDrawer : PropertyDrawer { /// - /// Stored list of event names as GUIContent for dispaly + /// Stored list of event names as GUIContent for display /// private static GUIContent[] AudioEventNames; diff --git a/Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/SpatialSoundSettings.cs b/Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/SpatialSoundSettings.cs index 9c00814c017..808053707c4 100644 --- a/Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/SpatialSoundSettings.cs +++ b/Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/SpatialSoundSettings.cs @@ -59,7 +59,7 @@ public static void SetRoomSize(AudioSource audioSource, SpatialSoundRoomSizes ro /// /// The AudioSource on which the minimum gain will be set. /// The desired minimum gain, in decibels. - [Obsolete("This spatializer paramerter is no longer used, volume attenuation is controlled by the unity volume curve.")] + [Obsolete("This spatializer parameter is no longer used, volume attenuation is controlled by the unity volume curve.")] public static void SetMinGain(AudioSource audioSource, float gain) { } @@ -69,7 +69,7 @@ public static void SetMinGain(AudioSource audioSource, float gain) /// /// The AudioSource on which the maximum gain will be set. /// The desired maximum gain, in decibels. - [Obsolete("This spatializer paramerter is no longer used, volume attenuation is controlled by the unity volume curve.")] + [Obsolete("This spatializer parameter is no longer used, volume attenuation is controlled by the unity volume curve.")] public static void SetMaxGain(AudioSource audioSource, float gain) { } @@ -79,7 +79,7 @@ public static void SetMaxGain(AudioSource audioSource, float gain) /// /// The AudioSource on which the unity gain distance will be set. /// The distance, in meters, at which the AudioSource gain will be 0 decibels. - [Obsolete("This spatializer paramerter is no longer used, volume attenuation is controlled by the unity volume curve.")] + [Obsolete("This spatializer parameter is no longer used, volume attenuation is controlled by the unity volume curve.")] public static void SetUnityGainDistance(AudioSource audioSource, float distance) { } diff --git a/Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/UAudioManager.cs b/Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/UAudioManager.cs index 6978b5d9d64..373ff4beac8 100644 --- a/Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/UAudioManager.cs +++ b/Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/UAudioManager.cs @@ -244,7 +244,7 @@ public void StopEvent(string eventName, GameObject emitter = null, float fadeOut emitter = ApplyAudioEmitterTransform(emitter); if (emitter == null) { - //if emitter is null, use the uaudiomanager gameobject(2dsound) + //if emitter is null, use the uaudiomanager GameObject (2dsound) emitter = gameObject; } diff --git a/Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/UAudioManagerBase.cs b/Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/UAudioManagerBase.cs index 5bb97b52987..6827ee1adfd 100644 --- a/Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/UAudioManagerBase.cs +++ b/Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/UAudioManagerBase.cs @@ -626,7 +626,7 @@ protected IEnumerator StopEventWithFadeCoroutine(ActiveEvent activeEvent, float /// The coroutine. private IEnumerator RecordEventInstanceCoroutine(ActiveEvent activeEvent) { - // Unity has no callback for an audioclip ending, so we have to estimate it ahead of time. + // Unity has no callback for an AudioClip ending, so we have to estimate it ahead of time. // Changing the pitch during playback will alter actual playback time. ActiveEvents.Add(activeEvent); diff --git a/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstanding.cs b/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstanding.cs index f0208631110..858913e7e23 100644 --- a/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstanding.cs +++ b/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstanding.cs @@ -49,7 +49,7 @@ public bool AllowSpatialUnderstanding } /// - /// Reference to the SpatialUnderstandingDLL class (wraps the understanding dll functions). + /// Reference to the SpatialUnderstandingDLL class (wraps the understanding DLL functions). /// public SpatialUnderstandingDll UnderstandingDLL { get; private set; } /// @@ -82,7 +82,7 @@ private set } } /// - /// Indicates the the scanning statistics are still being processed. + /// Indicates the scanning statistics are still being processed. /// Request finish should not be called when this is true. /// public bool ScanStatsReportStillWorking diff --git a/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingCustomMesh.cs b/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingCustomMesh.cs index ccc23850df7..efa7fee34ed 100644 --- a/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingCustomMesh.cs +++ b/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingCustomMesh.cs @@ -18,18 +18,18 @@ namespace HoloToolkit.Unity { /// - /// Handles the custom meshes generated by the understanding dll. The meshes + /// Handles the custom meshes generated by the understanding DLL. The meshes /// are generated during the scanning phase and once more on scan finalization. /// The meshes can be used to visualize the scanning progress. /// public class SpatialUnderstandingCustomMesh : SpatialMappingSource { // Config - [Tooltip("Indicate the time in seconds between mesh imports, during the scanning phase. A value of zero will disable pulling meshes from the dll")] + [Tooltip("Indicate the time in seconds between mesh imports, during the scanning phase. A value of zero will disable pulling meshes from the DLL")] public float ImportMeshPeriod = 1.0f; [SerializeField] - [Tooltip("Material used to render the custom mesh generated by the dll")] + [Tooltip("Material used to render the custom mesh generated by the DLL")] private Material meshMaterial; public Material MeshMaterial @@ -127,7 +127,7 @@ public bool DrawProcessedMesh private class MeshData { /// - /// Lists of verts/triangles that describe the mesh geometry. + /// Lists of vertices/triangles that describe the mesh geometry. /// private readonly List verts = new List(); private readonly List tris = new List(); @@ -269,7 +269,7 @@ private void AddTriangleToSector(Vector3 sector, Vector3 point1, Vector3 point2, } /// - /// Imports the custom mesh from the dll. This a a coroutine which will take multiple frames to complete. + /// Imports the custom mesh from the DLL. This a a coroutine which will take multiple frames to complete. /// /// public IEnumerator Import_UnderstandingMesh() diff --git a/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingDll.cs b/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingDll.cs index 85f45c18db3..151309e1fae 100644 --- a/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingDll.cs +++ b/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingDll.cs @@ -10,8 +10,8 @@ namespace HoloToolkit.Unity { /// - /// Encapsulates the primary dll functions, including marshalling helper functions. - /// The dll functions are organized into four parts - in this behavior, + /// Encapsulates the primary DLL functions, including marshalling helper functions. + /// The DLL functions are organized into four parts - in this behavior, /// SpatialUnderstandingDllTopology, SpatialUnderstandingDllShapes, and /// SpatialUnderstandingDllObjectPlacement. The scan flow, raycast, and alignment /// functions are included in this class. @@ -19,7 +19,7 @@ namespace HoloToolkit.Unity public class SpatialUnderstandingDll { /// - /// Representation of the mesh data to be passed to the understanding dll. + /// Representation of the mesh data to be passed to the understanding DLL. /// Used by SpatialUnderstandingSourceMesh to store local copies of the mesh data. /// public struct MeshData @@ -88,7 +88,7 @@ public IntPtr PinObject(System.Object obj) } /// - /// Pins the string, converting to the format expected by the dll. See PinObject for + /// Pins the string, converting to the format expected by the DLL. See PinObject for /// additional details. /// public IntPtr PinString(string str) @@ -160,7 +160,7 @@ public IntPtr GetStaticRaycastResultPtr() return reusedRaycastResultPtr; } /// - /// Resuable raycast result object. Can be used for inline raycast calls. + /// Reusable raycast result object. Can be used for inline raycast calls. /// /// Raycast result structure public Imports.RaycastResult GetStaticRaycastResult() @@ -169,7 +169,7 @@ public Imports.RaycastResult GetStaticRaycastResult() } /// - /// Resuable playspace statistics pointer. Can be used for inline playspace statistics calls. + /// Reusable playspace statistics pointer. Can be used for inline playspace statistics calls. /// /// playspace statistics pointer public IntPtr GetStaticPlayspaceStatsPtr() @@ -182,7 +182,7 @@ public IntPtr GetStaticPlayspaceStatsPtr() return reusedPlayspaceStatsPtr; } /// - /// Resuable playspace statistics. Can be used for inline playspace statistics calls. + /// Reusable playspace statistics. Can be used for inline playspace statistics calls. /// /// playspace statistics structure public Imports.PlayspaceStats GetStaticPlayspaceStats() @@ -191,7 +191,7 @@ public Imports.PlayspaceStats GetStaticPlayspaceStats() } /// - /// Resuable playspace alignment pointer. Can be used for inline playspace alignment query calls. + /// Reusable playspace alignment pointer. Can be used for inline playspace alignment query calls. /// /// playspace alignment pointer public IntPtr GetStaticPlayspaceAlignmentPtr() @@ -204,7 +204,7 @@ public IntPtr GetStaticPlayspaceAlignmentPtr() return reusedPlayspaceAlignmentPtr; } /// - /// Resuable playspace alignment. Can be used for inline playspace alignment query calls. + /// Reusable playspace alignment. Can be used for inline playspace alignment query calls. /// /// playspace alignment structure public Imports.PlayspaceAlignment GetStaticPlayspaceAlignment() @@ -213,7 +213,7 @@ public Imports.PlayspaceAlignment GetStaticPlayspaceAlignment() } /// - /// Resuable object placement results pointer. Can be used for inline object placement queries. + /// Reusable object placement results pointer. Can be used for inline object placement queries. /// /// Object placement result pointer public IntPtr GetStaticObjectPlacementResultPtr() @@ -226,7 +226,7 @@ public IntPtr GetStaticObjectPlacementResultPtr() return reusedObjectPlacementResultPtr; } /// - /// Resuable object placement results. Can be used for inline object placement queries. + /// Reusable object placement results. Can be used for inline object placement queries. /// /// Object placement result structure public SpatialUnderstandingDllObjectPlacement.ObjectPlacementResult GetStaticObjectPlacementResult() @@ -276,7 +276,7 @@ public T[] MarshalArrayFromIntPtr(IntPtr outArray, int count) public class Imports { /// - /// Mesh input data passed to the dll + /// Mesh input data passed to the DLL /// [StructLayout(LayoutKind.Sequential, Pack = 1)] public struct MeshData @@ -358,14 +358,14 @@ public enum SurfaceTypes // Functions /// - /// Initialize the spatial understanding dll. Function must be called - /// before any other dll function. + /// Initialize the spatial understanding DLL. Function must be called + /// before any other DLL function. /// /// Zero if fails, one if success [DllImport("SpatialUnderstanding")] public static extern int SpatialUnderstanding_Init(); /// - /// Terminate the spatial understanding dll. + /// Terminate the spatial understanding DLL. /// [DllImport("SpatialUnderstanding")] public static extern void SpatialUnderstanding_Term(); @@ -383,7 +383,7 @@ public enum SurfaceTypes /// The user's camera/view unit up vector, y value /// The user's camera/view unit up vector, z value /// Suggested search distance for playspace center - /// Optimal room size. Used to determind the playspace size + /// Optimal room size. Used to determined the playspace size [DllImport("SpatialUnderstanding")] public static extern void GeneratePlayspace_InitScan( [In] float camPos_X, [In] float camPos_Y, [In] float camPos_Z, @@ -438,7 +438,7 @@ public static extern int GeneratePlayspace_ExtractMesh_Setup( [Out] out int indexCount); /// - /// Call to receive the dll's custom generated mesh data. Use GeneratePlayspace_ExtractMesh_Setup to + /// Call to receive the DLL's custom generated mesh data. Use GeneratePlayspace_ExtractMesh_Setup to /// query the minimum size of the vertex positions, normals, and indices. /// /// Size of vericesPos & verticesNormal, in number Vector3 elements in each array @@ -474,7 +474,7 @@ public static extern int QueryPlayspaceAlignment( [In] IntPtr playspaceAlignment); // PlayspaceAlignment /// - /// Perform a raycast against the internal world representation of the understanding dll. + /// Perform a raycast against the internal world representation of the understanding DLL. /// This will not be valid until after scanning is finalized. /// /// Ray origin, x component diff --git a/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingDllObjectPlacement.cs b/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingDllObjectPlacement.cs index 5ba7e15fcf7..eb1f6de26e5 100644 --- a/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingDllObjectPlacement.cs +++ b/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingDllObjectPlacement.cs @@ -10,7 +10,7 @@ namespace HoloToolkit.Unity { /// - /// Encapsulates the object placement queries of the understanding dll. + /// Encapsulates the object placement queries of the understanding DLL. /// These queries will not be valid until after scanning is finalized. /// public static class SpatialUnderstandingDllObjectPlacement @@ -459,11 +459,11 @@ public object Clone() /// locations that satisfy the type and rules are selected /// by optimizing within the constraint list. /// - /// Objects placed with with Solver_PlaceObject persist until removed + /// Objects placed with Solver_PlaceObject persist until removed /// and are considered in subsequent queries by some rules and constraints. /// /// Name of the object placement query - /// The placement defintion, of type ObjectPlacementDefinition + /// The placement definition, of type ObjectPlacementDefinition /// Length of the provided placementRules array /// Array of ObjectPlacementRule structures, defining the rules /// Length of the provided placementConstraints array @@ -483,7 +483,7 @@ public static extern int Solver_PlaceObject( /// /// Removed a solved object. /// - /// Objects placed with with Solver_PlaceObject persist until removed + /// Objects placed with Solver_PlaceObject persist until removed /// and are considered in subsequent queries by some rules and constraints. /// /// @@ -495,7 +495,7 @@ public static extern int Solver_RemoveObject( /// /// Removed all solved object placements. /// - /// Objects placed with with Solver_PlaceObject persist until removed + /// Objects placed with Solver_PlaceObject persist until removed /// and are considered in subsequent queries by some rules and constraints. /// [DllImport("SpatialUnderstanding")] diff --git a/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingDllShapes.cs b/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingDllShapes.cs index 41d56a473d2..bca64088668 100644 --- a/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingDllShapes.cs +++ b/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingDllShapes.cs @@ -10,7 +10,7 @@ namespace HoloToolkit.Unity { /// - /// Encapsulates the shape detection queries of the understanding dll. + /// Encapsulates the shape detection queries of the understanding DLL. /// Shapes are defined by the user with AddShape and the analysis is /// initiated with ActivateShapeAnalysis. These queries will not be /// valid until after scanning is finalized. @@ -743,7 +743,7 @@ public static ShapeConstraint Create_RectanglesAligned(int componentIndexA, int /// /// Constructs a constraint requiring the components shapes longest edges to - /// have the same length, within the difference difference parameter. + /// have the same length, within the difference parameter. /// /// The difference is defined as the ratio of the longest edges of the two components. /// diff --git a/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingDllTopology.cs b/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingDllTopology.cs index 124952c450e..bf874360ec9 100644 --- a/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingDllTopology.cs +++ b/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingDllTopology.cs @@ -10,7 +10,7 @@ namespace HoloToolkit.Unity { /// - /// Encapsulates the topology queries of the understanding dll. + /// Encapsulates the topology queries of the understanding DLL. /// These queries will not be valid until after scanning is finalized. /// public static class SpatialUnderstandingDllTopology diff --git a/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingSourceMesh.cs b/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingSourceMesh.cs index 7fe0ecbc8d0..539bc88d53a 100644 --- a/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingSourceMesh.cs +++ b/Assets/HoloToolkit/SpatialUnderstanding/Scripts/SpatialUnderstandingSourceMesh.cs @@ -9,16 +9,16 @@ namespace HoloToolkit.Unity { /// - /// Provides the input meshes to the spatial understanding dll. + /// Provides the input meshes to the spatial understanding DLL. /// The component relies on the spatial mapping module. It maintains - /// a mesh list in the required dll format which is updated from + /// a mesh list in the required DLL format which is updated from /// the spatial mapping's SurfaceObject list. /// public class SpatialUnderstandingSourceMesh : MonoBehaviour { // Privates /// - /// Internal list of meshes that is passed to the dll. This is + /// Internal list of meshes that is passed to the DLL. This is /// kept up to date with spatial mapping's SurfaceObject list. /// private readonly List inputMeshList = new List(); @@ -143,7 +143,7 @@ private static SpatialUnderstandingDll.MeshData CreateMeshData(SpatialMappingSou /// /// Update the internal mesh list and provides an array pointer in - /// the form the dll will accept. + /// the form the DLL will accept. /// /// Number of meshes contains in the return mesh list /// Marshalled mesh list pointer. Valid only with the caller's function context diff --git a/Assets/HoloToolkit/UX/Resources/Audio.meta b/Assets/HoloToolkit/UX/Audio.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Audio.meta rename to Assets/HoloToolkit/UX/Audio.meta diff --git a/Assets/HoloToolkit/UX/Resources/Audio/Interaction.meta b/Assets/HoloToolkit/UX/Audio/Interaction.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Audio/Interaction.meta rename to Assets/HoloToolkit/UX/Audio/Interaction.meta diff --git a/Assets/HoloToolkit/UX/Resources/Audio/Interaction/Button_Press.wav b/Assets/HoloToolkit/UX/Audio/Interaction/Button_Press.wav similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Audio/Interaction/Button_Press.wav rename to Assets/HoloToolkit/UX/Audio/Interaction/Button_Press.wav diff --git a/Assets/HoloToolkit/UX/Resources/Audio/Interaction/Button_Press.wav.meta b/Assets/HoloToolkit/UX/Audio/Interaction/Button_Press.wav.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Audio/Interaction/Button_Press.wav.meta rename to Assets/HoloToolkit/UX/Audio/Interaction/Button_Press.wav.meta diff --git a/Assets/HoloToolkit/UX/Materials/3DTextSelawik.mat b/Assets/HoloToolkit/UX/Fonts/3DTextSelawik.mat similarity index 100% rename from Assets/HoloToolkit/UX/Materials/3DTextSelawik.mat rename to Assets/HoloToolkit/UX/Fonts/3DTextSelawik.mat diff --git a/Assets/HoloToolkit/UX/Materials/3DTextSelawik.mat.meta b/Assets/HoloToolkit/UX/Fonts/3DTextSelawik.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Materials/3DTextSelawik.mat.meta rename to Assets/HoloToolkit/UX/Fonts/3DTextSelawik.mat.meta diff --git a/Assets/HoloToolkit/UX/Images.meta b/Assets/HoloToolkit/UX/Images.meta deleted file mode 100644 index 3ff7d9f199d..00000000000 --- a/Assets/HoloToolkit/UX/Images.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: ebf9a4ed0c92cc24483bdd4cca5078c2 -folderAsset: yes -timeCreated: 1489016130 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/UX/Materials.meta b/Assets/HoloToolkit/UX/Materials.meta index bdb76a1b6a1..739734cc976 100644 --- a/Assets/HoloToolkit/UX/Materials.meta +++ b/Assets/HoloToolkit/UX/Materials.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: a6c8ebce1b5778243a2cf54e0783964f +guid: 46c41e12ac7033b47a5c7d2d83595fda folderAsset: yes -timeCreated: 1480372955 -licenseType: Free +timeCreated: 1440628853 +licenseType: Pro DefaultImporter: userData: assetBundleName: diff --git a/Assets/HoloToolkit/UX/Resources/Materials/BeamMat.mat b/Assets/HoloToolkit/UX/Materials/BeamMat.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/BeamMat.mat rename to Assets/HoloToolkit/UX/Materials/BeamMat.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/BeamMat.mat.meta b/Assets/HoloToolkit/UX/Materials/BeamMat.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/BeamMat.mat.meta rename to Assets/HoloToolkit/UX/Materials/BeamMat.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/BoundingBoxHandleMaterial.mat b/Assets/HoloToolkit/UX/Materials/BoundingBoxHandleMaterial.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/BoundingBoxHandleMaterial.mat rename to Assets/HoloToolkit/UX/Materials/BoundingBoxHandleMaterial.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/BoundingBoxHandleMaterial.mat.meta b/Assets/HoloToolkit/UX/Materials/BoundingBoxHandleMaterial.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/BoundingBoxHandleMaterial.mat.meta rename to Assets/HoloToolkit/UX/Materials/BoundingBoxHandleMaterial.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/BoundingBoxLines.mat b/Assets/HoloToolkit/UX/Materials/BoundingBoxLines.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/BoundingBoxLines.mat rename to Assets/HoloToolkit/UX/Materials/BoundingBoxLines.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/BoundingBoxLines.mat.meta b/Assets/HoloToolkit/UX/Materials/BoundingBoxLines.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/BoundingBoxLines.mat.meta rename to Assets/HoloToolkit/UX/Materials/BoundingBoxLines.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/ButtonHighlightCircle.mat b/Assets/HoloToolkit/UX/Materials/ButtonHighlightCircle.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/ButtonHighlightCircle.mat rename to Assets/HoloToolkit/UX/Materials/ButtonHighlightCircle.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/ButtonHighlightCircle.mat.meta b/Assets/HoloToolkit/UX/Materials/ButtonHighlightCircle.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/ButtonHighlightCircle.mat.meta rename to Assets/HoloToolkit/UX/Materials/ButtonHighlightCircle.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/ButtonHighlightRectangle.mat b/Assets/HoloToolkit/UX/Materials/ButtonHighlightRectangle.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/ButtonHighlightRectangle.mat rename to Assets/HoloToolkit/UX/Materials/ButtonHighlightRectangle.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/ButtonHighlightRectangle.mat.meta b/Assets/HoloToolkit/UX/Materials/ButtonHighlightRectangle.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/ButtonHighlightRectangle.mat.meta rename to Assets/HoloToolkit/UX/Materials/ButtonHighlightRectangle.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/ButtonHighlightSquare.mat b/Assets/HoloToolkit/UX/Materials/ButtonHighlightSquare.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/ButtonHighlightSquare.mat rename to Assets/HoloToolkit/UX/Materials/ButtonHighlightSquare.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/ButtonHighlightSquare.mat.meta b/Assets/HoloToolkit/UX/Materials/ButtonHighlightSquare.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/ButtonHighlightSquare.mat.meta rename to Assets/HoloToolkit/UX/Materials/ButtonHighlightSquare.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/ButtonIconFontMaterial.mat b/Assets/HoloToolkit/UX/Materials/ButtonIconFontMaterial.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/ButtonIconFontMaterial.mat rename to Assets/HoloToolkit/UX/Materials/ButtonIconFontMaterial.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/ButtonIconFontMaterial.mat.meta b/Assets/HoloToolkit/UX/Materials/ButtonIconFontMaterial.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/ButtonIconFontMaterial.mat.meta rename to Assets/HoloToolkit/UX/Materials/ButtonIconFontMaterial.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/ButtonIconMaterial.mat b/Assets/HoloToolkit/UX/Materials/ButtonIconMaterial.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/ButtonIconMaterial.mat rename to Assets/HoloToolkit/UX/Materials/ButtonIconMaterial.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/ButtonIconMaterial.mat.meta b/Assets/HoloToolkit/UX/Materials/ButtonIconMaterial.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/ButtonIconMaterial.mat.meta rename to Assets/HoloToolkit/UX/Materials/ButtonIconMaterial.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/ButtonMat.mat b/Assets/HoloToolkit/UX/Materials/ButtonMat.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/ButtonMat.mat rename to Assets/HoloToolkit/UX/Materials/ButtonMat.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/ButtonMat.mat.meta b/Assets/HoloToolkit/UX/Materials/ButtonMat.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/ButtonMat.mat.meta rename to Assets/HoloToolkit/UX/Materials/ButtonMat.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/CeilingPlane.mat b/Assets/HoloToolkit/UX/Materials/CeilingPlane.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/CeilingPlane.mat rename to Assets/HoloToolkit/UX/Materials/CeilingPlane.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/CeilingPlane.mat.meta b/Assets/HoloToolkit/UX/Materials/CeilingPlane.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/CeilingPlane.mat.meta rename to Assets/HoloToolkit/UX/Materials/CeilingPlane.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/Cursor.meta b/Assets/HoloToolkit/UX/Materials/Cursor.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/Cursor.meta rename to Assets/HoloToolkit/UX/Materials/Cursor.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/Cursor/CursorColor.mat b/Assets/HoloToolkit/UX/Materials/Cursor/CursorColor.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/Cursor/CursorColor.mat rename to Assets/HoloToolkit/UX/Materials/Cursor/CursorColor.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/Cursor/CursorColor.mat.meta b/Assets/HoloToolkit/UX/Materials/Cursor/CursorColor.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/Cursor/CursorColor.mat.meta rename to Assets/HoloToolkit/UX/Materials/Cursor/CursorColor.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/Cursor/Joystickwhite.mat b/Assets/HoloToolkit/UX/Materials/Cursor/Joystickwhite.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/Cursor/Joystickwhite.mat rename to Assets/HoloToolkit/UX/Materials/Cursor/Joystickwhite.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/Cursor/Joystickwhite.mat.meta b/Assets/HoloToolkit/UX/Materials/Cursor/Joystickwhite.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/Cursor/Joystickwhite.mat.meta rename to Assets/HoloToolkit/UX/Materials/Cursor/Joystickwhite.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/Cursor/circle_shadow.mat b/Assets/HoloToolkit/UX/Materials/Cursor/circle_shadow.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/Cursor/circle_shadow.mat rename to Assets/HoloToolkit/UX/Materials/Cursor/circle_shadow.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/Cursor/circle_shadow.mat.meta b/Assets/HoloToolkit/UX/Materials/Cursor/circle_shadow.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/Cursor/circle_shadow.mat.meta rename to Assets/HoloToolkit/UX/Materials/Cursor/circle_shadow.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/Cursor/hand_press.mat b/Assets/HoloToolkit/UX/Materials/Cursor/hand_press.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/Cursor/hand_press.mat rename to Assets/HoloToolkit/UX/Materials/Cursor/hand_press.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/Cursor/hand_press.mat.meta b/Assets/HoloToolkit/UX/Materials/Cursor/hand_press.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/Cursor/hand_press.mat.meta rename to Assets/HoloToolkit/UX/Materials/Cursor/hand_press.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/Cursor/move_scale_arrow_soft.mat b/Assets/HoloToolkit/UX/Materials/Cursor/move_scale_arrow_soft.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/Cursor/move_scale_arrow_soft.mat rename to Assets/HoloToolkit/UX/Materials/Cursor/move_scale_arrow_soft.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/Cursor/move_scale_arrow_soft.mat.meta b/Assets/HoloToolkit/UX/Materials/Cursor/move_scale_arrow_soft.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/Cursor/move_scale_arrow_soft.mat.meta rename to Assets/HoloToolkit/UX/Materials/Cursor/move_scale_arrow_soft.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/Cursor/ring_shadow.mat b/Assets/HoloToolkit/UX/Materials/Cursor/ring_shadow.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/Cursor/ring_shadow.mat rename to Assets/HoloToolkit/UX/Materials/Cursor/ring_shadow.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/Cursor/ring_shadow.mat.meta b/Assets/HoloToolkit/UX/Materials/Cursor/ring_shadow.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/Cursor/ring_shadow.mat.meta rename to Assets/HoloToolkit/UX/Materials/Cursor/ring_shadow.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/DebugNormals.mat b/Assets/HoloToolkit/UX/Materials/DebugNormals.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/DebugNormals.mat rename to Assets/HoloToolkit/UX/Materials/DebugNormals.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/DebugNormals.mat.meta b/Assets/HoloToolkit/UX/Materials/DebugNormals.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/DebugNormals.mat.meta rename to Assets/HoloToolkit/UX/Materials/DebugNormals.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/FloorPlane.mat b/Assets/HoloToolkit/UX/Materials/FloorPlane.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/FloorPlane.mat rename to Assets/HoloToolkit/UX/Materials/FloorPlane.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/FloorPlane.mat.meta b/Assets/HoloToolkit/UX/Materials/FloorPlane.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/FloorPlane.mat.meta rename to Assets/HoloToolkit/UX/Materials/FloorPlane.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/HUXButtonMaterial.mat b/Assets/HoloToolkit/UX/Materials/HUXButtonMaterial.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/HUXButtonMaterial.mat rename to Assets/HoloToolkit/UX/Materials/HUXButtonMaterial.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/HUXButtonMaterial.mat.meta b/Assets/HoloToolkit/UX/Materials/HUXButtonMaterial.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/HUXButtonMaterial.mat.meta rename to Assets/HoloToolkit/UX/Materials/HUXButtonMaterial.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/MovieMat.mat b/Assets/HoloToolkit/UX/Materials/MovieMat.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/MovieMat.mat rename to Assets/HoloToolkit/UX/Materials/MovieMat.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/MovieMat.mat.meta b/Assets/HoloToolkit/UX/Materials/MovieMat.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/MovieMat.mat.meta rename to Assets/HoloToolkit/UX/Materials/MovieMat.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/Occlusion.mat b/Assets/HoloToolkit/UX/Materials/Occlusion.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/Occlusion.mat rename to Assets/HoloToolkit/UX/Materials/Occlusion.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/Occlusion.mat.meta b/Assets/HoloToolkit/UX/Materials/Occlusion.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/Occlusion.mat.meta rename to Assets/HoloToolkit/UX/Materials/Occlusion.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/TablePlane.mat b/Assets/HoloToolkit/UX/Materials/TablePlane.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/TablePlane.mat rename to Assets/HoloToolkit/UX/Materials/TablePlane.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/TablePlane.mat.meta b/Assets/HoloToolkit/UX/Materials/TablePlane.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/TablePlane.mat.meta rename to Assets/HoloToolkit/UX/Materials/TablePlane.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/WallPlane.mat b/Assets/HoloToolkit/UX/Materials/WallPlane.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/WallPlane.mat rename to Assets/HoloToolkit/UX/Materials/WallPlane.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/WallPlane.mat.meta b/Assets/HoloToolkit/UX/Materials/WallPlane.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/WallPlane.mat.meta rename to Assets/HoloToolkit/UX/Materials/WallPlane.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/backgroundOverlay.mat b/Assets/HoloToolkit/UX/Materials/backgroundOverlay.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/backgroundOverlay.mat rename to Assets/HoloToolkit/UX/Materials/backgroundOverlay.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/backgroundOverlay.mat.meta b/Assets/HoloToolkit/UX/Materials/backgroundOverlay.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/backgroundOverlay.mat.meta rename to Assets/HoloToolkit/UX/Materials/backgroundOverlay.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/textOverlay.mat b/Assets/HoloToolkit/UX/Materials/textOverlay.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/textOverlay.mat rename to Assets/HoloToolkit/UX/Materials/textOverlay.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/textOverlay.mat.meta b/Assets/HoloToolkit/UX/Materials/textOverlay.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/textOverlay.mat.meta rename to Assets/HoloToolkit/UX/Materials/textOverlay.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Materials/transparent_background.mat b/Assets/HoloToolkit/UX/Materials/transparent_background.mat similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/transparent_background.mat rename to Assets/HoloToolkit/UX/Materials/transparent_background.mat diff --git a/Assets/HoloToolkit/UX/Resources/Materials/transparent_background.mat.meta b/Assets/HoloToolkit/UX/Materials/transparent_background.mat.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Materials/transparent_background.mat.meta rename to Assets/HoloToolkit/UX/Materials/transparent_background.mat.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models.meta b/Assets/HoloToolkit/UX/Models.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models.meta rename to Assets/HoloToolkit/UX/Models.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/BoundingBoxes.meta b/Assets/HoloToolkit/UX/Models/BoundingBoxes.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/BoundingBoxes.meta rename to Assets/HoloToolkit/UX/Models/BoundingBoxes.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/BoundingBoxes/BoundingBoxes.fbx b/Assets/HoloToolkit/UX/Models/BoundingBoxes/BoundingBoxes.fbx similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/BoundingBoxes/BoundingBoxes.fbx rename to Assets/HoloToolkit/UX/Models/BoundingBoxes/BoundingBoxes.fbx diff --git a/Assets/HoloToolkit/UX/Resources/Models/BoundingBoxes/BoundingBoxes.fbx.meta b/Assets/HoloToolkit/UX/Models/BoundingBoxes/BoundingBoxes.fbx.meta similarity index 97% rename from Assets/HoloToolkit/UX/Resources/Models/BoundingBoxes/BoundingBoxes.fbx.meta rename to Assets/HoloToolkit/UX/Models/BoundingBoxes/BoundingBoxes.fbx.meta index ede211dcdcd..ac26d87d4f8 100644 --- a/Assets/HoloToolkit/UX/Resources/Models/BoundingBoxes/BoundingBoxes.fbx.meta +++ b/Assets/HoloToolkit/UX/Models/BoundingBoxes/BoundingBoxes.fbx.meta @@ -179,13 +179,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -195,7 +195,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 4 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 @@ -211,10 +211,10 @@ ModelImporter: rootMotionBoneName: rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 2 + animationType: 0 humanoidOversampling: 1 additionalBone: 0 userData: diff --git a/Assets/HoloToolkit/UX/Resources/Models/Buttons.meta b/Assets/HoloToolkit/UX/Models/Buttons.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Buttons.meta rename to Assets/HoloToolkit/UX/Models/Buttons.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Buttons/CompoundButtonMeshes.fbx b/Assets/HoloToolkit/UX/Models/Buttons/CompoundButtonMeshes.fbx similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Buttons/CompoundButtonMeshes.fbx rename to Assets/HoloToolkit/UX/Models/Buttons/CompoundButtonMeshes.fbx diff --git a/Assets/HoloToolkit/UX/Resources/Models/Buttons/CompoundButtonMeshes.fbx.meta b/Assets/HoloToolkit/UX/Models/Buttons/CompoundButtonMeshes.fbx.meta similarity index 97% rename from Assets/HoloToolkit/UX/Resources/Models/Buttons/CompoundButtonMeshes.fbx.meta rename to Assets/HoloToolkit/UX/Models/Buttons/CompoundButtonMeshes.fbx.meta index 5bba0f9b3b4..781ce4e5bcd 100644 --- a/Assets/HoloToolkit/UX/Resources/Models/Buttons/CompoundButtonMeshes.fbx.meta +++ b/Assets/HoloToolkit/UX/Models/Buttons/CompoundButtonMeshes.fbx.meta @@ -92,13 +92,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -108,7 +108,7 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - importAnimation: 1 + importAnimation: 0 copyAvatar: 0 humanDescription: serializedVersion: 2 @@ -124,10 +124,10 @@ ModelImporter: rootMotionBoneName: rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 2 + animationType: 0 humanoidOversampling: 1 additionalBone: 0 userData: diff --git a/Assets/HoloToolkit/UX/Resources/Models/Buttons/SimpleDialogMeshes.fbx b/Assets/HoloToolkit/UX/Models/Buttons/SimpleDialogMeshes.fbx similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Buttons/SimpleDialogMeshes.fbx rename to Assets/HoloToolkit/UX/Models/Buttons/SimpleDialogMeshes.fbx diff --git a/Assets/HoloToolkit/UX/Resources/Models/Buttons/SimpleDialogMeshes.fbx.meta b/Assets/HoloToolkit/UX/Models/Buttons/SimpleDialogMeshes.fbx.meta similarity index 98% rename from Assets/HoloToolkit/UX/Resources/Models/Buttons/SimpleDialogMeshes.fbx.meta rename to Assets/HoloToolkit/UX/Models/Buttons/SimpleDialogMeshes.fbx.meta index 134d89e21d4..9e187d32a7f 100644 --- a/Assets/HoloToolkit/UX/Resources/Models/Buttons/SimpleDialogMeshes.fbx.meta +++ b/Assets/HoloToolkit/UX/Models/Buttons/SimpleDialogMeshes.fbx.meta @@ -107,13 +107,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor.meta b/Assets/HoloToolkit/UX/Models/Cursor.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor.meta rename to Assets/HoloToolkit/UX/Models/Cursor.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.controller b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.controller similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.controller rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.controller diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.controller.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.controller.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.controller.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.controller.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbm.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbm.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm/circle_shadow.png b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbm/circle_shadow.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm/circle_shadow.png rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbm/circle_shadow.png diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm/circle_shadow.png.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbm/circle_shadow.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm/circle_shadow.png.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbm/circle_shadow.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm/ring_shadow.png b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbm/ring_shadow.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm/ring_shadow.png rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbm/ring_shadow.png diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm/ring_shadow.png.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbm/ring_shadow.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm/ring_shadow.png.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbm/ring_shadow.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm/scroll_ring_shadow.png b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbm/scroll_ring_shadow.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm/scroll_ring_shadow.png rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbm/scroll_ring_shadow.png diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm/scroll_ring_shadow.png.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbm/scroll_ring_shadow.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm/scroll_ring_shadow.png.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbm/scroll_ring_shadow.png.meta diff --git a/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbx b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbx new file mode 100644 index 00000000000..12db04e3a73 Binary files /dev/null and b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbx differ diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbx.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbx.meta similarity index 97% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbx.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbx.meta index 0200257dd13..8588cbbf9d7 100644 --- a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbx.meta +++ b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.fbx.meta @@ -89,34 +89,9 @@ ModelImporter: 7400038: Cursor_Ring_Drag_Enter 7400040: Cursor_Ring_Zoom_Enter 7400042: Cursor - 7400044: Take 001 + 7400044: Cursor 9500000: //RootNode - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: CursorColor - second: {fileID: 2100000, guid: 0627cce8f631805458f039b1e5835872, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: CursorShadow - second: {fileID: 2100000, guid: 216a758dd752ab14f8e151a62eefb089, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: Joystickwhite - second: {fileID: 2100000, guid: 3a7ca1788027f7542b45519ba9e4596b, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: RingShadow - second: {fileID: 2100000, guid: a7032e074a69888438da3e8b05ceca51, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert6 - second: {fileID: 2100000, guid: 05385d5b77fb75b46b15ab303cfbec11, type: 2} + externalObjects: {} materials: importMaterials: 0 materialName: 0 @@ -1280,7 +1255,7 @@ ModelImporter: weight: 1 - path: Cursor_Ring/ring_press_scale/ring_press_shadow weight: 1 - maskType: 0 + maskType: 3 maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 isReadable: 1 @@ -1290,7 +1265,7 @@ ModelImporter: meshCompression: 0 addColliders: 0 importVisibility: 0 - importBlendShapes: 1 + importBlendShapes: 0 importCameras: 0 importLights: 0 swapUVChannels: 0 @@ -1298,7 +1273,7 @@ ModelImporter: useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.prefab b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.prefab similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.prefab rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.prefab diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.prefab.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.prefab.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.prefab.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRing.prefab.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Drag_Enter.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Drag_Enter.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Drag_Enter.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Drag_Enter.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Drag_Enter.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Drag_Enter.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Drag_Enter.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Drag_Enter.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Drag_From_Hold.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Drag_From_Hold.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Drag_From_Hold.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Drag_From_Hold.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Drag_From_Hold.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Drag_From_Hold.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Drag_From_Hold.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Drag_From_Hold.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_GestureFOV_off.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_GestureFOV_off.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_GestureFOV_off.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_GestureFOV_off.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_GestureFOV_off.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_GestureFOV_off.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_GestureFOV_off.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_GestureFOV_off.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_From_Observation.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_From_Observation.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_From_Observation.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_From_Observation.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_From_Observation.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_From_Observation.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_From_Observation.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_From_Observation.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_GestureFOV.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_GestureFOV.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_GestureFOV.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_GestureFOV.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_GestureFOV.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_GestureFOV.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_GestureFOV.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_GestureFOV.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_In.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_In.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_In.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_In.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_In.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_In.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_In.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_In.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_Out.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_Out.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_Out.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_Out.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_Out.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_Out.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_Out.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Hold_Out.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_Hold.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_Hold.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_Hold.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_Hold.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_Hold.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_Hold.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_Hold.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_Hold.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_Observation.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_Observation.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_Observation.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_Observation.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_Observation.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_Observation.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_Observation.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_Observation.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_PressHold.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_PressHold.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_PressHold.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_PressHold.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_PressHold.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_PressHold.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_PressHold.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_From_PressHold.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_In.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_In.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_In.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_In.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_In.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_In.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_In.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_In.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_Out.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_Out.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_Out.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_Out.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_Out.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_Out.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_Out.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Interaction_Out.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_From_PressHold.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_From_PressHold.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_From_PressHold.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_From_PressHold.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_From_PressHold.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_From_PressHold.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_From_PressHold.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_From_PressHold.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_In.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_In.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_In.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_In.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_In.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_In.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_In.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_In.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_Out.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_Out.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_Out.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_Out.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_Out.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_Out.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_Out.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Observation_Out.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Scroll_Enter.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Scroll_Enter.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Scroll_Enter.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Scroll_Enter.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Scroll_Enter.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Scroll_Enter.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Scroll_Enter.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Scroll_Enter.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Scroll_From_Hold.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Scroll_From_Hold.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Scroll_From_Hold.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Scroll_From_Hold.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Scroll_From_Hold.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Scroll_From_Hold.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Scroll_From_Hold.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Scroll_From_Hold.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Zoom_Enter.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Zoom_Enter.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Zoom_Enter.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Zoom_Enter.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Zoom_Enter.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Zoom_Enter.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Zoom_Enter.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Zoom_Enter.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Zoom_From_Hold.anim b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Zoom_From_Hold.anim similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Zoom_From_Hold.anim rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Zoom_From_Hold.anim diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Zoom_From_Hold.anim.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Zoom_From_Hold.anim.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Zoom_From_Hold.anim.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_move/CursorRingAnim/Cursor_Ring_Zoom_From_Hold.anim.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.controller b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.controller similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.controller rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.controller diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.controller.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.controller.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.controller.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.controller.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/circle_shadow.png b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/circle_shadow.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/circle_shadow.png rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/circle_shadow.png diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/circle_shadow.png.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/circle_shadow.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/circle_shadow.png.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/circle_shadow.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/hand_press.png b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/hand_press.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/hand_press.png rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/hand_press.png diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/hand_press.png.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/hand_press.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/hand_press.png.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/hand_press.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/move_scale_arrow_soft.png b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/move_scale_arrow_soft.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/move_scale_arrow_soft.png rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/move_scale_arrow_soft.png diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/move_scale_arrow_soft.png.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/move_scale_arrow_soft.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/move_scale_arrow_soft.png.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbm/move_scale_arrow_soft.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbx b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbx similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbx rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbx diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbx.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbx.meta similarity index 97% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbx.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbx.meta index 78dcab79217..3df4c2582e3 100644 --- a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbx.meta +++ b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.fbx.meta @@ -3,7 +3,7 @@ guid: bcf5a18aea16b1d41b747c84181ca558 timeCreated: 1442349494 licenseType: Pro ModelImporter: - serializedVersion: 22 + serializedVersion: 19 fileIDToRecycleName: 100000: Cursor_Cross 100002: cursor_cross_ring @@ -100,37 +100,10 @@ ModelImporter: 7400016: Cursor_Cross_Interaction_From_Hold_NorthSouth 7400018: Cursor_Cross_Hold_NorthSouth 9500000: //RootNode - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert10 - second: {fileID: 2100000, guid: 170bada3f495b0d49884ccedf2a26131, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert11 - second: {fileID: 2100000, guid: 170bada3f495b0d49884ccedf2a26131, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert2 - second: {fileID: 2100000, guid: 69ad186d6ee6fb0499359e09bdef95db, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert5 - second: {fileID: 2100000, guid: 30b414a694ff60744a035148e25d4274, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert6 - second: {fileID: 2100000, guid: 23202c3c9bf7ee949868fe82b00c5051, type: 2} materials: importMaterials: 0 materialName: 0 materialSearch: 1 - materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -143,14 +116,12 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: - serializedVersion: 16 name: Cursor_Cross_Observation_In_NorthSouth @@ -918,16 +889,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -937,7 +905,6 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 4 - normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.prefab b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.prefab similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.prefab rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.prefab diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.prefab.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.prefab.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.prefab.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthSouth.prefab.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.controller b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.controller similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.controller rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.controller diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.controller.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.controller.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.controller.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.controller.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/circle_shadow.png b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/circle_shadow.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/circle_shadow.png rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/circle_shadow.png diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/circle_shadow.png.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/circle_shadow.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/circle_shadow.png.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/circle_shadow.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/hand_press.png b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/hand_press.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/hand_press.png rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/hand_press.png diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/hand_press.png.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/hand_press.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/hand_press.png.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/hand_press.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/move_scale_arrow_soft.png b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/move_scale_arrow_soft.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/move_scale_arrow_soft.png rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/move_scale_arrow_soft.png diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/move_scale_arrow_soft.png.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/move_scale_arrow_soft.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/move_scale_arrow_soft.png.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbm/move_scale_arrow_soft.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbx b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbx similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbx rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbx diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbx.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbx.meta similarity index 97% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbx.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbx.meta index a023bbb87bd..326a031c45f 100644 --- a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbx.meta +++ b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.fbx.meta @@ -3,7 +3,7 @@ guid: f76d5867ddbee9c4daff05b004090922 timeCreated: 1442349477 licenseType: Pro ModelImporter: - serializedVersion: 22 + serializedVersion: 19 fileIDToRecycleName: 100000: Cursor_Cross 100002: cursor_cross_ring @@ -100,37 +100,10 @@ ModelImporter: 7400016: Cursor_Cross_Interaction_From_Hold_NortheastSouthwest 7400018: Cursor_Cross_Hold_NortheastSouthwest 9500000: //RootNode - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert2 - second: {fileID: 2100000, guid: 69ad186d6ee6fb0499359e09bdef95db, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert5 - second: {fileID: 2100000, guid: 30b414a694ff60744a035148e25d4274, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert6 - second: {fileID: 2100000, guid: 23202c3c9bf7ee949868fe82b00c5051, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert7 - second: {fileID: 2100000, guid: 170bada3f495b0d49884ccedf2a26131, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert8 - second: {fileID: 2100000, guid: 170bada3f495b0d49884ccedf2a26131, type: 2} materials: importMaterials: 0 materialName: 0 materialSearch: 1 - materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -143,14 +116,12 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: - serializedVersion: 16 name: Cursor_Cross_Observation_In_NortheastSouthwest @@ -918,16 +889,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -937,7 +905,6 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 4 - normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.prefab b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.prefab similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.prefab rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.prefab diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.prefab.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.prefab.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.prefab.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NortheastSouthwest.prefab.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.controller b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.controller similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.controller rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.controller diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.controller.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.controller.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.controller.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.controller.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/circle_shadow.png b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/circle_shadow.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/circle_shadow.png rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/circle_shadow.png diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/circle_shadow.png.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/circle_shadow.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/circle_shadow.png.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/circle_shadow.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/hand_press.png b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/hand_press.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/hand_press.png rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/hand_press.png diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/hand_press.png.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/hand_press.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/hand_press.png.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/hand_press.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/move_scale_arrow_soft.png b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/move_scale_arrow_soft.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/move_scale_arrow_soft.png rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/move_scale_arrow_soft.png diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/move_scale_arrow_soft.png.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/move_scale_arrow_soft.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/move_scale_arrow_soft.png.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbm/move_scale_arrow_soft.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbx b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbx similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbx rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbx diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbx.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbx.meta similarity index 97% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbx.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbx.meta index aaf65535b66..fdc25bf1a91 100644 --- a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbx.meta +++ b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.fbx.meta @@ -3,7 +3,7 @@ guid: 449e08ed41035264a997b19b6eda31e7 timeCreated: 1442349494 licenseType: Pro ModelImporter: - serializedVersion: 22 + serializedVersion: 19 fileIDToRecycleName: 100000: Cursor_Cross 100002: cursor_cross_ring @@ -100,37 +100,10 @@ ModelImporter: 7400016: Cursor_Cross_Interaction_From_Hold_NorthwestSoutheast 7400018: Cursor_Cross_Hold 9500000: //RootNode - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert2 - second: {fileID: 2100000, guid: 69ad186d6ee6fb0499359e09bdef95db, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert3 - second: {fileID: 2100000, guid: 170bada3f495b0d49884ccedf2a26131, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert4 - second: {fileID: 2100000, guid: 170bada3f495b0d49884ccedf2a26131, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert5 - second: {fileID: 2100000, guid: 30b414a694ff60744a035148e25d4274, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert6 - second: {fileID: 2100000, guid: 23202c3c9bf7ee949868fe82b00c5051, type: 2} materials: importMaterials: 0 materialName: 0 materialSearch: 1 - materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -143,14 +116,12 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: - serializedVersion: 16 name: Cursor_Cross_Observation_In_NorthwestSoutheast @@ -918,16 +889,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -937,7 +905,6 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 4 - normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.prefab b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.prefab similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.prefab rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.prefab diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.prefab.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.prefab.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.prefab.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_Size_NorthwestSoutheast.prefab.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/circle_shadow.png b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/circle_shadow.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/circle_shadow.png rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/circle_shadow.png diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/circle_shadow.png.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/circle_shadow.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/circle_shadow.png.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/circle_shadow.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/hand_press.png b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/hand_press.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/hand_press.png rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/hand_press.png diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/hand_press.png.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/hand_press.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/hand_press.png.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/hand_press.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/move_scale_arrow_soft.png b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/move_scale_arrow_soft.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/move_scale_arrow_soft.png rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/move_scale_arrow_soft.png diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/move_scale_arrow_soft.png.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/move_scale_arrow_soft.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/move_scale_arrow_soft.png.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbm/move_scale_arrow_soft.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbx b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbx similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbx rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbx diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbx.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbx.meta similarity index 97% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbx.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbx.meta index feec1056e16..b0a57d308f9 100644 --- a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.fbx.meta +++ b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.fbx.meta @@ -3,7 +3,7 @@ guid: 1c3f3eb4100c6fd46ac459cb1ab0aa8d timeCreated: 1442349494 licenseType: Pro ModelImporter: - serializedVersion: 22 + serializedVersion: 19 fileIDToRecycleName: 100000: Cursor_Cross 100002: cursor_cross_arrows @@ -123,47 +123,10 @@ ModelImporter: 7400022: Cursor_Cross_GestureFOV_off_root 7400024: Cursor 9500000: //RootNode - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert12 - second: {fileID: 2100000, guid: 170bada3f495b0d49884ccedf2a26131, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert13 - second: {fileID: 2100000, guid: 170bada3f495b0d49884ccedf2a26131, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert14 - second: {fileID: 2100000, guid: 170bada3f495b0d49884ccedf2a26131, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert15 - second: {fileID: 2100000, guid: 170bada3f495b0d49884ccedf2a26131, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert2 - second: {fileID: 2100000, guid: 69ad186d6ee6fb0499359e09bdef95db, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert5 - second: {fileID: 2100000, guid: 30b414a694ff60744a035148e25d4274, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: lambert6 - second: {fileID: 2100000, guid: 23202c3c9bf7ee949868fe82b00c5051, type: 2} materials: importMaterials: 0 materialName: 0 materialSearch: 1 - materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -176,14 +139,12 @@ ModelImporter: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 animationCompression: 3 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - extraUserProperties: [] clipAnimations: - serializedVersion: 16 name: Cursor_Cross_Observation_In_root @@ -1283,16 +1244,13 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -1302,7 +1260,6 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 4 - normalCalculationMode: 0 importAnimation: 1 copyAvatar: 0 humanDescription: diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.prefab b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.prefab similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.prefab rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.prefab diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.prefab.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.prefab.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/Cursor_cross_root.prefab.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/Cursor_cross_root.prefab.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/cursor_cross_root.controller b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/cursor_cross_root.controller similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/cursor_cross_root.controller rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/cursor_cross_root.controller diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/cursor_cross_root.controller.meta b/Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/cursor_cross_root.controller.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_scale/cursor_cross_root.controller.meta rename to Assets/HoloToolkit/UX/Models/Cursor/Cursor_scale/cursor_cross_root.controller.meta diff --git a/Assets/HoloToolkit/UX/Resources/Models/HMD.meta b/Assets/HoloToolkit/UX/Models/HMD.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Models/HMD.meta rename to Assets/HoloToolkit/UX/Models/HMD.meta diff --git a/Assets/HoloToolkit/UX/Models/HMD/hololens_low.fbx b/Assets/HoloToolkit/UX/Models/HMD/hololens_low.fbx new file mode 100644 index 00000000000..5b5168b6588 Binary files /dev/null and b/Assets/HoloToolkit/UX/Models/HMD/hololens_low.fbx differ diff --git a/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbx.meta b/Assets/HoloToolkit/UX/Models/HMD/hololens_low.fbx.meta similarity index 62% rename from Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbx.meta rename to Assets/HoloToolkit/UX/Models/HMD/hololens_low.fbx.meta index 1b518437bdc..458b26ba160 100644 --- a/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbx.meta +++ b/Assets/HoloToolkit/UX/Models/HMD/hololens_low.fbx.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 8e2be7c18eccca745950440e24c3a081 licenseType: Pro ModelImporter: - serializedVersion: 18 + serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode @@ -17,28 +17,35 @@ ModelImporter: animations: legacyGenerateAnimations: 4 bakeSimulation: 0 + resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 animationCompression: 1 - animationRotationError: .5 - animationPositionError: .5 - animationScaleError: .5 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] clipAnimations: [] isReadable: 1 meshes: lODScreenPercentages: [] - globalScale: .00999999978 + globalScale: 0.01 meshCompression: 0 addColliders: 0 - importBlendShapes: 1 + importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 - weldVertices: 1 + weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -46,24 +53,29 @@ ModelImporter: useFileScale: 1 tangentSpace: normalSmoothAngle: 60 - splitTangentsAcrossUV: 1 normalImportMode: 0 - tangentImportMode: 1 - importAnimation: 1 + tangentImportMode: 4 + importAnimation: 0 copyAvatar: 0 humanDescription: + serializedVersion: 2 human: [] skeleton: [] - armTwist: .5 - foreArmTwist: .5 - upperLegTwist: .5 - legTwist: .5 - armStretch: .0500000007 - legStretch: .0500000007 + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 feetSpacing: 0 rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 2 + animationType: 0 + humanoidOversampling: 1 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/HoloToolkit/UX/Resources/Profiles.meta b/Assets/HoloToolkit/UX/Profiles.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Profiles.meta rename to Assets/HoloToolkit/UX/Profiles.meta diff --git a/Assets/HoloToolkit/UX/Resources/Profiles/DefaultButtonIconProfileTexture.asset b/Assets/HoloToolkit/UX/Profiles/DefaultButtonIconProfileTexture.asset similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Profiles/DefaultButtonIconProfileTexture.asset rename to Assets/HoloToolkit/UX/Profiles/DefaultButtonIconProfileTexture.asset diff --git a/Assets/HoloToolkit/UX/Resources/Profiles/DefaultButtonIconProfileTexture.asset.meta b/Assets/HoloToolkit/UX/Profiles/DefaultButtonIconProfileTexture.asset.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Profiles/DefaultButtonIconProfileTexture.asset.meta rename to Assets/HoloToolkit/UX/Profiles/DefaultButtonIconProfileTexture.asset.meta diff --git a/Assets/HoloToolkit/UX/Resources/Profiles/DefaultButtonMeshProfile.asset b/Assets/HoloToolkit/UX/Profiles/DefaultButtonMeshProfile.asset similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Profiles/DefaultButtonMeshProfile.asset rename to Assets/HoloToolkit/UX/Profiles/DefaultButtonMeshProfile.asset diff --git a/Assets/HoloToolkit/UX/Resources/Profiles/DefaultButtonMeshProfile.asset.meta b/Assets/HoloToolkit/UX/Profiles/DefaultButtonMeshProfile.asset.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Profiles/DefaultButtonMeshProfile.asset.meta rename to Assets/HoloToolkit/UX/Profiles/DefaultButtonMeshProfile.asset.meta diff --git a/Assets/HoloToolkit/UX/Resources/Profiles/DefaultButtonSoundsProfile.asset b/Assets/HoloToolkit/UX/Profiles/DefaultButtonSoundsProfile.asset similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Profiles/DefaultButtonSoundsProfile.asset rename to Assets/HoloToolkit/UX/Profiles/DefaultButtonSoundsProfile.asset diff --git a/Assets/HoloToolkit/UX/Resources/Profiles/DefaultButtonSoundsProfile.asset.meta b/Assets/HoloToolkit/UX/Profiles/DefaultButtonSoundsProfile.asset.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Profiles/DefaultButtonSoundsProfile.asset.meta rename to Assets/HoloToolkit/UX/Profiles/DefaultButtonSoundsProfile.asset.meta diff --git a/Assets/HoloToolkit/UX/Resources/Profiles/DefaultButtonTextProfile.asset b/Assets/HoloToolkit/UX/Profiles/DefaultButtonTextProfile.asset similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Profiles/DefaultButtonTextProfile.asset rename to Assets/HoloToolkit/UX/Profiles/DefaultButtonTextProfile.asset diff --git a/Assets/HoloToolkit/UX/Resources/Profiles/DefaultButtonTextProfile.asset.meta b/Assets/HoloToolkit/UX/Profiles/DefaultButtonTextProfile.asset.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Profiles/DefaultButtonTextProfile.asset.meta rename to Assets/HoloToolkit/UX/Profiles/DefaultButtonTextProfile.asset.meta diff --git a/Assets/HoloToolkit/UX/Resources/Profiles/SimpleDialogButtonTextProfile.asset b/Assets/HoloToolkit/UX/Profiles/SimpleDialogButtonTextProfile.asset similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Profiles/SimpleDialogButtonTextProfile.asset rename to Assets/HoloToolkit/UX/Profiles/SimpleDialogButtonTextProfile.asset diff --git a/Assets/HoloToolkit/UX/Resources/Profiles/SimpleDialogButtonTextProfile.asset.meta b/Assets/HoloToolkit/UX/Profiles/SimpleDialogButtonTextProfile.asset.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Profiles/SimpleDialogButtonTextProfile.asset.meta rename to Assets/HoloToolkit/UX/Profiles/SimpleDialogButtonTextProfile.asset.meta diff --git a/Assets/HoloToolkit/UX/Resources.meta b/Assets/HoloToolkit/UX/Resources.meta deleted file mode 100644 index 9f99c8a9457..00000000000 --- a/Assets/HoloToolkit/UX/Resources.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: c4201ed0cf04a6646a99e9c0e8d199e7 -folderAsset: yes -timeCreated: 1506288410 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/UX/Resources/Materials.meta b/Assets/HoloToolkit/UX/Resources/Materials.meta deleted file mode 100644 index 739734cc976..00000000000 --- a/Assets/HoloToolkit/UX/Resources/Materials.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 46c41e12ac7033b47a5c7d2d83595fda -folderAsset: yes -timeCreated: 1440628853 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm/templates.meta b/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm/templates.meta deleted file mode 100644 index 41ac9741154..00000000000 --- a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbm/templates.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 20978cf8cb27a50459a532d464f4fece -folderAsset: yes -timeCreated: 1509728667 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbx b/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbx deleted file mode 100644 index 8a30e7c2967..00000000000 Binary files a/Assets/HoloToolkit/UX/Resources/Models/Cursor/Cursor_move/CursorRing.fbx and /dev/null differ diff --git a/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbm.meta b/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbm.meta deleted file mode 100644 index 1a3de37133a..00000000000 --- a/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbm.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 4f1a1338957d56f4094aebe1160b231e -folderAsset: yes -timeCreated: 1508360997 -licenseType: Pro -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbm/normal.dds b/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbm/normal.dds deleted file mode 100644 index 3d348d7cfd2..00000000000 Binary files a/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbm/normal.dds and /dev/null differ diff --git a/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbm/normal.dds.meta b/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbm/normal.dds.meta deleted file mode 100644 index 4bd456cec31..00000000000 --- a/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbm/normal.dds.meta +++ /dev/null @@ -1,18 +0,0 @@ -fileFormatVersion: 2 -guid: b76dd5118a99a3c48b26074321de7bda -timeCreated: 1508735417 -licenseType: Free -IHVImageFormatImporter: - externalObjects: {} - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - isReadable: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbm/white.dds b/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbm/white.dds deleted file mode 100644 index 9c9a5dd7d30..00000000000 Binary files a/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbm/white.dds and /dev/null differ diff --git a/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbm/white.dds.meta b/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbm/white.dds.meta deleted file mode 100644 index 94adf5fcb93..00000000000 --- a/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbm/white.dds.meta +++ /dev/null @@ -1,18 +0,0 @@ -fileFormatVersion: 2 -guid: 995fa7b06c49b944eb70013b1a4c9746 -timeCreated: 1508360997 -licenseType: Pro -IHVImageFormatImporter: - externalObjects: {} - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - isReadable: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbx b/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbx deleted file mode 100644 index 19f1da41b02..00000000000 Binary files a/Assets/HoloToolkit/UX/Resources/Models/HMD/hololens_low.fbx and /dev/null differ diff --git a/Assets/HoloToolkit/UX/Resources/Shaders.meta b/Assets/HoloToolkit/UX/Resources/Shaders.meta deleted file mode 100644 index 01b680a233e..00000000000 --- a/Assets/HoloToolkit/UX/Resources/Shaders.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 502c5075267ac2a448035f1cff424bf9 -folderAsset: yes -timeCreated: 1506288410 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/UX/Resources/Textures.meta b/Assets/HoloToolkit/UX/Resources/Textures.meta deleted file mode 100644 index 42984bfa7b6..00000000000 --- a/Assets/HoloToolkit/UX/Resources/Textures.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 61688ba8209a8b0468d460f0db0ae66d -folderAsset: yes -timeCreated: 1440628853 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/UX/Scripts/AxisSlider.cs b/Assets/HoloToolkit/UX/Scripts/AxisSlider.cs index e044187e832..97e285d5095 100644 --- a/Assets/HoloToolkit/UX/Scripts/AxisSlider.cs +++ b/Assets/HoloToolkit/UX/Scripts/AxisSlider.cs @@ -6,7 +6,7 @@ namespace HoloToolkit.UI.Keyboard { /// - /// Axis slider is a script to lock a bar acros a specific axis. + /// Axis slider is a script to lock a bar across a specific axis. /// public class AxisSlider : MonoBehaviour { diff --git a/Assets/HoloToolkit/UX/Scripts/Buttons/Button.cs b/Assets/HoloToolkit/UX/Scripts/Buttons/Button.cs index 1720109c3e6..d9f5aea2340 100644 --- a/Assets/HoloToolkit/UX/Scripts/Buttons/Button.cs +++ b/Assets/HoloToolkit/UX/Scripts/Buttons/Button.cs @@ -30,9 +30,9 @@ public abstract class Button : MonoBehaviour, IInputHandler, IPointerSpecificFoc public InteractionSourcePressInfo ButtonPressFilter = InteractionSourcePressInfo.Select; /// - /// If true the interactable will unselect when you look off of the object + /// If true the interactable will deselect when you look off of the object /// - [Tooltip("If RequireGaze then looking away will unselect object")] + [Tooltip("If RequireGaze then looking away will deselect object")] public bool RequireGaze = true; /// @@ -258,7 +258,7 @@ public void OnSourceDetected(SourceStateEventData eventData) } /// - /// On Source lost decrement hand count and set visiblity + /// On Source lost decrement hand count and set visibility /// /// public void OnSourceLost(SourceStateEventData eventData) @@ -368,7 +368,7 @@ public void LateUpdate() } /// - /// Event to fire off when hand visibity changes + /// Event to fire off when hand visibility changes /// /// public virtual void OnHandVisibleChange(bool visible) @@ -425,7 +425,7 @@ public virtual void OnStateChange(ButtonStateEnum newState) { ButtonState = newState; - // Send out the action/event for the statechange + // Send out the action/event for the state change if (StateChange != null) { StateChange(newState); diff --git a/Assets/HoloToolkit/UX/Scripts/Buttons/ButtonTextProfile.cs b/Assets/HoloToolkit/UX/Scripts/Buttons/ButtonTextProfile.cs index c6d0bab205a..16ba20aaf6d 100644 --- a/Assets/HoloToolkit/UX/Scripts/Buttons/ButtonTextProfile.cs +++ b/Assets/HoloToolkit/UX/Scripts/Buttons/ButtonTextProfile.cs @@ -20,7 +20,7 @@ public class ButtonTextProfile : ButtonProfile // Used to reposition the text mesh object in addition to setting its anchor // This is useful when button text position will change dramatically based on the presence of other elements - // eg, bottom anchor will move the text out of the way of an icon + // e.g., bottom anchor will move the text out of the way of an icon [Header("Anchor Settings")] [HideInMRTKInspector] public Vector3 AnchorLowerCenterOffset = Vector3.zero; diff --git a/Assets/HoloToolkit/UX/Scripts/Buttons/CompoundButton.cs b/Assets/HoloToolkit/UX/Scripts/Buttons/CompoundButton.cs index 4baa2406b0b..905cea41f42 100644 --- a/Assets/HoloToolkit/UX/Scripts/Buttons/CompoundButton.cs +++ b/Assets/HoloToolkit/UX/Scripts/Buttons/CompoundButton.cs @@ -9,7 +9,7 @@ namespace HoloToolkit.Unity.Buttons { /// - /// Concrete version of Button class used with other CompoundButton scripts (eg, CompoundButtonMesh) + /// Concrete version of Button class used with other CompoundButton scripts (e.g., CompoundButtonMesh) /// Also contains fields for commonly referenced components /// public class CompoundButton : Button @@ -55,7 +55,7 @@ protected override void DrawCustomFooter() { } } else if (parentRigidBody == null) { foundError = true; - DrawError("Button requires a rigidbody if colliders are only present on child transforms."); + DrawError("Button requires a Rigidbody if colliders are only present on child transforms."); if (GUILayout.Button("Fix now")) { Rigidbody rb = cb.gameObject.AddComponent(); rb.isKinematic = true; diff --git a/Assets/HoloToolkit/UX/Scripts/Buttons/CompoundButtonAnim.cs b/Assets/HoloToolkit/UX/Scripts/Buttons/CompoundButtonAnim.cs index e1d6d429c20..2979fe2ba45 100644 --- a/Assets/HoloToolkit/UX/Scripts/Buttons/CompoundButtonAnim.cs +++ b/Assets/HoloToolkit/UX/Scripts/Buttons/CompoundButtonAnim.cs @@ -125,7 +125,7 @@ protected override void DrawCustomFooter() { UnityEditor.EditorGUILayout.BeginVertical(UnityEditor.EditorStyles.helpBox); UnityEditor.EditorGUILayout.LabelField("Animation states:", UnityEditor.EditorStyles.miniBoldLabel); - // Draw the editor for all the anim actions + // Draw the editor for all the animation actions for (int i = 0; i < acb.AnimActions.Length; i++) { acb.AnimActions[i] = DrawAnimActionEditor(acb.AnimActions[i], animParams); } diff --git a/Assets/HoloToolkit/UX/Scripts/Buttons/CompoundButtonSpeech.cs b/Assets/HoloToolkit/UX/Scripts/Buttons/CompoundButtonSpeech.cs index ae96783c236..903528d83c8 100644 --- a/Assets/HoloToolkit/UX/Scripts/Buttons/CompoundButtonSpeech.cs +++ b/Assets/HoloToolkit/UX/Scripts/Buttons/CompoundButtonSpeech.cs @@ -43,7 +43,7 @@ public enum KeywordSourceEnum public ConfidenceLevel ConfidenceLevel = ConfidenceLevel.Medium; /// - /// Variable to keep track of previous button text incase the button text changes after registration. + /// Variable to keep track of previous button text in case the button text changes after registration. /// private string prevButtonText; diff --git a/Assets/HoloToolkit/UX/Scripts/Buttons/ObjectButton.cs b/Assets/HoloToolkit/UX/Scripts/Buttons/ObjectButton.cs index 04d5c200eab..0a76fd1d2b6 100644 --- a/Assets/HoloToolkit/UX/Scripts/Buttons/ObjectButton.cs +++ b/Assets/HoloToolkit/UX/Scripts/Buttons/ObjectButton.cs @@ -12,7 +12,7 @@ namespace HoloToolkit.Unity.Buttons /// /// Prefab button has a set of prefabs of linked objects created or linked to the different states. Simply reference /// the prefab object or the instanced game object to the state and it will be toggled active or inactive based on the - /// currrent state. + /// current state. /// public class ObjectButton : Button { diff --git a/Assets/HoloToolkit/UX/Scripts/Collections/ObjectCollectionDynamic.cs b/Assets/HoloToolkit/UX/Scripts/Collections/ObjectCollectionDynamic.cs index 72a96078cc7..a72a1350c3f 100644 --- a/Assets/HoloToolkit/UX/Scripts/Collections/ObjectCollectionDynamic.cs +++ b/Assets/HoloToolkit/UX/Scripts/Collections/ObjectCollectionDynamic.cs @@ -10,7 +10,7 @@ namespace HoloToolkit.Unity.Collections { /// /// A utility that stores transform information for objects in a collection - /// This info can then be used for non-destructive realtime manipulation + /// This info can then be used for non-destructive real-time manipulation /// Or to restore an earlier configuration gathered on startup /// public class ObjectCollectionDynamic : MonoBehaviour diff --git a/Assets/HoloToolkit/UX/Scripts/Distorters/FastSimplexNoise.cs b/Assets/HoloToolkit/UX/Scripts/Distorters/FastSimplexNoise.cs index 054922d3cbb..794c7d31874 100644 --- a/Assets/HoloToolkit/UX/Scripts/Distorters/FastSimplexNoise.cs +++ b/Assets/HoloToolkit/UX/Scripts/Distorters/FastSimplexNoise.cs @@ -5,7 +5,7 @@ using System; /// -/// A conglimeration of open-source simplex libraries in C# with an emphasis on performance +/// A conglomeration of open-source simplex libraries in C# with an emphasis on performance /// public class FastSimplexNoise { diff --git a/Assets/HoloToolkit/UX/Scripts/KeyboardKeyFunc.cs b/Assets/HoloToolkit/UX/Scripts/KeyboardKeyFunc.cs index 34f98601f8b..6819c10e53d 100644 --- a/Assets/HoloToolkit/UX/Scripts/KeyboardKeyFunc.cs +++ b/Assets/HoloToolkit/UX/Scripts/KeyboardKeyFunc.cs @@ -42,7 +42,7 @@ public enum Function public Function m_ButtonFunction = Function.UNDEFINED; /// - /// Reference to gameobject's Button component. + /// Reference to GameObject's Button component. /// private Button m_Button = null; diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/Bezier.cs b/Assets/HoloToolkit/UX/Scripts/Lines/Bezier.cs index 70b46095da8..f332376d67b 100644 --- a/Assets/HoloToolkit/UX/Scripts/Lines/Bezier.cs +++ b/Assets/HoloToolkit/UX/Scripts/Lines/Bezier.cs @@ -93,7 +93,7 @@ protected override float GetUnclampedWorldLengthInternal() { } protected override Vector3 GetUpVectorInternal(float normalizedLength) { - // Bezeir up vectors just use transform up + // Bezier up vectors just use transform up return transform.up; } diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/LineBaseEditor.cs b/Assets/HoloToolkit/UX/Scripts/Lines/LineBaseEditor.cs index 6e69712bb29..60fa1a57345 100644 --- a/Assets/HoloToolkit/UX/Scripts/Lines/LineBaseEditor.cs +++ b/Assets/HoloToolkit/UX/Scripts/Lines/LineBaseEditor.cs @@ -8,7 +8,7 @@ using UnityEditor; /// -/// Base class for line editors (splines, bezeirs, parabolas, etc) +/// Base class for line editors (splines, Beziers, parabolas, etc) /// public class LineBaseEditor : MRTKEditor { diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/LineMeshes.cs b/Assets/HoloToolkit/UX/Scripts/Lines/LineMeshes.cs index 326788310a8..e0834c1f61f 100644 --- a/Assets/HoloToolkit/UX/Scripts/Lines/LineMeshes.cs +++ b/Assets/HoloToolkit/UX/Scripts/Lines/LineMeshes.cs @@ -53,9 +53,9 @@ protected void OnEnable() if (onWillRenderHelper == null) { // OnWillRenderObject won't be called unless there's a renderer attached - // and if the renderer's bounds are visbile. + // and if the renderer's bounds are visible. // So we create a simple 1-triangle mesh to ensure it's always called. - // Hackey, but it works. + // Hacky, but it works. onWillRenderHelper = gameObject.AddComponent(); onWillRenderHelper.receiveShadows = false; onWillRenderHelper.shadowCastingMode = ShadowCastingMode.Off; diff --git a/Assets/HoloToolkit/UX/Scripts/Lines/Spline.cs b/Assets/HoloToolkit/UX/Scripts/Lines/Spline.cs index 408ab9c3712..9ec56e582ef 100644 --- a/Assets/HoloToolkit/UX/Scripts/Lines/Spline.cs +++ b/Assets/HoloToolkit/UX/Scripts/Lines/Spline.cs @@ -381,7 +381,7 @@ protected override void DrawCustomFooter() if (overlappingPointIndexes.Count > 0) { GUI.color = errorColor; - if (GUILayout.Button("Fix overlappoing points")) + if (GUILayout.Button("Fix overlapping points")) { // Move them slightly out of the way foreach (int overlappoingPointIndex in overlappingPointIndexes) diff --git a/Assets/HoloToolkit/UX/Scripts/Receivers/InteractionReceiver.cs b/Assets/HoloToolkit/UX/Scripts/Receivers/InteractionReceiver.cs index 6842fc1fcab..c0898f4910e 100644 --- a/Assets/HoloToolkit/UX/Scripts/Receivers/InteractionReceiver.cs +++ b/Assets/HoloToolkit/UX/Scripts/Receivers/InteractionReceiver.cs @@ -66,12 +66,19 @@ public virtual void OnEnable() } /// - /// On disable remove all linked interacibles from the delegate functions + /// On disable remove all linked interactables from the delegate functions /// public virtual void OnDisable() { - InputManager.Instance.RemoveGlobalListener(gameObject); - FocusManager.Instance.PointerSpecificFocusChanged += OnPointerSpecificFocusChanged; + if (InputManager.IsInitialized) + { + InputManager.Instance.RemoveGlobalListener(gameObject); + } + + if (FocusManager.IsInitialized) + { + FocusManager.Instance.PointerSpecificFocusChanged -= OnPointerSpecificFocusChanged; + } } /// diff --git a/Assets/HoloToolkit/UX/Shaders.meta b/Assets/HoloToolkit/UX/Shaders.meta index aadb4d8cc45..01b680a233e 100644 --- a/Assets/HoloToolkit/UX/Shaders.meta +++ b/Assets/HoloToolkit/UX/Shaders.meta @@ -1,9 +1,10 @@ fileFormatVersion: 2 -guid: d836831ae3fcf3a4ea272a0458a5ccb6 +guid: 502c5075267ac2a448035f1cff424bf9 folderAsset: yes -timeCreated: 1480372956 +timeCreated: 1506288410 licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/Alpha-Diffuse.shader b/Assets/HoloToolkit/UX/Shaders/Alpha-Diffuse.shader similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/Alpha-Diffuse.shader rename to Assets/HoloToolkit/UX/Shaders/Alpha-Diffuse.shader diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/Alpha-Diffuse.shader.meta b/Assets/HoloToolkit/UX/Shaders/Alpha-Diffuse.shader.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/Alpha-Diffuse.shader.meta rename to Assets/HoloToolkit/UX/Shaders/Alpha-Diffuse.shader.meta diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/DebugNormals.shader b/Assets/HoloToolkit/UX/Shaders/DebugNormals.shader similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/DebugNormals.shader rename to Assets/HoloToolkit/UX/Shaders/DebugNormals.shader diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/DebugNormals.shader.meta b/Assets/HoloToolkit/UX/Shaders/DebugNormals.shader.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/DebugNormals.shader.meta rename to Assets/HoloToolkit/UX/Shaders/DebugNormals.shader.meta diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/HUXButtonHighlightShader.shader b/Assets/HoloToolkit/UX/Shaders/HUXButtonHighlightShader.shader similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/HUXButtonHighlightShader.shader rename to Assets/HoloToolkit/UX/Shaders/HUXButtonHighlightShader.shader diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/HUXButtonHighlightShader.shader.meta b/Assets/HoloToolkit/UX/Shaders/HUXButtonHighlightShader.shader.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/HUXButtonHighlightShader.shader.meta rename to Assets/HoloToolkit/UX/Shaders/HUXButtonHighlightShader.shader.meta diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/HUXButtonShader.shader b/Assets/HoloToolkit/UX/Shaders/HUXButtonShader.shader similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/HUXButtonShader.shader rename to Assets/HoloToolkit/UX/Shaders/HUXButtonShader.shader diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/HUXButtonShader.shader.meta b/Assets/HoloToolkit/UX/Shaders/HUXButtonShader.shader.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/HUXButtonShader.shader.meta rename to Assets/HoloToolkit/UX/Shaders/HUXButtonShader.shader.meta diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/LuminousUnity.shader b/Assets/HoloToolkit/UX/Shaders/LuminousUnity.shader similarity index 66% rename from Assets/HoloToolkit/UX/Resources/Shaders/LuminousUnity.shader rename to Assets/HoloToolkit/UX/Shaders/LuminousUnity.shader index 76296bfc797..16997a896fc 100644 --- a/Assets/HoloToolkit/UX/Resources/Shaders/LuminousUnity.shader +++ b/Assets/HoloToolkit/UX/Shaders/LuminousUnity.shader @@ -1,79 +1,57 @@ -// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. -// Upgrade NOTE: replaced '_Object2World' with 'unity_ObjectToWorld' - -// // Unity port of HoloFX Shell shader // // v0.1 Mathew Lamb // based upon work by Doug Service // -// // This shader implements the surface properties of the Prototype Shader, implemented in // the Fulcrum render engine. It does so shackled by Unity's lighting engine which limits the // number and type of lights used in a render pass. // // It is a two pass shader, the first pass computes the major Directional light and all additive -// sources (emission, reflection etc), the second pass captures the first 4 spot lights, implemented -// in Unity's fucked up approach to this. +// sources (emission, reflection etc), the second pass captures the first 4 spot lights. // // All computation based upon lighting is code-identical to the HLSL equivalent. // -// // To Do: -// - implement lights as parameters to the shader and wrap filling in the relevent values with a script +// - implement lights as parameters to the shader and wrap filling in the relevant values with a script // run from within Unity -// -// -// - - - - - Shader "Custom/MayaHLSL4" { - - - Properties { - - _fDiffuseIntensity ("Diffuse Intensity", Float) = 1 - _cAlbedo ("Albedo Color", Color) = (0.0,0.0,0.0) - _txAlbedo ("Albedo Texture (RGB Texture)", 2D) = "white" {} - _bEnableHalfLambert ("Half Lambert Toggle",Range(0,1)) = 0 - _fHalfLambertExp ("Half Lambert Exponent", Float) = 1 - - _cSpecular ("Specular Color", Color) = (0.0,0.0,0.0) - _txSpecular ("Specular Texture (RGB Texture)", 2D) = "white" {} - _fSpecularPower ("Specular Power", Float) = 1 - _bEnableFresnel ("Fresnel Toggle",Range(0,1)) = 0 - _bEnableAlphaFresnel ("Alpha Fresnel Toggle",Range(0,1)) = 0 - _fFresnelExp ("Fresnel Exponent", Float) = 1 - _fFresnelMin ("Fresnel Minimum", Float) = 1 - _cReflection ("Reflection Color", Color) = (0.0,0.0,0.0) - _txReflection ("Reflection Texture (RGB Cubemap)", Cube) = "white" {} - - _cEmission ("Emission Color", Color) = (0.0,0.0,0.0) - _txEmission ("Emission Texture (RGB Texture)", 2D) = "white" {} - - _cAmbient ("Ambient Color", Color) = (0.0,0.0,0.0) - _txAmbient ("Ambient Texture (RGB Cubemap)", Cube) = "white" {} - - _fAlphaScale ("Alpha Scale", Float) = 1 - _txAlpha ("Alpha Texture (RGB Texture)", 2D) = "white" {} - - _txOcclusion ("Occlusion Texture (RGB Texture)", 2D) = "white" {} - - _txNormal ("Normal Texture (RGB Texture)", 2D) = "white" { TexGen CubeNormal } - - - - + _fDiffuseIntensity("Diffuse Intensity", Float) = 1 + _cAlbedo("Albedo Color", Color) = (0.0,0.0,0.0) + _txAlbedo("Albedo Texture (RGB Texture)", 2D) = "white" {} + _bEnableHalfLambert("Half Lambert Toggle",Range(0,1)) = 0 + _fHalfLambertExp("Half Lambert Exponent", Float) = 1 + + _cSpecular("Specular Color", Color) = (0.0,0.0,0.0) + _txSpecular("Specular Texture (RGB Texture)", 2D) = "white" {} + _fSpecularPower("Specular Power", Float) = 1 + _bEnableFresnel("Fresnel Toggle",Range(0,1)) = 0 + _bEnableAlphaFresnel("Alpha Fresnel Toggle",Range(0,1)) = 0 + _fFresnelExp("Fresnel Exponent", Float) = 1 + _fFresnelMin("Fresnel Minimum", Float) = 1 + _cReflection("Reflection Color", Color) = (0.0,0.0,0.0) + _txReflection("Reflection Texture (RGB Cubemap)", Cube) = "white" {} + + _cEmission("Emission Color", Color) = (0.0,0.0,0.0) + _txEmission("Emission Texture (RGB Texture)", 2D) = "white" {} + + _cAmbient("Ambient Color", Color) = (0.0,0.0,0.0) + _txAmbient("Ambient Texture (RGB Cubemap)", Cube) = "white" {} + + _fAlphaScale("Alpha Scale", Float) = 1 + _txAlpha("Alpha Texture (RGB Texture)", 2D) = "white" {} + + _txOcclusion("Occlusion Texture (RGB Texture)", 2D) = "white" {} + + _txNormal("Normal Texture (RGB Texture)", 2D) = "white" { TexGen CubeNormal } } - - SubShader { + SubShader { Tags { "Queue" = "Transparent" "RenderType" = "Transparent" @@ -83,31 +61,28 @@ Shader "Custom/MayaHLSL4" { // total Unity nastiness // all reflective and emissive terms are here as this pass is only evaluated once Pass { - Tags { "LightMode" = "ForwardBase" } - + Cull Back Lighting On ZWrite On ZTest LEqual Blend SrcAlpha OneMinusSrcAlpha - + CGPROGRAM #pragma only_renderers d3d11 #pragma vertex vert #pragma fragment frag #pragma multi_compile_fwdbase - - #pragma target 5.0 - - #include "UnityCG.cginc" - #include "AutoLight.cginc" - - - + + #pragma target 5.0 + + #include "UnityCG.cginc" + #include "AutoLight.cginc" + uniform float4 _LightColor0; // color of light source - from Lighting.cginc uniform float3 _cEmission; @@ -122,115 +97,107 @@ Shader "Custom/MayaHLSL4" { uniform float _fFresnelMin; uniform float _fFresnelExp; uniform float _fAlphaScale; - - uniform bool _bEnableFresnel; - uniform bool _bEnableAlphaFresnel; - uniform bool _bEnableHalfLambert; - - uniform sampler2D _txEmission; - uniform samplerCUBE _txAmbient; - uniform sampler2D _txOcclusion; - uniform sampler2D _txAlbedo; - uniform sampler2D _txNormal; - uniform sampler2D _txSpecular; - uniform samplerCUBE _txReflection; - uniform sampler2D _txAlpha; - - struct VsIn { - float4 vPosition : POSITION; - float4 vTangent : TANGENT; - float3 vNormal : NORMAL; - float4 vTexCoord0 : TEXCOORD0; - }; - - struct Vs2Ps { - float4 vPosition : SV_POSITION; - float3 vWorldPosition : TEXCOORD0; - float3 vToEye : TEXCOORD1; - float3 vWorldNormal : TEXCOORD2; - float3 vWorldTangent : TEXCOORD3; - float3 vWorldBitangent : TEXCOORD4; - float2 vTexCoord0 : TEXCOORD5; - }; - + + uniform bool _bEnableFresnel; + uniform bool _bEnableAlphaFresnel; + uniform bool _bEnableHalfLambert; + + uniform sampler2D _txEmission; + uniform samplerCUBE _txAmbient; + uniform sampler2D _txOcclusion; + uniform sampler2D _txAlbedo; + uniform sampler2D _txNormal; + uniform sampler2D _txSpecular; + uniform samplerCUBE _txReflection; + uniform sampler2D _txAlpha; + + struct VsIn { + float4 vPosition : POSITION; + float4 vTangent : TANGENT; + float3 vNormal : NORMAL; + float4 vTexCoord0 : TEXCOORD0; + }; + + struct Vs2Ps { + float4 vPosition : SV_POSITION; + float3 vWorldPosition : TEXCOORD0; + float3 vToEye : TEXCOORD1; + float3 vWorldNormal : TEXCOORD2; + float3 vWorldTangent : TEXCOORD3; + float3 vWorldBitangent : TEXCOORD4; + float2 vTexCoord0 : TEXCOORD5; + }; + Vs2Ps vert(in VsIn vsIn) { Vs2Ps vsOut; - + // vertex from model space to view space and world space // normally a geometry shader would come next, in which case we would only go to world space vsOut.vPosition = UnityObjectToClipPos(vsIn.vPosition); vsOut.vWorldPosition = mul(unity_ObjectToWorld,vsIn.vPosition).xyz; - + vsOut.vToEye = normalize(WorldSpaceViewDir(vsIn.vPosition)); - + // tangent space basis vector from model space to view space // normally a geometry shader would come next, in which case we would only go to world space vsOut.vWorldNormal = normalize(mul((float3x3)unity_ObjectToWorld,vsIn.vNormal)); vsOut.vWorldTangent = normalize(mul((float3x3)unity_ObjectToWorld,vsIn.vTangent)); float3 BiTangent = cross(vsIn.vNormal,vsIn.vTangent.xyz) * vsIn.vTangent.w; vsOut.vWorldBitangent = normalize(mul((float3x3)unity_ObjectToWorld,BiTangent)); - - // pass through the texture coord + + // pass through the texture coordinates vsOut.vTexCoord0 = vsIn.vTexCoord0; - - return vsOut; + return vsOut; } - - - // - // wrap-around lambert + // wrap-around lambertian // float HalfLambert(float nDotL) { - return saturate((nDotL + _fHalfLambertExp)/((1 + _fHalfLambertExp) * ( 1 + _fHalfLambertExp))); + return saturate((nDotL + _fHalfLambertExp) / ((1 + _fHalfLambertExp) * (1 + _fHalfLambertExp))); } - - -// + + // // this class is the per-light computation of the illuminance // class Material { - + // Material properties used in lighting calculation. - float fFresnelMin; - float fFresnelExp; - float fSpecPower; - float3 cSpecular; - float3 cAlbedo; - float3 cOcclusion; - float3 cResult; - - void Illuminate( - in float3 nVertex, // Iterated world space vertex normal - in float3 nLight, // World space surface normal for lighting - in float3 vToLight, // Direction to light. - in float3 vToEye, // Direction to the eye. - in float3 cIrradiance // Light irradiance. - ) - { - // + float fFresnelMin; + float fFresnelExp; + float fSpecPower; + float3 cSpecular; + float3 cAlbedo; + float3 cOcclusion; + float3 cResult; + + void Illuminate( + in float3 nVertex, // Iterated world space vertex normal + in float3 nLight, // World space surface normal for lighting + in float3 vToLight, // Direction to light. + in float3 vToEye, // Direction to the eye. + in float3 cIrradiance // Light irradiance. + ) + { + // // this next piece of code is the fulcrum illuminance loop // - + float nDotL = dot(nLight,vToLight); // normal due to the normal map float nDotLVert = dot(nVertex,vToLight); // interpolated vertex normal - + // calculate the reflection vector from the light float3 vReflect = 2.0f * nDotL * nLight - vToLight; - - // Calculate the diffuse intensity and clamp lighting // on backside normal map normals. float fBackClamp = 1.0; float fIDiffuse = 0.0; - if (_bEnableHalfLambert) { fBackClamp = HalfLambert(nDotLVert); @@ -241,7 +208,7 @@ Shader "Custom/MayaHLSL4" { fBackClamp = step(0, nDotLVert); fIDiffuse = fBackClamp * _fDiffuseIntensity * saturate(nDotL); } - + // Calculate the Fresnel term for the light. float2 vCoeff = float2(1, 1); if (_bEnableFresnel) @@ -249,47 +216,33 @@ Shader "Custom/MayaHLSL4" { float fReflect = _fFresnelMin + (1.0 - _fFresnelMin) * pow(1.0 - fIDiffuse, _fFresnelExp); vCoeff = float2(1 - fReflect, fReflect); } - + // Calculate the specular intensity. float fISpecular = fBackClamp* pow(saturate(dot(vReflect, vToEye)), _fSpecularPower); - // // bring the two color computations together // - cResult = cOcclusion * cIrradiance * (vCoeff.x * fIDiffuse * cAlbedo + vCoeff.y * fISpecular * cSpecular); - - - } - - - + cResult = cOcclusion * cIrradiance * (vCoeff.x * fIDiffuse * cAlbedo + vCoeff.y * fISpecular * cSpecular); + } }; - - - - - float4 frag(in Vs2Ps psIn) : SV_TARGET { - - - float gamma=1.0; - - + float gamma = 1.0; + // // the following code is more-or-less lifted straight from the fulcrum shader // cubemap implementation differs // - + // read emissive, ambient, diffuse and specular maps // correct gamma to linear float3 ctEmission = pow(tex2D(_txEmission, psIn.vTexCoord0).rgb, gamma); float3 ctOcclusion = pow(tex2D(_txOcclusion, psIn.vTexCoord0).rgb, gamma); float3 ctAlbedo = pow(tex2D(_txAlbedo, psIn.vTexCoord0).rgb, gamma); float3 ctSpecular = pow(tex2D(_txSpecular, psIn.vTexCoord0).rgb, gamma); - + // read normal map and Eye, Normal, Tangent and Bitangent vectors // from the vertex shader data structure float3 vtNormal = tex2D(_txNormal, psIn.vTexCoord0).rgb; @@ -297,36 +250,32 @@ Shader "Custom/MayaHLSL4" { float3 nVertex = normalize(psIn.vWorldNormal); float3 nTangent = normalize(psIn.vWorldTangent); float3 nBitangent = normalize(psIn.vWorldBitangent); - + // convert the normal map from normalized range [0,1] to [-1,1] vtNormal.xyz = 2 * vtNormal - 1; - + // build the tangent space to world space transform and transform // the normal map normal from tangent space to world space float3x3 mTangentToWorld = { nTangent, nBitangent, nVertex }; float3 nLight = mul(vtNormal, mTangentToWorld); nLight = normalize(nLight); - + // get the ambient illumination along the normal float3 ctAmbient = pow(texCUBE(_txAmbient, nLight).rgb, gamma); - + // calculate the eye reflection vector and get reflection map color float3 vEyeReflect = 2.0f * dot(nLight,vToEye) * nLight - vToEye; float3 ctReflection = pow(texCUBE(_txReflection,vEyeReflect).rgb, gamma); - + // add the emissive and ambient irradiance colorized by albedo float3 cOut = _cEmission * ctEmission + _cAmbient * ctAmbient * ctOcclusion * _cAlbedo * ctAlbedo; - - - // + // at this point in the fulcrum shader the illuminance loop is called - // due to the idiosyncracies of Unity at this point we sample the one light that is known to be calling + // due to the idiosyncrasies of Unity at this point we sample the one light that is known to be calling // this shader - a single directional light // additional (spot) lights are computed in the next pass // in this pass we compute the light due to the directional and all non-light related quantities - // - - + // work with the directional light (if it exists) - compute its direction and attenuation float3 L; float atten; @@ -339,11 +288,10 @@ Shader "Custom/MayaHLSL4" { { L = float3(_WorldSpaceLightPos0 - psIn.vWorldPosition); float dist = length(L); - atten = 1.0/dist; + atten = 1.0 / dist; L = normalize(L); } - - + // hide the material characteristics in class and call its Illuminate() method // to light it Material obj; @@ -354,62 +302,46 @@ Shader "Custom/MayaHLSL4" { obj.cAlbedo = ctAlbedo * _cAlbedo; obj.cOcclusion = ctOcclusion; obj.cResult = float3(0,0,0); - + obj.Illuminate(nVertex,nLight,L,vToEye,float3(_LightColor0.rgb) * atten); - + cOut = cOut + obj.cResult; - - - - - // // transparency - modulated by the 'r' channel of the Alpha texture - // - float alpha=_fAlphaScale * tex2D(_txAlpha,psIn.vTexCoord0).r; + float alpha = _fAlphaScale * tex2D(_txAlpha,psIn.vTexCoord0).r; - - // calculate the fresnel term for the reflected light - float fFresnelReflect = lerp(1.0f, _fFresnelMin + (1.0f - _fFresnelMin) * - pow(1.0f - saturate(dot(vEyeReflect,nLight)), _fFresnelExp), _bEnableFresnel); - cOut += fFresnelReflect * ctSpecular * _cReflection * ctReflection; - - - return float4(cOut,alpha); + // calculate the Fresnel term for the reflected light + float fFresnelReflect = lerp(1.0f, _fFresnelMin + (1.0f - _fFresnelMin) * + pow(1.0f - saturate(dot(vEyeReflect,nLight)), _fFresnelExp), _bEnableFresnel); + cOut += fFresnelReflect * ctSpecular * _cReflection * ctReflection; + return float4(cOut,alpha); } - ENDCG } - - - // additional light sources - // and all light sources with cookies - ie spot lights - for these use cookies to achieve the correct angle + // and all light sources with cookies - i.e. spot lights - for these use cookies to achieve the correct angle Pass { - - Tags { - "LightMode" = "ForwardAdd" - } + Tags { + "LightMode" = "ForwardAdd" + } Blend One One // additive blending for additional lights - - CGPROGRAM + CGPROGRAM #pragma only_renderers d3d11 #pragma vertex vert #pragma fragment frag #pragma multi_compile_fwdbase - - #pragma target 5.0 + + #pragma target 5.0 #include "UnityCG.cginc" #include "AutoLight.cginc" - - + uniform float4 _LightColor0; // color of light source - from Lighting.cginc uniform float3 _cAlbedo; @@ -421,114 +353,100 @@ Shader "Custom/MayaHLSL4" { uniform float _fFresnelMin; uniform float _fFresnelExp; uniform float _fAlphaScale; - - uniform bool _bEnableFresnel; - uniform bool _bEnableAlphaFresnel; - uniform bool _bEnableHalfLambert; - uniform sampler2D _txOcclusion; - uniform sampler2D _txAlbedo; - uniform sampler2D _txNormal; - uniform sampler2D _txSpecular; - uniform sampler2D _txAlpha; + uniform bool _bEnableFresnel; + uniform bool _bEnableAlphaFresnel; + uniform bool _bEnableHalfLambert; + uniform sampler2D _txOcclusion; + uniform sampler2D _txAlbedo; + uniform sampler2D _txNormal; + uniform sampler2D _txSpecular; + uniform sampler2D _txAlpha; struct VsIn { - float4 vPosition : POSITION; - float4 vTangent : TANGENT; - float3 vNormal : NORMAL; - float4 vTexCoord0 : TEXCOORD0; - }; - - struct Vs2Ps { - float4 vPosition : SV_POSITION; - float3 vWorldPosition : TEXCOORD0; - float3 vToEye : TEXCOORD1; - float3 vWorldNormal : TEXCOORD2; - float3 vWorldTangent : TEXCOORD3; - float3 vWorldBitangent : TEXCOORD4; - float2 vTexCoord0 : TEXCOORD5; - LIGHTING_COORDS(6,7) - }; + float4 vPosition : POSITION; + float4 vTangent : TANGENT; + float3 vNormal : NORMAL; + float4 vTexCoord0 : TEXCOORD0; + }; + struct Vs2Ps { + float4 vPosition : SV_POSITION; + float3 vWorldPosition : TEXCOORD0; + float3 vToEye : TEXCOORD1; + float3 vWorldNormal : TEXCOORD2; + float3 vWorldTangent : TEXCOORD3; + float3 vWorldBitangent : TEXCOORD4; + float2 vTexCoord0 : TEXCOORD5; + LIGHTING_COORDS(6,7) + }; Vs2Ps vert(in VsIn vsIn) { Vs2Ps vsOut; - + // vertex from model space to view space and world space // normally a geometry shader would come next, in which case we would only go to world space vsOut.vPosition = UnityObjectToClipPos(vsIn.vPosition); vsOut.vWorldPosition = mul(unity_ObjectToWorld,vsIn.vPosition).xyz; - - vsOut.vToEye = normalize(WorldSpaceViewDir(vsIn.vPosition)); - + + vsOut.vToEye = normalize(WorldSpaceViewDir(vsIn.vPosition)); + // tangent space basis vector from model space to view space // normally a geometry shader would come next, in which case we would only go to world space vsOut.vWorldNormal = normalize(mul((float3x3)unity_ObjectToWorld,vsIn.vNormal)); vsOut.vWorldTangent = normalize(mul((float3x3)unity_ObjectToWorld,vsIn.vTangent)); float3 BiTangent = cross(vsIn.vNormal,vsIn.vTangent.xyz) * vsIn.vTangent.w; vsOut.vWorldBitangent = normalize(mul((float3x3)unity_ObjectToWorld,BiTangent)); - + // pass through the texture coord vsOut.vTexCoord0 = vsIn.vTexCoord0; - - return vsOut; + return vsOut; } - - - - - // - // wrap-around lambert - // + // wrap-around lambertian float HalfLambert(float nDotL) { - return saturate((nDotL + _fHalfLambertExp)/((1 + _fHalfLambertExp) * ( 1 + _fHalfLambertExp))); + return saturate((nDotL + _fHalfLambertExp) / ((1 + _fHalfLambertExp) * (1 + _fHalfLambertExp))); } - - -// + + // // this class is the per-light computation of the illuminance // class Material { - // Material properties used in lighting calculation. - float fFresnelMin; - float fFresnelExp; - float fSpecPower; - float3 cSpecular; - float3 cAlbedo; - float3 cOcclusion; - float3 cResult; - - void Illuminate( - in float3 nVertex, // Iterated world space vertex normal - in float3 nLight, // World space surface normal for lighting - in float3 vToLight, // Direction to light. - in float3 vToEye, // Direction to the eye. - in float3 cIrradiance // Light irradiance. - ) - { - // + float fFresnelMin; + float fFresnelExp; + float fSpecPower; + float3 cSpecular; + float3 cAlbedo; + float3 cOcclusion; + float3 cResult; + + void Illuminate( + in float3 nVertex, // Iterated world space vertex normal + in float3 nLight, // World space surface normal for lighting + in float3 vToLight, // Direction to light. + in float3 vToEye, // Direction to the eye. + in float3 cIrradiance // Light irradiance. + ) + { // this next piece of code is the fulcrum illuminance loop - // - + float nDotL = dot(nLight,vToLight); // normal due to the normal map float nDotLVert = dot(nVertex,vToLight); // interpolated vertex normal - + // calculate the reflection vector from the light float3 vReflect = 2.0f * nDotL * nLight - vToLight; - + // Calculate the diffuse intensity and clamp lighting // on backside normal map normals. float fBackClamp = 1.0; float fIDiffuse = 0.0; - if (_bEnableHalfLambert) { fBackClamp = HalfLambert(nDotLVert); @@ -539,7 +457,7 @@ Shader "Custom/MayaHLSL4" { fBackClamp = step(0, nDotLVert); fIDiffuse = fBackClamp * _fDiffuseIntensity * saturate(nDotL); } - + // Calculate the Fresnel term for the light. float2 vCoeff = float2(1, 1); if (_bEnableFresnel) @@ -547,41 +465,27 @@ Shader "Custom/MayaHLSL4" { float fReflect = _fFresnelMin + (1.0 - _fFresnelMin) * pow(1.0 - fIDiffuse, _fFresnelExp); vCoeff = float2(1 - fReflect, fReflect); } - + // Calculate the specular intensity. float fISpecular = fBackClamp * pow(saturate(dot(vReflect, vToEye)), _fSpecularPower); - - // // bring the two color computations together - // - cResult = cOcclusion * cIrradiance * (vCoeff.x * fIDiffuse * _cAlbedo + vCoeff.y * fISpecular * _cSpecular); - - - } - - - + cResult = cOcclusion * cIrradiance * (vCoeff.x * fIDiffuse * _cAlbedo + vCoeff.y * fISpecular * _cSpecular); + } }; - - - - float4 frag(in Vs2Ps psIn) : SV_TARGET { - - // + // the following code is more-or-less lifted straight from the fulcrum shader // cubemap implementation differs - // - + // read emissive, ambient, diffuse and specular maps // correct gamma to linear float3 ctOcclusion = pow(tex2D(_txOcclusion, psIn.vTexCoord0).rgb, 2.2); float3 ctAlbedo = pow(tex2D(_txAlbedo, psIn.vTexCoord0).rgb, 2.2); float3 ctSpecular = pow(tex2D(_txSpecular, psIn.vTexCoord0).rgb, 2.2); - + // read normal map and Eye, Normal, Tangent and Bitangent vectors // from the vertex shader data structure float3 vtNormal = tex2D(_txNormal, psIn.vTexCoord0).rgb; @@ -589,32 +493,25 @@ Shader "Custom/MayaHLSL4" { float3 nVertex = normalize(psIn.vWorldNormal); float3 nTangent = normalize(psIn.vWorldTangent); float3 nBitangent = normalize(psIn.vWorldBitangent); - + // convert the normal map from normalized range [0,1] to [-1,1] vtNormal.xyz = 2 * vtNormal - 1; - + // build the tangent space to world space transform and transform // the normal map normal from tangent space to world space float3x3 mTangentToWorld = { nTangent, nBitangent, nVertex }; float3 N = mul(vtNormal, mTangentToWorld); N = normalize(N); - - + // calculate the eye reflection vector and get reflection map color float3 vEyeReflect = 2.0f * dot(N,V) * N - V; - - - - // // at this point in the fulcrum shader the illuminance loop is called - // due to the idiosyncracies of Unity at this point we sample the one light that is known to be calling + // due to the idiosyncrasies of Unity at this point we sample the one light that is known to be calling // this shader - a single directional light // additional (spot) lights are computed in the next pass // in this pass we compute the light due to the directional and all non-light related quantities - // - - + // work with the directional light (if it exists) - compute its direction and attenuation float3 L; float atten; @@ -627,11 +524,10 @@ Shader "Custom/MayaHLSL4" { { L = float3(_WorldSpaceLightPos0 - psIn.vWorldPosition); float dist = length(L); - atten = 1.0/dist; + atten = 1.0 / dist; L = normalize(L); } - - + // hide the material characteristics in class and call its Illuminate() method // to light it Material obj; @@ -642,35 +538,19 @@ Shader "Custom/MayaHLSL4" { obj.cAlbedo = ctAlbedo * _cAlbedo; obj.cOcclusion = ctOcclusion; obj.cResult = float3(0,0,0); - + obj.Illuminate(nVertex,N,L,V,float3(_LightColor0.rgb) * atten); - + float3 cOut = obj.cResult; - - - // - // transparency - modulated by the 'r' channel of the Alpha texture - // - float alpha=_fAlphaScale * tex2D(_txAlpha,psIn.vTexCoord0).r; + // transparency - modulated by the 'r' channel of the Alpha texture + float alpha = _fAlphaScale * tex2D(_txAlpha,psIn.vTexCoord0).r; //cOut=float3(0,0,0); - - return float4(cOut,alpha); - - - } - + return float4(cOut,alpha); + } ENDCG - } - - - - - - - } } \ No newline at end of file diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/LuminousUnity.shader.meta b/Assets/HoloToolkit/UX/Shaders/LuminousUnity.shader.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/LuminousUnity.shader.meta rename to Assets/HoloToolkit/UX/Shaders/LuminousUnity.shader.meta diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/MovieMask.shader b/Assets/HoloToolkit/UX/Shaders/MovieMask.shader similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/MovieMask.shader rename to Assets/HoloToolkit/UX/Shaders/MovieMask.shader diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/MovieMask.shader.meta b/Assets/HoloToolkit/UX/Shaders/MovieMask.shader.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/MovieMask.shader.meta rename to Assets/HoloToolkit/UX/Shaders/MovieMask.shader.meta diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/Normal-Diffuse.shader b/Assets/HoloToolkit/UX/Shaders/Normal-Diffuse.shader similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/Normal-Diffuse.shader rename to Assets/HoloToolkit/UX/Shaders/Normal-Diffuse.shader diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/Normal-Diffuse.shader.meta b/Assets/HoloToolkit/UX/Shaders/Normal-Diffuse.shader.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/Normal-Diffuse.shader.meta rename to Assets/HoloToolkit/UX/Shaders/Normal-Diffuse.shader.meta diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/Occlusion.shader b/Assets/HoloToolkit/UX/Shaders/Occlusion.shader similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/Occlusion.shader rename to Assets/HoloToolkit/UX/Shaders/Occlusion.shader diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/Occlusion.shader.meta b/Assets/HoloToolkit/UX/Shaders/Occlusion.shader.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/Occlusion.shader.meta rename to Assets/HoloToolkit/UX/Shaders/Occlusion.shader.meta diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/StereoImage.shader b/Assets/HoloToolkit/UX/Shaders/StereoImage.shader similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/StereoImage.shader rename to Assets/HoloToolkit/UX/Shaders/StereoImage.shader diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/StereoImage.shader.meta b/Assets/HoloToolkit/UX/Shaders/StereoImage.shader.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/StereoImage.shader.meta rename to Assets/HoloToolkit/UX/Shaders/StereoImage.shader.meta diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/unlit_vert_color.shader b/Assets/HoloToolkit/UX/Shaders/unlit_vert_color.shader similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/unlit_vert_color.shader rename to Assets/HoloToolkit/UX/Shaders/unlit_vert_color.shader diff --git a/Assets/HoloToolkit/UX/Resources/Shaders/unlit_vert_color.shader.meta b/Assets/HoloToolkit/UX/Shaders/unlit_vert_color.shader.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Shaders/unlit_vert_color.shader.meta rename to Assets/HoloToolkit/UX/Shaders/unlit_vert_color.shader.meta diff --git a/Assets/HoloToolkit/UX/Textures.meta b/Assets/HoloToolkit/UX/Textures.meta index 7fe202a0039..42984bfa7b6 100644 --- a/Assets/HoloToolkit/UX/Textures.meta +++ b/Assets/HoloToolkit/UX/Textures.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 295d7addc3a626b4789738749b23be14 +guid: 61688ba8209a8b0468d460f0db0ae66d folderAsset: yes -timeCreated: 1452822325 +timeCreated: 1440628853 licenseType: Pro DefaultImporter: - externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/HoloToolkit/UX/Resources/Textures/BeamTex.png b/Assets/HoloToolkit/UX/Textures/BeamTex.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/BeamTex.png rename to Assets/HoloToolkit/UX/Textures/BeamTex.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/BeamTex.png.meta b/Assets/HoloToolkit/UX/Textures/BeamTex.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/BeamTex.png.meta rename to Assets/HoloToolkit/UX/Textures/BeamTex.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Bounding Box.png b/Assets/HoloToolkit/UX/Textures/Bounding Box.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Bounding Box.png rename to Assets/HoloToolkit/UX/Textures/Bounding Box.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Bounding Box.png.meta b/Assets/HoloToolkit/UX/Textures/Bounding Box.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Bounding Box.png.meta rename to Assets/HoloToolkit/UX/Textures/Bounding Box.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/BoundingBox.png b/Assets/HoloToolkit/UX/Textures/BoundingBox.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/BoundingBox.png rename to Assets/HoloToolkit/UX/Textures/BoundingBox.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/BoundingBox.png.meta b/Assets/HoloToolkit/UX/Textures/BoundingBox.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/BoundingBox.png.meta rename to Assets/HoloToolkit/UX/Textures/BoundingBox.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/ButtonCircleHighlight.psd b/Assets/HoloToolkit/UX/Textures/ButtonCircleHighlight.psd similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/ButtonCircleHighlight.psd rename to Assets/HoloToolkit/UX/Textures/ButtonCircleHighlight.psd diff --git a/Assets/HoloToolkit/UX/Resources/Textures/ButtonCircleHighlight.psd.meta b/Assets/HoloToolkit/UX/Textures/ButtonCircleHighlight.psd.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/ButtonCircleHighlight.psd.meta rename to Assets/HoloToolkit/UX/Textures/ButtonCircleHighlight.psd.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/ButtonExclusionMatte.png b/Assets/HoloToolkit/UX/Textures/ButtonExclusionMatte.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/ButtonExclusionMatte.png rename to Assets/HoloToolkit/UX/Textures/ButtonExclusionMatte.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/ButtonExclusionMatte.png.meta b/Assets/HoloToolkit/UX/Textures/ButtonExclusionMatte.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/ButtonExclusionMatte.png.meta rename to Assets/HoloToolkit/UX/Textures/ButtonExclusionMatte.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/ButtonHover.png b/Assets/HoloToolkit/UX/Textures/ButtonHover.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/ButtonHover.png rename to Assets/HoloToolkit/UX/Textures/ButtonHover.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/ButtonHover.png.meta b/Assets/HoloToolkit/UX/Textures/ButtonHover.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/ButtonHover.png.meta rename to Assets/HoloToolkit/UX/Textures/ButtonHover.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/ButtonRectangleHighlight.psd b/Assets/HoloToolkit/UX/Textures/ButtonRectangleHighlight.psd similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/ButtonRectangleHighlight.psd rename to Assets/HoloToolkit/UX/Textures/ButtonRectangleHighlight.psd diff --git a/Assets/HoloToolkit/UX/Resources/Textures/ButtonRectangleHighlight.psd.meta b/Assets/HoloToolkit/UX/Textures/ButtonRectangleHighlight.psd.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/ButtonRectangleHighlight.psd.meta rename to Assets/HoloToolkit/UX/Textures/ButtonRectangleHighlight.psd.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/ButtonSquareHighlight.psd b/Assets/HoloToolkit/UX/Textures/ButtonSquareHighlight.psd similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/ButtonSquareHighlight.psd rename to Assets/HoloToolkit/UX/Textures/ButtonSquareHighlight.psd diff --git a/Assets/HoloToolkit/UX/Resources/Textures/ButtonSquareHighlight.psd.meta b/Assets/HoloToolkit/UX/Textures/ButtonSquareHighlight.psd.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/ButtonSquareHighlight.psd.meta rename to Assets/HoloToolkit/UX/Textures/ButtonSquareHighlight.psd.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor.meta b/Assets/HoloToolkit/UX/Textures/Cursor.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor.meta rename to Assets/HoloToolkit/UX/Textures/Cursor.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/1-1-32x32 cuser reg.png b/Assets/HoloToolkit/UX/Textures/Cursor/1-1-32x32 cuser reg.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/1-1-32x32 cuser reg.png rename to Assets/HoloToolkit/UX/Textures/Cursor/1-1-32x32 cuser reg.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/1-1-32x32 cuser reg.png.meta b/Assets/HoloToolkit/UX/Textures/Cursor/1-1-32x32 cuser reg.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/1-1-32x32 cuser reg.png.meta rename to Assets/HoloToolkit/UX/Textures/Cursor/1-1-32x32 cuser reg.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/1-2-32x32 cuser-handup.png b/Assets/HoloToolkit/UX/Textures/Cursor/1-2-32x32 cuser-handup.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/1-2-32x32 cuser-handup.png rename to Assets/HoloToolkit/UX/Textures/Cursor/1-2-32x32 cuser-handup.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/1-2-32x32 cuser-handup.png.meta b/Assets/HoloToolkit/UX/Textures/Cursor/1-2-32x32 cuser-handup.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/1-2-32x32 cuser-handup.png.meta rename to Assets/HoloToolkit/UX/Textures/Cursor/1-2-32x32 cuser-handup.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/1-3-32x32 cuser reg overlink.png b/Assets/HoloToolkit/UX/Textures/Cursor/1-3-32x32 cuser reg overlink.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/1-3-32x32 cuser reg overlink.png rename to Assets/HoloToolkit/UX/Textures/Cursor/1-3-32x32 cuser reg overlink.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/1-3-32x32 cuser reg overlink.png.meta b/Assets/HoloToolkit/UX/Textures/Cursor/1-3-32x32 cuser reg overlink.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/1-3-32x32 cuser reg overlink.png.meta rename to Assets/HoloToolkit/UX/Textures/Cursor/1-3-32x32 cuser reg overlink.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/1-4-32x32 cuser-overlink-handup.png b/Assets/HoloToolkit/UX/Textures/Cursor/1-4-32x32 cuser-overlink-handup.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/1-4-32x32 cuser-overlink-handup.png rename to Assets/HoloToolkit/UX/Textures/Cursor/1-4-32x32 cuser-overlink-handup.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/1-4-32x32 cuser-overlink-handup.png.meta b/Assets/HoloToolkit/UX/Textures/Cursor/1-4-32x32 cuser-overlink-handup.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/1-4-32x32 cuser-overlink-handup.png.meta rename to Assets/HoloToolkit/UX/Textures/Cursor/1-4-32x32 cuser-overlink-handup.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/32x32 1-cuser-glance.png b/Assets/HoloToolkit/UX/Textures/Cursor/32x32 1-cuser-glance.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/32x32 1-cuser-glance.png rename to Assets/HoloToolkit/UX/Textures/Cursor/32x32 1-cuser-glance.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/32x32 1-cuser-glance.png.meta b/Assets/HoloToolkit/UX/Textures/Cursor/32x32 1-cuser-glance.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/32x32 1-cuser-glance.png.meta rename to Assets/HoloToolkit/UX/Textures/Cursor/32x32 1-cuser-glance.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/32x32 1-cuser-handup.png b/Assets/HoloToolkit/UX/Textures/Cursor/32x32 1-cuser-handup.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/32x32 1-cuser-handup.png rename to Assets/HoloToolkit/UX/Textures/Cursor/32x32 1-cuser-handup.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/32x32 1-cuser-handup.png.meta b/Assets/HoloToolkit/UX/Textures/Cursor/32x32 1-cuser-handup.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/32x32 1-cuser-handup.png.meta rename to Assets/HoloToolkit/UX/Textures/Cursor/32x32 1-cuser-handup.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/32x32 1-cuser-overlink-glance.png b/Assets/HoloToolkit/UX/Textures/Cursor/32x32 1-cuser-overlink-glance.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/32x32 1-cuser-overlink-glance.png rename to Assets/HoloToolkit/UX/Textures/Cursor/32x32 1-cuser-overlink-glance.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/32x32 1-cuser-overlink-glance.png.meta b/Assets/HoloToolkit/UX/Textures/Cursor/32x32 1-cuser-overlink-glance.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/32x32 1-cuser-overlink-glance.png.meta rename to Assets/HoloToolkit/UX/Textures/Cursor/32x32 1-cuser-overlink-glance.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/32x32 1-cuser-overlink-handup.png b/Assets/HoloToolkit/UX/Textures/Cursor/32x32 1-cuser-overlink-handup.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/32x32 1-cuser-overlink-handup.png rename to Assets/HoloToolkit/UX/Textures/Cursor/32x32 1-cuser-overlink-handup.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/32x32 1-cuser-overlink-handup.png.meta b/Assets/HoloToolkit/UX/Textures/Cursor/32x32 1-cuser-overlink-handup.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/32x32 1-cuser-overlink-handup.png.meta rename to Assets/HoloToolkit/UX/Textures/Cursor/32x32 1-cuser-overlink-handup.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/circle_shadow.png b/Assets/HoloToolkit/UX/Textures/Cursor/circle_shadow.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/circle_shadow.png rename to Assets/HoloToolkit/UX/Textures/Cursor/circle_shadow.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/circle_shadow.png.meta b/Assets/HoloToolkit/UX/Textures/Cursor/circle_shadow.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/circle_shadow.png.meta rename to Assets/HoloToolkit/UX/Textures/Cursor/circle_shadow.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/cursor_Outline.png b/Assets/HoloToolkit/UX/Textures/Cursor/cursor_Outline.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/cursor_Outline.png rename to Assets/HoloToolkit/UX/Textures/Cursor/cursor_Outline.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/cursor_Outline.png.meta b/Assets/HoloToolkit/UX/Textures/Cursor/cursor_Outline.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/cursor_Outline.png.meta rename to Assets/HoloToolkit/UX/Textures/Cursor/cursor_Outline.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/cursor_nonOutline.png b/Assets/HoloToolkit/UX/Textures/Cursor/cursor_nonOutline.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/cursor_nonOutline.png rename to Assets/HoloToolkit/UX/Textures/Cursor/cursor_nonOutline.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/cursor_nonOutline.png.meta b/Assets/HoloToolkit/UX/Textures/Cursor/cursor_nonOutline.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/cursor_nonOutline.png.meta rename to Assets/HoloToolkit/UX/Textures/Cursor/cursor_nonOutline.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/ring_shadow.png b/Assets/HoloToolkit/UX/Textures/Cursor/ring_shadow.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/ring_shadow.png rename to Assets/HoloToolkit/UX/Textures/Cursor/ring_shadow.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/ring_shadow.png.meta b/Assets/HoloToolkit/UX/Textures/Cursor/ring_shadow.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/ring_shadow.png.meta rename to Assets/HoloToolkit/UX/Textures/Cursor/ring_shadow.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/scroll_ring_shadow.png b/Assets/HoloToolkit/UX/Textures/Cursor/scroll_ring_shadow.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/scroll_ring_shadow.png rename to Assets/HoloToolkit/UX/Textures/Cursor/scroll_ring_shadow.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Cursor/scroll_ring_shadow.png.meta b/Assets/HoloToolkit/UX/Textures/Cursor/scroll_ring_shadow.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Cursor/scroll_ring_shadow.png.meta rename to Assets/HoloToolkit/UX/Textures/Cursor/scroll_ring_shadow.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Icons.meta b/Assets/HoloToolkit/UX/Textures/Icons.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Icons.meta rename to Assets/HoloToolkit/UX/Textures/Icons.meta diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Backspace.png b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Backspace.png similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Backspace.png rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Backspace.png diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Backspace.png.meta b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Backspace.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Backspace.png.meta rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Backspace.png.meta diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Close.png b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Close.png similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Close.png rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Close.png diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Close.png.meta b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Close.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Close.png.meta rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Close.png.meta diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Dictation.png b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Dictation.png similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Dictation.png rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Dictation.png diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Dictation.png.meta b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Dictation.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Dictation.png.meta rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Dictation.png.meta diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Down.png b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Down.png similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Down.png rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Down.png diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Down.png.meta b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Down.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Down.png.meta rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Down.png.meta diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Left.png b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Left.png similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Left.png rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Left.png diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Left.png.meta b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Left.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Left.png.meta rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Left.png.meta diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Right.png b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Right.png similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Right.png rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Right.png diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Right.png.meta b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Right.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Right.png.meta rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Right.png.meta diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Shift_Symbols.png b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Shift_Symbols.png similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Shift_Symbols.png rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Shift_Symbols.png diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Shift_Symbols.png.meta b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Shift_Symbols.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Shift_Symbols.png.meta rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Shift_Symbols.png.meta diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_UnShift_Symbols.png b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_UnShift_Symbols.png similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_UnShift_Symbols.png rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_UnShift_Symbols.png diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_UnShift_Symbols.png.meta b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_UnShift_Symbols.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_UnShift_Symbols.png.meta rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_UnShift_Symbols.png.meta diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Up.png b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Up.png similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Up.png rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Up.png diff --git a/Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Up.png.meta b/Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Up.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Images/KeyboardKeyGlyphs_Up.png.meta rename to Assets/HoloToolkit/UX/Textures/Icons/KeyboardKeyGlyphs_Up.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionCylinder.png b/Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionCylinder.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionCylinder.png rename to Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionCylinder.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionCylinder.png.meta b/Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionCylinder.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionCylinder.png.meta rename to Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionCylinder.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionDefault.png b/Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionDefault.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionDefault.png rename to Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionDefault.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionDefault.png.meta b/Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionDefault.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionDefault.png.meta rename to Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionDefault.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionPlane.png b/Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionPlane.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionPlane.png rename to Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionPlane.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionPlane.png.meta b/Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionPlane.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionPlane.png.meta rename to Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionPlane.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionScatter.png b/Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionScatter.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionScatter.png rename to Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionScatter.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionScatter.png.meta b/Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionScatter.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionScatter.png.meta rename to Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionScatter.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionSphere.png b/Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionSphere.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionSphere.png rename to Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionSphere.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionSphere.png.meta b/Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionSphere.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Icons/ObjectCollectionSphere.png.meta rename to Assets/HoloToolkit/UX/Textures/Icons/ObjectCollectionSphere.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Icons/Placeholder.png b/Assets/HoloToolkit/UX/Textures/Icons/Placeholder.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Icons/Placeholder.png rename to Assets/HoloToolkit/UX/Textures/Icons/Placeholder.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/Icons/Placeholder.png.meta b/Assets/HoloToolkit/UX/Textures/Icons/Placeholder.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/Icons/Placeholder.png.meta rename to Assets/HoloToolkit/UX/Textures/Icons/Placeholder.png.meta diff --git a/Assets/HoloToolkit/UX/Textures/KeyboardAtlas.spriteatlas b/Assets/HoloToolkit/UX/Textures/KeyboardAtlas.spriteatlas index ed8c75c1ad5..7be627de973 100644 --- a/Assets/HoloToolkit/UX/Textures/KeyboardAtlas.spriteatlas +++ b/Assets/HoloToolkit/UX/Textures/KeyboardAtlas.spriteatlas @@ -28,11 +28,11 @@ SpriteAtlas: enableTightPacking: 0 packedHash: serializedVersion: 2 - Hash: 59447b9d27cd467b975647bc4533e86e + Hash: b579d9a28ce9cc7d8109d453a20bac11 variantMultiplier: 1 bindAsDefault: 1 finalFormat: 4 - hashString: 59447b9d27cd467b975647bc4533e86e + hashString: b579d9a28ce9cc7d8109d453a20bac11 totalSpriteSurfaceArea: 2359296 packables: - {fileID: 102900000, guid: ebf9a4ed0c92cc24483bdd4cca5078c2, type: 3} diff --git a/Assets/HoloToolkit/UX/Resources/Textures/WorldCursor.png b/Assets/HoloToolkit/UX/Textures/WorldCursor.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/WorldCursor.png rename to Assets/HoloToolkit/UX/Textures/WorldCursor.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/WorldCursor.png.meta b/Assets/HoloToolkit/UX/Textures/WorldCursor.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/WorldCursor.png.meta rename to Assets/HoloToolkit/UX/Textures/WorldCursor.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/arrow.png b/Assets/HoloToolkit/UX/Textures/arrow.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/arrow.png rename to Assets/HoloToolkit/UX/Textures/arrow.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/arrow.png.meta b/Assets/HoloToolkit/UX/Textures/arrow.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/arrow.png.meta rename to Assets/HoloToolkit/UX/Textures/arrow.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/arrowend.png b/Assets/HoloToolkit/UX/Textures/arrowend.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/arrowend.png rename to Assets/HoloToolkit/UX/Textures/arrowend.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/arrowend.png.meta b/Assets/HoloToolkit/UX/Textures/arrowend.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/arrowend.png.meta rename to Assets/HoloToolkit/UX/Textures/arrowend.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/arrows.png b/Assets/HoloToolkit/UX/Textures/arrows.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/arrows.png rename to Assets/HoloToolkit/UX/Textures/arrows.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/arrows.png.meta b/Assets/HoloToolkit/UX/Textures/arrows.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/arrows.png.meta rename to Assets/HoloToolkit/UX/Textures/arrows.png.meta diff --git a/Assets/HoloToolkit/UX/Resources/Textures/bounding_box_TEX.png b/Assets/HoloToolkit/UX/Textures/bounding_box_TEX.png similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/bounding_box_TEX.png rename to Assets/HoloToolkit/UX/Textures/bounding_box_TEX.png diff --git a/Assets/HoloToolkit/UX/Resources/Textures/bounding_box_TEX.png.meta b/Assets/HoloToolkit/UX/Textures/bounding_box_TEX.png.meta similarity index 100% rename from Assets/HoloToolkit/UX/Resources/Textures/bounding_box_TEX.png.meta rename to Assets/HoloToolkit/UX/Textures/bounding_box_TEX.png.meta diff --git a/Assets/HoloToolkit/Utilities/Plugins.meta b/Assets/HoloToolkit/Utilities/Plugins.meta deleted file mode 100644 index a70665ad949..00000000000 --- a/Assets/HoloToolkit/Utilities/Plugins.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 4862ae2ff6facbd4d838616e68a44140 -folderAsset: yes -timeCreated: 1504289889 -licenseType: Pro -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/Utilities/Plugins/WSA.meta b/Assets/HoloToolkit/Utilities/Plugins/WSA.meta deleted file mode 100644 index f2d8817128c..00000000000 --- a/Assets/HoloToolkit/Utilities/Plugins/WSA.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 41963246e6d08274f94072b955cb9662 -folderAsset: yes -timeCreated: 1504289905 -licenseType: Pro -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/Utilities/Plugins/WSA/System.IO.dll b/Assets/HoloToolkit/Utilities/Plugins/WSA/System.IO.dll deleted file mode 100644 index e4de0c29aed..00000000000 Binary files a/Assets/HoloToolkit/Utilities/Plugins/WSA/System.IO.dll and /dev/null differ diff --git a/Assets/HoloToolkit/Utilities/Plugins/WSA/System.IO.dll.meta b/Assets/HoloToolkit/Utilities/Plugins/WSA/System.IO.dll.meta deleted file mode 100644 index 5d268f014f6..00000000000 --- a/Assets/HoloToolkit/Utilities/Plugins/WSA/System.IO.dll.meta +++ /dev/null @@ -1,113 +0,0 @@ -fileFormatVersion: 2 -guid: a9406722c1724b54385234881e4e0c76 -timeCreated: 1504290006 -licenseType: Pro -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude WindowsStoreApps: 0 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 1 - settings: - CPU: AnyCPU - DontProcess: False - PlaceholderPath: - SDK: UWP - ScriptingBackend: Il2Cpp - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HoloToolkit/Utilities/Scripts/AdaptiveQuality/AdaptiveQuality.cs b/Assets/HoloToolkit/Utilities/Scripts/AdaptiveQuality/AdaptiveQuality.cs index 1f9ff926804..a968a5471b0 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/AdaptiveQuality/AdaptiveQuality.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/AdaptiveQuality/AdaptiveQuality.cs @@ -6,10 +6,10 @@ namespace HoloToolkit.Unity { /// - /// Main components for controlling the quality of the system to maintain a steady framerate. - /// Calulates a QualityLevel based on the reported framerate and the refreshrate of the device inside the provided thresholds. + /// Main components for controlling the quality of the system to maintain a steady frame rate. + /// Calculates a QualityLevel based on the reported frame rate and the refresh rate of the device inside the provided thresholds. /// A QualityChangedEvent is triggered whenever the quality level changes. - /// Uses the GpuTimingCamera component to measure gpu time of the frame, if the Camera doesnt already have this component, it is automatically added. + /// Uses the GpuTimingCamera component to measure GPU time of the frame, if the Camera doesn't already have this component, it is automatically added. /// public class AdaptiveQuality : MonoBehaviour @@ -55,7 +55,7 @@ private void OnEnable() { QualityLevel = StartQualityLevel; - //Store our refreshrate + // Store our refresh rate #if UNITY_2017_2_OR_NEWER RefreshRate = (int)UnityEngine.XR.XRDevice.refreshRate; @@ -72,13 +72,13 @@ private void OnEnable() } frameTimeQuota = 1.0f / RefreshRate; - //Assume main camera if no camera was setup + // Assume main camera if no camera was setup if (adaptiveCamera == null) { adaptiveCamera = Camera.main; } - //Make sure we have the GpuTimingCamera component attached to our camera with the correct timing tag + // Make sure we have the GpuTimingCamera component attached to our camera with the correct timing tag GpuTimingCamera gpuCamera = adaptiveCamera.GetComponent(); if (gpuCamera == null || gpuCamera.TimingTag.CompareTo(TimingTag) != 0) { @@ -93,14 +93,14 @@ protected void Update() private bool LastFramesBelowThreshold(int frameCount) { - //Make sure we have enough new frames since last change + // Make sure we have enough new frames since last change if (lastFrames.Count < frameCount || frameCountSinceLastLevelUpdate < frameCount) { return false; } float maxTime = frameTimeQuota * MinFrameTimeThreshold; - //See if all our frames are below the threshold + // See if all our frames are below the threshold foreach (var frameTime in lastFrames) { if (frameTime >= maxTime) @@ -114,7 +114,7 @@ private bool LastFramesBelowThreshold(int frameCount) private void UpdateQualityLevel(int delta) { - //Change and clamp the new quality level + // Change and clamp the new quality level int prevQualityLevel = QualityLevel; QualityLevel = Mathf.Clamp(QualityLevel + delta, MinQualityLevel, MaxQualityLevel); diff --git a/Assets/HoloToolkit/Utilities/Scripts/AdaptiveQuality/AdaptiveViewport.cs b/Assets/HoloToolkit/Utilities/Scripts/AdaptiveQuality/AdaptiveViewport.cs index 50a6246e8dc..7f86f2de390 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/AdaptiveQuality/AdaptiveViewport.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/AdaptiveQuality/AdaptiveViewport.cs @@ -6,7 +6,7 @@ namespace HoloToolkit.Unity { /// - /// Changes the VR viewport to correlate to the requested quality, trying to maintain a steady framerate by reducing the amount of pixels rendered. + /// Changes the VR viewport to correlate to the requested quality, trying to maintain a steady frame rate by reducing the amount of pixels rendered. /// Uses the AdaptiveQuality component to respond to quality change events. /// At MaxQualityLevel, the viewport will be set to 1.0 and will linearly drop of to MinViewportSize at MinQualityLevel /// Note, that it is ok to have the quality levels in this component correlate to a subset of the levels reported from the AdaptiveQuality component diff --git a/Assets/HoloToolkit/Utilities/Scripts/ApplicationViewManager.cs b/Assets/HoloToolkit/Utilities/Scripts/ApplicationViewManager.cs index 11bd11b0642..4e3325f3456 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/ApplicationViewManager.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/ApplicationViewManager.cs @@ -43,7 +43,7 @@ static System.Collections.Concurrent.ConcurrentDictionary> C /// /// Call this method with Application View Dispatcher， or in Application View Thread, will return to Full3D View and close Application View /// - /// The return value of the Xaml View Execution + /// The return value of the XAML View Execution #if !UNITY_EDITOR && UNITY_WSA public static async void CallbackReturnValue(object returnValue) { @@ -69,7 +69,7 @@ public static void CallbackReturnValue(object returnValue) } #endif /// - /// Call this method in Unity App Thread can switch to Plan View, create and show a new Xaml View. + /// Call this method in Unity App Thread can switch to Plan View, create and show a new XAML View. /// /// /// diff --git a/Assets/HoloToolkit/Utilities/Scripts/Attributes/TextAreaProp.cs b/Assets/HoloToolkit/Utilities/Scripts/Attributes/TextAreaProp.cs index 96c30f31a3a..10209439e74 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/Attributes/TextAreaProp.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/Attributes/TextAreaProp.cs @@ -10,7 +10,7 @@ namespace HoloToolkit.Unity { - // Displays a text property as a textarea + // Displays a text property as a text area [AttributeUsage(AttributeTargets.Property)] public sealed class TextAreaProp : DrawOverrideAttribute { diff --git a/Assets/HoloToolkit/Utilities/Scripts/Attributes/TutorialAttribute.cs b/Assets/HoloToolkit/Utilities/Scripts/Attributes/TutorialAttribute.cs index f0c59ea9a61..406e1502e65 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/Attributes/TutorialAttribute.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/Attributes/TutorialAttribute.cs @@ -8,7 +8,7 @@ namespace HoloToolkit.Unity { - // Provides a clickable link to a tuturoial in the inspector header + // Provides a clickable link to a tutorial in the inspector header [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] public sealed class TutorialAttribute : Attribute { diff --git a/Assets/HoloToolkit/Utilities/Scripts/Editor/AutoConfigureMenu.cs b/Assets/HoloToolkit/Utilities/Scripts/Editor/AutoConfigureMenu.cs index 87b40ce916d..3bf8c53d82d 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/Editor/AutoConfigureMenu.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/Editor/AutoConfigureMenu.cs @@ -31,7 +31,7 @@ public static void ShowHelp() } /// - /// Applies recommended scene settings to the current scenes + /// Applies recommended scene settings to the current scenes. /// [MenuItem("Mixed Reality Toolkit/Configure/Apply Mixed Reality Scene Settings #&s", false, 1)] public static void ShowSceneSettingsWindow() @@ -41,7 +41,7 @@ public static void ShowSceneSettingsWindow() } /// - /// Applies recommended project settings to the current project + /// Applies recommended project settings to the current project. /// [MenuItem("Mixed Reality Toolkit/Configure/Apply Mixed Reality Project Settings #&p", false, 0)] public static void ShowProjectSettingsWindow() @@ -51,7 +51,7 @@ public static void ShowProjectSettingsWindow() } /// - /// Applies recommended capability settings to the current project + /// Applies recommended capability settings to the current project. /// [MenuItem("Mixed Reality Toolkit/Configure/Apply UWP Capability Settings #&c", false, 2)] public static void ShowCapabilitySettingsWindow() diff --git a/Assets/HoloToolkit/Utilities/Scripts/Editor/AutoConfigureWindow.cs b/Assets/HoloToolkit/Utilities/Scripts/Editor/AutoConfigureWindow.cs index caadd9b249b..14c19d9a0a5 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/Editor/AutoConfigureWindow.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/Editor/AutoConfigureWindow.cs @@ -52,6 +52,30 @@ private void SettingToggle(TSetting setting) /// private string StatusMessage { get { return statusMessage; } set { statusMessage = value; } } + /// + /// Checks all the checkboxes in the window. + /// + private void SelectAll() + { + var keys = values.Keys.ToArray(); + for (int iKey = 0; iKey < keys.Length; iKey++) + { + Values[keys[iKey]] = true; + } + } + + /// + /// Unchecks all the checkboxes in the window. + /// + private void SelectNone() + { + var keys = values.Keys.ToArray(); + for (int iKey = 0; iKey < keys.Length; iKey++) + { + Values[keys[iKey]] = false; + } + } + #endregion // Internal Methods #region Overridables / Event Triggers @@ -123,12 +147,24 @@ protected virtual void OnGUI() GUILayout.EndScrollView(); GUILayout.EndVertical(); - // Apply button - GUILayout.BeginVertical(EditorStyles.miniButtonRight); + // Buttons + GUILayout.BeginHorizontal(EditorStyles.miniButtonRight); + bool selectAllClicked = GUILayout.Button("Select All"); + bool selectNoneClicked = GUILayout.Button("Select None"); bool applyClicked = GUILayout.Button("Apply"); - GUILayout.EndVertical(); + GUILayout.EndHorizontal(); // Clicked? + if (selectAllClicked) + { + SelectAll(); + } + + if (selectNoneClicked) + { + SelectNone(); + } + if (applyClicked) { ApplySettings(); diff --git a/Assets/HoloToolkit/Utilities/Scripts/Editor/EditorPrefs.cs b/Assets/HoloToolkit/Utilities/Scripts/Editor/EditorPrefsUtility.cs similarity index 100% rename from Assets/HoloToolkit/Utilities/Scripts/Editor/EditorPrefs.cs rename to Assets/HoloToolkit/Utilities/Scripts/Editor/EditorPrefsUtility.cs diff --git a/Assets/HoloToolkit/Utilities/Scripts/Editor/EditorPrefs.cs.meta b/Assets/HoloToolkit/Utilities/Scripts/Editor/EditorPrefsUtility.cs.meta similarity index 100% rename from Assets/HoloToolkit/Utilities/Scripts/Editor/EditorPrefs.cs.meta rename to Assets/HoloToolkit/Utilities/Scripts/Editor/EditorPrefsUtility.cs.meta diff --git a/Assets/HoloToolkit/Utilities/Scripts/Editor/EnumFlagsPropertyDrawer.cs b/Assets/HoloToolkit/Utilities/Scripts/Editor/EnumFlagsPropertyDrawer.cs index 0ad50f16b35..6bdd5c29f0b 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/Editor/EnumFlagsPropertyDrawer.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/Editor/EnumFlagsPropertyDrawer.cs @@ -15,7 +15,7 @@ public class EnumFlagsPropertyDrawer : PropertyDrawer { public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) { - // If we're using MRDL custom edtiors, let the draw override property handle it + // If we're using MRDL custom editors, let the draw override property handle it if (MRTKEditor.ShowCustomEditors) return; diff --git a/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs b/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs index 533ddac7813..d7d71896350 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. using System; +using System.Collections.Generic; using System.IO; using System.Text.RegularExpressions; using UnityEditor; @@ -16,7 +17,48 @@ namespace HoloToolkit.Unity public class ProjectSettingsWindow : AutoConfigureWindow { private const string SharingServiceURL = "https://raw.githubusercontent.com/Microsoft/MixedRealityToolkit-Unity/master/External/HoloToolkit/Sharing/Server/SharingService.exe"; - private const string InputManagerAssetURL = "https://raw.githubusercontent.com/Microsoft/MixedRealityToolkit-Unity/master/ProjectSettings/InputManager.asset"; + + /// + /// This is used to keep a local list of axis names, so we don't have to keep iterating through each SerializedProperty. + /// + private List axisNames = new List(); + + /// + /// This is used to keep a single reference to InputManager.asset, refreshed when necessary. + /// + private SerializedObject inputManagerAsset; + + /// + /// Define new axes here adding a new InputManagerAxis to the array. + /// + private readonly InputManagerAxis[] newInputAxes = + { + new InputManagerAxis() { Name = InputMappingAxisUtility.CONTROLLER_LEFT_STICK_HORIZONTAL, Dead = 0.19f, Sensitivity = 1, Invert = false, Type = AxisType.JoystickAxis, Axis = 1 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.CONTROLLER_LEFT_STICK_VERTICAL, Dead = 0.19f, Sensitivity = 1, Invert = true, Type = AxisType.JoystickAxis, Axis = 2 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.XBOX_SHARED_TRIGGER, Dead = 0.19f, Sensitivity = 1, Invert = false, Type = AxisType.JoystickAxis, Axis = 3 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.CONTROLLER_RIGHT_STICK_HORIZONTAL, Dead = 0.19f, Sensitivity = 1, Invert = false, Type = AxisType.JoystickAxis, Axis = 4 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.CONTROLLER_RIGHT_STICK_VERTICAL, Dead = 0.19f, Sensitivity = 1, Invert = true, Type = AxisType.JoystickAxis, Axis = 5 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.XBOX_DPAD_HORIZONTAL, Dead = 0.19f, Sensitivity = 1, Invert = false, Type = AxisType.JoystickAxis, Axis = 6 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.XBOX_DPAD_VERTICAL, Dead = 0.19f, Sensitivity = 1, Invert = false, Type = AxisType.JoystickAxis, Axis = 7 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.CONTROLLER_LEFT_TRIGGER, Dead = 0.19f, Sensitivity = 1, Invert = false, Type = AxisType.JoystickAxis, Axis = 9 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.CONTROLLER_RIGHT_TRIGGER, Dead = 0.19f, Sensitivity = 1, Invert = false, Type = AxisType.JoystickAxis, Axis = 10 }, + + new InputManagerAxis() { Name = InputMappingAxisUtility.XBOX_A, PositiveButton = "joystick button 0", Gravity = 1000, Dead = 0.001f, Sensitivity = 1000, Type = AxisType.KeyOrMouseButton, Axis = 1 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.XBOX_B, PositiveButton = "joystick button 1", Gravity = 1000, Dead = 0.001f, Sensitivity = 1000, Type = AxisType.KeyOrMouseButton, Axis = 1 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.XBOX_X, PositiveButton = "joystick button 2", Gravity = 1000, Dead = 0.001f, Sensitivity = 1000, Type = AxisType.KeyOrMouseButton, Axis = 1 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.XBOX_Y, PositiveButton = "joystick button 3", Gravity = 1000, Dead = 0.001f, Sensitivity = 1000, Type = AxisType.KeyOrMouseButton, Axis = 1 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.CONTROLLER_LEFT_BUMPER_OR_GRIP, PositiveButton = "joystick button 4", Gravity = 1000, Dead = 0.001f, Sensitivity = 1000, Type = AxisType.KeyOrMouseButton, Axis = 1 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.CONTROLLER_RIGHT_BUMPER_OR_GRIP, PositiveButton = "joystick button 5", Gravity = 1000, Dead = 0.001f, Sensitivity = 1000, Type = AxisType.KeyOrMouseButton, Axis = 1 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.CONTROLLER_LEFT_MENU, PositiveButton = "joystick button 6", Gravity = 1000, Dead = 0.001f, Sensitivity = 1000, Type = AxisType.KeyOrMouseButton, Axis = 1 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.CONTROLLER_RIGHT_MENU, PositiveButton = "joystick button 7", Gravity = 1000, Dead = 0.001f, Sensitivity = 1000, Type = AxisType.KeyOrMouseButton, Axis = 1 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.CONTROLLER_LEFT_STICK_CLICK, PositiveButton = "joystick button 8", Gravity = 1000, Dead = 0.001f, Sensitivity = 1000, Type = AxisType.KeyOrMouseButton, Axis = 1 }, + new InputManagerAxis() { Name = InputMappingAxisUtility.CONTROLLER_RIGHT_STICK_CLICK, PositiveButton = "joystick button 9", Gravity = 1000, Dead = 0.001f, Sensitivity = 1000, Type = AxisType.KeyOrMouseButton, Axis = 1 }, + }; + + /// + /// As axes in newInputAxes are removed or renamed, move them here for proper clean-up in user projects. + /// + private readonly InputManagerAxis[] obsoleteInputAxes = { }; #region Nested Types @@ -27,10 +69,42 @@ public enum ProjectSetting WsaUwpBuildToD3D, TargetOccludedDevices, SharingServices, - XboxControllerSupport, + UseInputManagerAxes, DotNetScriptingBackend, } + /// + /// Used to map AxisType from a useful name to the int value the InputManager wants. + /// + private enum AxisType + { + KeyOrMouseButton, + MouseMovement, + JoystickAxis + }; + + /// + /// Used to define an entire InputManagerAxis, with each variable defined by the same term the Inspector shows. + /// + private class InputManagerAxis + { + public string Name = ""; + public string DescriptiveName = ""; + public string DescriptiveNegativeName = ""; + public string NegativeButton = ""; + public string PositiveButton = ""; + public string AltNegativeButton = ""; + public string AltPositiveButton = ""; + public float Gravity = 0.0f; + public float Dead = 0.0f; + public float Sensitivity = 0.0f; + public bool Snap = false; + public bool Invert = false; + public AxisType Type = default(AxisType); + public int Axis = 0; + public int JoyNum = 0; + } + #endregion // Nested Types #region Overrides / Event Handlers @@ -77,13 +151,14 @@ protected override void LoadSettings() case ProjectSetting.SharingServices: Values[(ProjectSetting)i] = EditorPrefsUtility.GetEditorPref(Names[(ProjectSetting)i], false); break; - case ProjectSetting.XboxControllerSupport: + case ProjectSetting.UseInputManagerAxes: Values[(ProjectSetting)i] = EditorPrefsUtility.GetEditorPref(Names[(ProjectSetting)i], false); break; default: throw new ArgumentOutOfRangeException(); } } + } private void UpdateSettings(BuildTarget currentBuildTarget) @@ -109,7 +184,7 @@ private void UpdateSettings(BuildTarget currentBuildTarget) #endif while (!webRequest.isDone) { - if (webRequest.downloadProgress != -1) + if (webRequest.downloadProgress > -1) { EditorUtility.DisplayProgressBar( "Downloading the SharingService executable from GitHub", @@ -122,7 +197,7 @@ private void UpdateSettings(BuildTarget currentBuildTarget) #if UNITY_2017_1_OR_NEWER if (webRequest.isNetworkError || webRequest.isHttpError) #else - if (webRequest.isError) + if (webRequest.isError) #endif { Debug.LogError("Network Error: " + webRequest.error); @@ -150,72 +225,48 @@ private void UpdateSettings(BuildTarget currentBuildTarget) PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.PrivateNetworkClientServer, false); } - var inputManagerPath = Directory.GetParent(Path.GetFullPath(Application.dataPath)).FullName + "\\ProjectSettings\\InputManager.asset"; - bool userPermission = Values[ProjectSetting.XboxControllerSupport]; + bool useToolkitAxes = Values[ProjectSetting.UseInputManagerAxes]; - if (userPermission) + if (useToolkitAxes != EditorPrefsUtility.GetEditorPref(Names[ProjectSetting.UseInputManagerAxes], false)) { - userPermission = EditorUtility.DisplayDialog("Attention!", - "Hi there, we noticed that you've enabled the Xbox Controller support.\n\n" + - "Do you give us permission to download the latest input mapping definitions from " + - "the Mixed Reality Toolkit's GitHub page and replace your project's InputManager.asset?\n\n", - "OK", "Cancel"); + EditorPrefsUtility.SetEditorPref(Names[ProjectSetting.UseInputManagerAxes], useToolkitAxes); - if (userPermission) + // Grabs the actual asset file into a SerializedObject, so we can iterate through it and edit it. + inputManagerAsset = new SerializedObject(AssetDatabase.LoadAssetAtPath("ProjectSettings/InputManager.asset", typeof(UnityEngine.Object))); + + if (useToolkitAxes) { - using (var webRequest = UnityWebRequest.Get(InputManagerAssetURL)) + foreach (InputManagerAxis axis in newInputAxes) { -#if UNITY_2017_2_OR_NEWER - webRequest.SendWebRequest(); -#else - webRequest.Send(); -#endif - - while (!webRequest.isDone) + if (!DoesAxisNameExist(axis.Name)) { - if (webRequest.downloadProgress != -1) - { - EditorUtility.DisplayProgressBar("Downloading InputManager.asset from GitHub", "Progress...", webRequest.downloadProgress); - } + AddAxis(axis); } + } - EditorUtility.ClearProgressBar(); - -#if UNITY_2017_1_OR_NEWER - if (webRequest.isNetworkError || webRequest.isHttpError) -#else - if (webRequest.isError) -#endif + } + else + { + foreach (InputManagerAxis axis in newInputAxes) + { + if (DoesAxisNameExist(axis.Name)) { - Debug.LogError("Network Error: " + webRequest.error); - userPermission = false; + RemoveAxis(axis.Name); } - else + } + + foreach (InputManagerAxis axis in obsoleteInputAxes) + { + if (DoesAxisNameExist(axis.Name)) { - File.Copy(inputManagerPath, inputManagerPath + ".old", true); - File.WriteAllText(inputManagerPath, webRequest.downloadHandler.text); + RemoveAxis(axis.Name); } } } - } - if (!userPermission) - { - Values[ProjectSetting.XboxControllerSupport] = false; - if (File.Exists(inputManagerPath + ".old")) - { - File.Copy(inputManagerPath + ".old", inputManagerPath, true); - File.Delete(inputManagerPath + ".old"); - Debug.Log("Previous Input Mapping Restored."); - } - else - { - Debug.LogWarning("No old Input Mapping found!"); - } + inputManagerAsset.ApplyModifiedProperties(); } - EditorPrefsUtility.SetEditorPref(Names[ProjectSetting.XboxControllerSupport], Values[ProjectSetting.XboxControllerSupport]); - if (currentBuildTarget != BuildTarget.WSAPlayer) { AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate); @@ -249,7 +300,7 @@ private void UpdateSettings(BuildTarget currentBuildTarget) #else UnityEditorInternal.VR.VREditor.SetVREnabledDevicesOnTargetGroup(BuildTargetGroup.WSA, new[] { "HoloLens" }); #endif - PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.HumanInterfaceDevice, Values[ProjectSetting.XboxControllerSupport]); + PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.HumanInterfaceDevice, Values[ProjectSetting.UseInputManagerAxes]); BuildDeployPrefs.BuildPlatform = "x86"; for (var i = 0; i < QualitySettings.names.Length; i++) @@ -314,7 +365,7 @@ protected override void LoadStrings() Descriptions[ProjectSetting.BuildWsaUwp] = "Required\n\n" + "Switches the currently active target to produce a Store app targeting the Universal Windows Platform.\n\n" + - "Note: Cross platform development can be done with this toolkit, but many features and" + + "Note: Cross platform development can be done with this toolkit, but many features and " + "tools will not work if the build target is not Windows Universal."; Names[ProjectSetting.WsaEnableXR] = "Enable XR"; @@ -327,9 +378,9 @@ protected override void LoadStrings() Names[ProjectSetting.WsaUwpBuildToD3D] = "Build for Direct3D"; Descriptions[ProjectSetting.WsaUwpBuildToD3D] = "Recommended\n\n" + - "Produces an app that targets Direct3D instead of Xaml.\n\n" + - "Pure Direct3D apps run faster than applications that include Xaml. This option should remain checked unless you plan to " + - "overlay Unity content with Xaml content or you plan to switch between Unity views and Xaml views at runtime."; + "Produces an app that targets Direct3D instead of XAML.\n\n" + + "Pure Direct3D apps run faster than applications that include XAML. This option should remain checked unless you plan to " + + "overlay Unity content with XAML content or you plan to switch between Unity views and XAML views at runtime."; Names[ProjectSetting.TargetOccludedDevices] = "Target Occluded Devices"; Descriptions[ProjectSetting.TargetOccludedDevices] = @@ -345,17 +396,16 @@ protected override void LoadStrings() Names[ProjectSetting.SharingServices] = "Enable Sharing Services"; Descriptions[ProjectSetting.SharingServices] = "Enables the use of the Sharing Services in your project for all apps on any platform.\n\n" + - "Note: Start the Sharing Server via 'HoloToolkit/Sharing Service/Launch Sharing Service'.\n\n" + + "Note: Start the Sharing Server via 'Mixed Reality Toolkit/Sharing Service/Launch Sharing Service'.\n\n" + "Note: The InternetClientServer and PrivateNetworkClientServer capabilities will be enabled in the " + "appx manifest for you."; - Names[ProjectSetting.XboxControllerSupport] = "Enable Xbox Controller Support"; - Descriptions[ProjectSetting.XboxControllerSupport] = - "Enables the use of Xbox Controller support for all apps on any platform.\n\n" + - "Warning! Enabling this feature will copy your old InputManager.asset and append it with \".old\". " + - "To revert simply disable Xbox Controller Support.\n\n" + - "Note: ONLY the HoloLens platform target requires the HID capabilities be defined in the appx manifest. " + - "This capability is automatically enabled for you if you enable Xbox Controller Support and enable VR and target the HoloLens device."; + Names[ProjectSetting.UseInputManagerAxes] = "Use Toolkit-specific InputManager axes"; + Descriptions[ProjectSetting.UseInputManagerAxes] = + "Enables the use of the Xbox Controller for all apps on any platform.\n\n" + + "To remove the added axes, simply disable this setting.\n\n" + + "Note: The HoloLens platform target requires the HID capability to be defined in the appx manifest. " + + "This capability is automatically enabled for you if you select this setting, \"Enable XR\", and don't select \"Target Occluded Devices\"."; Names[ProjectSetting.DotNetScriptingBackend] = "Enable .NET scripting backend"; Descriptions[ProjectSetting.DotNetScriptingBackend] = @@ -375,6 +425,119 @@ protected override void OnEnable() maxSize = minSize; } + private void OnDisable() + { + if (inputManagerAsset != null) + { + inputManagerAsset.Dispose(); + } + } + #endregion // Overrides / Event Handlers + + private void AddAxis(InputManagerAxis axis) + { + SerializedProperty axesProperty = inputManagerAsset.FindProperty("m_Axes"); + + // Creates a new axis by incrementing the size of the m_Axes array. + axesProperty.arraySize++; + + // Get the new axis be querying for the last array element. + SerializedProperty axisProperty = axesProperty.GetArrayElementAtIndex(axesProperty.arraySize - 1); + + // Iterate through all the properties of the new axis. + while (axisProperty.Next(true)) + { + switch (axisProperty.name) + { + case "m_Name": + axisProperty.stringValue = axis.Name; + break; + case "descriptiveName": + axisProperty.stringValue = axis.DescriptiveName; + break; + case "descriptiveNegativeName": + axisProperty.stringValue = axis.DescriptiveNegativeName; + break; + case "negativeButton": + axisProperty.stringValue = axis.NegativeButton; + break; + case "positiveButton": + axisProperty.stringValue = axis.PositiveButton; + break; + case "altNegativeButton": + axisProperty.stringValue = axis.AltNegativeButton; + break; + case "altPositiveButton": + axisProperty.stringValue = axis.AltPositiveButton; + break; + case "gravity": + axisProperty.floatValue = axis.Gravity; + break; + case "dead": + axisProperty.floatValue = axis.Dead; + break; + case "sensitivity": + axisProperty.floatValue = axis.Sensitivity; + break; + case "snap": + axisProperty.boolValue = axis.Snap; + break; + case "invert": + axisProperty.boolValue = axis.Invert; + break; + case "type": + axisProperty.intValue = (int)axis.Type; + break; + case "axis": + axisProperty.intValue = axis.Axis - 1; + break; + case "joyNum": + axisProperty.intValue = axis.JoyNum; + break; + } + } + } + + private void RemoveAxis(string axis) + { + SerializedProperty axesProperty = inputManagerAsset.FindProperty("m_Axes"); + + // This loop accounts for multiple axes with the same name. + while (axisNames.Contains(axis)) + { + int index = axisNames.IndexOf(axis); + axesProperty.DeleteArrayElementAtIndex(index); + axisNames.RemoveAt(index); + } + } + + /// + /// Checks our local cache of axis names to see if an axis exists. This cache is refreshed if it's empty or if InputManager.asset has been changed. + /// + private bool DoesAxisNameExist(string axisName) + { + if (axisNames.Count == 0 || inputManagerAsset.UpdateIfRequiredOrScript()) + { + RefreshLocalAxesList(); + } + + return axisNames.Contains(axisName); + } + + /// + /// Clears our local cache, then refills it by iterating through the m_Axes arrays and storing the display names. + /// + private void RefreshLocalAxesList() + { + axisNames.Clear(); + + SerializedProperty axesProperty = inputManagerAsset.FindProperty("m_Axes"); + + for (int i = 0; i < axesProperty.arraySize; i++) + { + axisNames.Add(axesProperty.GetArrayElementAtIndex(i).displayName); + } + } } } diff --git a/Assets/HoloToolkit/Utilities/Scripts/FadeManager.cs b/Assets/HoloToolkit/Utilities/Scripts/FadeManager.cs new file mode 100644 index 00000000000..99f9169e2ab --- /dev/null +++ b/Assets/HoloToolkit/Utilities/Scripts/FadeManager.cs @@ -0,0 +1,133 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using System; +using UnityEngine; + +#if UNITY_WSA +#if UNITY_2017_2_OR_NEWER +using UnityEngine.XR.WSA; +#else +using UnityEngine.VR; +using UnityEngine.VR.WSA; +#endif +#endif + +namespace HoloToolkit.Unity +{ + public class FadeManager : Singleton + { + [Tooltip("If true, the FadeManager will update the shared material. Useful for fading multiple cameras that each render different layers.")] + public bool FadeSharedMaterial; + + private Material fadeMaterial; + private Color fadeColor = Color.black; + + private enum FadeState + { + idle = 0, + fadingOut, + FadingIn + } + + public bool Busy + { + get + { + return currentState != FadeState.idle; + } + } + + private FadeState currentState; + private float startTime; + private float fadeOutTime; + private Action fadeOutAction; + private float fadeInTime; + private Action fadeInAction; + + protected override void Awake() + { + // We want to check before calling base Awake +#if UNITY_WSA +#if UNITY_2017_2_OR_NEWER + if (!HolographicSettings.IsDisplayOpaque) +#else + if (VRDevice.isPresent) +#endif + { + Destroy(gameObject); + return; + } +#endif + + base.Awake(); + + currentState = FadeState.idle; + fadeMaterial = FadeSharedMaterial + ? GetComponentInChildren().sharedMaterial + : GetComponentInChildren().material; + } + + private void Update() + { + if (Busy) + { + CalculateFade(); + } + } + + private void CalculateFade() + { + float actionTime = currentState == FadeState.fadingOut ? fadeOutTime : fadeInTime; + float timeBusy = Time.realtimeSinceStartup - startTime; + float timePercentUsed = timeBusy / actionTime; + if (timePercentUsed >= 1.0f) + { + Action callback = currentState == FadeState.fadingOut ? fadeOutAction : fadeInAction; + if (callback != null) + { + callback(); + } + + fadeColor.a = currentState == FadeState.fadingOut ? 1 : 0; + fadeMaterial.color = fadeColor; + + currentState = currentState == FadeState.fadingOut ? FadeState.FadingIn : FadeState.idle; + startTime = Time.realtimeSinceStartup; + } + else + { + fadeColor.a = currentState == FadeState.fadingOut ? timePercentUsed : 1 - timePercentUsed; + fadeMaterial.color = fadeColor; + } + } + + protected override void OnDestroy() + { + if (fadeMaterial != null && !FadeSharedMaterial) + { + Destroy(fadeMaterial); + } + + base.OnDestroy(); + } + + public bool DoFade(float _fadeOutTime, float _fadeInTime, Action _fadedOutAction, Action _fadedInAction) + { + if (Busy) + { + Debug.Log("Already fading"); + return false; + } + + fadeOutTime = _fadeOutTime; + fadeOutAction = _fadedOutAction; + fadeInTime = _fadeInTime; + fadeInAction = _fadedInAction; + + startTime = Time.realtimeSinceStartup; + currentState = FadeState.fadingOut; + return true; + } + } +} diff --git a/Assets/HoloToolkit/Utilities/Scripts/FadeManager.cs.meta b/Assets/HoloToolkit/Utilities/Scripts/FadeManager.cs.meta new file mode 100644 index 00000000000..e4eebf0b572 --- /dev/null +++ b/Assets/HoloToolkit/Utilities/Scripts/FadeManager.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 794a5a07720daf4479efca14d8ba4297 +timeCreated: 1495751254 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HoloToolkit/Utilities/Scripts/FadeScript.cs b/Assets/HoloToolkit/Utilities/Scripts/FadeScript.cs index 26c6ba6d683..74013e6f26f 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/FadeScript.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/FadeScript.cs @@ -2,130 +2,11 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. using System; -using UnityEngine; - -#if UNITY_WSA -#if UNITY_2017_2_OR_NEWER -using UnityEngine.XR.WSA; -#else -using UnityEngine.VR.WSA; -#endif -#endif namespace HoloToolkit.Unity { + [Obsolete("Use FadeManager")] public class FadeScript : Singleton { - [Tooltip("If true, the FadeScript will update the shared material. Useful for fading multiple cameras that each render different layers.")] - public bool FadeSharedMaterial; - - private Material fadeMaterial; - private Color fadeColor = Color.black; - - private enum FadeState - { - idle = 0, - fadingOut, - FadingIn - } - - public bool Busy - { - get - { - return currentState != FadeState.idle; - } - } - - private FadeState currentState; - private float startTime; - private float fadeOutTime; - private Action fadeOutAction; - private float fadeInTime; - private Action fadeInAction; - - private void Start() - { -#if UNITY_WSA && UNITY_2017_2_OR_NEWER - if (!HolographicSettings.IsDisplayOpaque) - { - GetComponentInChildren().enabled = false; - Debug.Log("Removing unnecessary full screen effect from HoloLens"); - return; - } -#endif - - currentState = FadeState.idle; - fadeMaterial = FadeSharedMaterial - ? GetComponentInChildren().sharedMaterial - : GetComponentInChildren().material; - } - - private void Update() - { - if (Busy) - { - CalculateFade(); - } - - if (Input.GetKeyUp(KeyCode.F)) - { - DoFade(3, 3, () => { Debug.Log("Done fading out"); }, () => { Debug.Log("Done fading in"); }); - } - } - - private void CalculateFade() - { - float actionTime = currentState == FadeState.fadingOut ? fadeOutTime : fadeInTime; - float timeBusy = Time.realtimeSinceStartup - startTime; - float timePercentUsed = timeBusy / actionTime; - if (timePercentUsed >= 1.0f) - { - Action callback = currentState == FadeState.fadingOut ? fadeOutAction : fadeInAction; - if (callback != null) - { - callback(); - } - - fadeColor.a = currentState == FadeState.fadingOut ? 1 : 0; - fadeMaterial.color = fadeColor; - - currentState = currentState == FadeState.fadingOut ? FadeState.FadingIn : FadeState.idle; - startTime = Time.realtimeSinceStartup; - } - else - { - fadeColor.a = currentState == FadeState.fadingOut ? timePercentUsed : 1 - timePercentUsed; - fadeMaterial.color = fadeColor; - } - } - - protected override void OnDestroy() - { - if (fadeMaterial != null && !FadeSharedMaterial) - { - Destroy(fadeMaterial); - } - - base.OnDestroy(); - } - - public bool DoFade(float _fadeOutTime, float _fadeInTime, Action _fadedOutAction, Action _fadedInAction) - { - if (Busy) - { - Debug.Log("Already fading"); - return false; - } - - fadeOutTime = _fadeOutTime; - fadeOutAction = _fadedOutAction; - fadeInTime = _fadeInTime; - fadeInAction = _fadedInAction; - - startTime = Time.realtimeSinceStartup; - currentState = FadeState.fadingOut; - return true; - } } -} \ No newline at end of file +} diff --git a/Assets/HoloToolkit/Utilities/Scripts/FadeScript.cs.meta b/Assets/HoloToolkit/Utilities/Scripts/FadeScript.cs.meta index e4eebf0b572..014e1c64143 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/FadeScript.cs.meta +++ b/Assets/HoloToolkit/Utilities/Scripts/FadeScript.cs.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: 794a5a07720daf4479efca14d8ba4297 -timeCreated: 1495751254 +guid: 3227eb50378702c4eba7e61f471ee7c7 +timeCreated: 1509990865 licenseType: Pro MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/GLTFLoader.cs b/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/GLTFLoader.cs index 73226213544..32ae6dcad31 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/GLTFLoader.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/GLTFLoader.cs @@ -89,7 +89,7 @@ public IEnumerator Load(int sceneIndex = -1) if (scene == null) { - throw new Exception("No default scene in gltf file."); + throw new Exception("No default scene in glTF file."); } if (_lastLoadedScene == null) @@ -457,9 +457,9 @@ private UnityEngine.Material CreateMaterial(Material def, bool useVertexColors) private const string Base64StringInitializer = "^data:[a-z-]+/[a-z-]+;base64,"; /// - /// Get the absolute path to a gltf uri reference. + /// Get the absolute path to a glTF URI reference. /// - /// The relative path stored in the uri. + /// The relative path stored in the URI. /// private string AbsolutePath(string relativePath) { diff --git a/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/AnimationSampler.cs b/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/AnimationSampler.cs index 9c6f170d255..6c401745692 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/AnimationSampler.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/AnimationSampler.cs @@ -27,7 +27,7 @@ public class AnimationSampler : GLTFProperty /// and the animation's interpolation is `\"LINEAR\"`, spherical linear /// interpolation (slerp) should be used to interpolate quaternions. When /// interpolation is `\"STEP\"`, animated value remains constant to the value - /// of the first point of the timeframe, until the next timeframe. + /// of the first point of the time-frame, until the next time-frame. /// public InterpolationType Interpolation; diff --git a/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/Buffer.cs b/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/Buffer.cs index 358c7271686..9f34dea3bb4 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/Buffer.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/Buffer.cs @@ -8,9 +8,9 @@ namespace GLTF public class Buffer : GLTFChildOfRootProperty { /// - /// The uri of the buffer. + /// The URI of the buffer. /// Relative paths are relative to the .gltf file. - /// Instead of referencing an external file, the uri can also be a data-uri. + /// Instead of referencing an external file, the URI can also be a data-URI. /// public string Uri; diff --git a/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/GLTFRoot.cs b/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/GLTFRoot.cs index 93370de8fec..066c8f7d29f 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/GLTFRoot.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/GLTFRoot.cs @@ -123,7 +123,7 @@ public static GLTFRoot Deserialize(JsonReader reader) if (reader.Read() && reader.TokenType != JsonToken.StartObject) { - throw new Exception("gltf json must be an object"); + throw new Exception("glTF JSON must be an object"); } while (reader.Read() && reader.TokenType == JsonToken.PropertyName) diff --git a/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/Image.cs b/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/Image.cs index 2c95b943716..7974a1c87aa 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/Image.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/Image.cs @@ -9,8 +9,8 @@ namespace GLTF public class Image : GLTFChildOfRootProperty { /// - /// The uri of the image. Relative paths are relative to the .gltf file. - /// Instead of referencing an external file, the uri can also be a data-uri. + /// The URI of the image. Relative paths are relative to the .gltf file. + /// Instead of referencing an external file, the URI can also be a data-URI. /// The image format must be jpg, png, bmp, or gif. /// public string Uri; @@ -23,7 +23,7 @@ public class Image : GLTFChildOfRootProperty /// /// The index of the bufferView that contains the image. - /// Use this instead of the image's uri property. + /// Use this instead of the image's URI property. /// public BufferViewId BufferView; diff --git a/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/Material.cs b/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/Material.cs index f3dcad2a27a..5d292a4fe3a 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/Material.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/Material.cs @@ -27,7 +27,7 @@ public class Material : GLTFChildOfRootProperty public NormalTextureInfo NormalTexture; /// - /// The occlusion map is a greyscale texture, with white indicating areas that + /// The occlusion map is a gray-scale texture, with white indicating areas that /// should receive full indirect lighting and black indicating no indirect /// lighting. /// diff --git a/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/MaterialCommonConstant.cs b/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/MaterialCommonConstant.cs index c59493c9400..9bee3d71f17 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/MaterialCommonConstant.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/MaterialCommonConstant.cs @@ -14,7 +14,7 @@ public class MaterialCommonConstant : GLTFProperty public Color AmbientFactor = Color.white; /// - /// Texture used to store pre-computed direct lighting + /// Texture used to store precomputed direct lighting /// public TextureInfo LightmapTexture; diff --git a/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/MaterialPBRMetallicRoughness.cs b/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/MaterialPBRMetallicRoughness.cs index 457742b25b7..cd194aee573 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/MaterialPBRMetallicRoughness.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/GLTF/Scripts/Schema/MaterialPBRMetallicRoughness.cs @@ -28,7 +28,7 @@ public class PbrMetallicRoughness : GLTFProperty public TextureInfo BaseColorTexture; /// - /// The metalness of the material. + /// The metallicness of the material. /// A value of 1.0 means the material is a metal. /// A value of 0.0 means the material is a dielectric. /// Values in between are for blending between metals and dielectrics such as @@ -47,7 +47,7 @@ public class PbrMetallicRoughness : GLTFProperty /// /// The metallic-roughness texture has two components. - /// The first component (R) contains the metallic-ness of the material. + /// The first component (R) contains the metallicness of the material. /// The second component (G) contains the roughness of the material. /// These values are linear. /// If the third component (B) and/or the fourth component (A) are present, diff --git a/Assets/HoloToolkit/Utilities/Scripts/GpuTiming/GpuTiming.cs b/Assets/HoloToolkit/Utilities/Scripts/GpuTiming/GpuTiming.cs index d113c0cd97e..c7276227b72 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/GpuTiming/GpuTiming.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/GpuTiming/GpuTiming.cs @@ -29,7 +29,7 @@ public static class GpuTiming /// Gets the latest available sample time for the given event. /// /// Name of the event. - /// Time in miliseconds. + /// Time in milliseconds. public static double GetTime(string eventId) { int eventValue; diff --git a/Assets/HoloToolkit/Utilities/Scripts/GpuTiming/GpuTimingCamera.cs b/Assets/HoloToolkit/Utilities/Scripts/GpuTiming/GpuTimingCamera.cs index 333b67ad84f..95ce827515b 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/GpuTiming/GpuTimingCamera.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/GpuTiming/GpuTimingCamera.cs @@ -5,7 +5,7 @@ namespace HoloToolkit.Unity { /// - /// Tracks the gpu time spent rendering a camera. + /// Tracks the GPU time spent rendering a camera. /// For stereo rendering sampling is made from the beginning of the left eye to the end of the right eye. /// public class GpuTimingCamera : MonoBehaviour diff --git a/Assets/HoloToolkit/Utilities/Scripts/HeadsUpDirectionIndicator.cs b/Assets/HoloToolkit/Utilities/Scripts/HeadsUpDirectionIndicator.cs index e8e089e624e..457fc1eb06b 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/HeadsUpDirectionIndicator.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/HeadsUpDirectionIndicator.cs @@ -15,7 +15,7 @@ namespace HoloToolkit.Unity // object according to that assumption. public class HeadsUpDirectionIndicator : MonoBehaviour { - // Use as a named indexer for Unity's frustum planes. The order follows that layed + // Use as a named indexer for Unity's frustum planes. The order follows that laid // out in the API documentation. DO NOT CHANGE ORDER unless a corresponding change // has been made in the Unity API. private enum FrustumPlanes @@ -149,7 +149,7 @@ private FrustumPlanes GetExitPlane(Vector3 targetPosition, Camera camera) Vector3 farRight = far * tanFovx * cameraRight; Vector3 farLeft = -farRight; - // Caclulate the center point of the near plane and the far plane as offsets from the + // Calculate the center point of the near plane and the far plane as offsets from the // camera in world space. Vector3 nearBase = near * cameraForward; Vector3 farBase = far * cameraForward; @@ -171,7 +171,7 @@ private FrustumPlanes GetExitPlane(Vector3 targetPosition, Camera camera) #if UNITY_EDITOR if (DebugDrawPointerOrientationPlanes) { - // Debug draw a tringale coplanar with 'd' + // Debug draw a triangle coplanar with 'd' Debug.DrawLine(nearUpperLeft, nearLowerRight); Debug.DrawLine(nearLowerRight, farUpperLeft); Debug.DrawLine(farUpperLeft, nearUpperLeft); @@ -226,7 +226,7 @@ private FrustumPlanes GetExitPlane(Vector3 targetPosition, Camera camera) } // given a frustum wall we wish to snap the pointer to, this function returns a ray - // along which the pointer should be placed to appear at the appropiate point along + // along which the pointer should be placed to appear at the appropriate point along // the edge of the indicator field. private bool TryGetIndicatorPosition(Vector3 targetPosition, Plane frustumWall, out Ray r) { @@ -240,7 +240,7 @@ private bool TryGetIndicatorPosition(Vector3 targetPosition, Plane frustumWall, Vector3 normal = Vector3.Cross(cameraToTarget.normalized, cameraForward); // In the case that the three points are colinear we cannot form a plane but we'll - // assume the target is directly behind us and we'll use a prechosen plane. + // assume the target is directly behind us and we'll use a pre-chosen plane. if (normal == Vector3.zero) { normal = -Vector3.right; @@ -325,7 +325,7 @@ private void UpdatePointerTransform(Camera camera, Plane[] planes, Vector3 targe Vector3 indicatorFieldCenter = cameraPosition + indicatorFieldOffset; Vector3 pointerDirection = (indicatorPosition - indicatorFieldCenter).normalized; - // allign this object's up vector with the pointerDirection + // Align this object's up vector with the pointerDirection this.transform.rotation = Quaternion.LookRotation(cameraForward, pointerDirection); } diff --git a/Assets/HoloToolkit/Utilities/Scripts/InputMappingAxisUtility.cs b/Assets/HoloToolkit/Utilities/Scripts/InputMappingAxisUtility.cs new file mode 100644 index 00000000000..08e1183cc68 --- /dev/null +++ b/Assets/HoloToolkit/Utilities/Scripts/InputMappingAxisUtility.cs @@ -0,0 +1,37 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +namespace HoloToolkit.Unity +{ + /// + /// Utility class for Unity's Input Manager Mappings. + /// Input from all types should be defined here for use + /// though out the entire toolkit. + /// + public static class InputMappingAxisUtility + { + #region Xbox and Motion Controller Mappings + + public const string CONTROLLER_LEFT_STICK_HORIZONTAL = "CONTROLLER_LEFT_STICK_HORIZONTAL"; + public const string CONTROLLER_LEFT_STICK_VERTICAL = "CONTROLLER_LEFT_STICK_VERTICAL"; + public const string CONTROLLER_RIGHT_STICK_HORIZONTAL = "CONTROLLER_RIGHT_STICK_HORIZONTAL"; + public const string CONTROLLER_RIGHT_STICK_VERTICAL = "CONTROLLER_RIGHT_STICK_VERTICAL"; + public const string XBOX_DPAD_HORIZONTAL = "XBOX_DPAD_HORIZONTAL"; + public const string XBOX_DPAD_VERTICAL = "XBOX_DPAD_VERTICAL"; + public const string CONTROLLER_LEFT_TRIGGER = "CONTROLLER_LEFT_TRIGGER"; + public const string CONTROLLER_RIGHT_TRIGGER = "CONTROLLER_RIGHT_TRIGGER"; + public const string XBOX_SHARED_TRIGGER = "XBOX_SHARED_TRIGGER"; + public const string XBOX_A = "XBOX_A"; + public const string XBOX_B = "XBOX_B"; + public const string XBOX_X = "XBOX_X"; + public const string XBOX_Y = "XBOX_Y"; + public const string CONTROLLER_LEFT_MENU = "CONTROLLER_LEFT_MENU"; + public const string CONTROLLER_RIGHT_MENU = "CONTROLLER_RIGHT_MENU"; + public const string CONTROLLER_LEFT_BUMPER_OR_GRIP = "XBOX_LEFT_BUMPER"; + public const string CONTROLLER_RIGHT_BUMPER_OR_GRIP = "XBOX_RIGHT_BUMPER"; + public const string CONTROLLER_LEFT_STICK_CLICK = "CONTROLLER_LEFT_STICK_CLICK"; + public const string CONTROLLER_RIGHT_STICK_CLICK = "CONTROLLER_RIGHT_STICK_CLICK"; + + #endregion Xbox and Motion Controller Mappings + } +} diff --git a/Assets/HoloToolkit/Utilities/Scripts/InputMappingAxisUtility.cs.meta b/Assets/HoloToolkit/Utilities/Scripts/InputMappingAxisUtility.cs.meta new file mode 100644 index 00000000000..395f0a37e3d --- /dev/null +++ b/Assets/HoloToolkit/Utilities/Scripts/InputMappingAxisUtility.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: cf829549d34b4eacb41e0f0b2f5a01b6 +timeCreated: 1512517532 \ No newline at end of file diff --git a/Assets/HoloToolkit/Utilities/Scripts/Inspectors/MRTKEditor.cs b/Assets/HoloToolkit/Utilities/Scripts/Inspectors/MRTKEditor.cs index 73a73889b3b..55308758719 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/Inspectors/MRTKEditor.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/Inspectors/MRTKEditor.cs @@ -13,7 +13,7 @@ namespace HoloToolkit.Unity { #if UNITY_EDITOR /// - /// To use this class in a Monobehavior or ScriptableObject, add this line at the bottom of your class: + /// To use this class in a MonoBehavior or ScriptableObject, add this line at the bottom of your class: /// /// public class ClassName { /// ... @@ -27,8 +27,20 @@ namespace HoloToolkit.Unity public class MRTKEditor : Editor { #region static vars + const string mrtkShowEditorKey = "_Show_MRTK_Editors"; + // Toggles custom editors on / off - public static bool ShowCustomEditors { get; private set; } + public static bool ShowCustomEditors + { + get + { + return GetEditorPref(mrtkShowEditorKey, true); + } + private set + { + SetEditorPref(mrtkShowEditorKey, value); + } + } public static bool CustomEditorActive { get; private set; } public static GameObject lastTarget; @@ -75,7 +87,7 @@ public class MRTKEditor : Editor public override void OnInspectorGUI() { - // Set this to true so + // Set this to true so we can track which kind of headers to draw CustomEditorActive = true; try @@ -86,8 +98,10 @@ public override void OnInspectorGUI() if (ShowCustomEditors) { + BeginInspectorStyle(); DrawCustomEditor(); DrawCustomFooter(); + EndInspectorStyle(); } else { @@ -109,11 +123,28 @@ public void OnSceneGUI() DrawCustomSceneGUI(); } + protected virtual void BeginInspectorStyle() + { + // Empty by default + } + + protected virtual void EndInspectorStyle() + { + // Empty by default + } + + protected virtual bool DisplayHeader { get { return true; } } + /// /// Draws buttons for turning custom editors on/off, as well as DocType, Tutorial and UseWith attributes /// private void DrawInspectorHeader() { + if (!DisplayHeader) + { + return; + } + EditorGUILayout.Space(); GUILayout.BeginHorizontal(); if (GUILayout.Button(ShowCustomEditors ? "Toggle Custom Editors (ON)" : "Toggle Custom Editors (OFF)", ShowCustomEditors ? toggleButtonOnStyle : toggleButtonOffStyle)) @@ -411,10 +442,8 @@ protected virtual void DrawCustomFooter() /// protected void SaveChanges() { - if (serializedObject.ApplyModifiedProperties()) - { - EditorUtility.SetDirty(target); - } + serializedObject.ApplyModifiedProperties(); + EditorUtility.SetDirty(target); } #region drawing @@ -698,7 +727,7 @@ private static UnityEngine.Object DrawProfileField(UnityEngine.Object target, Un } /// - /// Displays a help window explaning profile objects + /// Displays a help window explaining profile objects /// private static void LaunchProfileHelp() { @@ -988,6 +1017,26 @@ protected Quaternion RotationHandle(Vector3 position, Quaternion rotation, float return rotation; } #endregion + + #region editor prefs + + private static void SetEditorPref(string key, bool value) + { + EditorPrefs.SetBool(Application.productName + key, value); + } + + private static bool GetEditorPref(string key, bool defaultValue) + { + if (EditorPrefs.HasKey(Application.productName + key)) + { + return EditorPrefs.GetBool(Application.productName + key); + } + + EditorPrefs.SetBool(Application.productName + key, defaultValue); + return defaultValue; + } + + #endregion } #endif } \ No newline at end of file diff --git a/Assets/HoloToolkit/Utilities/Scripts/Inspectors/ProfileInspector.cs b/Assets/HoloToolkit/Utilities/Scripts/Inspectors/ProfileInspector.cs index a3955e87e6b..d9e8cd6d6ed 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/Inspectors/ProfileInspector.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/Inspectors/ProfileInspector.cs @@ -22,28 +22,32 @@ public abstract class ProfileInspector : MRTKEditor { public Component targetComponent; - public override void OnInspectorGUI() + protected override bool DisplayHeader { - Undo.RecordObject(target, target.name); - BeginProfileInspector(); - DrawCustomEditor(); - DrawCustomFooter(); - EndProfileInspector(); - SaveChanges(); + get + { + return targetComponent == null; + } } - private void BeginProfileInspector() + protected override void BeginInspectorStyle() { - GUI.color = profileColor; - EditorGUILayout.BeginVertical(EditorStyles.helpBox); - GUI.color = Color.Lerp(profileColor, Color.red, 0.5f); - EditorGUILayout.LabelField("(Warning: this section edits the button profile. These changes will affect all objects that use this profile.)", EditorStyles.wordWrappedMiniLabel); - GUI.color = defaultColor; + if (targetComponent == null) + { + GUI.color = profileColor; + EditorGUILayout.BeginVertical(EditorStyles.helpBox); + GUI.color = Color.Lerp(profileColor, Color.red, 0.5f); + EditorGUILayout.LabelField("(Warning: this section edits the button profile. These changes will affect all objects that use this profile.)", EditorStyles.wordWrappedMiniLabel); + GUI.color = defaultColor; + } } - private void EndProfileInspector() + protected override void EndInspectorStyle() { - EditorGUILayout.EndVertical(); + if (targetComponent == null) + { + EditorGUILayout.EndVertical(); + } } } #endif diff --git a/Assets/HoloToolkit/Utilities/Scripts/InterpolatedValues/InterpolatedValue.cs b/Assets/HoloToolkit/Utilities/Scripts/InterpolatedValues/InterpolatedValue.cs index ea27881b95c..6f2ada57578 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/InterpolatedValues/InterpolatedValue.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/InterpolatedValues/InterpolatedValue.cs @@ -19,7 +19,7 @@ public abstract class InterpolatedValue public const float SmallNumberSquared = SmallNumber * SmallNumber; /// - /// Implict cast operator that returns the current value of the Interpolator. + /// Implicit cast operator that returns the current value of the Interpolator. /// /// The interpolator casting from. public static implicit operator T(InterpolatedValue interpolatedValue) @@ -67,7 +67,7 @@ public float Duration private AnimationCurve curve = null; /// - /// The AnimationCurve used for evaluatng the interpolation value. + /// The AnimationCurve used for evaluating the interpolation value. /// public AnimationCurve Curve { @@ -88,7 +88,7 @@ public AnimationCurve Curve private T value; /// - /// Retruns the current interpolated value. + /// Returns the current interpolated value. /// public T Value { @@ -104,7 +104,7 @@ private set } /// - /// Retruns the current interpolation target value. + /// Returns the current interpolation target value. /// public T Target { @@ -197,7 +197,7 @@ public void SnapToTarget(T snapTargetValue) /// Interpolative snap to target will interpolate until it reaches the given target value, after which subsequent calls to this method it will snap to the target value given. /// /// SnapToTarget and UpdateTarget resets this. - /// The target value to set and interpolatively snap to. + /// The target value to set and interpolate to. public void InterpolateThenSnapToTarget(T snapTargetValue) { if (performingInterpolativeSnap) @@ -284,7 +284,7 @@ public T FrameUpdate() } /// - /// A method to check whether two values are equal. This should be overriden by inheriting classes. + /// A method to check whether two values are equal. This should be overridden by inheriting classes. /// /// This method is public because of a Unity compilation bug when dealing with abstract methods on generics. /// First value. @@ -293,7 +293,7 @@ public T FrameUpdate() public abstract bool DoValuesEqual(T one, T other); /// - /// A method to calculate the current interpolated value based on the start value, a target value and the curve evaluated interpolation position value. This should be overriden by inheriting classes. + /// A method to calculate the current interpolated value based on the start value, a target value and the curve evaluated interpolation position value. This should be overridden by inheriting classes. /// /// This method is public because of a Unity compilation bug when dealing with abstract methods on generics. /// The value that the interpolation started at. diff --git a/Assets/HoloToolkit/Utilities/Scripts/InterpolatedValues/Vector3Interpolated.cs b/Assets/HoloToolkit/Utilities/Scripts/InterpolatedValues/Vector3Interpolated.cs index c1bc1b179f8..7f1e65a99fa 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/InterpolatedValues/Vector3Interpolated.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/InterpolatedValues/Vector3Interpolated.cs @@ -9,7 +9,7 @@ namespace HoloToolkit.Unity { /// /// Class to encapsulate an interpolating Vector3 property. - /// TODO: Remove if reduncatnt to InterpolatedVector3.cs + /// TODO: Remove if redundant to InterpolatedVector3.cs /// public class Vector3Interpolated { diff --git a/Assets/HoloToolkit/Utilities/Scripts/PriorityQueue.cs b/Assets/HoloToolkit/Utilities/Scripts/PriorityQueue.cs index 2b63d54c82a..583ae356729 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/PriorityQueue.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/PriorityQueue.cs @@ -131,7 +131,7 @@ public KeyValuePair Top /// /// Pop the minimal element of the queue. Will fail at runtime if queue is empty. /// - /// The minmal element + /// The minimal element public KeyValuePair Pop() { KeyValuePair ret = queue[0]; diff --git a/Assets/HoloToolkit/Utilities/Scripts/ReadOnlyHashSet.cs b/Assets/HoloToolkit/Utilities/Scripts/ReadOnlyHashSet.cs index 4142b69aaea..d583f003cd3 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/ReadOnlyHashSet.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/ReadOnlyHashSet.cs @@ -74,7 +74,7 @@ IEnumerator IEnumerable.GetEnumerator() private NotSupportedException NewWriteDeniedException() { - return new NotSupportedException("ReadOnlyHashSet is not directly writeable."); + return new NotSupportedException("ReadOnlyHashSet is not directly writable."); } } diff --git a/Assets/HoloToolkit/Utilities/Scripts/VectorRollingStatistics.cs b/Assets/HoloToolkit/Utilities/Scripts/VectorRollingStatistics.cs index bdbd708b354..e85d6f35b21 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/VectorRollingStatistics.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/VectorRollingStatistics.cs @@ -131,7 +131,7 @@ public void AddSample(Vector3 value) // And calculate new averages and standard deviations // (note that calculating a standard deviation of a Vector3 might not - // be done properly, but the logic is working for the gaze stabalization scenario) + // be done properly, but the logic is working for the gaze stabilization scenario) Average = cumulativeFrame / ActualSampleCount; float newStandardDev = Mathf.Sqrt((cumulativeFrameSquared / ActualSampleCount - Average.Mul(Average)).magnitude); StandardDeviationDeltaAfterLatestSample = oldStandardDeviation - newStandardDev; diff --git a/Assets/HoloToolkit/Utilities/Shaders/FastConfigurable/Editor/FastConfigurableGUI.cs b/Assets/HoloToolkit/Utilities/Shaders/FastConfigurable/Editor/FastConfigurableGUI.cs index 486ef678a30..74edb6f49cb 100644 --- a/Assets/HoloToolkit/Utilities/Shaders/FastConfigurable/Editor/FastConfigurableGUI.cs +++ b/Assets/HoloToolkit/Utilities/Shaders/FastConfigurable/Editor/FastConfigurableGUI.cs @@ -435,7 +435,7 @@ protected static class Styles public static GUIContent main = new GUIContent("Albedo", "Albedo (RGB) and Transparency (A)"); public static GUIContent alphaCutoffText = new GUIContent("Alpha Cutoff", "Threshold for alpha cutoff"); - public static GUIContent occlusionMap = new GUIContent("Occlusion Map", "Additional texture to be overlayed on the main texture"); + public static GUIContent occlusionMap = new GUIContent("Occlusion Map", "Additional texture to be overlaid on the main texture"); public static GUIContent ambientLightingEnabled = new GUIContent("Ambient", "Scene ambient lighting"); public static GUIContent diffuseLightingEnabled = new GUIContent("Diffuse", "Diffuse (lambertian) lighting from directional lights"); diff --git a/GettingStarted.md b/GettingStarted.md index 2a87a000314..fbb3022bea2 100644 --- a/GettingStarted.md +++ b/GettingStarted.md @@ -34,8 +34,8 @@ You can install more components and UWP SDK's as you wish. Make sure you are running the appropriate version of Unity 3D on your machine. You should [download and install the latest version](https://unity3d.com/get-unity/download/archive) this project says it supports on the [main readme page](/README.md). -[unity-release]: http://beta.unity3d.com/download/b1565bfe4a0c/download.html -[unity-version-badge]: https://img.shields.io/badge/Latest%20Mixed%20Reality%20Technical%20Preview-2017.2.0p1%20MRTP4-green.svg +[unity-release]: https://unity3d.com/unity/whats-new/unity-2017.2.1 +[unity-version-badge]: https://img.shields.io/badge/Unity%20Editor-2017.2.1f1-green.svg > The Mixed Reality Toolkit now recommends the following Unity 3D version: > [![Github Release][unity-version-badge]][unity-release] diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 26293c43c5b..3438ea44ca7 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -37,6 +37,70 @@ InputManager: type: 0 axis: 0 joyNum: 0 + - serializedVersion: 3 + m_Name: Fire1 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left ctrl + altNegativeButton: + altPositiveButton: mouse 0 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire2 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left alt + altNegativeButton: + altPositiveButton: mouse 1 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire3 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left shift + altNegativeButton: + altPositiveButton: mouse 2 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Jump + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: space + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 - serializedVersion: 3 m_Name: Mouse X descriptiveName: @@ -86,13 +150,45 @@ InputManager: axis: 2 joyNum: 0 - serializedVersion: 3 - m_Name: Submit + m_Name: Horizontal descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: return + positiveButton: altNegativeButton: - altPositiveButton: enter + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 1 + type: 2 + axis: 1 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire1 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 0 + altNegativeButton: + altPositiveButton: gravity: 1000 dead: 0.001 sensitivity: 1000 @@ -102,13 +198,13 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: Cancel + m_Name: Fire2 descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: escape + positiveButton: joystick button 1 altNegativeButton: - altPositiveButton: joystick button 1 + altPositiveButton: gravity: 1000 dead: 0.001 sensitivity: 1000 @@ -118,11 +214,11 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: CONTROLLER_MENU + m_Name: Fire3 descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: joystick button 7 + positiveButton: joystick button 2 altNegativeButton: altPositiveButton: gravity: 1000 @@ -134,11 +230,11 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: CONTROLLER_LEFT_STICK_CLICK + m_Name: Jump descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: joystick button 8 + positiveButton: joystick button 3 altNegativeButton: altPositiveButton: gravity: 1000 @@ -150,13 +246,45 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: CONTROLLER_RIGHT_STICK_CLICK + m_Name: Submit descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: joystick button 9 + positiveButton: return altNegativeButton: - altPositiveButton: + altPositiveButton: joystick button 0 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Submit + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: enter + altNegativeButton: + altPositiveButton: space + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Cancel + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: escape + altNegativeButton: + altPositiveButton: joystick button 1 gravity: 1000 dead: 0.001 sensitivity: 1000 @@ -197,6 +325,22 @@ InputManager: type: 2 axis: 1 joyNum: 0 + - serializedVersion: 3 + m_Name: CONTROLLER_LEFT_STICK_CLICK + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 8 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 - serializedVersion: 3 m_Name: CONTROLLER_RIGHT_STICK_HORIZONTAL descriptiveName: @@ -230,39 +374,55 @@ InputManager: axis: 4 joyNum: 0 - serializedVersion: 3 - m_Name: CONTROLLER_LEFT_TRIGGER + m_Name: CONTROLLER_RIGHT_STICK_CLICK descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: + positiveButton: joystick button 9 altNegativeButton: altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 snap: 0 invert: 0 - type: 2 - axis: 8 + type: 0 + axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: CONTROLLER_RIGHT_TRIGGER + m_Name: CONTROLLER_LEFT_MENU descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: + positiveButton: joystick button 6 altNegativeButton: altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 snap: 0 invert: 0 - type: 2 - axis: 9 + type: 0 + axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: XBOX_SHARED_TRIGGER + m_Name: CONTROLLER_RIGHT_MENU + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 7 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: CONTROLLER_LEFT_TRIGGER descriptiveName: descriptiveNegativeName: negativeButton: @@ -275,10 +435,10 @@ InputManager: snap: 0 invert: 0 type: 2 - axis: 2 + axis: 8 joyNum: 0 - serializedVersion: 3 - m_Name: XBOX_DPAD_HORIZONTAL + m_Name: CONTROLLER_RIGHT_TRIGGER descriptiveName: descriptiveNegativeName: negativeButton: @@ -291,10 +451,10 @@ InputManager: snap: 0 invert: 0 type: 2 - axis: 5 + axis: 9 joyNum: 0 - serializedVersion: 3 - m_Name: XBOX_DPAD_VERTICAL + m_Name: XBOX_SHARED_TRIGGER descriptiveName: descriptiveNegativeName: negativeButton: @@ -307,14 +467,14 @@ InputManager: snap: 0 invert: 0 type: 2 - axis: 6 + axis: 2 joyNum: 0 - serializedVersion: 3 - m_Name: XBOX_A + m_Name: XBOX_LEFT_BUMPER descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: joystick button 0 + positiveButton: joystick button 4 altNegativeButton: altPositiveButton: gravity: 1000 @@ -326,11 +486,11 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: XBOX_B + m_Name: XBOX_RIGHT_BUMPER descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: joystick button 1 + positiveButton: joystick button 5 altNegativeButton: altPositiveButton: gravity: 1000 @@ -342,11 +502,11 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: XBOX_X + m_Name: XBOX_A descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: joystick button 2 + positiveButton: joystick button 0 altNegativeButton: altPositiveButton: gravity: 1000 @@ -358,11 +518,11 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: XBOX_Y + m_Name: XBOX_B descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: joystick button 3 + positiveButton: joystick button 1 altNegativeButton: altPositiveButton: gravity: 1000 @@ -374,11 +534,11 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: XBOX_LEFT_BUMPER + m_Name: XBOX_X descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: joystick button 4 + positiveButton: joystick button 2 altNegativeButton: altPositiveButton: gravity: 1000 @@ -390,11 +550,11 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: XBOX_RIGHT_BUMPER + m_Name: XBOX_Y descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: joystick button 5 + positiveButton: joystick button 3 altNegativeButton: altPositiveButton: gravity: 1000 @@ -406,18 +566,34 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: XBOX_VIEW + m_Name: XBOX_DPAD_HORIZONTAL descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: joystick button 6 + positiveButton: altNegativeButton: altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 + gravity: 0 + dead: 0.19 + sensitivity: 1 snap: 0 invert: 0 - type: 0 - axis: 0 + type: 2 + axis: 5 + joyNum: 0 + - serializedVersion: 3 + m_Name: XBOX_DPAD_VERTICAL + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 6 joyNum: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 9a94dad91e5..ffb84782b70 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -71,6 +71,8 @@ PlayerSettings: muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + deferSystemGesturesMode: 0 + hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 bakeCollisionMeshes: 0 @@ -101,6 +103,8 @@ PlayerSettings: n3dsEnableVSync: 0 ignoreAlphaClear: 0 xboxOneResolution: 0 + xboxOneSResolution: 0 + xboxOneXResolution: 3 xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 @@ -123,7 +127,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.0 + bundleVersion: 2017.2.1.0 preloadedAssets: [] metroInputSource: 0 m_HolographicPauseOnTrackingLoss: 0 @@ -149,7 +153,7 @@ PlayerSettings: androidMaxAspectRatio: 2.1 applicationIdentifier: Android: com.Company.ProductName - Standalone: unity.DefaultCompany.HoloToolkit-Unity + Standalone: Microsoft.HoloToolkit-Unity Tizen: com.Company.ProductName iOS: com.Company.ProductName tvOS: com.Company.ProductName @@ -189,6 +193,8 @@ PlayerSettings: iPhone47inSplashScreen: {fileID: 0} iPhone55inPortraitSplashScreen: {fileID: 0} iPhone55inLandscapeSplashScreen: {fileID: 0} + iPhone58inPortraitSplashScreen: {fileID: 0} + iPhone58inLandscapeSplashScreen: {fileID: 0} iPadPortraitSplashScreen: {fileID: 0} iPadHighResPortraitSplashScreen: {fileID: 0} iPadLandscapeSplashScreen: {fileID: 0} @@ -613,12 +619,12 @@ PlayerSettings: m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: MixedRealityToolkit-Unity - metroPackageVersion: 1.2017.2.0 + metroPackageVersion: 2017.2.1.0 metroCertificatePath: Assets/WSATestCertificate.pfx metroCertificatePassword: metroCertificateSubject: Microsoft metroCertificateIssuer: Microsoft - metroCertificateNotAfter: 80c43adda35bd401 + metroCertificateNotAfter: 0047bdc38784d401 metroApplicationDescription: MixedRealityToolkit-Unity wsaImages: {} metroTileShortName: MixedRealityToolkit-Unity diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index e093294e81d..2576b7835a0 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.2.0p1-MRTP4 +m_EditorVersion: 2017.2.1f1 diff --git a/README.md b/README.md index 66f941cb616..c482836155d 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,8 @@ _Note: The latest release should work for both HoloLens and Windows Mixed Realit [mrtk-version-badge]: https://img.shields.io/github/tag/microsoft/MixedRealityToolkit-unity.svg?label=Latest%20Master%20Branch%20Release&colorB=9acd32 [![Github Release][mrtk-version-badge]][github-rel] -[unity-download]: http://beta.unity3d.com/download/b1565bfe4a0c/download.html -[unity-version-badge]: https://img.shields.io/badge/Current%20Unity%20Editor%20Version-2017.2.0p1%20MRTP4-green.svg +[unity-download]: https://unity3d.com/unity/whats-new/unity-2017.2.1 +[unity-version-badge]: https://img.shields.io/badge/Current%20Unity%20Editor%20Version-2017.2.1f1-green.svg [![Github Release][unity-version-badge]][unity-download] > Check out the MRTK [Roadmap](/Roadmap.md) for Unity. @@ -36,7 +36,7 @@ The Mixed Reality Toolkit for Unity includes many API's to accelerate the develo | [![Input](External/ReadMeImages/MRTK170802_Short_03.png)](Assets/HoloToolkit/Input/README.md) [Input](Assets/HoloToolkit/Input/README.md) | [![Sharing](External/ReadMeImages/MRTK170802_Short_04.png)](Assets/HoloToolkit/Sharing/README.md) [Sharing](Assets/HoloToolkit/Sharing/README.md) | [![Spatial Mapping](External/ReadMeImages/MRTK170802_Short_05.png)](Assets/HoloToolkit/SpatialMapping/README.md) [Spatial Mapping](Assets/HoloToolkit/SpatialMapping/README.md)| | :--- | :--- | :--- | -| Scripts that leverage inputs such as gaze, gesture, voice and motion controllers. | Sharing library enables collaboration across multiple devices. | Scripts that allow applications to bring the real world into the digital using HoloLens. | +| Scripts that leverage inputs such as gaze, gesture, voice and motion controllers. Includes the Mixed Reality camera prefabs. | Sharing library enables collaboration across multiple devices. | Scripts that allow applications to bring the real world into the digital using HoloLens. | | [![Spatial Sound](External/ReadMeImages/MRTK170802_Short_09.png)](Assets/HoloToolkit/SpatialSound/README.md) [Spatial Sound](Assets/HoloToolkit/SpatialSound/README.md) | [![UX Controls](External/ReadMeImages/MRTK170802_Short_10.png)](Assets/HoloToolkit/UX/README.md) [UX Controls](Assets/HoloToolkit/UX/README.md)| [![Utilities](External/ReadMeImages/MRTK170802_Short_11.png)](Assets/HoloToolkit/Utilities/README.md) [Utilities](Assets/HoloToolkit/Utilities/README.md) | | Scripts to help plug spatial audio into your application. | Building blocks for creating good UX in your application like common controls. | Common helpers and tools that you can leverage in your application. | | [![Spatial Understanding](External/ReadMeImages/MRTK170802_Short_06.png)](Assets/HoloToolkit/SpatialUnderstanding/README.md) [Spatial Understanding](Assets/HoloToolkit/SpatialUnderstanding/README.md)| [![Build](External/ReadMeImages/MRTK170802_Short_12.png)](Assets/HoloToolkit/BuildAndDeploy/README.md) [Build](Assets/HoloToolkit/BuildAndDeploy/README.md)| [![Boundary](External/ReadMeImages/MRTK170802_Short_07.png)](Assets/HoloToolkit/Boundary/README.md) [Boundary](Assets/HoloToolkit/Boundary/README.md) |