Added Sound.spatialize. Made ClatterManager.adjustAudioSettings and C…

…latterManager.auto static fields.
alters-mit · Jul 10, 2023 · eed7095 · eed7095
1 parent cf80dd2
commit eed7095
Show file tree

Hide file tree

Showing 11 changed files with 655 additions and 650 deletions.
diff --git a/Clatter/Clatter.CommandLine/Clatter.CommandLine.csproj b/Clatter/Clatter.CommandLine/Clatter.CommandLine.csproj
@@ -8,7 +8,7 @@
         <RootNamespace>Clatter.CommandLine</RootNamespace>
         <Company>MIT</Company>
         <Product>clatter</Product>
-        <AssemblyVersion>0.1.3</AssemblyVersion>
+        <AssemblyVersion>0.1.4</AssemblyVersion>
         <AssemblyName>clatter</AssemblyName>
     </PropertyGroup>
 

diff --git a/Clatter/Clatter.Core/Properties/AssemblyInfo.cs b/Clatter/Clatter.Core/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.3")]
-[assembly: AssemblyFileVersion("0.1.3")]
+[assembly: AssemblyVersion("0.1.4")]
+[assembly: AssemblyFileVersion("0.1.4")]
diff --git a/Clatter/Clatter.Unity/ClatterManager.cs b/Clatter/Clatter.Unity/ClatterManager.cs
@@ -44,7 +44,11 @@ public class ClatterManager : MonoBehaviour
         /// <summary>
         /// If true, automatically update by calling Awake(), Update(), and FixedUpdate() (like an ordinary MonoBehaviour object). If this is false, you must manually update instead by calling instance.Awake(), instance.OnUpdate(), and instance.OnFixedUpdate().
         /// </summary>
-        public bool auto = true;
+        public static bool auto = true;
+        /// <summary>
+        /// If true, adjust the global audio settings for better-quality audio.
+        /// </summary>
+        public static bool adjustAudioSettings = true;
         /// <summary>
         /// If true, generate a new random seed.
         /// </summary>
@@ -54,10 +58,6 @@ public class ClatterManager : MonoBehaviour
         /// </summary>
         public int seed;
         /// <summary>
-        /// If true, adjust the global audio settings for better-quality audio.
-        /// </summary>
-        public bool adjustAudioSettings = true;
-        /// <summary>
         /// The audio generator.
         /// </summary>
         public AudioGenerator generator;

diff --git a/Clatter/Clatter.Unity/Properties/AssemblyInfo.cs b/Clatter/Clatter.Unity/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.3")]
-[assembly: AssemblyFileVersion("0.1.3")]
+[assembly: AssemblyVersion("0.1.4")]
+[assembly: AssemblyFileVersion("0.1.4")]
diff --git a/Clatter/Clatter.Unity/Sound.cs b/Clatter/Clatter.Unity/Sound.cs
@@ -23,6 +23,10 @@ public abstract class Sound : MonoBehaviour
         /// </summary>
         public static Action<Sound, AudioSource> onCreate;
         /// <summary>
+        /// If true, spatialize each AudioSource.
+        /// </summary>
+        public static bool spatialize = true;
+        /// <summary>
         /// Invoked when the audio ends.
         /// </summary>
         public Action<int> onEnd;
@@ -76,7 +80,10 @@ public static T Create<T>(Samples samples, Vector3d position, int id)
             sound.id = id;
             sound.samples = samples;
             sound.source = go.AddComponent<AudioSource>();
-            sound.source.spatialize = true;
+            if (spatialize)
+            {
+                sound.source.spatialize = true;           
+            }
             // Set the audio clip.
             sound.Play(sound.samples.ToFloats());
             // Announce creation.

diff --git a/Clatter/doc_code_examples/Marbles.cs b/Clatter/doc_code_examples/Marbles.cs
@@ -69,7 +69,6 @@ private void Awake()
         // Add the ClatterManager.
         GameObject go = new GameObject("ClatterManager");
         ClatterManager cm = go.AddComponent<ClatterManager>();
-        cm.auto = true;
         cm.OnAwake();
     }
 }
diff --git a/ClatterUnityExamples/Assembly-CSharp.csproj b/ClatterUnityExamples/Assembly-CSharp.csproj
diff --git a/ClatterUnityExamples/Assets/DefaultObjectData/DefaultObjectData.cs b/ClatterUnityExamples/Assets/DefaultObjectData/DefaultObjectData.cs
@@ -31,7 +31,6 @@ private void Awake()
         clatterObject.amp = 0.2;
         // Add the ClatterManager.
         ClatterManager clatterManager = new GameObject("ClatterManager").AddComponent<ClatterManager>();
-        clatterManager.auto = true;
         clatterManager.OnAwake();
     }
 }
diff --git a/ClatterUnityExamples/Assets/Marbles/Marbles.cs b/ClatterUnityExamples/Assets/Marbles/Marbles.cs
@@ -82,7 +82,6 @@ private void Awake()
         // Add the ClatterManager.
         GameObject go = new GameObject("ClatterManager");
         ClatterManager cm = go.AddComponent<ClatterManager>();
-        cm.auto = true;
         cm.OnAwake();
     }
 }
diff --git a/ClatterUnityExamples/ClatterUnityExamples.sln b/ClatterUnityExamples/ClatterUnityExamples.sln
@@ -1,18 +1,18 @@
 
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{606D97F0-30D5-CB7E-18C8-5FAAAB128105}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{f0976d60-d530-7ecb-18c8-5faaab128105}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{606D97F0-30D5-CB7E-18C8-5FAAAB128105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{606D97F0-30D5-CB7E-18C8-5FAAAB128105}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{606D97F0-30D5-CB7E-18C8-5FAAAB128105}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{606D97F0-30D5-CB7E-18C8-5FAAAB128105}.Release|Any CPU.Build.0 = Release|Any CPU
+		{f0976d60-d530-7ecb-18c8-5faaab128105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{f0976d60-d530-7ecb-18c8-5faaab128105}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{f0976d60-d530-7ecb-18c8-5faaab128105}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{f0976d60-d530-7ecb-18c8-5faaab128105}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+# 0.1.4
+
+- `ClatterManager.auto` and `ClatterManager.adjustAudioSettings` are now static fields.
+- Added: `Sound.spatialize`
+
 # 0.1.3
 
 - Added: `ScrapeMaterialData.roughnessRatioExponent` An exponent for each scrape material's roughness ratio. A lower value will cause all scrape audio to be louder relative to impact audio.