Skip to content

Commit

Permalink
Merge pull request #6253 from microsoft/prerelease/2.1.0_stabilization
Browse files Browse the repository at this point in the history 
merge 2.1.0 into release branch
  • Loading branch information
David Kline authored Oct 9, 2019
2 parents ac2b810 + e9c2fda commit 2c711ab
Show file tree
Hide file tree
Showing 1,363 changed files with 145,069 additions and 46,359 deletions.
14 changes: 12 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
[Aa]pp/
UWP/
WindowsStoreApp/
WSA/
UnityGenerated/
UnityPackageManager/
.out/
Expand Down Expand Up @@ -74,10 +75,19 @@ Assets/StreamingAssets.meta
# =============== #
doc/

# This is only needed because docfx chooses the first alphabetically occurring
# .cs file's folder to create an obj/xdoc cache folder inside.
# When https://github.com/dotnet/docfx/issues/1156 is addressed, it should be
# possible to remove the rule on the following line and update our docfx
# configuration to place its cache in a deterministic folder.
[Oo]bj.meta

# ============================= #
# NuGet Build Process Generated #
# ============================= #
/NuGet/
/NuGet/*
!/NuGet/BuildSource.proj
/MRTKBuild/
/MSBuild/
/PackagesCopy/
/PackagesCopy/
!/scripts/Packaging/NuGetRestoreProject.csproj
26 changes: 17 additions & 9 deletions Assets/MixedReality.Toolkit.Foundation.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,39 @@
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<releaseNotes>$releaseNotes$</releaseNotes>
<tags>Unity MixedReality</tags>
<contentFiles>
<files include="any\any\.PkgSrc\**" buildAction="None" copyToOutput="false" />
</contentFiles>
</metadata>
<files>
<file src="MixedRealityToolkit\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
<file src="MixedRealityToolkit.Providers\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
<file src="MixedRealityToolkit.SDK\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
<file src="MixedRealityToolkit.Services\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
<file src="MixedRealityToolkit\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit\toc.yml*" target="MRTK\" />
<file src="MixedRealityToolkit.Providers\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Providers\License.txt*;MixedRealityToolkit.Providers\Version.txt*" target="MRTK\" />
<file src="MixedRealityToolkit.SDK\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.SDK\License.txt*;MixedRealityToolkit.SDK\Version.txt*;MixedRealityToolkit.SDK\toc.yml*;MixedRealityToolkit.SDK\StandardAssets.meta;MixedRealityToolkit.SDK\StandardAssets\Fonts.meta;MixedRealityToolkit.SDK\StandardAssets\Materials.meta;MixedRealityToolkit.SDK\StandardAssets\Shaders.meta;MixedRealityToolkit.SDK\StandardAssets\Textures.meta" target="MRTK\" />
<file src="MixedRealityToolkit.Services\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Services\License.txt*;MixedRealityToolkit.Services\Version.txt*" target="MRTK\" />

<file src="MixedRealityToolkit\MixedReality.Toolkit.targets" target="build\Microsoft.MixedReality.Toolkit.Foundation.targets" />

<!-- Assemblies that are built from the MixedRealityToolkit folder -->
<!-- Assemblies and Sources that are built from the MixedRealityToolkit folder -->
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Editor.*" target="Plugins\" />
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Async.*" target="Plugins\" />
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.dll*" target="Plugins\" />
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.pdb*" target="Plugins\" />
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.pdb*" target="Plugins\" />
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Gltf.*" target="Plugins\" />
<!--Source commented as part of 2.1 release due to lack of support for long paths in N4U, and there is support for using source publicly yet.-->
<!--<file src="..\..\Assets\MixedRealityToolkit\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit" />-->

<!-- Assemblies that are built from the MixedRealityToolkit.Providers folder -->
<!-- Assemblies and Sources that are built from the MixedRealityToolkit.Providers folder -->
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Providers.*" target="Plugins\" />
<!--<file src="..\..\Assets\MixedRealityToolkit.Providers\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.Providers" />-->

<!-- Assemblies that are built from the MixedRealityToolkit.SDK folder -->
<!-- Assemblies and Sources that are built from the MixedRealityToolkit.SDK folder -->
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.SDK.*" target="Plugins\" />
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.SDK.Inspectors.*" target="Plugins\" />
<!--<file src="..\..\Assets\MixedRealityToolkit.SDK\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.SDK" />-->

<!-- Assemblies that are built from the MixedRealityToolkit.Services folder -->
<!-- Assemblies and Sources that are built from the MixedRealityToolkit.Services folder -->
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Services.*" target="Plugins\" />
<!--<file src="..\..\Assets\MixedRealityToolkit.Services\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.Services" />-->

<!--
link.xml is copied to the root location, so that it can catch IL2CPP
Expand Down
6 changes: 0 additions & 6 deletions ...tyToolkit.Examples/Demos/EyeTracking/DemoScrollPanZoom/Scripts/BaseClasses/PanZoomBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ public void AutoPan()
/// <summary>
/// Scroll sideways.
/// </summary>
/// <param name="speed"></param>
public void PanHorizontally(float speed)
{
offsetRate_Pan = new Vector2(Time.deltaTime * speed, offsetRate_Pan.y);
Expand All @@ -216,7 +215,6 @@ public void PanHorizontally(float speed)
/// <summary>
/// Scroll from top to bottom
/// </summary>
/// <param name="speed"></param>
public void PanVertically(float speed)
{
offsetRate_Pan = new Vector2(offsetRate_Pan.x, Time.deltaTime * speed);
Expand All @@ -235,7 +233,6 @@ public void DisableHandZoom()
/// <summary>
/// Resets the zoom speed and sets the correct zoom direction when first engaging with "zoom in/out"
/// </summary>
/// <param name="zoomIn"></param>
private void ZoomStart(bool zoomIn)
{
zoomSpeed = 0;
Expand Down Expand Up @@ -538,9 +535,6 @@ private IEnumerator ZoomAndStop(bool zoomIn)
/// Wrapper to ease keeping parameters up-to-date
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="objBase"></param>
/// <param name="objLocal"></param>
/// <returns></returns>
internal bool UpdateValues<T>(ref T objBase, T objLocal)
{
if (!EqualityComparer<T>.Default.Equals(objBase, objLocal))
Expand Down
3 changes: 0 additions & 3 deletions ...it.Examples/Demos/EyeTracking/DemoScrollPanZoom/Scripts/BaseClasses/PanZoomBaseTexture.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ public void Initialize(float newAspectRatio)
/// Returns the pan speed.
/// </summary>
/// <param name="uvCursorVal">Normalized cursor position in the hit box. Center is assumed to be at [-0.5, 0.5].</param>
/// <param name="maxSpeed"></param>
/// <param name="minDistThresh"></param>
/// <returns></returns>
public override float ComputePanSpeed(float uvCursorPos, float maxSpeed, float minDistFromCenterForAutoPan)
{
// UV space from [0,1] -> Center: [-0.5, 0.5]
Expand Down
48 changes: 40 additions & 8 deletions ...olkit.Examples/Demos/EyeTracking/DemoTargetPositioning/Materials/mat_destination_blue.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ Material:
m_Name: mat_destination_blue
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
m_ShaderKeywords: _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT _DISABLE_ALBEDO_MAP
_HOVER_LIGHT _REFLECTIONS _SPECULAR_HIGHLIGHTS
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000
stringTagMap:
Expand Down Expand Up @@ -45,6 +44,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _IridescentSpectrumMap:
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}
Expand All @@ -69,12 +72,17 @@ Material:
- _AlbedoAlphaMode: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
- _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
- _BorderLightReplacesAlbedo: 0
- _BorderLightUsesHoverColor: 1
- _BorderMinValue: 0.1
- _BorderWidth: 0.1
- _BorderMinValue: 0.05
- _BorderWidth: 0.05
- _BumpScale: 1
- _ClippingBorder: 0
- _ClippingBorderWidth: 0.025
- _ClippingPlane: 0
- _ClippingPlaneBorder: 0
- _ClippingPlaneBorderWidth: 0.025
Expand All @@ -92,26 +100,39 @@ Material:
- _EnableHoverColorOverride: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
- _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
- _EnvironmentColoring: 0
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
- _FadeMinValue: 0
- _FluentLightIntensity: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HoverLight: 1
- _HoverLight: 0
- _HoverLightOpaque: 0
- _IgnoreZScale: 0
- _InnerGlow: 0
- _InnerGlowPower: 2.68
- _InstancedColor: 0
- _Iridescence: 0
- _IridescenceAngle: -0.78
- _IridescenceIntensity: 0.5
- _IridescenceThreshold: 0.05
- _Metallic: 0
- _Mode: 0
- _NearLightFade: 0
- _NearPlaneFade: 0
- _NormalMapScale: 1
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Reflections: 1
- _ProximityLight: 0
- _ProximityLightSubtractive: 0
- _ProximityLightTwoSided: 0
- _Reflections: 0
- _Refraction: 0
- _RefractiveIndex: 0
- _RenderQueueOverride: -1
Expand All @@ -122,20 +143,28 @@ Material:
- _RoundCorners: 0
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SpecularHighlights: 0
- _SphericalHarmonics: 0
- _SrcBlend: 1
- _Stencil: 0
- _StencilComparison: 0
- _StencilOperation: 0
- _StencilReference: 0
- _TriplanarMappingBlendSharpness: 4
- _UVSec: 0
- _VertexColors: 0
- _VertexExtrusion: 0
- _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
- _ZTest: 4
- _ZWrite: 1
m_Colors:
- _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
- _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
- _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
- _Color: {r: 0.062477753, g: 0.08642863, b: 0.33962262, a: 1}
- _Color: {r: 0.27536488, g: 0.29355088, b: 0.49056602, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
Expand All @@ -144,4 +173,7 @@ Material:
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
- _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
- _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
- _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
41 changes: 37 additions & 4 deletions ...kit.Examples/Demos/EyeTracking/DemoTargetPositioning/Materials/mat_destination_purple.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Material:
m_Name: mat_destination_purple
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
m_ShaderKeywords: _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT _DISABLE_ALBEDO_MAP
_HOVER_LIGHT _REFLECTIONS _SPECULAR_HIGHLIGHTS
_SPECULAR_HIGHLIGHTS
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -45,6 +45,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _IridescentSpectrumMap:
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}
Expand All @@ -69,12 +73,17 @@ Material:
- _AlbedoAlphaMode: 0
- _AlbedoAssignedAtRuntime: 0
- _BlendOp: 0
- _BlendedClippingWidth: 1
- _BorderLight: 0
- _BorderLightOpaque: 0
- _BorderLightOpaqueAlpha: 1
- _BorderLightReplacesAlbedo: 0
- _BorderLightUsesHoverColor: 1
- _BorderMinValue: 0.1
- _BorderWidth: 0.1
- _BumpScale: 1
- _ClippingBorder: 0
- _ClippingBorderWidth: 0.025
- _ClippingPlane: 0
- _ClippingPlaneBorder: 0
- _ClippingPlaneBorderWidth: 0.025
Expand All @@ -92,26 +101,39 @@ Material:
- _EnableHoverColorOverride: 0
- _EnableLocalSpaceTriplanarMapping: 0
- _EnableNormalMap: 0
- _EnableProximityLightColorOverride: 0
- _EnableTriplanarMapping: 0
- _EnvironmentColorIntensity: 0.5
- _EnvironmentColorThreshold: 1.5
- _EnvironmentColoring: 0
- _FadeBeginDistance: 0.85
- _FadeCompleteDistance: 0.5
- _FadeMinValue: 0
- _FluentLightIntensity: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HoverLight: 1
- _HoverLight: 0
- _HoverLightOpaque: 0
- _IgnoreZScale: 0
- _InnerGlow: 0
- _InnerGlowPower: 4
- _InstancedColor: 0
- _Iridescence: 0
- _IridescenceAngle: -0.78
- _IridescenceIntensity: 0.5
- _IridescenceThreshold: 0.05
- _Metallic: 0
- _Mode: 0
- _NearLightFade: 0
- _NearPlaneFade: 0
- _NormalMapScale: 1
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Reflections: 1
- _ProximityLight: 0
- _ProximityLightSubtractive: 0
- _ProximityLightTwoSided: 0
- _Reflections: 0
- _Refraction: 0
- _RefractiveIndex: 0
- _RenderQueueOverride: -1
Expand All @@ -123,19 +145,27 @@ Material:
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SphericalHarmonics: 0
- _SrcBlend: 1
- _Stencil: 0
- _StencilComparison: 0
- _StencilOperation: 0
- _StencilReference: 0
- _TriplanarMappingBlendSharpness: 4
- _UVSec: 0
- _VertexColors: 0
- _VertexExtrusion: 0
- _VertexExtrusionSmoothNormals: 0
- _VertexExtrusionValue: 0
- _ZOffsetFactor: 0
- _ZOffsetUnits: 0
- _ZTest: 4
- _ZWrite: 1
m_Colors:
- _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
- _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
- _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
- _Color: {r: 0.41509432, g: 0.048949793, b: 0.37441173, a: 1}
- _Color: {r: 0.745283, g: 0.35506406, b: 0.70050377, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
Expand All @@ -144,4 +174,7 @@ Material:
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
- _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
- _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
- _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
Loading

0 comments on commit 2c711ab

Please sign in to comment.