Undo formatting changes

Author: andybak

Assets/Scripts/Model.cs

@@ -29,8 +29,10 @@
 
 namespace TiltBrush
 {
+
     public class Model
     {
+
         public struct Location
         {
             public enum Type
@@ -59,7 +61,6 @@ public static Location File(string relativePath)
                     path = relativePath.Substring(0, lastIndex);
                     fragment = relativePath.Substring(lastIndex + 1);
                 }
-
                 return new Location
                 {
                     type = Type.LocalFile,
@@ -87,15 +88,13 @@ public string AbsolutePath
                     {
                         return null;
                     }
-
                     switch (type)
                     {
                         case Type.LocalFile:
                             return Path.Combine(App.ModelLibraryPath(), path).Replace("\\", "/");
                         case Type.IcosaAssetId:
                             return path.Replace("\\", "/");
                     }
-
                     return null;
                 }
             }
@@ -104,11 +103,7 @@ public string RelativePath
             {
                 get
                 {
-                    if (type == Type.LocalFile)
-                    {
-                        return path;
-                    }
-
+                    if (type == Type.LocalFile) { return path; }
                     throw new Exception("Invalid relative path request");
                 }
             }
@@ -119,19 +114,12 @@ public string AssetId
             {
                 get
                 {
-                    if (type == Type.IcosaAssetId)
-                    {
-                        return id;
-                    }
-
+                    if (type == Type.IcosaAssetId) { return id; }
                     throw new Exception("Invalid Icosa asset id request");
                 }
             }
 
-            public Type GetLocationType()
-            {
-                return type;
-            }
+            public Type GetLocationType() { return type; }
 
             public override int GetHashCode()
             {
@@ -149,7 +137,6 @@ public override string ToString()
                 {
                     str = $"{type}:{path}";
                 }
-
                 return str;
             }
 
@@ -159,7 +146,6 @@ public override bool Equals(object obj)
                 {
                     return false;
                 }
-
                 return this == (Location)obj;
             }
 
@@ -212,10 +198,8 @@ public LoadError(string message, string detail = null)
                 this.message = message;
                 this.detail = detail;
             }
-
             public readonly string message; // Human-readable short message
-
-            public readonly string detail; // Maybe non-human-readable details
+            public readonly string detail;  // Maybe non-human-readable details
             // maybe? public bool transient;  // true if we know for sure that this error is transient
         }
 
@@ -225,7 +209,6 @@ public LoadError(string message, string detail = null)
 
         /// m_LoadError != null implies m_Valid == false
         private LoadError? m_LoadError;
-
         public LoadError? Error => m_LoadError;
 
         // How many widgets are using this model?
@@ -267,11 +250,7 @@ public IExportableMaterial GetExportableMaterial(Material material)
             return m_ImportMaterialCollector.GetExportableMaterial(material);
         }
 
-
-        public Model(Location location)
-        {
-            m_Location = location;
-        }
+        public Model(Location location) { m_Location = location; }
 
         public Location GetLocation()
         {
@@ -309,7 +288,11 @@ abstract class ModelBuilder
             /// It's unclear if the intent is that the user should continue calling TryEndAsyncLoad
             /// until it returns true, or if they should stop calling TryEndAsyncLoad. etc. Probably
             /// we should remove this.
-            public bool IsValid { get; protected set; }
+            public bool IsValid
+            {
+                get;
+                protected set;
+            }
 
             public ModelBuilder(string localPath)
             {
@@ -334,15 +317,13 @@ public void CancelAsyncLoad()
                 if (m_root != null)
                 {
                     foreach (var mesh in m_root.GetComponentsInChildren<MeshFilter>()
-                                 .Select(x => x.sharedMesh))
+                        .Select(x => x.sharedMesh))
                     {
                         UObject.Destroy(mesh);
                     }
-
                     UObject.Destroy(m_root);
                     m_root = null;
                 }
-
                 m_stateReader.Close();
             }
 
@@ -352,7 +333,7 @@ public void CancelAsyncLoad()
             ///   ImportMaterialCollector - non-null upon successful completion.
             /// Raises an exception on unsuccessful completion.
             public bool TryEndAsyncLoad(out GameObject root,
-                out ImportMaterialCollector importMaterialCollector)
+                                        out ImportMaterialCollector importMaterialCollector)
             {
                 // Three things happen in this function.
                 // 1: It waits to try and get the result of reading the model on a background thread
@@ -364,10 +345,7 @@ public bool TryEndAsyncLoad(out GameObject root,
                 if (m_meshEnumerator == null)
                 {
                     IDisposable state;
-                    if (!m_stateReader.TryGetResult(out state))
-                    {
-                        return false;
-                    }
+                    if (!m_stateReader.TryGetResult(out state)) { return false; }
 
                     IEnumerable<Null> enumerable;
                     m_root = DoUnityThreadWork(state, out enumerable, out m_ImportMaterialCollector);
@@ -380,15 +358,13 @@ public bool TryEndAsyncLoad(out GameObject root,
                     {
                         return false;
                     }
-
                     m_ImportMaterialCollector = new ImportMaterialCollector(
                         Path.GetDirectoryName(m_localPath),
                         uniqueSeed: m_localPath
                     );
                     m_meshEnumerator = enumerable.GetEnumerator();
                     m_root.SetActive(false);
                 }
-
                 // Yield until the limiter unblocks.
                 // Multiple calls to TryGetResult above are harmless.
                 if (sm_Limiter.IsBlocked())
@@ -410,7 +386,6 @@ public bool TryEndAsyncLoad(out GameObject root,
                         stopwatch.Stop();
                         return true;
                     }
-
                     if (stopwatch.ElapsedTicks > numTicks)
                     {
                         stopwatch.Stop();
@@ -461,14 +436,13 @@ protected override IDisposable DoBackgroundThreadWork()
                 {
                     return ImportGltf.BeginImport(m_localPath, loader, options);
                 }
-
                 return NewGltfImporter.BeginImport(m_localPath);
             }
 
             protected override GameObject DoUnityThreadWork(IDisposable state__,
-                out IEnumerable<Null> meshEnumerable,
-                out ImportMaterialCollector
-                    importMaterialCollector)
+                                                            out IEnumerable<Null> meshEnumerable,
+                                                            out ImportMaterialCollector
+                                                                importMaterialCollector)
             {
                 GameObject rootObject = null;
                 if (m_fromIcosa)
@@ -492,7 +466,6 @@ out ImportMaterialCollector
                             importMaterialCollector = (ImportMaterialCollector)result.materialCollector;
                         }
                     }
-
                     IsValid = rootObject != null;
                     meshEnumerable = null;
                     importMaterialCollector = null;
@@ -511,11 +484,9 @@ out ImportMaterialCollector
                             // EndImport doesn't try to use the loadImages functionality of UriLoader anyway.
                             // It knows it's on the main thread, so chooses to use Unity's fast loading.
                             rootObject = state.root;
-                            importMaterialCollector =
-                                new ImportMaterialCollector(assetLocation, uniqueSeed: m_localPath);
+                            importMaterialCollector = new ImportMaterialCollector(assetLocation, uniqueSeed: m_localPath);
                         }
                     }
-
                     IsValid = rootObject != null;
                     return rootObject;
                 }
@@ -533,6 +504,7 @@ GameObject LoadUsd(List<string> warnings)
 
         GameObject LoadPly(List<string> warningsOut)
         {
+
             try
             {
                 var reader = new PlyReader(m_Location.AbsolutePath);
@@ -549,6 +521,7 @@ GameObject LoadPly(List<string> warningsOut)
                 Debug.LogException(ex);
                 return null;
             }
+
         }
 
         GameObject LoadSvg(List<string> warningsOut, out SVGParser.SceneInfo sceneInfo)
@@ -689,7 +662,6 @@ public bool TryLoadModel()
                 {
                     return false;
                 }
-
                 isValid = m_builder.IsValid;
             }
             catch (ObjectDisposedException ex)
@@ -732,11 +704,12 @@ public async Task LoadModelAsync()
         {
             Task t = StartCreatePrefab(null);
             await t;
-        }
 
+        }
         public void LoadModel()
         {
             StartCreatePrefab(null);
+
         }
 
         /// Either synchronously load a GameObject hierarchy and convert it to a "prefab"
@@ -776,7 +749,7 @@ private async Task StartCreatePrefab(GameObject go)
                     EndCreatePrefab(go, warnings);
                 }
                 else if (m_Location.GetLocationType() == Location.Type.IcosaAssetId ||
-                         ext == ".gltf2" || ext == ".gltf" || ext == ".glb")
+                    ext == ".gltf2" || ext == ".gltf" || ext == ".glb")
                 {
                     // If we pulled this from Icosa, it's going to be a gltf file.
                     Task t = LoadGltf(warnings);
@@ -806,6 +779,7 @@ private async Task StartCreatePrefab(GameObject go)
                     m_LoadError = new LoadError("Unknown format", ext);
                 }
             }
+
         }
 
         public void CalcBoundsGltf(GameObject go)
@@ -827,7 +801,6 @@ public void CalcBoundsGltf(GameObject go)
                     b.Encapsulate(bounds);
                 }
             }
-
             m_MeshBounds = b;
             if (first)
             {
@@ -857,16 +830,15 @@ private void CalcBoundsNonGltf(GameObject go)
                 {
                     b.Encapsulate(bc.bounds);
                 }
-
                 UnityEngine.Object.Destroy(bc);
             }
-
             m_MeshBounds = b;
             if (first)
             {
                 // There was no geometry
                 Debug.LogErrorFormat("No usable geometry in model. LoadModel({0})", go.name);
             }
+
         }
 
         public void EndCreatePrefab(GameObject go, List<string> warnings)
@@ -885,7 +857,6 @@ public void EndCreatePrefab(GameObject go, List<string> warnings)
             {
                 UnityEngine.Object.Destroy(m_ModelParent.gameObject);
             }
-
             m_ModelParent = go.transform;
 
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
@@ -928,27 +899,24 @@ void SetUniqueNameForNode(Transform node)
             }
         }
 
-
         public void UnloadModel()
         {
             if (m_builder != null)
             {
                 m_builder.CancelAsyncLoad();
                 m_builder = null;
             }
-
             m_Valid = false;
             m_LoadError = null;
             if (m_ModelParent != null)
             {
                 // Procedurally created meshes need to be explicitly destroyed - you can't just destroy
                 // the MeshFilter that references them.
                 foreach (var mesh in m_ModelParent.GetComponentsInChildren<MeshFilter>()
-                             .Select(x => x.sharedMesh))
+                    .Select(x => x.sharedMesh))
                 {
                     UObject.Destroy(mesh);
                 }
-
                 UObject.Destroy(m_ModelParent.gameObject);
                 m_ModelParent = null;
             }
@@ -976,7 +944,6 @@ public IEnumerator LoadFullyCoroutine(string reason)
                     {
                         yield return null;
                     }
-
                     break;
                 default:
                     m_LoadError = new LoadError($"Unknown load type {type}");
@@ -1001,7 +968,7 @@ private void DisplayWarnings(List<string> warnings)
         public bool IsCached()
         {
             return m_Location.GetLocationType() == Location.Type.IcosaAssetId &&
-                   Directory.Exists(m_Location.AbsolutePath);
+                Directory.Exists(m_Location.AbsolutePath);
         }
 
         public void RefreshCache()
@@ -1019,7 +986,6 @@ public MeshFilter[] GetMeshes()
             {
                 throw new InvalidOperationException();
             }
-
             return m_ModelParent.GetComponent<ObjModelScript>().m_MeshChildren;
         }
 
@@ -1032,7 +998,6 @@ public string GetExportName()
                 case Model.Location.Type.IcosaAssetId:
                     return AssetId;
             }
-
             return "Unknown";
         }
 
@@ -1061,4 +1026,4 @@ public void EnsureCollectorExists()
             }
         }
     }
-} // namespace TiltBrush;
+} // namespace TiltBrush;