Merge pull request #2117 from cre8ivepark/may18_dev_SurfaceMagnetism

[May18] Surface Magnetism + Spatial Processing example scene - improvement

Author: David Kline

Assets/HoloToolkit-Examples/SpatialMapping/Scenes/SpatialProcessingSurfaceMagnetism.unity

@@ -230,7 +230,7 @@ MonoBehaviour:
   Lifetime: 0
   MagneticSurface:
     serializedVersion: 2
-    m_Bits: 256
+    m_Bits: 2147483648
   MaxDistance: 10
   CloseDistance: 0.5
   SurfaceNormalOffset: 0.05
@@ -519,6 +519,11 @@ Prefab:
       propertyPath: surfaceMaterial
       value: 
       objectReference: {fileID: 2100000, guid: 729453690df4d40488b01b78b3af849d, type: 2}
+    - target: {fileID: 114000011154029958, guid: 2ed75ffdf9031c94e8bce4b3d17b9928,
+        type: 2}
+      propertyPath: PhysicsLayer
+      value: 31
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 2ed75ffdf9031c94e8bce4b3d17b9928, type: 2}
   m_IsPrefabParent: 0
@@ -564,7 +569,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ActivePlanes: []
-  SurfacePlanePrefab: {fileID: 1000010593991404, guid: 184d6e9ce2d89844489583805253eb83,
+  SurfacePlanePrefab: {fileID: 1000010593991404, guid: e2f0116ed6ef0d44bb7791f327bea328,
     type: 2}
   MinArea: 0.025
   drawPlanesMask: 15
@@ -581,7 +586,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   scanTime: 15
-  defaultMaterial: {fileID: 2100000, guid: d698790d3facd3d4289a13fa1243030a, type: 2}
+  defaultMaterial: {fileID: 2100000, guid: 729453690df4d40488b01b78b3af849d, type: 2}
   secondaryMaterial: {fileID: 2100000, guid: df172103f5fba4a4d8636aeca60cb0d7, type: 2}
   minimumFloors: 1
 --- !u!4 &1325178179

Assets/HoloToolkit-Examples/SpatialMapping/SpatialProcessingSurfaceMagnetism.md

@@ -12,17 +12,13 @@ https://gfycat.com/PitifulRareKodiakbear
 ## How to use 
 You need to assign same Unity layer to the Spatial mapping’s plane and Solver Surface Magnetism’s Magnetic Surface.
 
-1. Add a new layer for the planes created by Spatial Processing. (to snap to) This example shows a new layer named ‘SpatialProcessingPlane’
-<img src="/External/ReadMeImages/MRTK_SurfaceMagnetism1.png" width="550">
-<img src="/External/ReadMeImages/MRTK_SurfaceMagnetism2.png" width="550">
+1. Add a new layer for the planes created by Spatial Processing. Mixed Reality Toolkit's **Apply Mixed Reality Projcet Settings** automatically addes a new layer **31:Spatial Mapping**. <img src="/External/ReadMeImages/MRTK_SurfaceMagnetism1.png" width="550"> <img src="/External/ReadMeImages/MRTK_SurfaceMagnetism2.png" width="300"> <img src="/External/ReadMeImages/MRTK_SurfaceMagnetism3.png" width="550"> <img src="/External/ReadMeImages/MRTK_SurfaceMagnetism4.png" width="300">
 
-2. In SpatialMapping prefab, change Physics Layer to the new layer number. In this example, the new layer is 8
-<img src="/External/ReadMeImages/MRTK_SurfaceMagnetism3.png" width="550">
+2. In **SpatialMapping** prefab, make sure the **Physics Layer** is set to **31**. <br/><img src="/External/ReadMeImages/MRTK_SurfaceMagnetism5.png" width="550">
 
-3. Assign SolverSurfaceMagnetism script to an object. In Magnetic Surface option, select the new layer (SpatialProcessingPlane) that you created. 
-<img src="/External/ReadMeImages/MRTK_SurfaceMagnetism4.png" width="550">
+3. Assign **SolverSurfaceMagnetism** script to an object. In **Magnetic Surface** option, select the **SpatialMapping** layer.<br/><img src="/External/ReadMeImages/MRTK_SurfaceMagnetism6.png" width="550">
 
-4. After initial room scanning, you will be able to see MRTK logo plane is smoothly snapping to the surfaces.
+4. After initial room scanning, you will be able to see MRTK logo plane smoothly snaps to the surfaces.
 
 
 

Assets/HoloToolkit/SpatialMapping/Prefabs/SurfacePlaneTransparent.prefab

@@ -0,0 +1,119 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1000010593991404}
+  m_IsPrefabParent: 1
+--- !u!1 &1000010593991404
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4000012375631134}
+  - component: {fileID: 33000012042644992}
+  - component: {fileID: 65000010549037612}
+  - component: {fileID: 23000010797497162}
+  - component: {fileID: 114000011287056714}
+  m_Layer: 0
+  m_Name: SurfacePlaneTransparent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4000012375631134
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000010593991404}
+  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: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &23000010797497162
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000010593991404}
+  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: 452f941bcd9202641b983cd4fee093a3, 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!33 &33000012042644992
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000010593991404}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!65 &65000010549037612
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000010593991404}
+  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!114 &114000011287056714
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1000010593991404}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d29c05be38579034196d7b7692e52bc1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PlaneThickness: 0.01
+  UpNormalThreshold: 0.9
+  FloorBuffer: 0.1
+  CeilingBuffer: 0.1
+  WallMaterial: {fileID: 2100000, guid: 452f941bcd9202641b983cd4fee093a3, type: 2}
+  FloorMaterial: {fileID: 2100000, guid: 452f941bcd9202641b983cd4fee093a3, type: 2}
+  CeilingMaterial: {fileID: 2100000, guid: 452f941bcd9202641b983cd4fee093a3, type: 2}
+  TableMaterial: {fileID: 2100000, guid: 452f941bcd9202641b983cd4fee093a3, type: 2}
+  UnknownMaterial: {fileID: 2100000, guid: 452f941bcd9202641b983cd4fee093a3, type: 2}
+  PlaneType: 16