Merge pull request #3478 from davidkline-ms/resourcesCleanup

rename Resources to StandardAssets, update code references

Author: David Kline

Assets/MixedRealityToolkit.Providers/OpenVR/OculusRemoteController.cs

@@ -12,7 +12,7 @@ namespace Microsoft.MixedReality.Toolkit.Providers.OpenVR
     [MixedRealityController(
         SupportedControllerType.OculusRemote,
         new[] { Handedness.None },
-        "Resources/Textures/OculusRemoteController")]
+        "StandardAssets/Textures/OculusRemoteController")]
     public class OculusRemoteController : GenericOpenVRController
     {
         /// <summary>

Assets/MixedRealityToolkit.Providers/OpenVR/OculusTouchController.cs

@@ -13,7 +13,7 @@ namespace Microsoft.MixedReality.Toolkit.Providers.OpenVR
     [MixedRealityController(
         SupportedControllerType.OculusTouch,
         new[] { Handedness.Left, Handedness.Right },
-        "Resources/Textures/OculusControllersTouch")]
+        "StandardAssets/Textures/OculusControllersTouch")]
     public class OculusTouchController : GenericOpenVRController
     {
         /// <summary>

Assets/MixedRealityToolkit.Providers/OpenVR/ViveWandController.cs

@@ -13,7 +13,7 @@ namespace Microsoft.MixedReality.Toolkit.Providers.OpenVR
     [MixedRealityController(
         SupportedControllerType.ViveWand,
         new[] { Handedness.Left, Handedness.Right },
-        "Resources/Textures/ViveWandController")]
+        "StandardAssets/Textures/ViveWandController")]
     public class ViveWandController : GenericOpenVRController
     {
         /// <summary>

Assets/MixedRealityToolkit.Providers/OpenVR/WindowsMixedRealityOpenVRMotionController.cs

@@ -16,7 +16,7 @@ namespace Microsoft.MixedReality.Toolkit.Providers.OpenVR
     [MixedRealityController(
         SupportedControllerType.WindowsMixedReality,
         new[] { Handedness.Left, Handedness.Right },
-        "Resources/Textures/MotionController")]
+        "StandardAssets/Textures/MotionController")]
     public class WindowsMixedRealityOpenVRMotionController : GenericOpenVRController
     {
         /// <summary>

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityController.cs

@@ -22,7 +22,7 @@ namespace Microsoft.MixedReality.Toolkit.Providers.WindowsMixedReality
     [MixedRealityController(
         SupportedControllerType.WindowsMixedReality,
         new[] { Handedness.Left, Handedness.Right, Handedness.None },
-        "Resources/Textures/MotionController")]
+        "StandardAssets/Textures/MotionController")]
     public class WindowsMixedRealityController : BaseController
     {
         /// <summary>

Assets/MixedRealityToolkit/Definitions/Devices/ControllerMappingLibrary.cs

@@ -276,7 +276,7 @@ private static Texture2D GetControllerTextureInternal(Type controllerType, Hande
                 }
             }
 
-            return GetControllerTextureInternal("Resources/Textures/Generic_controller", Handedness.None, suffix);
+            return GetControllerTextureInternal("StandardAssets/Textures/Generic_controller", Handedness.None, suffix);
         }
 
         private static Texture2D GetControllerTextureInternal(string relativeTexturePath, Handedness handedness, string suffix)

Assets/MixedRealityToolkit/Inspectors/Profiles/BaseMixedRealityToolkitConfigurationProfileInspector.cs

@@ -26,14 +26,16 @@ public abstract class BaseMixedRealityToolkitConfigurationProfileInspector : Bas
 
         protected virtual void Awake()
         {
+            string assetPath = $"{MixedRealityEditorSettings.MixedRealityToolkit_RelativeFolderPath}/StandardAssets/Textures";
+
             if (logoLightTheme == null)
             {
-                logoLightTheme = (Texture2D)AssetDatabase.LoadAssetAtPath($"{MixedRealityEditorSettings.MixedRealityToolkit_RelativeFolderPath}/Resources/Textures/MRTK_Logo_Black.png", typeof(Texture2D));
+                logoLightTheme = (Texture2D)AssetDatabase.LoadAssetAtPath($"{assetPath}/MRTK_Logo_Black.png", typeof(Texture2D));
             }
 
             if (logoDarkTheme == null)
             {
-                logoDarkTheme = (Texture2D)AssetDatabase.LoadAssetAtPath($"{MixedRealityEditorSettings.MixedRealityToolkit_RelativeFolderPath}/Resources/Textures/MRTK_Logo_White.png", typeof(Texture2D));
+                logoDarkTheme = (Texture2D)AssetDatabase.LoadAssetAtPath($"{assetPath}/MRTK_Logo_White.png", typeof(Texture2D));
             }
         }
 

Assets/MixedRealityToolkit/Inspectors/README.md

@@ -15,7 +15,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Providers.UnityInput
     [MixedRealityController(
         SupportedControllerType.Xbox,
         new[] { Handedness.None },
-        "Resources/Textures/XboxController")]
+        "StandardAssets/Textures/XboxController")]
     public class XboxController : GenericJoystickController
     {
         /// <summary>