From 1d0e1d3dc47de07ca63ed7756a482c874849a391 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 12 Apr 2017 16:30:14 -0400 Subject: [PATCH 01/17] Update Editor to 5.6.0f3 Updated obsolete methods. --- .../Scenes/sharingwithunet.unity | 118 ++++++++----- .../Scenes/sharingwithunet/LightingData.asset | Bin 12556 -> 12912 bytes .../sharingwithunet/LightingData.asset.meta | 3 +- .../Scripts/PlaneFindingTest.cs | 2 +- .../Build/Editor/BuildSLNUtilities.cs | 48 +++--- .../Scripts/Editor/ProjectSettingsWindow.cs | 2 +- ProjectSettings/ProjectSettings.asset | 162 ++++++++++++++++-- ProjectSettings/ProjectVersion.txt | 2 +- 8 files changed, 250 insertions(+), 87 deletions(-) diff --git a/Assets/HoloToolkit-Examples/SharingWithUNET/Scenes/sharingwithunet.unity b/Assets/HoloToolkit-Examples/SharingWithUNET/Scenes/sharingwithunet.unity index a419dc88c80..a5a88e5f2ff 100644 --- a/Assets/HoloToolkit-Examples/SharingWithUNET/Scenes/sharingwithunet.unity +++ b/Assets/HoloToolkit-Examples/SharingWithUNET/Scenes/sharingwithunet.unity @@ -1,21 +1,19 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!29 &1 -SceneSettings: +OcclusionCullingSettings: m_ObjectHideFlags: 0 - m_PVSData: 120000d62e3da696d00400000000a041000000000000a0c10000a0c10000a0c10000a0410000a0410000a041200000005001000000000000010000006001000002000000d001000000000000000000000002000021000000a0010000020000000000000000000000000000000000000000000000000000000000000001000000b00100000000000090010000010000000100000001000000700100008001000010020000000000000000000000000000000000000000000000000000542032302e3020534f20352e3020534820302e323530204246203130302046203020435320302e30202d20332e332e3136204620302030204f4720300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000ffff7f7f0000000000000000000000000100000000000000000000000000000000000040000000000000000000000000000000000400000000000000000000000e000000000000000000000000000000000000000000000000000000ffff0000ffffffff000000000000000000000000ea509dc0e17a94be0cb53cc016afa240e17a94be7aa5e140cdccccbd8d97ee3e3333f33fcdcccc3dfa7e2a3f6666064000000000010000000000000000000000200200000000000000000000000000000000a0c10000a0c10000a0c10000a0410000a0410000a041e300000080020000a0020000020000009002000001b002000000a03e0400010050000000e00000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000ffff00000040008006000000060000000000000001000000000000000000000000000000ffffff3f008000800c0000000700000000000000010000000000000000000000ff7f0000ffff00000080ffff13000000070000000000000002000000000000000000000000000000ffffff7fffffffff000000a0ff3f0100ffff0000ff7f000000000060ff7f0200ff3f0000ffff0000ffffff9300000000ffff0000ff7f0000ffffff1300000000ff7f0000ff3f0000ffffff33ffff0000ff7f0000ff3f0000ffffff5300000000ff3f0000ffff000000000080ff3f0000ffff0000ff7f000000000060ff7f0200ff7fff3fffff0000000000a0ff7f0300ffff0000ff7f0000ffffff1300000000ff7f0000ff7fff3fffffff33ffff0000ff7f0000ff7fff3fffffff5300000000ff7fff3fffff000000000040ff7f0000ff3f0000ffff000000000040ff7f0100ff7fff3fffff0000000000a0ff7f0300ffff0000ffffff7fffffff9300000000ffff0000ffffff7fffffff1300000000ffffff7fff7f0000ffffff33ffff0000ffffff7fff7f0000ffffff73ffff0000ff7f0000ffff000000000080ff7f0100ffff0000ff7f000000000080ff7f0200ffff0000ffffff7fffffff1300000000ffff0000ffffff7fffffff33ffff0000ffff0000ffffff7fffffff5300000000ffffff7fffff0000ffffff73ffff0000ffffff7fffff0000ffffffb3ffff0000ffff0000ffff0000b63f00000000000000000000000000000000000000000000000000000000000013020000000000000000000000000000 - m_PVSObjectsArray: - - {fileID: 0} - - {fileID: 0} - m_PVSPortalsArray: [] + serializedVersion: 2 m_OcclusionBakeSettings: smallestOccluder: 5 smallestHole: 0.25 backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 8 m_Fog: 1 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -27,6 +25,7 @@ RenderSettings: m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 0} m_HaloStrength: 0.5 m_FlareStrength: 1 @@ -43,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 9 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -55,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 4 + serializedVersion: 8 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -68,40 +67,57 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_DirectLightInLightProbes: 1 m_FinalGather: 0 m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 - m_LightingDataAsset: {fileID: 112000001, guid: f7b6b724857b3584584b684aabfb6ff6, + m_MixedBakeMode: 1 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFiltering: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousColorSigma: 1 + m_PVRFilteringAtrousNormalSigma: 1 + m_PVRFilteringAtrousPositionSigma: 1 + m_LightingDataAsset: {fileID: 112000002, guid: f7b6b724857b3584584b684aabfb6ff6, type: 2} - m_RuntimeCPUUsage: 25 + m_ShadowMaskMode: 2 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 + agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 agentSlope: 45 agentClimb: 0.4 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 - accuratePlacement: 0 minRegionArea: 2 - cellSize: 0.16666667 manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 m_NavMeshData: {fileID: 0} --- !u!1 &543313553 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 543313555} - - 108: {fileID: 543313554} + - component: {fileID: 543313555} + - component: {fileID: 543313554} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -116,7 +132,7 @@ Light: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 543313553} m_Enabled: 1 - serializedVersion: 7 + serializedVersion: 8 m_Type: 1 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 @@ -141,6 +157,8 @@ Light: m_Lightmapping: 1 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &543313555 @@ -152,19 +170,19 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 6.95, y: 1.61, z: 2.11} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &942915099 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 942915100} - - 114: {fileID: 942915101} + - component: {fileID: 942915100} + - component: {fileID: 942915101} m_Layer: 0 m_Name: HologramCollection m_TagString: Untagged @@ -181,11 +199,11 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1499115225} m_Father: {fileID: 0} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &942915101 MonoBehaviour: m_ObjectHideFlags: 0 @@ -202,11 +220,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 987084766} - - 114: {fileID: 987084768} - - 114: {fileID: 987084769} + - component: {fileID: 987084766} + - component: {fileID: 987084768} + - component: {fileID: 987084769} m_Layer: 0 m_Name: Managers m_TagString: Untagged @@ -223,11 +241,11 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1943070928} m_Father: {fileID: 0} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &987084768 MonoBehaviour: m_ObjectHideFlags: 0 @@ -298,12 +316,12 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1499115225} - - 23: {fileID: 1499115227} - - 102: {fileID: 1499115226} - - 114: {fileID: 1499115228} + - component: {fileID: 1499115225} + - component: {fileID: 1499115227} + - component: {fileID: 1499115226} + - component: {fileID: 1499115228} m_Layer: 0 m_Name: Shared Anchor Pos Text m_TagString: Untagged @@ -320,10 +338,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.005, y: 0.005, z: 0.005} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 942915100} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!102 &1499115226 TextMesh: serializedVersion: 3 @@ -359,7 +377,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -367,12 +387,13 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 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!114 &1499115228 MonoBehaviour: @@ -391,11 +412,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1898807463} - - 114: {fileID: 1898807461} - - 114: {fileID: 1898807462} + - component: {fileID: 1898807463} + - component: {fileID: 1898807461} + - component: {fileID: 1898807462} m_Layer: 0 m_Name: UNETSharingStage m_TagString: Untagged @@ -447,12 +468,19 @@ MonoBehaviour: m_OverflowDropThreshold: 5 m_MaxConnectionAttempt: 10 m_AckDelay: 33 + m_SendDelay: 10 m_MaxCombinedReliableMessageSize: 100 m_MaxCombinedReliableMessageCount: 10 m_MaxSentMessageQueueSize: 128 - m_IsAcksLong: 0 + m_AcksType: 1 m_UsePlatformSpecificProtocols: 0 + m_InitialBandwidth: 0 + m_BandwidthPeakFactor: 2 m_WebSocketReceiveBufferMaxSize: 0 + m_UdpSocketReceiveBufferMaxSize: 0 + m_SSLCertFilePath: + m_SSLPrivateKeyFilePath: + m_SSLCAFilePath: m_Channels: [] m_GlobalConfig: m_ThreadAwakeTimeout: 1 @@ -460,6 +488,12 @@ MonoBehaviour: m_ReactorMaximumReceivedMessages: 1024 m_ReactorMaximumSentMessages: 1024 m_MaxPacketSize: 2000 + m_MaxHosts: 16 + m_ThreadPoolSize: 1 + m_MinTimerTimeout: 1 + m_MaxTimerTimeout: 12000 + m_MinNetSimulatorTimeout: 1 + m_MaxNetSimulatorTimeout: 12000 m_Channels: 0500000000000000 m_UseWebSockets: 0 m_UseSimulator: 0 @@ -504,10 +538,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1943070927 Prefab: m_ObjectHideFlags: 0 diff --git a/Assets/HoloToolkit-Examples/SharingWithUNET/Scenes/sharingwithunet/LightingData.asset b/Assets/HoloToolkit-Examples/SharingWithUNET/Scenes/sharingwithunet/LightingData.asset index 1ff2f9ce23a0ef1f1f9426c04c89e21cec7e8445..f497d83baed62f20f0336aca4c511750a4b9a02a 100644 GIT binary patch literal 12912 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 literal 12556 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 diff --git a/Assets/HoloToolkit-Examples/SharingWithUNET/Scenes/sharingwithunet/LightingData.asset.meta b/Assets/HoloToolkit-Examples/SharingWithUNET/Scenes/sharingwithunet/LightingData.asset.meta index 63e20627018..b0811a76f40 100644 --- a/Assets/HoloToolkit-Examples/SharingWithUNET/Scenes/sharingwithunet/LightingData.asset.meta +++ b/Assets/HoloToolkit-Examples/SharingWithUNET/Scenes/sharingwithunet/LightingData.asset.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 guid: f7b6b724857b3584584b684aabfb6ff6 -timeCreated: 1477526681 +timeCreated: 1492028469 licenseType: Pro NativeFormatImporter: + mainObjectFileID: 25800000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/HoloToolkit-Tests/SpatialMapping/Scripts/PlaneFindingTest.cs b/Assets/HoloToolkit-Tests/SpatialMapping/Scripts/PlaneFindingTest.cs index 7e85c4a58ef..8b61b9b8a8a 100644 --- a/Assets/HoloToolkit-Tests/SpatialMapping/Scripts/PlaneFindingTest.cs +++ b/Assets/HoloToolkit-Tests/SpatialMapping/Scripts/PlaneFindingTest.cs @@ -111,7 +111,7 @@ private void OnDrawGizmosSelected() UnityEditor.Handles.DrawLine(corners[1], corners[2]); UnityEditor.Handles.DrawLine(corners[1], corners[3]); UnityEditor.Handles.DrawLine(corners[2], corners[3]); - UnityEditor.Handles.ArrowCap(0, center, Quaternion.FromToRotation(Vector3.forward, normal), 0.4f); + UnityEditor.Handles.ArrowHandleCap(0, center, Quaternion.FromToRotation(Vector3.forward, normal), 0.4f, EventType.ignore); // If this plane is currently in the center of the camera's field of view, highlight it by drawing a // solid rectangle, and display the important details about this plane. diff --git a/Assets/HoloToolkit/Build/Editor/BuildSLNUtilities.cs b/Assets/HoloToolkit/Build/Editor/BuildSLNUtilities.cs index 30022b67288..fcb8ada41fc 100644 --- a/Assets/HoloToolkit/Build/Editor/BuildSLNUtilities.cs +++ b/Assets/HoloToolkit/Build/Editor/BuildSLNUtilities.cs @@ -66,12 +66,12 @@ public BuildInfo() public void AppendSymbols(params string[] symbol) { - this.AppendSymbols((IEnumerable)symbol); + AppendSymbols((IEnumerable)symbol); } public void AppendSymbols(IEnumerable symbols) { - string[] toAdd = symbols.Except(this.BuildSymbols.Split(';')) + string[] toAdd = symbols.Except(BuildSymbols.Split(';')) .Where(sym => !string.IsNullOrEmpty(sym)).ToArray(); if (!toAdd.Any()) @@ -79,40 +79,40 @@ public void AppendSymbols(IEnumerable symbols) return; } - if (!String.IsNullOrEmpty(this.BuildSymbols)) + if (!String.IsNullOrEmpty(BuildSymbols)) { - this.BuildSymbols += ";"; + BuildSymbols += ";"; } - this.BuildSymbols += String.Join(";", toAdd); + BuildSymbols += String.Join(";", toAdd); } public bool HasAnySymbols(params string[] symbols) { - return this.BuildSymbols.Split(';').Intersect(symbols).Any(); + return BuildSymbols.Split(';').Intersect(symbols).Any(); } public bool HasConfigurationSymbol() { return HasAnySymbols( - BuildSLNUtilities.BuildSymbolDebug, - BuildSLNUtilities.BuildSymbolRelease, - BuildSLNUtilities.BuildSymbolMaster); + BuildSymbolDebug, + BuildSymbolRelease, + BuildSymbolMaster); } public static IEnumerable RemoveConfigurationSymbols(string symbolstring) { return symbolstring.Split(';').Except(new[] { - BuildSLNUtilities.BuildSymbolDebug, - BuildSLNUtilities.BuildSymbolRelease, - BuildSLNUtilities.BuildSymbolMaster + BuildSymbolDebug, + BuildSymbolRelease, + BuildSymbolMaster }); } public bool HasAnySymbols(IEnumerable symbols) { - return this.BuildSymbols.Split(';').Intersect(symbols).Any(); + return BuildSymbols.Split(';').Intersect(symbols).Any(); } } @@ -151,16 +151,16 @@ public static void PerformBuild(BuildInfo buildInfo) { if (!buildInfo.HasConfigurationSymbol()) { - buildInfo.AppendSymbols(BuildSLNUtilities.BuildSymbolDebug); + buildInfo.AppendSymbols(BuildSymbolDebug); } } - if (buildInfo.HasAnySymbols(BuildSLNUtilities.BuildSymbolDebug)) + if (buildInfo.HasAnySymbols(BuildSymbolDebug)) { buildInfo.BuildOptions |= BuildOptions.Development | BuildOptions.AllowDebugging; } - if (buildInfo.HasAnySymbols(BuildSLNUtilities.BuildSymbolRelease)) + if (buildInfo.HasAnySymbols(BuildSymbolRelease)) { //Unity automatically adds the DEBUG symbol if the BuildOptions.Development flag is //specified. In order to have debug symbols and the RELEASE symbole we have to @@ -168,8 +168,10 @@ public static void PerformBuild(BuildInfo buildInfo) buildInfo.AppendSymbols("DEVELOPMENT_BUILD"); } - var oldBuildTarget = EditorUserBuildSettings.activeBuildTarget; - EditorUserBuildSettings.SwitchActiveBuildTarget(buildInfo.BuildTarget); + BuildTarget oldBuildTarget = EditorUserBuildSettings.activeBuildTarget; + BuildTargetGroup oldBuildTargetGroup = GetGroup(oldBuildTarget); + + EditorUserBuildSettings.SwitchActiveBuildTarget(buildTargetGroup, buildInfo.BuildTarget); var oldWSASDK = EditorUserBuildSettings.wsaSDK; if (buildInfo.WSASdk.HasValue) @@ -243,13 +245,13 @@ public static void PerformBuild(BuildInfo buildInfo) EditorUserBuildSettings.wsaGenerateReferenceProjects = oldWSAGenerateReferenceProjects; - EditorUserBuildSettings.SwitchActiveBuildTarget(oldBuildTarget); + EditorUserBuildSettings.SwitchActiveBuildTarget(oldBuildTargetGroup, oldBuildTarget); } } public static void ParseBuildCommandLine(ref BuildInfo buildInfo) { - string[] arguments = System.Environment.GetCommandLineArgs(); + string[] arguments = Environment.GetCommandLineArgs(); buildInfo.IsCommandLine = true; @@ -293,10 +295,10 @@ public static void ParseBuildCommandLine(ref BuildInfo buildInfo) public static void PerformBuild_CommandLine() { - BuildInfo buildInfo = new BuildInfo() + BuildInfo buildInfo = new BuildInfo { // Use scenes from the editor build settings. - Scenes = EditorBuildSettings.scenes.Where(scene => scene.enabled).Select(scene => scene.path), + Scenes = EditorBuildSettings.scenes.Where(scene => scene.enabled).Select(scene => scene.path) }; ParseBuildCommandLine(ref buildInfo); @@ -403,7 +405,7 @@ private static IEnumerable ReadCopyList(XmlTextReader reader) } else if (string.Equals(reader.Name, "Recursive", StringComparison.InvariantCultureIgnoreCase)) { - recursive = System.Convert.ToBoolean(reader.Value); + recursive = Convert.ToBoolean(reader.Value); } else if (string.Equals(reader.Name, "Filter", StringComparison.InvariantCultureIgnoreCase)) { diff --git a/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs b/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs index 52d7968f5d2..7963a22ee5b 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs @@ -205,7 +205,7 @@ protected override void ApplySettings() // Apply individual settings if (Values[ProjectSetting.BuildWsaUwp]) { - EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTarget.WSAPlayer); + EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.WSA ,BuildTarget.WSAPlayer); EditorUserBuildSettings.wsaSDK = WSASDK.UWP; } if (Values[ProjectSetting.WsaUwpBuildToD3D]) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8caa129be37..24fc0faf241 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 10 + serializedVersion: 11 productGUID: 4dcb8c58cabfde44da6ffb0c21242af7 AndroidProfiler: 0 defaultScreenOrientation: 4 @@ -96,7 +96,6 @@ PlayerSettings: n3dsDisableStereoscopicView: 0 n3dsEnableSharedListOpt: 1 n3dsEnableVSync: 0 - uiUse16BitDepthBuffer: 1 ignoreAlphaClear: 0 xboxOneResolution: 0 xboxOneMonoLoggingLevel: 0 @@ -119,27 +118,44 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleIdentifier: com.Company.ProductName bundleVersion: 1.0 preloadedAssets: [] metroInputSource: 0 m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 + xboxOneEnable7thCore: 0 + vrSettings: + cardboard: + depthFormat: 0 + enableTransitionView: 0 + daydream: + depthFormat: 0 + useSustainedPerformanceMode: 0 + hololens: + depthFormat: 1 protectGraphicsMemory: 0 + useHDRDisplay: 0 + applicationIdentifier: + Android: com.Company.ProductName + Standalone: unity.DefaultCompany.HoloToolkit-Unity + Tizen: com.Company.ProductName + iOS: com.Company.ProductName + tvOS: com.Company.ProductName + buildNumber: + iOS: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 9 + AndroidMinSdkVersion: 16 + AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: - apiCompatibilityLevel: 2 stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 - iPhoneBuildNumber: 0 ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 APKExpansionFiles: 0 - preloadShaders: 0 + keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 VertexChannelCompressionMask: serializedVersion: 2 @@ -191,6 +207,8 @@ PlayerSettings: iOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 + metalEditorSupport: 1 + metalAPIValidation: 1 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -303,16 +321,115 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: - XboxTitleId: - XboxImageXexPath: - XboxSpaPath: - XboxGenerateSpa: 0 - XboxDeployKinectResources: 0 - XboxSplashScreen: {fileID: 0} - xboxEnableSpeech: 0 - xboxAdditionalTitleMemorySize: 0 - xboxDeployKinectHeadOrientation: 0 - xboxDeployKinectHeadPosition: 0 + switchNetLibKey: + switchSocketMemoryPoolSize: 6144 + switchSocketAllocatorPoolSize: 128 + switchSocketConcurrencyLimit: 14 + switchUseCPUProfiler: 0 + switchApplicationID: 0x0005000C10000001 + switchNSODependencies: + switchTitleNames_0: + switchTitleNames_1: + switchTitleNames_2: + switchTitleNames_3: + switchTitleNames_4: + switchTitleNames_5: + switchTitleNames_6: + switchTitleNames_7: + switchTitleNames_8: + switchTitleNames_9: + switchTitleNames_10: + switchTitleNames_11: + switchTitleNames_12: + switchTitleNames_13: + switchTitleNames_14: + switchPublisherNames_0: + switchPublisherNames_1: + switchPublisherNames_2: + switchPublisherNames_3: + switchPublisherNames_4: + switchPublisherNames_5: + switchPublisherNames_6: + switchPublisherNames_7: + switchPublisherNames_8: + switchPublisherNames_9: + switchPublisherNames_10: + switchPublisherNames_11: + switchPublisherNames_12: + switchPublisherNames_13: + switchPublisherNames_14: + switchIcons_0: {fileID: 0} + switchIcons_1: {fileID: 0} + switchIcons_2: {fileID: 0} + switchIcons_3: {fileID: 0} + switchIcons_4: {fileID: 0} + switchIcons_5: {fileID: 0} + switchIcons_6: {fileID: 0} + switchIcons_7: {fileID: 0} + switchIcons_8: {fileID: 0} + switchIcons_9: {fileID: 0} + switchIcons_10: {fileID: 0} + switchIcons_11: {fileID: 0} + switchIcons_12: {fileID: 0} + switchIcons_13: {fileID: 0} + switchIcons_14: {fileID: 0} + switchSmallIcons_0: {fileID: 0} + switchSmallIcons_1: {fileID: 0} + switchSmallIcons_2: {fileID: 0} + switchSmallIcons_3: {fileID: 0} + switchSmallIcons_4: {fileID: 0} + switchSmallIcons_5: {fileID: 0} + switchSmallIcons_6: {fileID: 0} + switchSmallIcons_7: {fileID: 0} + switchSmallIcons_8: {fileID: 0} + switchSmallIcons_9: {fileID: 0} + switchSmallIcons_10: {fileID: 0} + switchSmallIcons_11: {fileID: 0} + switchSmallIcons_12: {fileID: 0} + switchSmallIcons_13: {fileID: 0} + switchSmallIcons_14: {fileID: 0} + switchManualHTML: + switchAccessibleURLs: + switchLegalInformation: + switchMainThreadStackSize: 1048576 + switchPresenceGroupId: 0x0005000C10000001 + switchLogoHandling: 0 + switchReleaseVersion: 0 + switchDisplayVersion: 1.0.0 + switchStartupUserAccount: 0 + switchTouchScreenUsage: 0 + switchSupportedLanguagesMask: 0 + switchLogoType: 0 + switchApplicationErrorCodeCategory: + switchUserAccountSaveDataSize: 0 + switchUserAccountSaveDataJournalSize: 0 + switchAttribute: 0 + switchCardSpecSize: 4 + switchCardSpecClock: 25 + switchRatingsMask: 0 + switchRatingsInt_0: 0 + switchRatingsInt_1: 0 + switchRatingsInt_2: 0 + switchRatingsInt_3: 0 + switchRatingsInt_4: 0 + switchRatingsInt_5: 0 + switchRatingsInt_6: 0 + switchRatingsInt_7: 0 + switchRatingsInt_8: 0 + switchRatingsInt_9: 0 + switchRatingsInt_10: 0 + switchRatingsInt_11: 0 + switchLocalCommunicationIds_0: 0x0005000C10000001 + switchLocalCommunicationIds_1: + switchLocalCommunicationIds_2: + switchLocalCommunicationIds_3: + switchLocalCommunicationIds_4: + switchLocalCommunicationIds_5: + switchLocalCommunicationIds_6: + switchLocalCommunicationIds_7: + switchParentalControl: 0 + switchAllowsScreenshot: 1 + switchDataLossConfirmation: 0 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -432,6 +549,7 @@ PlayerSettings: spritePackerPolicy: webGLMemorySize: 256 webGLExceptionSupport: 1 + webGLNameFilesAsHashes: 0 webGLDataCaching: 0 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -450,6 +568,7 @@ PlayerSettings: WebPlayer: 0 incrementalIl2cppBuild: {} additionalIl2CppArgs: + apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: HoloToolkit-Unity @@ -551,7 +670,11 @@ PlayerSettings: XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 - vrEditorSettings: {} + xboxOneScriptCompiler: 0 + vrEditorSettings: + daydream: + daydreamIconForeground: {fileID: 0} + daydreamIconBackground: {fileID: 0} cloudServicesEnabled: Analytics: 0 Build: 0 @@ -562,7 +685,10 @@ PlayerSettings: Purchasing: 0 UNet: 0 Unity_Ads: 0 + facebookSdkVersion: 7.9.1 + apiCompatibilityLevel: 2 cloudProjectId: projectName: organizationId: cloudEnabled: 0 + enableNewInputSystem: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 1049cc72821..ca09a3dadc0 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 5.5.2f1 +m_EditorVersion: 5.6.0f3 From a16fdae70d9a0f848db34c42f27bd303bd91d9dd Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 12 Apr 2017 16:34:47 -0400 Subject: [PATCH 02/17] Fixed inconsistant spacing in updated method. --- .../Utilities/Scripts/Editor/ProjectSettingsWindow.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs b/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs index 7963a22ee5b..4e6a8990df7 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs @@ -205,7 +205,7 @@ protected override void ApplySettings() // Apply individual settings if (Values[ProjectSetting.BuildWsaUwp]) { - EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.WSA ,BuildTarget.WSAPlayer); + EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.WSA, BuildTarget.WSAPlayer); EditorUserBuildSettings.wsaSDK = WSASDK.UWP; } if (Values[ProjectSetting.WsaUwpBuildToD3D]) From aaad43d9c3bcbf5fa233064146f4858b52c30ee7 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 12 Apr 2017 16:44:02 -0400 Subject: [PATCH 03/17] updated unity editor version in main readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index acef98c0d83..181770656f3 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This is effectively part of the existing HoloToolkit, but this is the repository that will contain all Unity specific components. The HoloToolkit is a collection of scripts and components intended to accelerate development of holographic applications targeting Windows Holographic. -**Required Unity Editor Version: 5.5.2f1** +**Required Unity Editor Version: 5.6.0f3** HoloToolkit contains the following feature areas: From 1a0cce1a2cda9fc41be219c4259b8eb515c3b6ea Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 12 Apr 2017 16:45:16 -0400 Subject: [PATCH 04/17] updated some bad headers in utilities readme --- Assets/HoloToolkit/Utilities/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/HoloToolkit/Utilities/README.md b/Assets/HoloToolkit/Utilities/README.md index dc2cfaf4159..22c50771303 100644 --- a/Assets/HoloToolkit/Utilities/README.md +++ b/Assets/HoloToolkit/Utilities/README.md @@ -14,10 +14,10 @@ A drop in direction indicator that stays in the users view at all times. #### HeadsUpDirectionIndicatorPointer.prefab A quad based pointer to be used with the HeadsUpDirectionIndicator prefab to create an out of box direction indicator. -###[Scenes](Scenes) +### [Scenes](Scenes) --- -####HeadsetAdjustment.unity +#### HeadsetAdjustment.unity Helps the user adjust the headset so that he/she gets the full experience in demo scenarios. When demoing an app, it is important to ensure that the user has the headset on properly. This scene shows a border at the edge of the user's field of view and instructs him/her to adjust the headset until all four edges are visible. The user (or the demonstrator) can then air-tap or say "I'm ready" to proceed to the actual experience. From c17630d33398867caeb69932d397498b88849c5d Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 12 Apr 2017 16:46:00 -0400 Subject: [PATCH 05/17] updated bad header in spatial understanding readme --- Assets/HoloToolkit/SpatialUnderstanding/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/HoloToolkit/SpatialUnderstanding/README.md b/Assets/HoloToolkit/SpatialUnderstanding/README.md index 7ba77de8f41..1b12eb5df54 100644 --- a/Assets/HoloToolkit/SpatialUnderstanding/README.md +++ b/Assets/HoloToolkit/SpatialUnderstanding/README.md @@ -20,7 +20,7 @@ SpatialUnderstanding addon that can be used for topology, object detection, and ### [Prefabs](Prefabs) The following prefab makes it easy to quickly get started using the Spatial Understanding Modules. -####SpatialUnderstanding.prefab +#### SpatialUnderstanding.prefab This prefab is used to control the state and flow of the scanning process used in the understanding module, provides the means to visualize the scanning process. ### [Scripts](Scripts) From 6a07cc570e239b9c9ff0dcf8ac68019b9f5a569e Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 12 Apr 2017 16:46:49 -0400 Subject: [PATCH 06/17] updated invalid header in sharing readme --- Assets/HoloToolkit/Sharing/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/HoloToolkit/Sharing/README.md b/Assets/HoloToolkit/Sharing/README.md index c05d919bed7..2476b4babc5 100644 --- a/Assets/HoloToolkit/Sharing/README.md +++ b/Assets/HoloToolkit/Sharing/README.md @@ -112,7 +112,7 @@ Install or run the server instance. - Make sure all devices are connected to the same Wireless Local Area Network. - Ensure all firewall settings are correct. Windows firewall gives you options to enable/disable by network type (private, public, home), make sure you're enabling the firewall for your connection's type. -####Invalid Schema Version +#### Invalid Schema Version ``` SharingService [..\..\Source\Common\Private\SessionListHandshakeLogic.cpp (67)]: From 3baa18c676e19a4cc979f14e971c5162a3078e71 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 12 Apr 2017 16:57:25 -0400 Subject: [PATCH 07/17] removed extra space in project settings window --- .../Utilities/Scripts/Editor/ProjectSettingsWindow.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs b/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs index 4e6a8990df7..c2d1db3a8f4 100644 --- a/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs +++ b/Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs @@ -15,7 +15,6 @@ namespace HoloToolkit.Unity /// public class ProjectSettingsWindow : AutoConfigureWindow { - #region Nested Types public enum ProjectSetting { From 03727de02a2c95b9ff8b5983545fb44a6515aba2 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 19 Apr 2017 12:37:39 -0400 Subject: [PATCH 08/17] Updated to 5.6.0p1 --- ProjectSettings/GraphicsSettings.asset | 23 +++++++++++------------ ProjectSettings/ProjectVersion.txt | 2 +- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index f15de1d44e2..93ca4308418 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 12 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -35,29 +35,28 @@ GraphicsSettings: - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_TierSettings_Tier1: - renderingPath: 1 - useCascadedShadowMaps: 0 - m_TierSettings_Tier2: - renderingPath: 1 - useCascadedShadowMaps: 1 - m_TierSettings_Tier3: - renderingPath: 1 - useCascadedShadowMaps: 1 + m_CustomRenderPipeline: {fileID: 0} + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1 m_DefaultMobileRenderingPath: 1 m_TierSettings: [] m_LightmapStripping: 0 m_FogStripping: 0 + m_InstancingStripping: 0 m_LightmapKeepPlain: 1 m_LightmapKeepDirCombined: 1 - m_LightmapKeepDirSeparate: 1 m_LightmapKeepDynamicPlain: 1 m_LightmapKeepDynamicDirCombined: 1 - m_LightmapKeepDynamicDirSeparate: 1 + m_LightmapKeepShadowMask: 1 + m_LightmapKeepSubtractive: 1 m_FogKeepLinear: 1 m_FogKeepExp: 1 m_FogKeepExp2: 1 + m_AlbedoSwatchInfos: [] + m_LightsUseLinearIntensity: 0 + m_LightsUseColorTemperature: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index ca09a3dadc0..044e97ae24f 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 5.6.0f3 +m_EditorVersion: 5.6.0p1 From 67234e9a84370433e33d049a5eb60c7d2355c5db Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 19 Apr 2017 13:27:46 -0400 Subject: [PATCH 09/17] Added updated project settings file --- ProjectSettings/ProjectSettings.asset | 1 + 1 file changed, 1 insertion(+) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 24fc0faf241..bf0868c4715 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -314,6 +314,7 @@ PlayerSettings: wiiUGamePadStartupScreen: {fileID: 0} wiiUDrcBufferDisabled: 0 wiiUProfilerLibPath: + playModeTestRunnerEnabled: 0 actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 From 0f64e3809de1a6c844e72a8272736d993b60909e Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Thu, 20 Apr 2017 10:50:17 -0400 Subject: [PATCH 10/17] Updated HoloLensCamera.prefab serialization --- .../Input/Prefabs/HoloLensCamera.prefab | 114 ++++++++++-------- 1 file changed, 63 insertions(+), 51 deletions(-) diff --git a/Assets/HoloToolkit/Input/Prefabs/HoloLensCamera.prefab b/Assets/HoloToolkit/Input/Prefabs/HoloLensCamera.prefab index 2936f95d17e..a25988e92e5 100644 --- a/Assets/HoloToolkit/Input/Prefabs/HoloLensCamera.prefab +++ b/Assets/HoloToolkit/Input/Prefabs/HoloLensCamera.prefab @@ -16,10 +16,10 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 4000010085977160} - - 114: {fileID: 114000011221680894} + - component: {fileID: 4000010085977160} + - component: {fileID: 114000011221680894} m_Layer: 0 m_Name: JoystickXZTranslationAxis m_TagString: Untagged @@ -32,10 +32,10 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 4000011708201582} - - 114: {fileID: 114000012656745502} + - component: {fileID: 4000011708201582} + - component: {fileID: 114000012656745502} m_Layer: 0 m_Name: KeyboardXZTranslationAxis m_TagString: Untagged @@ -48,14 +48,14 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 4000010560871102} - - 20: {fileID: 20000013304850028} - - 92: {fileID: 92000010221946138} - - 124: {fileID: 124000011504821460} - - 81: {fileID: 81000013783107718} - - 114: {fileID: 114000013543835744} + - component: {fileID: 4000010560871102} + - component: {fileID: 20000013304850028} + - component: {fileID: 92000010221946138} + - component: {fileID: 124000011504821460} + - component: {fileID: 81000013783107718} + - component: {fileID: 114000013543835744} m_Layer: 0 m_Name: HoloLensCamera m_TagString: MainCamera @@ -68,10 +68,10 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 4000014150713462} - - 114: {fileID: 114000010160007858} + - component: {fileID: 4000014150713462} + - component: {fileID: 114000010160007858} m_Layer: 0 m_Name: JoystickXYTranslationAxis m_TagString: Untagged @@ -84,10 +84,10 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 4000010590998566} - - 114: {fileID: 114000013933693316} + - component: {fileID: 4000010590998566} + - component: {fileID: 114000013933693316} m_Layer: 0 m_Name: MouseXYRotationAxis m_TagString: Untagged @@ -100,9 +100,9 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 4000010510211078} + - component: {fileID: 4000010510211078} m_Layer: 0 m_Name: GazeControls m_TagString: Untagged @@ -115,10 +115,10 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 4000012378391282} - - 114: {fileID: 114000013988799740} + - component: {fileID: 4000012378391282} + - component: {fileID: 114000013988799740} m_Layer: 0 m_Name: MouseXZTranslationAxis m_TagString: Untagged @@ -131,10 +131,10 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 4000011800569768} - - 114: {fileID: 114000012889557236} + - component: {fileID: 4000011800569768} + - component: {fileID: 114000012889557236} m_Layer: 0 m_Name: KeyboardXYRotationAxis m_TagString: Untagged @@ -147,10 +147,10 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 4000011251444590} - - 114: {fileID: 114000012298662144} + - component: {fileID: 4000011251444590} + - component: {fileID: 114000012298662144} m_Layer: 0 m_Name: KeyboardXYTranslationAxis m_TagString: Untagged @@ -163,10 +163,10 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 4000010393938340} - - 114: {fileID: 114000011359953050} + - component: {fileID: 4000010393938340} + - component: {fileID: 114000011359953050} m_Layer: 0 m_Name: MouseXYTranslationAxis m_TagString: Untagged @@ -179,10 +179,10 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 4000012536474926} - - 114: {fileID: 114000014171224568} + - component: {fileID: 4000012536474926} + - component: {fileID: 114000014171224568} m_Layer: 0 m_Name: KeyboardXZRotationAxis m_TagString: Untagged @@ -195,10 +195,10 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 4000012610367806} - - 114: {fileID: 114000013649663976} + - component: {fileID: 4000012610367806} + - component: {fileID: 114000013649663976} m_Layer: 0 m_Name: JoystickXYRotationAxis m_TagString: Untagged @@ -215,10 +215,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 4000010510211078} m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4000010393938340 Transform: m_ObjectHideFlags: 1 @@ -228,10 +228,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 4000010510211078} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4000010510211078 Transform: m_ObjectHideFlags: 1 @@ -241,7 +241,6 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 4000010590998566} - {fileID: 4000010393938340} @@ -255,6 +254,7 @@ Transform: - {fileID: 4000010085977160} m_Father: {fileID: 4000010560871102} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4000010560871102 Transform: m_ObjectHideFlags: 1 @@ -264,11 +264,11 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 4000010510211078} m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4000010590998566 Transform: m_ObjectHideFlags: 1 @@ -278,10 +278,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 4000010510211078} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4000011251444590 Transform: m_ObjectHideFlags: 1 @@ -291,10 +291,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 4000010510211078} m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4000011708201582 Transform: m_ObjectHideFlags: 1 @@ -304,10 +304,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 4000010510211078} m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4000011800569768 Transform: m_ObjectHideFlags: 1 @@ -317,10 +317,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 4000010510211078} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4000012378391282 Transform: m_ObjectHideFlags: 1 @@ -330,10 +330,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 4000010510211078} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4000012536474926 Transform: m_ObjectHideFlags: 1 @@ -343,10 +343,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 4000010510211078} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4000012610367806 Transform: m_ObjectHideFlags: 1 @@ -356,10 +356,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 4000010510211078} m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4000014150713462 Transform: m_ObjectHideFlags: 1 @@ -369,10 +369,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 4000010510211078} m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &20000013304850028 Camera: m_ObjectHideFlags: 1 @@ -403,6 +403,8 @@ Camera: m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 + m_AllowMSAA: 1 + m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 @@ -433,6 +435,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SensitivityScale: 3 + UseUnscaledTime: 1 axisType: 0 buttonType: 21 InputManagerHorizontalAxisName: LeftTrigger @@ -452,6 +455,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SensitivityScale: 3 + UseUnscaledTime: 1 axisType: 0 buttonType: 21 InputManagerHorizontalAxisName: RightStickHorizontal @@ -471,6 +475,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SensitivityScale: 1 + UseUnscaledTime: 1 axisType: 13 buttonType: 21 InputManagerHorizontalAxisName: @@ -490,6 +495,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SensitivityScale: 1 + UseUnscaledTime: 1 axisType: 3 buttonType: 21 InputManagerHorizontalAxisName: @@ -509,6 +515,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SensitivityScale: 3 + UseUnscaledTime: 1 axisType: 0 buttonType: 21 InputManagerHorizontalAxisName: Horizontal @@ -528,6 +535,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SensitivityScale: 1 + UseUnscaledTime: 1 axisType: 6 buttonType: 21 InputManagerHorizontalAxisName: @@ -571,6 +579,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SensitivityScale: 3 + UseUnscaledTime: 1 axisType: 0 buttonType: 21 InputManagerHorizontalAxisName: LeftStickHorizontal @@ -590,6 +599,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SensitivityScale: 4.5 + UseUnscaledTime: 1 axisType: 11 buttonType: 1 InputManagerHorizontalAxisName: @@ -609,6 +619,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SensitivityScale: 3 + UseUnscaledTime: 1 axisType: 12 buttonType: 3 InputManagerHorizontalAxisName: @@ -628,6 +639,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SensitivityScale: 1 + UseUnscaledTime: 1 axisType: 7 buttonType: 21 InputManagerHorizontalAxisName: From 5a2e8a9c0fa962c49507fd95b092ae99ab4fdb7f Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Thu, 20 Apr 2017 10:54:16 -0400 Subject: [PATCH 11/17] Disabled MSAA in HoloLensCamera.prefab settings --- Assets/HoloToolkit/Input/Prefabs/HoloLensCamera.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/HoloToolkit/Input/Prefabs/HoloLensCamera.prefab b/Assets/HoloToolkit/Input/Prefabs/HoloLensCamera.prefab index a25988e92e5..64ec2789970 100644 --- a/Assets/HoloToolkit/Input/Prefabs/HoloLensCamera.prefab +++ b/Assets/HoloToolkit/Input/Prefabs/HoloLensCamera.prefab @@ -403,7 +403,7 @@ Camera: m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 - m_AllowMSAA: 1 + m_AllowMSAA: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 From f635c52fa5667559451a518f02065d200f76555d Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Thu, 20 Apr 2017 11:01:22 -0400 Subject: [PATCH 12/17] Added license to root HoloToolkit folder for addition in asset package releases --- Assets/HoloToolkit/License.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Assets/HoloToolkit/License.txt diff --git a/Assets/HoloToolkit/License.txt b/Assets/HoloToolkit/License.txt new file mode 100644 index 00000000000..1577ee99cec --- /dev/null +++ b/Assets/HoloToolkit/License.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 Microsoft Corporation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file From 48807e3e91e4a3885018264b06792ea763fd5660 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Sun, 23 Apr 2017 11:56:50 -0400 Subject: [PATCH 13/17] added missing license meta file --- Assets/HoloToolkit/License.txt.meta | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Assets/HoloToolkit/License.txt.meta diff --git a/Assets/HoloToolkit/License.txt.meta b/Assets/HoloToolkit/License.txt.meta new file mode 100644 index 00000000000..df70066d620 --- /dev/null +++ b/Assets/HoloToolkit/License.txt.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 110c179e1fb277a409f2f398b4c4c677 +timeCreated: 1492807261 +licenseType: Pro +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: From a259a03e39e4c95f416c3e2d46432720ed7ea625 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 10 May 2017 11:58:14 -0400 Subject: [PATCH 14/17] bumped to 5.6.0p4 Cleaned up editor warnings in InteractiveMeshCursor.cs --- .../Cursor/InteractiveMeshCursor.fbx.meta | 8 ++++- .../Scripts/Cursor/InteractiveMeshCursor.cs | 31 +++++++++---------- ProjectSettings/ProjectVersion.txt | 2 +- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/Assets/HoloToolkit/Input/Models/Cursor/InteractiveMeshCursor.fbx.meta b/Assets/HoloToolkit/Input/Models/Cursor/InteractiveMeshCursor.fbx.meta index 89ad48c09e3..edf01b24d96 100644 --- a/Assets/HoloToolkit/Input/Models/Cursor/InteractiveMeshCursor.fbx.meta +++ b/Assets/HoloToolkit/Input/Models/Cursor/InteractiveMeshCursor.fbx.meta @@ -18,7 +18,7 @@ ModelImporter: 4300000: CursorDot 4300002: CursorRing materials: - importMaterials: 1 + importMaterials: 0 materialName: 0 materialSearch: 1 animations: @@ -27,6 +27,8 @@ ModelImporter: resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -63,6 +65,7 @@ ModelImporter: importAnimation: 1 copyAvatar: 0 humanDescription: + serializedVersion: 2 human: [] skeleton: [] armTwist: 0.5 @@ -73,7 +76,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/Scripts/Cursor/InteractiveMeshCursor.cs b/Assets/HoloToolkit/Input/Scripts/Cursor/InteractiveMeshCursor.cs index b80f886d6a4..524267c9f00 100644 --- a/Assets/HoloToolkit/Input/Scripts/Cursor/InteractiveMeshCursor.cs +++ b/Assets/HoloToolkit/Input/Scripts/Cursor/InteractiveMeshCursor.cs @@ -1,5 +1,8 @@ -using System.Collections; -using System.Collections.Generic; +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. +// + using UnityEngine; namespace HoloToolkit.Unity.InputModule @@ -13,17 +16,13 @@ public class InteractiveMeshCursor : Cursor public float DownScale = 0.5f; public float UpScale = 1; public float ScaleTime = 0.5f; - - private bool mRingVisible = false; - private bool mScaleDown = false; - private float mTimer = 0; - - private bool mHasHover = false; - private bool mHasHand = false; - private bool mIsDown = false; + + private float mTimer; + private bool mHasHover; + private bool mHasHand; + private bool mIsDown; private Vector3 mBaseScale = new Vector3(1, 1, 1); private Vector3 mTargetScale; - private Vector3 mAwakeScale; private void Awake() @@ -35,14 +34,14 @@ public override void OnCursorStateChange(CursorStateEnum state) { base.OnCursorStateChange(state); - if (mHasHand != this.IsHandVisible || mIsDown != this.IsInputSourceDown || mHasHover != (this.TargetedObject != null)) + if (mHasHand != IsHandVisible || mIsDown != IsInputSourceDown || mHasHover != (TargetedObject != null)) { mTimer = 0; } - mHasHand = this.IsHandVisible; - mIsDown = this.IsInputSourceDown; - mHasHover = this.TargetedObject != null; + mHasHand = IsHandVisible; + mIsDown = IsInputSourceDown; + mHasHover = TargetedObject != null; mTargetScale = mBaseScale * DefaultScale; bool showRing = false; @@ -77,7 +76,6 @@ public override void OnCursorStateChange(CursorStateEnum state) Ring.SetActive(showRing); Dot.SetActive(!showRing); - } protected override void UpdateCursorTransform() @@ -99,7 +97,6 @@ protected override void UpdateCursorTransform() float distance = Vector3.Distance(GazeManager.Instance.GazeOrigin, transform.position); float smoothscaling = 1 - DefaultCursorDistance * DistanceScaleFactor; transform.localScale = mAwakeScale * (distance * DistanceScaleFactor + smoothscaling); - } } } diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 044e97ae24f..a8f87aad7ed 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 5.6.0p1 +m_EditorVersion: 5.6.0p4 From 0710d6a43d62bc25712183ae18f7ed830ebaa1d1 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 10 May 2017 12:52:39 -0400 Subject: [PATCH 15/17] updated editor version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 181770656f3..c74c9fde8f8 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This is effectively part of the existing HoloToolkit, but this is the repository that will contain all Unity specific components. The HoloToolkit is a collection of scripts and components intended to accelerate development of holographic applications targeting Windows Holographic. -**Required Unity Editor Version: 5.6.0f3** +**Required Unity Editor Version: 5.6.0p4** HoloToolkit contains the following feature areas: From 0ed454f0bc88613ab0d5cee43cf2671ebda1bf27 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Tue, 16 May 2017 17:52:35 -0400 Subject: [PATCH 16/17] bumped to 5.6.1f1 Removed unused variables in InteractiveMeshCursor.cs --- .../Materials/SampleButton_mat.mat | 142 +++++------------- .../Scripts/Cursor/InteractiveMeshCursor.cs | 2 - ProjectSettings/ProjectSettings.asset | 4 +- ProjectSettings/ProjectVersion.txt | 2 +- 4 files changed, 42 insertions(+), 108 deletions(-) diff --git a/Assets/HoloToolkit-Examples/InteractiveElements/Materials/SampleButton_mat.mat b/Assets/HoloToolkit-Examples/InteractiveElements/Materials/SampleButton_mat.mat index d7892b88d49..4e7d217656a 100644 --- a/Assets/HoloToolkit-Examples/InteractiveElements/Materials/SampleButton_mat.mat +++ b/Assets/HoloToolkit-Examples/InteractiveElements/Materials/SampleButton_mat.mat @@ -6,146 +6,80 @@ Material: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: Button_mat + m_Name: SampleButton_mat m_Shader: {fileID: 4800000, guid: b21aa08825c93084cb4072b24fc90532, type: 3} m_ShaderKeywords: _EMISSION _USECOLOR_ON m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _BumpMap - second: + - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _DetailAlbedoMap - second: + - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _DetailMask - second: + - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _DetailNormalMap - second: + - _DetailNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _EmissionMap - second: + - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _EmissionTex - second: + - _EmissionTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _MetallicGlossMap - second: + - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _OcclusionMap - second: + - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _ParallaxMap - second: + - _ParallaxMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BumpScale - second: 1 - - first: - name: _ColorWriteMask - second: 15 - - first: - name: _Cull - second: 2 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _GlossMapScale - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _GlossyReflections - second: 1 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _SmoothnessTextureChannel - second: 0 - - first: - name: _SpecularHighlights - second: 1 - - first: - name: _SrcBlend - second: 1 - - first: - name: _UVSec - second: 0 - - first: - name: _UseColor - second: 1 - - first: - name: _UseEmissionTex - second: 0 - - first: - name: _UseMainTex - second: 0 - - first: - name: _ZTest - second: 4 - - first: - name: _ZWrite - second: 1 + - _BumpScale: 1 + - _ColorWriteMask: 15 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _UseColor: 1 + - _UseEmissionTex: 0 + - _UseMainTex: 0 + - _ZTest: 4 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 0.66176474, g: 0.66176474, b: 0.66176474, a: 1} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0.66176474, g: 0.66176474, b: 0.66176474, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/HoloToolkit/Input/Scripts/Cursor/InteractiveMeshCursor.cs b/Assets/HoloToolkit/Input/Scripts/Cursor/InteractiveMeshCursor.cs index e879741dc64..e7f3fbd6eda 100644 --- a/Assets/HoloToolkit/Input/Scripts/Cursor/InteractiveMeshCursor.cs +++ b/Assets/HoloToolkit/Input/Scripts/Cursor/InteractiveMeshCursor.cs @@ -34,8 +34,6 @@ public class InteractiveMeshCursor : Cursor /// /// internal state and element management /// - private bool mRingVisible = false; - private bool mScaleDown = false; private float mTimer = 0; private bool mHasHover = false; diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bf0868c4715..8d9c67b6faf 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -76,6 +76,7 @@ PlayerSettings: forceSingleInstance: 0 resizableWindow: 0 useMacAppStoreValidation: 0 + macAppStoreCategory: public.app-category.games gpuSkinning: 1 graphicsJobs: 0 xboxPIXTextureCapture: 0 @@ -209,6 +210,7 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + iOSRenderExtraFrameOnPause: 1 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -631,7 +633,7 @@ PlayerSettings: tizenMicrophonePermissions: 0 tizenDeploymentTarget: tizenDeploymentTargetType: -522528772 - tizenMinOSVersion: 0 + tizenMinOSVersion: 1 n3dsUseExtSaveData: 0 n3dsCompressStaticMem: 1 n3dsExtSaveDataNumber: 0x12345 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index a8f87aad7ed..6e4d03da43a 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 5.6.0p4 +m_EditorVersion: 5.6.1f1 From 64df1628fb871f295b28cd4331f497634257a6ad Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Tue, 16 May 2017 17:54:40 -0400 Subject: [PATCH 17/17] bumped editor version in Readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c74c9fde8f8..96b0ee65797 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This is effectively part of the existing HoloToolkit, but this is the repository that will contain all Unity specific components. The HoloToolkit is a collection of scripts and components intended to accelerate development of holographic applications targeting Windows Holographic. -**Required Unity Editor Version: 5.6.0p4** +**Required Unity Editor Version: 5.6.1f1** HoloToolkit contains the following feature areas: