Removed toolkit preview and examples because of compile issues. Added new direction indicator. Fixed bug with double cancellations when adding anchors.

Author: Jared Bienz

SpatialAlignment-Unity/Assembly-CSharp-Editor.csproj

@@ -138,10 +138,6 @@
     <Compile Include="Assets\HoloToolkit\UX\Scripts\Collections\Editor\CollectionEditor.cs" />
     <Compile Include="Assets\HoloToolkit\UX\Scripts\Editor\CompoundButtonSaveInterceptor.cs" />
     <Compile Include="Assets\HoloToolkit\UX\Scripts\Editor\KeyboardInputFieldEditor.cs" />
-    <Compile Include="Assets\HoloToolkit-Examples\Medical\Editor\VolumeInformationEditor.cs" />
-    <Compile Include="Assets\HoloToolkit-Preview\SpectatorView\Scripts\SpatialSync\MarkerGeneration3D\Editor\MarkerGeneration3DEditor.cs" />
-    <Compile Include="Assets\HoloToolkit-Preview\SpectatorView\Scripts\Utilities\Editor\PlatformSwitcherEditor.cs" />
-    <Compile Include="Assets\HoloToolkit-Preview\SpectatorView\UnityARKitPlugin\Plugins\iOS\UnityARKit\Editor\UnityARBuildPostprocessor.cs" />
     <Reference Include="Unity.TextMeshPro.Editor">
       <HintPath>C:/Users/jbienz/Code/JBienzMS/SpatialAlignment/SpatialAlignment-Unity/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
     </Reference>
@@ -415,9 +411,6 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>C:/Users/jbienz/Code/JBienzMS/SpatialAlignment/SpatialAlignment-Unity/Assets/HoloToolkit/Utilities/Scripts/GLTF/Plugins/JsonNet/Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="QRCodesTrackerPlugin.Placeholder">
-      <HintPath>C:/Users/jbienz/Code/JBienzMS/SpatialAlignment/SpatialAlignment-Unity/Assets/HoloToolkit-Preview/QRTracker/Plugins/QRCodesTrackerPlugin.Placeholder.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEditor.Advertisements">
       <HintPath>C:/Users/jbienz/Code/JBienzMS/SpatialAlignment/SpatialAlignment-Unity/Library/PackageCache/[email protected]/Editor/UnityEditor.Advertisements.dll</HintPath>
     </Reference>

SpatialAlignment-Unity/Assembly-CSharp.csproj

@@ -466,7 +466,7 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 1190320660}
   m_PrefabAsset: {fileID: 0}
---- !u!64 &722041393
+--- !u!64 &722041396
 MeshCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -571,6 +571,80 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 992500263}
   m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1001 &1009152664
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3882863017087187430, guid: 8e43969e520e5d149b6ca084446340d7,
+        type: 3}
+      propertyPath: m_Name
+      value: RefinementDirection
+      objectReference: {fileID: 0}
+    - target: {fileID: 3882863017087187430, guid: 8e43969e520e5d149b6ca084446340d7,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3882863017087215046, guid: 8e43969e520e5d149b6ca084446340d7,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3882863017087215046, guid: 8e43969e520e5d149b6ca084446340d7,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3882863017087215046, guid: 8e43969e520e5d149b6ca084446340d7,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3882863017087215046, guid: 8e43969e520e5d149b6ca084446340d7,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3882863017087215046, guid: 8e43969e520e5d149b6ca084446340d7,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3882863017087215046, guid: 8e43969e520e5d149b6ca084446340d7,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3882863017087215046, guid: 8e43969e520e5d149b6ca084446340d7,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3882863017087215046, guid: 8e43969e520e5d149b6ca084446340d7,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 3882863017087215046, guid: 8e43969e520e5d149b6ca084446340d7,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3882863017087215046, guid: 8e43969e520e5d149b6ca084446340d7,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3882863017087215046, guid: 8e43969e520e5d149b6ca084446340d7,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8e43969e520e5d149b6ca084446340d7, type: 3}
 --- !u!1 &1034952781
 GameObject:
   m_ObjectHideFlags: 0

SpatialAlignment-Unity/Assets/SpatialAlignment-Examples/Refinement/Scenes/SA-RefinementBuilding.unity

@@ -56,6 +56,7 @@ private enum RefinementExampleMode
         {
             None,
             AddAnchor,
+            AddAnchorCancel,
             EditingAnchor,
         }
 
@@ -402,8 +403,14 @@ public void CancelAddAnchor()
                 return;
             }
 
-            // Cancel refinement of the large scale model
-            largeScaleRefinement.CancelRefinement();
+            // Now canceling
+            mode = RefinementExampleMode.AddAnchorCancel;
+
+            // Cancel refinement of the large scale model if in progress
+            if (largeScaleRefinement.IsRefining)
+            {
+                largeScaleRefinement.CancelRefinement();
+            }
 
             // Unsubscribe from anchor events
             UnsubscribeAnchor(newAnchor);

SpatialAlignment-Unity/Assets/SpatialAlignment-Examples/Refinement/Scripts/RefinementExampleManager.cs

@@ -0,0 +1,10 @@
+# Blender MTL File: 'Direction.blend'
+# Material Count: 1
+
+newmtl None
+Ns 0
+Ka 0.000000 0.000000 0.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
+illum 2

…t-Unity/Assets/HoloToolkit-Examples.meta …/SpatialAlignment/Refinement/Models.metaSpatialAlignment-Unity/Assets/HoloToolkit-Examples.meta renamed to SpatialAlignment-Unity/Assets/SpatialAlignment/Refinement/Models.meta SpatialAlignment-Unity/Assets/HoloToolkit-Examples.meta renamed to SpatialAlignment-Unity/Assets/SpatialAlignment/Refinement/Models.meta

@@ -0,0 +1,139 @@
+# Blender v2.79 (sub 0) OBJ File: 'Direction.blend'
+# www.blender.org
+mtllib Direction.mtl
+g Direction_Indicator
+v 0.000000 0.000000 -0.010000
+v 0.000000 0.040000 -0.010000
+v 0.003827 0.000000 -0.009239
+v 0.003827 0.040000 -0.009239
+v 0.007071 0.000000 -0.007071
+v 0.007071 0.040000 -0.007071
+v 0.009239 0.000000 -0.003827
+v 0.009239 0.040000 -0.003827
+v 0.010000 0.000000 0.000000
+v 0.010000 0.040000 0.000000
+v 0.009239 0.000000 0.003827
+v 0.009239 0.040000 0.003827
+v 0.007071 0.000000 0.007071
+v 0.007071 0.040000 0.007071
+v 0.003827 0.000000 0.009239
+v 0.003827 0.040000 0.009239
+v 0.000000 0.000000 0.010000
+v 0.000000 0.040000 0.010000
+v -0.003827 0.000000 0.009239
+v -0.003827 0.040000 0.009239
+v -0.007071 0.000000 0.007071
+v -0.007071 0.040000 0.007071
+v -0.009239 0.000000 0.003827
+v -0.009239 0.040000 0.003827
+v -0.010000 0.000000 -0.000000
+v -0.010000 0.040000 -0.000000
+v -0.009239 0.000000 -0.003827
+v -0.009239 0.040000 -0.003827
+v -0.007071 0.000000 -0.007071
+v -0.007071 0.040000 -0.007071
+v -0.003827 0.000000 -0.009239
+v -0.003827 0.040000 -0.009239
+v 0.000000 0.040000 -0.025000
+v 0.000000 0.080000 0.000000
+v 0.009567 0.040000 -0.023097
+v 0.017678 0.040000 -0.017678
+v 0.023097 0.040000 -0.009567
+v 0.025000 0.040000 0.000000
+v 0.023097 0.040000 0.009567
+v 0.017678 0.040000 0.017678
+v 0.009567 0.040000 0.023097
+v 0.000000 0.040000 0.025000
+v -0.009567 0.040000 0.023097
+v -0.017678 0.040000 0.017678
+v -0.023097 0.040000 0.009567
+v -0.025000 0.040000 -0.000000
+v -0.023097 0.040000 -0.009567
+v -0.017678 0.040000 -0.017678
+v -0.009567 0.040000 -0.023097
+vn 0.0000 -0.6657 -0.7462
+vn 0.0000 0.6657 -0.7462
+vn 0.2855 0.6657 -0.6894
+vn 0.2855 -0.6657 -0.6894
+vn 0.5276 0.6657 -0.5276
+vn 0.5276 -0.6657 -0.5276
+vn 0.6894 0.6657 -0.2855
+vn 0.6894 -0.6657 -0.2855
+vn 0.7462 0.6657 0.0000
+vn 0.7462 -0.6657 0.0000
+vn 0.6894 0.6657 0.2855
+vn 0.6894 -0.6657 0.2855
+vn 0.5276 0.6657 0.5276
+vn 0.5276 -0.6657 0.5276
+vn 0.2855 0.6657 0.6894
+vn 0.2855 -0.6657 0.6894
+vn 0.0000 0.6657 0.7462
+vn 0.0000 -0.6657 0.7462
+vn -0.2855 0.6657 0.6894
+vn -0.2855 -0.6657 0.6894
+vn -0.5276 0.6657 0.5276
+vn -0.5276 -0.6657 0.5276
+vn -0.6894 0.6657 0.2855
+vn -0.6894 -0.6657 0.2855
+vn -0.7462 0.6657 0.0000
+vn -0.7462 -0.6657 0.0000
+vn -0.6894 0.6657 -0.2855
+vn -0.6894 -0.6657 -0.2855
+vn -0.5276 0.6657 -0.5276
+vn -0.5276 -0.6657 -0.5276
+vn -0.2855 0.6657 -0.6894
+vn -0.2855 -0.6657 -0.6894
+vn 0.0000 -0.4438 -0.8961
+vn 0.0000 1.0000 0.0000
+vn 0.3429 -0.4438 -0.8279
+vn 0.6336 -0.4438 -0.6336
+vn 0.8279 -0.4438 -0.3429
+vn 0.8961 -0.4438 0.0000
+vn 0.8279 -0.4438 0.3429
+vn 0.6336 -0.4438 0.6336
+vn 0.3429 -0.4438 0.8279
+vn 0.0000 -0.4438 0.8961
+vn -0.3429 -0.4438 0.8279
+vn -0.6336 -0.4438 0.6336
+vn -0.8279 -0.4438 0.3429
+vn -0.8961 -0.4438 0.0000
+vn -0.8279 -0.4438 -0.3429
+vn -0.6336 -0.4438 -0.6336
+vn -0.3429 -0.4438 -0.8279
+usemtl None
+s 1
+f 1//1 2//2 4//3 3//4
+f 3//4 4//3 6//5 5//6
+f 5//6 6//5 8//7 7//8
+f 7//8 8//7 10//9 9//10
+f 9//10 10//9 12//11 11//12
+f 11//12 12//11 14//13 13//14
+f 13//14 14//13 16//15 15//16
+f 15//16 16//15 18//17 17//18
+f 17//18 18//17 20//19 19//20
+f 19//20 20//19 22//21 21//22
+f 21//22 22//21 24//23 23//24
+f 23//24 24//23 26//25 25//26
+f 25//26 26//25 28//27 27//28
+f 27//28 28//27 30//29 29//30
+f 4//3 2//2 32//31 30//29 28//27 26//25 24//23 22//21 20//19 18//17 16//15 14//13 12//11 10//9 8//7 6//5
+f 29//30 30//29 32//31 31//32
+f 31//32 32//31 2//2 1//1
+f 1//1 3//4 5//6 7//8 9//10 11//12 13//14 15//16 17//18 19//20 21//22 23//24 25//26 27//28 29//30 31//32
+f 33//33 34//34 35//35
+f 35//35 34//34 36//36
+f 36//36 34//34 37//37
+f 37//37 34//34 38//38
+f 38//38 34//34 39//39
+f 39//39 34//34 40//40
+f 40//40 34//34 41//41
+f 41//41 34//34 42//42
+f 42//42 34//34 43//43
+f 43//43 34//34 44//44
+f 44//44 34//34 45//45
+f 45//45 34//34 46//46
+f 46//46 34//34 47//47
+f 47//47 34//34 48//48
+f 48//48 34//34 49//49
+f 49//49 34//34 33//33
+f 33//33 35//35 36//36 37//37 38//38 39//39 40//40 41//41 42//42 43//43 44//44 45//45 46//46 47//47 48//48 49//49