Skip to content

Commit 05f8b13

Browse files
committed
ref: добавлены build conditions для разделения платформ
1 parent ccec19f commit 05f8b13

16 files changed

+34
-21
lines changed

Assets/Plugins/CREEXTEAM/UniHowl/Application/Editor/AudioBuildProcess.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
namespace UniHowl
88
{
9-
// TODO: REFACTOR
10-
namespace UniHowl
11-
{
9+
#if UNITY_WEBGL && UNITY_EDITOR
1210
public static class AudioBuildProcess
1311
{
1412
[PostProcessBuild(int.MinValue)]
@@ -75,5 +73,5 @@ private static void CreateFolder(string root, string path)
7573
}
7674
}
7775
}
78-
}
76+
#endif
7977
}

Assets/Plugins/CREEXTEAM/UniHowl/Application/Models/CrossplatformAudioMap.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class CrossplatformAudioMap : ScriptableObject
1212
{
1313
[SerializeField] private List<CrossplatformAudio> _audio = new();
1414

15-
//#if UNITY_WEBGL
15+
#if UNITY_WEBGL
1616
public IAudioMap<HowlAudio> ToHowlAudioMap()
1717
{
1818
var map = new HowlAudioMap();
@@ -24,7 +24,7 @@ public IAudioMap<HowlAudio> ToHowlAudioMap()
2424

2525
return map;
2626
}
27-
//#endif
27+
#endif
2828

2929
#if !UNITY_WEBGL || UNITY_EDITOR
3030
public IAudioMap<UnityAudio> ToUnityAudioMap()

Assets/Plugins/CREEXTEAM/UniHowl/Application/Options/HowlSpatialAudioSourceBehaviourOption.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
namespace UniHowl.Spatial.Options
88
{
9+
10+
#if UNITY_WEBGL || UNITY_EDITOR
911
public class HowlSpatialAudioSourceBehaviourOption : MonoBehaviour, IBehaviourSpatialAudioSourceOptions
1012
{
1113
[SerializeField] private HowlSpatialAudioSourceOptions _options;
@@ -38,7 +40,6 @@ public void Initialize()
3840
refDistance: _refDistance,
3941
rollOffFactor: _rolloffFactor);
4042
}
41-
#if UNITY_EDITOR
4243
private void OnValidate()
4344
{
4445
_options.PanningMode = _panningModel;
@@ -50,10 +51,12 @@ private void OnValidate()
5051
_options.RefDistance = _refDistance;
5152
_options.RollOffFactor = _rolloffFactor;
5253
}
53-
#endif
54+
5455
public ISpatialAudioSourceOptions GetOptions()
5556
{
5657
return _options;
5758
}
5859
}
60+
61+
#endif
5962
}

Assets/Plugins/CREEXTEAM/UniHowl/Application/Options/UnitySpatialAudioSourceBehaviourOption.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace UniHowl.Spatial.Options
88
{
9+
#if !UNITY_WEBGL || UNITY_EDITOR
910
public class UnitySpatialAudioSourceBehaviourOption : MonoBehaviour, IBehaviourSpatialAudioSourceOptions
1011
{
1112
private UnitySpatialAudioSourceOptions _options;
@@ -75,4 +76,6 @@ public ISpatialAudioSourceOptions GetOptions()
7576
return _options;
7677
}
7778
}
78-
}
79+
80+
#endif
81+
}

Assets/Plugins/CREEXTEAM/UniHowl/Application/Player/HowlAudioPlayer.cs

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace UniHowl
55
{
6+
#if UNITY_WEBGL && !UNITY_EDITOR
67
public sealed class HowlAudioPlayer : Entity<Guid>, IAudioPlayer
78
{
89
private readonly string _id;
@@ -37,4 +38,5 @@ public HowlAudioPlayer(Guid id, IAudioMap<HowlAudio> map, string key, float volu
3738
public void Load() => HowlAudioProxy.Load(_id);
3839
public Guid GetId() => Id;
3940
}
41+
#endif
4042
}

Assets/Plugins/CREEXTEAM/UniHowl/Application/Player/UnityAudioPlayer.cs

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace UniHowl
66
{
7+
#if !UNITY_WEBGL || UNITY_EDITOR
78
public class UnityAudioPlayer : Entity<Guid>, IAudioPlayer
89
{
910
private readonly AudioSource _source;
@@ -105,4 +106,5 @@ public void Load()
105106

106107
public Guid GetId() => Id;
107108
}
109+
#endif
108110
}

Assets/Plugins/CREEXTEAM/UniHowl/Application/Source/CrossplatformAudioSource.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public void Init(AudioConfiguration configuration)
115115

116116
_player = _fallbackPlayer switch
117117
{
118-
#if UNITY_WEBGL
118+
#if UNITY_WEBGL && !UNITY_EDITOR
119119
AudioPlayers.Howl => new HowlAudioPlayer(Id, configuration.Audio.ToHowlAudioMap(),
120120
_soundKey,
121121
_volume,

Assets/Plugins/CREEXTEAM/UniHowl/Application/Source/CrossplatformSpatialAudioSource.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void Init(AudioConfiguration configuration,
4444
{
4545
_spatial = _fallbackPlayer switch
4646
{
47-
#if UNITY_WEBGL
47+
#if UNITY_WEBGL && !UNITY_EDITOR
4848
AudioPlayers.Howl => new HowlSpatialPositionSource(Id, this.transform, optionsProvider.GetOptions<HowlSpatialAudioSourceOptions>(AudioPlayers.Howl)),
4949
#endif
5050
#if !UNITY_WEBGL || UNITY_EDITOR

Assets/Plugins/CREEXTEAM/UniHowl/Application/Spatial/HowlSpatialAudioListenerSource.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
namespace UniHowl.Spatial
55
{
6+
#if UNITY_WEBGL && !UNITY_EDITOR
67
public class HowlSpatialAudioListenerSource : MonoBehaviour
78
{
8-
#if UNITY_WEBGL && !UNITY_EDITOR
99
private static readonly Vector3 _coordinateSystem = Vector3.up;
1010
private Vector3 _latestPosition;
1111
private Vector3 _latestRotation;
@@ -35,6 +35,6 @@ private void SetRotation(Vector3 rotation)
3535

3636
HowlSpatialAudioProxy.AudioListenerSetRotation(rotation, _coordinateSystem);
3737
}
38-
#endif
3938
}
39+
#endif
4040
}

Assets/Plugins/CREEXTEAM/UniHowl/Application/Spatial/HowlSpatialPositionSource.cs

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace UniHowl.Spatial
88
{
9+
#if UNITY_WEBGL && !UNITY_EDITOR
910
public class HowlSpatialPositionSource : Entity<Guid>, ISpatialAudioSource
1011
{
1112
private readonly string _id;
@@ -50,4 +51,5 @@ public void SetPosition(Vector3 position)
5051
HowlSpatialAudioProxy.SetPosition(_id, position);
5152
}
5253
}
54+
#endif
5355
}

Assets/Plugins/CREEXTEAM/UniHowl/Example/Scripts/RotateAround.cs

-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
using System.Collections;
2-
using System.Collections.Generic;
3-
using UnityEngine;
4-
5-
using System.Collections;
6-
using System.Collections.Generic;
71
using UnityEngine;
82

93
public enum RotateAroundDirection

Assets/Plugins/CREEXTEAM/UniHowl/Infrastructure/Dto/HowlerSpatialAudioSourceOptionsWrapper.cs

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace Plugins.CREEXTEAM.UniHowl.Infrastructure.Dto
55
{
6+
#if UNITY_WEBGL || UNITY_EDITOR
67
// Why this strange object?
78
// I wouldn’t want to drag along a custom serializer, and in order not to constantly create garbage,
89
// we created such a wrapper to json object
@@ -80,4 +81,5 @@ public void SetDistanceMode(HowlDistanceMode mode)
8081
};
8182
}
8283
}
84+
#endif
8385
}

Assets/Plugins/CREEXTEAM/UniHowl/Infrastructure/HowlAudioProxy.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Runtime.InteropServices;
44
using UnityEngine;
55

6+
#if UNITY_WEBGL && !UNITY_EDITOR
67
public static class HowlAudioProxy
78
{
89
public static void SetGlobalMute(bool state) => HowlGlobalMute(state);
@@ -73,5 +74,6 @@ public static class HowlAudioProxy
7374
public static extern bool HowlGetMute(string soundSourceId);
7475

7576
#endregion
76-
7777
}
78+
79+
#endif

Assets/Plugins/CREEXTEAM/UniHowl/Infrastructure/HowlSpatialAudioProxy.cs

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
namespace Plugins.CREEXTEAM.UniHowl.Infrastructure
77
{
8+
#if UNITY_WEBGL && !UNITY_EDITOR
89
public static class HowlSpatialAudioProxy
910
{
1011
public static void SetPan(string sourceId, HowlSpatialAudioSourceOptions options)
@@ -40,4 +41,5 @@ public static void AudioListenerSetRotation(Vector3 rotation, Vector3 coordinate
4041
public static extern bool HowlAudioListenerSetRotation(float x, float y, float z, float xUp, float yUp, float zUp);
4142

4243
}
44+
#endif
4345
}

Assets/Plugins/CREEXTEAM/UniHowl/Infrastructure/Options/HowlSpatialAudioSourceOptions.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
namespace UniHowl.Spatial.Options
77
{
8+
#if UNITY_WEBGL || UNITY_EDITOR
89
// Why is not inherited from some universal class?
910
// Because in cross-platform games we can sacrifice some features for the sake of performance or platform support
1011
[Serializable]
@@ -123,7 +124,7 @@ public float InnerAngle
123124

124125
public string ToJson() => JsonUtility.ToJson(_wrapper);
125126
}
126-
127+
#endif
127128
public enum HowlDistanceMode
128129
{
129130
Linear,

Assets/Plugins/CREEXTEAM/UniHowl/Infrastructure/Options/UnitySpatialAudioSourceOptions.cs

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace UniHowl.Spatial.Options
66
{
7+
#if !UNITY_WEBGL || UNITY_EDITOR
78
public class UnitySpatialAudioSourceOptions : ISpatialAudioSourceOptions
89
{
910
/// <summary>
@@ -28,4 +29,5 @@ public class UnitySpatialAudioSourceOptions : ISpatialAudioSourceOptions
2829
public float MinDistance = 1;
2930
public float MaxDistance = 500;
3031
}
32+
#endif
3133
}

0 commit comments

Comments
 (0)