diff --git a/Basis/Packages/com.basis.framework/Device Management/BasisDeviceManagement.cs b/Basis/Packages/com.basis.framework/Device Management/BasisDeviceManagement.cs index a45367466..41390d1e4 100644 --- a/Basis/Packages/com.basis.framework/Device Management/BasisDeviceManagement.cs +++ b/Basis/Packages/com.basis.framework/Device Management/BasisDeviceManagement.cs @@ -8,6 +8,7 @@ using Basis.Scripts.TransformBinders.BoneControl; using System; using System.Collections; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Globalization; using System.Linq; @@ -479,25 +480,19 @@ public void LoadAndOrSaveDefaultDeviceConfigs(string directoryPath) UseAbleDeviceConfigs = deviceDictionary.Values.ToList(); } - private static readonly Queue mainThreadActions = new Queue(); public void Update() { - lock (mainThreadActions) + while (mainThreadActions.TryDequeue(out var action)) { - while (mainThreadActions.Count != 0) - { - mainThreadActions.Dequeue()?.Invoke(); - } + action.Invoke(); } } - + private static readonly ConcurrentQueue mainThreadActions = new ConcurrentQueue(); public static void EnqueueOnMainThread(Action action) { Debug.Log("Enqueueing Action on Main Thread..."); - lock (mainThreadActions) - { - mainThreadActions.Enqueue(action); - } + if (action == null) return; + mainThreadActions.Enqueue(action); } } } diff --git a/Basis/Packages/com.basis.framework/Device Management/Devices/Desktop/BasisLocalInputActions.cs b/Basis/Packages/com.basis.framework/Device Management/Devices/Desktop/BasisLocalInputActions.cs index 289c02c4c..4531a7360 100644 --- a/Basis/Packages/com.basis.framework/Device Management/Devices/Desktop/BasisLocalInputActions.cs +++ b/Basis/Packages/com.basis.framework/Device Management/Devices/Desktop/BasisLocalInputActions.cs @@ -4,6 +4,7 @@ using Basis.Scripts.Drivers; using Basis.Scripts.UI.UI_Panels; using System; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Threading.Tasks; using UnityEngine; diff --git a/Basis/Packages/com.basis.framework/Drivers/BasisLocalCameraDriver.cs b/Basis/Packages/com.basis.framework/Drivers/BasisLocalCameraDriver.cs index 173ea8389..afc0bb5f5 100644 --- a/Basis/Packages/com.basis.framework/Drivers/BasisLocalCameraDriver.cs +++ b/Basis/Packages/com.basis.framework/Drivers/BasisLocalCameraDriver.cs @@ -28,11 +28,11 @@ public class BasisLocalCameraDriver : MonoBehaviour public static event System.Action InstanceExists; public BasisLockToInput BasisLockToInput; public bool HasEvents = false; - public Canvas MicrophoneCanvas; public Transform CanvasTransform; - public RawImage MicrophoneMutedIcon; - public RawImage MicrophoneUnMutedIcon; - public Transform MicrophoneUnMutedIconTransform; + public SpriteRenderer SpriteRendererIcon; + public Transform SpriteRendererIconTransform; + public Sprite SpriteMicrophoneOn; + public Sprite SpriteMicrophoneOff; public Vector3 DesktopMicrophoneViewportPosition = new(0.2f, 0.15f, 1f); // Adjust as needed for canvas position and depth public Vector3 VRMicrophoneOffset = new Vector3(-0.0004f, -0.0015f, 2f); @@ -78,7 +78,7 @@ public void OnEnable() HasEvents = true; } halfDuration = duration / 2f; // Time to scale up and down - StartingScale = MicrophoneMutedIcon.transform.localScale; + StartingScale = SpriteRendererIcon.transform.localScale; // Target scale for the "bounce" effect (e.g., 1.2 times larger) largerScale = StartingScale * 1.2f; UpdateMicrophoneVisuals(MicrophoneRecorder.isPaused, false); @@ -87,16 +87,17 @@ public void OnEnable() { SteamAudioManager.NotifyAudioListenerChanged(); } + SpriteRendererIcon.gameObject.SetActive(true); } public void MicrophoneTransmitting() { - MicrophoneUnMutedIcon.color = UnMutedMutedIconColorActive; - MicrophoneUnMutedIconTransform.localScale = largerScale; + SpriteRendererIcon.color = UnMutedMutedIconColorActive; + SpriteRendererIconTransform.localScale = largerScale; } public void MicrophoneNotTransmitting() { - MicrophoneUnMutedIcon.color = UnMutedMutedIconColorInactive; - MicrophoneUnMutedIconTransform.localScale = StartingScale; + SpriteRendererIcon.color = UnMutedMutedIconColorInactive; + SpriteRendererIconTransform.localScale = StartingScale; } private void OnPausedEvent(bool IsMuted) @@ -113,30 +114,27 @@ public void UpdateMicrophoneVisuals(bool IsMuted, bool PlaySound) } if (IsMuted) { - // BasisDebug.Log(nameof(UpdateMicrophoneVisuals) + IsMuted); - - MicrophoneMutedIcon.gameObject.SetActive(true); - MicrophoneUnMutedIcon.gameObject.SetActive(false); + // BasisDebug.Log(nameof(UpdateMicrophoneVisuals) + IsMuted); + SpriteRendererIcon.sprite = SpriteMicrophoneOff; if (PlaySound) { AudioSource.PlayOneShot(MuteSound); } // Start a new coroutine for the scale animation - scaleCoroutine = StartCoroutine(ScaleIcons(MicrophoneMutedIcon.gameObject)); + scaleCoroutine = StartCoroutine(ScaleIcons(SpriteRendererIcon.gameObject)); } else { - // BasisDebug.Log(nameof(UpdateMicrophoneVisuals) + IsMuted); + // BasisDebug.Log(nameof(UpdateMicrophoneVisuals) + IsMuted); - MicrophoneMutedIcon.gameObject.SetActive(false); - MicrophoneUnMutedIcon.gameObject.SetActive(true); + SpriteRendererIcon.sprite = SpriteMicrophoneOn; if (PlaySound) { AudioSource.PlayOneShot(UnMuteSound); } // Start a new coroutine for the scale animation - scaleCoroutine = StartCoroutine(ScaleIcons(MicrophoneUnMutedIcon.gameObject)); + scaleCoroutine = StartCoroutine(ScaleIcons(SpriteRendererIconTransform.gameObject)); } } private IEnumerator ScaleIcons(GameObject iconToScale) diff --git a/Basis/Packages/com.basis.framework/Editor/BasisUIHeadsUpLoadingbarEditor.cs b/Basis/Packages/com.basis.framework/Editor/BasisUIHeadsUpLoadingbarEditor.cs new file mode 100644 index 000000000..895d5739a --- /dev/null +++ b/Basis/Packages/com.basis.framework/Editor/BasisUIHeadsUpLoadingbarEditor.cs @@ -0,0 +1,37 @@ +using Basis.Scripts.UI.UI_Panels; +using UnityEditor; +using UnityEngine; + +public class BasisUIHeadsUpLoadingbarEditor : EditorWindow +{ + private BasisUIHeadsUpLoadingbarEditor targetScript; + public string UniqueId = "UniqueIDOutput"; + // Create a menu item to open the window + [MenuItem("Basis/Tests/Loading Bar Tests")] + public static void ShowWindow() + { + GetWindow("Custom Editor Window"); + } + public bool IsRunning = false; + private void OnGUI() + { + GUILayout.Label("Execute Task from Editor", EditorStyles.boldLabel); + + // Display a button + if (GUILayout.Button("Start Testing")) + { + CallFunction(); + IsRunning = true; + } + if (IsRunning) + { + float randomValue = UnityEngine.Random.Range(0f, 99f); + BasisUILoadingBar.ProgressReport(UniqueId, randomValue, "Test Message " + randomValue); + } + } + + private void CallFunction() + { + BasisUILoadingBar.ProgressReport(UniqueId, 33, "Test Message"); + } +} diff --git a/Basis/Packages/com.basis.framework/Editor/BasisUIHeadsUpLoadingbarEditor.cs.meta b/Basis/Packages/com.basis.framework/Editor/BasisUIHeadsUpLoadingbarEditor.cs.meta new file mode 100644 index 000000000..66d4f0235 --- /dev/null +++ b/Basis/Packages/com.basis.framework/Editor/BasisUIHeadsUpLoadingbarEditor.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d05bfb4851d5e9344940b32b0a1b7391 \ No newline at end of file diff --git a/Basis/Packages/com.basis.framework/Microphone/MicrophoneRecorder.cs b/Basis/Packages/com.basis.framework/Microphone/MicrophoneRecorder.cs index 118e4b404..3754729b5 100644 --- a/Basis/Packages/com.basis.framework/Microphone/MicrophoneRecorder.cs +++ b/Basis/Packages/com.basis.framework/Microphone/MicrophoneRecorder.cs @@ -1,4 +1,4 @@ -using UnityEngine; +using UnityEngine; using System; using System.Linq; using Basis.Scripts.Device_Management; @@ -380,4 +380,4 @@ public bool IsTransmitWorthy() { return averageRms > silenceThreshold; } -} \ No newline at end of file +} diff --git a/Basis/Packages/com.basis.framework/UI/UI Panels/BasisUILoadingBar.cs b/Basis/Packages/com.basis.framework/UI/UI Panels/BasisUILoadingBar.cs index 29b9de89b..aa111f9ae 100644 --- a/Basis/Packages/com.basis.framework/UI/UI Panels/BasisUILoadingBar.cs +++ b/Basis/Packages/com.basis.framework/UI/UI Panels/BasisUILoadingBar.cs @@ -49,7 +49,7 @@ public static void DeInitalize() BasisSceneLoadDriver.progressCallback.OnProgressReport -= ProgressReport; } - private static void ProgressReport(string UniqueID, float progress, string info) + public static void ProgressReport(string UniqueID, float progress, string info) { BasisDeviceManagement.EnqueueOnMainThread(() => { diff --git a/Basis/Packages/com.basis.sdk/Prefabs/Loadins/Main Camera.prefab b/Basis/Packages/com.basis.sdk/Prefabs/Loadins/Main Camera.prefab index fde78e617..afdb6e778 100644 --- a/Basis/Packages/com.basis.sdk/Prefabs/Loadins/Main Camera.prefab +++ b/Basis/Packages/com.basis.sdk/Prefabs/Loadins/Main Camera.prefab @@ -1,77 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1600683472464500465 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3130027372817484121} - - component: {fileID: 6021568775932895793} - - component: {fileID: 7951072778522726859} - m_Layer: 5 - m_Name: Microphone Muted - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3130027372817484121 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1600683472464500465} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 309437807573434354} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 2, y: 2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6021568775932895793 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1600683472464500465} - m_CullTransparentMesh: 1 ---- !u!114 &7951072778522726859 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1600683472464500465} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: dcd160d4672c98e499e856ca0e45d858, type: 2} - m_Color: {r: 0.9528302, g: 0.3343779, b: 0.30113026, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: f184b79ab72cc224e94720390fb038c2, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 --- !u!1 &3912420243437177643 GameObject: m_ObjectHideFlags: 0 @@ -81,130 +9,84 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 309437807573434354} - - component: {fileID: 3373432966423603715} + - component: {fileID: 5438786761859189477} m_Layer: 5 - m_Name: Canvas + m_Name: Parent m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &309437807573434354 -RectTransform: +--- !u!4 &309437807573434354 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3912420243437177643} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.5} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_LocalPosition: {x: -0.175, y: -0.17, z: 0.5} + m_LocalScale: {x: 0.02, y: 0.02, z: 0.02} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3130027372817484121} - - {fileID: 1619504432556682231} + m_Children: [] m_Father: {fileID: 1773867613184342062} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -0.175, y: -0.17} - m_SizeDelta: {x: 5, y: 5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &3373432966423603715 -Canvas: +--- !u!212 &5438786761859189477 +SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3912420243437177643} m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 - m_SortingOrder: 32767 - m_TargetDisplay: 0 ---- !u!1 &4180789650971801243 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1619504432556682231} - - component: {fileID: 5815912683025343535} - - component: {fileID: 1908197658278707850} - m_Layer: 5 - m_Name: Microphone UnMuted - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1619504432556682231 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4180789650971801243} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 309437807573434354} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 2, y: 2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5815912683025343535 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4180789650971801243} - m_CullTransparentMesh: 1 ---- !u!114 &1908197658278707850 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4180789650971801243} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: dcd160d4672c98e499e856ca0e45d858, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 0.6} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: df4c5b7b152475f48adb88ead5775eb0, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: df4c5b7b152475f48adb88ead5775eb0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &5812972426740207491 GameObject: m_ObjectHideFlags: 0 @@ -398,11 +280,11 @@ MonoBehaviour: DefaultCameraFov: 80 BasisLockToInput: {fileID: 5985133177976618905} HasEvents: 0 - MicrophoneCanvas: {fileID: 3373432966423603715} CanvasTransform: {fileID: 309437807573434354} - MicrophoneMutedIcon: {fileID: 7951072778522726859} - MicrophoneUnMutedIcon: {fileID: 1908197658278707850} - MicrophoneUnMutedIconTransform: {fileID: 1619504432556682231} + SpriteRendererIcon: {fileID: 5438786761859189477} + SpriteRendererIconTransform: {fileID: 309437807573434354} + SpriteMicrophoneOn: {fileID: 21300000, guid: df4c5b7b152475f48adb88ead5775eb0, type: 3} + SpriteMicrophoneOff: {fileID: 21300000, guid: f184b79ab72cc224e94720390fb038c2, type: 3} DesktopMicrophoneViewportPosition: {x: 0.2, y: 0.15, z: 1} VRMicrophoneOffset: {x: -0.0001, y: -0.00025, z: 1} MuteSound: {fileID: 8300000, guid: 5b9ed5013ea1941499840ac97ad2b8e9, type: 3} @@ -549,3 +431,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: raycastDistance: 1 + hoverRadius: 0.5 + InteractInputs: [] + LineMaterial: {fileID: 0} + interactLineWidth: 0.015 + renderInteractLines: 1 + InteractableLayerMask: + serializedVersion: 2 + m_Bits: 0 diff --git a/Basis/Packages/com.basis.sdk/Textures/Runtime/microphone-mute-solid.png.meta b/Basis/Packages/com.basis.sdk/Textures/Runtime/microphone-mute-solid.png.meta index 6aac9a634..f7f297d05 100644 --- a/Basis/Packages/com.basis.sdk/Textures/Runtime/microphone-mute-solid.png.meta +++ b/Basis/Packages/com.basis.sdk/Textures/Runtime/microphone-mute-solid.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -54,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,7 +113,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Basis/Packages/com.basis.sdk/Textures/Runtime/microphone-solid.png.meta b/Basis/Packages/com.basis.sdk/Textures/Runtime/microphone-solid.png.meta index bb9be6c4c..fa6d0dace 100644 --- a/Basis/Packages/com.basis.sdk/Textures/Runtime/microphone-solid.png.meta +++ b/Basis/Packages/com.basis.sdk/Textures/Runtime/microphone-solid.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -54,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,7 +113,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: