Performance overhaul

Assets/Editor/BrushDescriptorEditor.cs

@@ -133,7 +133,7 @@ bool IsEditingAllowed(out string reason)
                 return false;
             }
 
-            if (brushVersion == "")
+            if (brushVersion?.Length == 0)
             {
                 // Looks like a new/experimental brush.
                 reason = null;

Assets/Editor/RenderCubeMap.cs

@@ -17,14 +17,10 @@ static void Init()
         // cam.fieldOfView = 45;
         // cam.farClipPlane = 4000;
         // cam.allowMSAA = false;
-
-        cam.transform.position = new Vector3(0, 10, 0);
-        cam.transform.rotation = Quaternion.identity;
-
+        cam.transform.SetPositionAndRotation(new Vector3(0, 10, 0), Quaternion.identity);
         RenderToCubeMap(Camera.main);
 
-        cam.transform.position = camPos;
-        cam.transform.rotation = camRot;
+        cam.transform.SetPositionAndRotation(camPos, camRot);
     }
 
     static void RenderToCubeMap(Camera Cam)

Assets/Editor/Tests/TestGeometryPool.cs

@@ -102,7 +102,7 @@ public static bool AreEqual(GeometryPool lhs, GeometryPool rhs, ref string outWh
             }
 
             outWhy += why;
-            return (why == "");
+            return (why?.Length == 0);
         }
 
         static bool AreEqual(TexcoordData lhs, TexcoordData rhs, int size, ref string why)

Assets/Editor/ToolkitUtils.cs

@@ -576,8 +576,7 @@ static void ExportToToolkit_Environment(
             {
                 var lsettings = environment.m_Lights[li];
                 var light = new GameObject("Light " + li, typeof(Light)).GetComponent<Light>();
-                light.transform.position = lsettings.m_Position;
-                light.transform.rotation = lsettings.m_Rotation;
+                light.transform.SetPositionAndRotation(lsettings.m_Position, lsettings.m_Rotation);
                 light.color = lsettings.Color;
                 light.type = lsettings.m_Type;
                 light.range = lsettings.m_Range;

Assets/Editor/UiScreenshotter.cs

@@ -81,8 +81,7 @@ async static void DelayedGenerateEnvironmentScreenshots()
             PanelManager.m_Instance.HideAllPanels();
             await Task.Delay(1000);
             var cam = Camera.main;
-            cam.transform.position = new Vector3(0, 10, -5);
-            cam.transform.rotation = Quaternion.identity;
+            cam.transform.SetPositionAndRotation(new Vector3(0, 10, -5), Quaternion.identity);
             cam.fieldOfView = 110;
             cam.aspect = 1;
             foreach (var env in EnvironmentCatalog.m_Instance.AllEnvironments)
@@ -177,8 +176,7 @@ async static void DelayedGeneratePanelScreenshots()
         private static Camera InitScreenshotCamera()
         {
             var cam = Camera.main;
-            cam.transform.position = new Vector3(0, 100, 0);
-            cam.transform.rotation = Quaternion.identity;
+            cam.transform.SetPositionAndRotation(new Vector3(0, 100, 0), Quaternion.identity);
             return cam;
         }
 

Assets/Scripts/API/ApiMethods.Utils.cs

@@ -265,12 +265,12 @@ private static string _DownloadMediaFileFromUrl(Uri url, string relativeDestinat
             }
 
             // TODO - make this smarter
-            if (filename.ToLower().EndsWith(".jpg") || filename.ToLower().EndsWith(".jpeg") ||
-                filename.ToLower().EndsWith(".png") || filename.ToLower().EndsWith(".mp4") ||
-                filename.ToLower().EndsWith(".hdr") || filename.ToLower().EndsWith(".svg") ||
-                filename.ToLower().EndsWith(".obj") || filename.ToLower().EndsWith(".off") ||
-                filename.ToLower().EndsWith(".gltf") || filename.ToLower().EndsWith(".glb") ||
-                filename.ToLower().EndsWith(".usd") || filename.ToLower().EndsWith(".fbx"))
+            if (filename.EndsWith(".jpg", StringComparison.OrdinalIgnoreCase) || filename.EndsWith(".jpeg", StringComparison.OrdinalIgnoreCase) ||
+                filename.EndsWith(".png", StringComparison.OrdinalIgnoreCase) || filename.EndsWith(".mp4", StringComparison.OrdinalIgnoreCase) ||
+                filename.EndsWith(".hdr", StringComparison.OrdinalIgnoreCase) || filename.EndsWith(".svg", StringComparison.OrdinalIgnoreCase) ||
+                filename.EndsWith(".obj", StringComparison.OrdinalIgnoreCase) || filename.EndsWith(".off", StringComparison.OrdinalIgnoreCase) ||
+                filename.EndsWith(".gltf", StringComparison.OrdinalIgnoreCase) || filename.EndsWith(".glb", StringComparison.OrdinalIgnoreCase) ||
+                filename.EndsWith(".usd", StringComparison.OrdinalIgnoreCase) || filename.EndsWith(".fbx", StringComparison.OrdinalIgnoreCase))
             {
 
                 WebClient wc = new WebClient();

Assets/Scripts/API/ApiMethods.cs

@@ -309,7 +309,7 @@ public static void BrushMoveTo(Vector3 position)
         public static void BrushMoveToHand(string hand, bool alsoRotate = false)
         {
             Transform tr;
-            if (hand.ToLower().StartsWith("l"))
+            if (hand.StartsWith("l", StringComparison.OrdinalIgnoreCase))
             {
                 tr = InputManager.Wand.Transform;
 
@@ -631,7 +631,7 @@ public static ImageWidget ImportImage(string location)
         public static void SetEnvironment(string name)
         {
             Environment env = EnvironmentCatalog.m_Instance.AllEnvironments
-                .First(x => x.name.ToLower() == name.ToLower());
+                .First(x => string.Equals(x.name, name, StringComparison.OrdinalIgnoreCase));
             SceneSettings.m_Instance.SetDesiredPreset(env, false, true);
         }
 
@@ -1035,14 +1035,14 @@ public static string SaveBase64(string base64, string filename)
             var bytes = Convert.FromBase64String(base64);
             if (bytes.Length > 4 && bytes[1] == 'P' && bytes[2] == 'N' && bytes[3] == 'G')
             {
-                if (!filename.ToLower().EndsWith(".png"))
+                if (!filename.EndsWith(".png", StringComparison.OrdinalIgnoreCase))
                 {
                     filename += ".png";
                 }
             }
             else if (bytes.Length > 3 && bytes[0] == 0xFF && bytes[1] == 0xD8 && bytes[2] == 0xFF)
             {
-                if (!filename.ToLower().EndsWith(".jpg") && !filename.ToLower().EndsWith(".jpeg"))
+                if (!filename.EndsWith(".jpg", StringComparison.OrdinalIgnoreCase) && !filename.EndsWith(".jpeg", StringComparison.OrdinalIgnoreCase))
                 {
                     filename += ".jpg";
                 }

Assets/Scripts/API/Lua/Wrappers/AppApiWrapper.cs

@@ -186,11 +186,11 @@ public static string ReadFile(string path)
         public static void TakeSnapshot(TrTransform tr, string filename, int width, int height, float superSampling = 1f, bool renderDepth = false, bool removeBackground = false)
         {
             bool saveAsPng;
-            if (filename.ToLower().EndsWith(".jpg") || filename.ToLower().EndsWith(".jpeg"))
+            if (filename.EndsWith(".jpg", System.StringComparison.OrdinalIgnoreCase) || filename.EndsWith(".jpeg", System.StringComparison.OrdinalIgnoreCase))
             {
                 saveAsPng = false;
             }
-            else if (filename.ToLower().EndsWith(".png"))
+            else if (filename.EndsWith(".png", System.StringComparison.OrdinalIgnoreCase))
             {
                 saveAsPng = true;
             }

Assets/Scripts/App.cs

@@ -868,11 +868,11 @@ void Update()
                         }
                     }
 
-                    if (driver.OutputBasename == null || driver.OutputBasename == "")
+                    if (string.IsNullOrEmpty(driver.OutputBasename))
                     {
                         driver.OutputBasename =
                             FileUtils.SanitizeFilename(SaveLoadScript.m_Instance.SceneFile.HumanName);
-                        if (driver.OutputBasename == null || driver.OutputBasename == "")
+                        if (string.IsNullOrEmpty(driver.OutputBasename))
                         {
                             if (Config.m_SketchFiles.Length > 0)
                             {
@@ -886,7 +886,7 @@ void Update()
                         }
                     }
 
-                    if (driver.OutputFolder == null || driver.OutputFolder == "")
+                    if (string.IsNullOrEmpty(driver.OutputFolder))
                     {
                         driver.OutputFolder = App.VrVideosPath();
                         FileUtils.InitializeDirectoryWithUserError(driver.OutputFolder);
@@ -1876,12 +1876,12 @@ void InitUserPath()
                     m_UserPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal);
 
                     // GetFolderPath() can fail, returning an empty string.
-                    if (m_UserPath == "")
+                    if (m_UserPath?.Length == 0)
                     {
                         // If that happens, try a bunch of other folders.
                         m_UserPath = System.Environment.GetFolderPath(
                             System.Environment.SpecialFolder.MyDocuments);
-                        if (m_UserPath == "")
+                        if (m_UserPath?.Length == 0)
                         {
                             m_UserPath = System.Environment.GetFolderPath(
                                 System.Environment.SpecialFolder.DesktopDirectory);
@@ -1963,15 +1963,7 @@ public static string UserPath()
 
         public static bool InitDirectoryAtPath(string path)
         {
-            if (Directory.Exists(path))
-            {
-                return true;
-            }
-            if (!FileUtils.InitializeDirectoryWithUserError(path))
-            {
-                return false;
-            }
-            return true;
+            return Directory.Exists(path) || FileUtils.InitializeDirectoryWithUserError(path);
         }
 
         public static string ShortenForDescriptionText(string desc)

Assets/Scripts/Batching/Batch.cs

@@ -64,8 +64,7 @@ static public Batch Create(BatchPool parentPool, Transform rParent, Bounds rBoun
 
             Transform t = newObj.transform;
             t.parent = rParent;
-            t.localPosition = Vector3.zero;
-            t.localRotation = Quaternion.identity;
+            t.SetLocalPositionAndRotation(Vector3.zero, Quaternion.identity);
             t.localScale = Vector3.one;
 
             newObj.AddComponent<MeshFilter>();

Assets/Scripts/CameraPathCaptureRig.cs

@@ -100,8 +100,7 @@ public void OverridePreviewWidgetPathT(PathT? t)
 
         public void UpdateCameraTransform(Transform xf)
         {
-            m_Camera.transform.position = xf.position;
-            m_Camera.transform.rotation = xf.rotation;
+            m_Camera.transform.SetPositionAndRotation(xf.position, xf.rotation);
         }
 
         public void SetFov(float fov)

Assets/Scripts/Commands/HideWidgetCommand.cs

@@ -62,8 +62,7 @@ protected override void OnUndo()
             {
                 m_Widget.gameObject.SetActive(true);
                 m_Widget.RestoreFromToss();
-                m_Widget.transform.localPosition = m_WidgetTransform.translation;
-                m_Widget.transform.localRotation = m_WidgetTransform.rotation;
+                m_Widget.transform.SetLocalPositionAndRotation(m_WidgetTransform.translation, m_WidgetTransform.rotation);
                 m_Widget.SetSignedWidgetSize(m_WidgetTransform.scale);
                 WidgetManager.m_Instance.RefreshPinAndUnpinLists();
                 TiltMeterScript.m_Instance.AdjustMeterWithWidget(m_TiltMeterCost, up: true);

Assets/Scripts/Commands/MovePositionKnotCommand.cs

@@ -46,8 +46,7 @@ public MovePositionKnotCommand(CameraPath path, KnotDescriptor knotDesc,
 
         protected override void OnRedo()
         {
-            Knot.transform.localPosition = m_EndXf_CS.translation;
-            Knot.transform.localRotation = m_EndXf_CS.rotation;
+            Knot.transform.SetLocalPositionAndRotation(m_EndXf_CS.translation, m_EndXf_CS.rotation);
             // If we're the tail and we've attached to the head, or vice versa, we need to match
             // our tangent magnitude to our buddy.
             m_Path.PathLoops = m_Path.ShouldPathLoop();
@@ -67,8 +66,7 @@ protected override void OnRedo()
 
         protected override void OnUndo()
         {
-            Knot.transform.localPosition = m_StartXf_CS.translation;
-            Knot.transform.localRotation = m_StartXf_CS.rotation;
+            Knot.transform.SetLocalPositionAndRotation(m_StartXf_CS.translation, m_StartXf_CS.rotation);
             m_Path.ValidatePathLooping();
             Knot.TangentMagnitude = m_StartTangentMagnitude;
             Knot.RefreshVisuals();

Assets/Scripts/Config.cs

@@ -332,10 +332,7 @@ void ParseArgs(string[] args)
             bool isInBatchMode = false;
 
             // If someone entered a sketch via the editor, we need to preserve that here.
-            foreach (var s in m_SketchFiles)
-            {
-                files.Add(s);
-            }
+            files.AddRange(m_SketchFiles);
 
             // Process all args.
             for (int i = 0; i < args.Length; i++)

Assets/Scripts/Export/ExportLatk.cs

@@ -191,7 +191,7 @@ private static JSONNode getJsonFromZip(byte[] bytes)
 
             foreach (ZipEntry entry in zipFile)
             {
-                if (Path.GetExtension(entry.Name).ToLower() == ".json")
+                if (string.Equals(Path.GetExtension(entry.Name), ".json", System.StringComparison.OrdinalIgnoreCase))
                 {
                     Stream zippedStream = zipFile.GetInputStream(entry);
                     StreamReader read = new StreamReader(zippedStream, true);

Assets/Scripts/FbxReader.cs

@@ -78,7 +78,7 @@ public FbxReader(string path)
             float fbxUnitToTiltUnit;
             {
                 var unit = scene.GetGlobalSettings().GetSystemUnit();
-                if (Path.GetExtension(m_path).ToLower() == ".obj")
+                if (string.Equals(Path.GetExtension(m_path), ".obj", StringComparison.OrdinalIgnoreCase))
                 {
                     // Obj doesn't specify units. We'd rather assume m, but fbx assumes cm.
                     unit = FbxSystemUnit.m;
@@ -609,7 +609,7 @@ private static string MakePathRelative(string path, string relativeTo)
             if (!Path.IsPathRooted(path)) { return path; }
             relativeTo = relativeTo.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
             // It's actually not an easy thing to do to make a path relative, but this works
-            if (path.ToLowerInvariant().StartsWith(relativeTo.ToLowerInvariant()))
+            if (path.StartsWith(relativeTo, StringComparison.InvariantCultureIgnoreCase))
             {
                 return path.Substring(relativeTo.Length + 1);
             }

Assets/Scripts/GUI/AdvancedPanelDiskLayout.cs

@@ -57,7 +57,7 @@ public void PopulateFromPlayerPrefs()
 
             // Early out if we've got a blank string.
             string advLayout = PlayerPrefs.GetString(kPlayerPrefAdvancedLayout, "");
-            if (advLayout == "")
+            if (advLayout?.Length == 0)
             {
                 return;
             }
@@ -162,8 +162,7 @@ public bool ApplyLayoutToPanel(BasePanel p)
                     }
                     else
                     {
-                        p.transform.position = layouts[i].pos;
-                        p.transform.rotation = layouts[i].rot;
+                        p.transform.SetPositionAndRotation(layouts[i].pos, layouts[i].rot);
                     }
                     return true;
                 }

Assets/Scripts/GUI/BasePanel.cs

@@ -507,8 +507,7 @@ virtual public void InitPanel()
             if (m_PanelDescriptionPrefab != null)
             {
                 m_PanelDescriptionObject = (GameObject)Instantiate(m_PanelDescriptionPrefab);
-                m_PanelDescriptionObject.transform.position = m_Mesh.transform.position;
-                m_PanelDescriptionObject.transform.rotation = m_Mesh.transform.rotation;
+                m_PanelDescriptionObject.transform.SetPositionAndRotation(m_Mesh.transform.position, m_Mesh.transform.rotation);
                 m_PanelDescriptionObject.transform.SetParent(transform);
                 Vector3 vScale = m_PanelDescriptionObject.transform.localScale;
                 vScale *= transform.localScale.x;

Assets/Scripts/GUI/BaseSlider.cs

@@ -65,8 +65,7 @@ override protected void Awake()
 
         override protected void OnDescriptionChanged()
         {
-            m_Description.transform.position = m_Nob.transform.position;
-            m_Description.transform.rotation = m_Nob.transform.rotation;
+            m_Description.transform.SetPositionAndRotation(m_Nob.transform.position, m_Nob.transform.rotation);
             m_Description.transform.parent = m_Nob.transform;
         }
 

Assets/Scripts/GUI/BrushGrid.cs

@@ -394,8 +394,7 @@ void RefreshButtonPositions()
                     updatedPosition = Vector3.Lerp(updateVector, updatedPosition, 1 - rotationAmount);
                 }
 
-                m_BrushButtons[i].transform.localPosition = updatedPosition;
-                m_BrushButtons[i].transform.localRotation = updatedRotation;
+                m_BrushButtons[i].transform.SetLocalPositionAndRotation(updatedPosition, updatedRotation);
             }
             RefreshButtonProperties();
             RefreshNavigationButtons();

Assets/Scripts/GUI/LightGizmo.cs

@@ -54,8 +54,7 @@ public void SetParentPanel(LightsPanel panel)
             m_ParentPanel = panel;
             App.Scene.PoseChanged += (TrTransform prev, TrTransform current) =>
             {
-                transform.rotation = current.rotation * m_Rotation_SS;
-                transform.position = m_ParentPanel.LightWidgetPosition(transform.rotation);
+                transform.SetPositionAndRotation(m_ParentPanel.LightWidgetPosition(transform.rotation), current.rotation * m_Rotation_SS);
             };
         }
 
@@ -200,10 +199,9 @@ public void UpdateTransform()
             if (m_Light != null && m_ParentPanel != null)
             {
                 Quaternion rotation = m_Light.transform.rotation;
-                transform.position = m_ParentPanel.LightWidgetPosition(rotation);
-                transform.rotation =
-                    Quaternion.LookRotation(rotation * Vector3.forward,
-                        (ViewpointScript.Head.position - transform.position).normalized);
+                transform.SetPositionAndRotation(m_ParentPanel.LightWidgetPosition(rotation),
+Quaternion.LookRotation(rotation * Vector3.forward,
+                        (ViewpointScript.Head.position - transform.position).normalized));
             }
         }
     }

Assets/Scripts/GUI/MultiplayerPanelButton.cs

@@ -29,15 +29,15 @@ override protected void OnButtonPressed()
             // notify the popup that we were pressed.  Which happens below.
             if (!m_CommandIgnored)
             {
-                if (m_RequiresPopup & m_Command == SketchControlsScript.GlobalCommands.EditMultiplayerRoomName)
+                if (m_RequiresPopup && m_Command == SketchControlsScript.GlobalCommands.EditMultiplayerRoomName)
                 {
                     KeyboardPopUpWindow.m_InitialText = popup.RoomName;
                 }
-                else if (m_RequiresPopup & m_Command == SketchControlsScript.GlobalCommands.EditMultiplayerNickName)
+                else if (m_RequiresPopup && m_Command == SketchControlsScript.GlobalCommands.EditMultiplayerNickName)
                 {
                     KeyboardPopUpWindow.m_InitialText = popup.NickName;
                 }
-                else if (m_RequiresPopup & m_Command == SketchControlsScript.GlobalCommands.EditMultiplayerRoomMaxPlayers)
+                else if (m_RequiresPopup && m_Command == SketchControlsScript.GlobalCommands.EditMultiplayerRoomMaxPlayers)
                 {
                     KeyboardPopUpWindow.m_InitialText = popup.MaxPlayers.ToString();
                 }