move globaltempo to main assets in unity

anokta · Feb 19, 2024 · 3c23d33 · 3c23d33
1 parent 3485061
commit 3c23d33
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 27 deletions.
diff --git a/platforms/unity/Assets/BarelyMusician/Scripts/GlobalTempo.cs b/platforms/unity/Assets/BarelyMusician/Scripts/GlobalTempo.cs
@@ -0,0 +1,14 @@
+using UnityEngine;
+
+namespace Barely {
+  [DisallowMultipleComponent]
+  public class GlobalTempo : MonoBehaviour {
+    [Tooltip("Sets the global tempo in beats per minute.")]
+    [Range(30.0f, 960.0f)]
+    public double Bpm = 120.0;
+
+    private void Update() {
+      Musician.Tempo = Bpm;
+    }
+  }
+}  // namespace Barely
diff --git a/...sets/Examples/Scripts/GlobalTempo.cs.meta → ...arelyMusician/Scripts/GlobalTempo.cs.meta b/...sets/Examples/Scripts/GlobalTempo.cs.meta → ...arelyMusician/Scripts/GlobalTempo.cs.meta
diff --git a/platforms/unity/Assets/Examples/Scenes/ArpeggiatorDemo.unity b/platforms/unity/Assets/Examples/Scenes/ArpeggiatorDemo.unity
@@ -248,7 +248,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bf2924acef9d3214e9203ba5ca1f8f38, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  tempo: 150
+  Bpm: 135
 --- !u!850595691 &748775628
 LightingSettings:
   m_ObjectHideFlags: 0
@@ -442,9 +442,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   instrument: {fileID: 1737834380}
   arpeggiator: {fileID: 1737834384}
+  repeater: {fileID: 0}
   rootPitch: 0
   octaveOffset: 0
   noteIntensity: 1
+  repeaterNoteLength: 1
 --- !u!114 &1737834380
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -612,6 +614,5 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   ProcessOrder: 0
   GateRatio: 0.5
-  Instrument: {fileID: 1737834380}
   Rate: 2
   Style: 0
diff --git a/platforms/unity/Assets/Examples/Scenes/PerformerDemo.unity b/platforms/unity/Assets/Examples/Scenes/PerformerDemo.unity
@@ -590,7 +590,6 @@ MonoBehaviour:
   performer: {fileID: 2014543008}
   text: {fileID: 84924158}
   cutoffLfoAmplitude: 2000
-  freq: 0
   scale: 00000000020000000400000007000000090000000b000000
 --- !u!114 &2014543010
 MonoBehaviour:
@@ -604,7 +603,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bf2924acef9d3214e9203ba5ca1f8f38, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  tempo: 118
+  Bpm: 115
 --- !u!114 &2014543011
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/platforms/unity/Assets/Examples/Scenes/RepeaterDemo.unity b/platforms/unity/Assets/Examples/Scenes/RepeaterDemo.unity
@@ -248,7 +248,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bf2924acef9d3214e9203ba5ca1f8f38, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  tempo: 150
+  Bpm: 110
 --- !u!850595691 &748775628
 LightingSettings:
   m_ObjectHideFlags: 0

diff --git a/platforms/unity/Assets/Examples/Scenes/SequencerDemo.unity b/platforms/unity/Assets/Examples/Scenes/SequencerDemo.unity
@@ -484,7 +484,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bf2924acef9d3214e9203ba5ca1f8f38, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  tempo: 118
+  Bpm: 121
 --- !u!114 &675413002
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -546,6 +546,7 @@ MonoBehaviour:
   isLoggingToConsole: 0
   isTicking: 0
   playOnAwake: 1
+  isAuto: 1
   OnBeatEvent:
     m_PersistentCalls:
       m_Calls:
@@ -1546,7 +1547,6 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   _processOrder: 0
-  CutoffFrequency: 800
 --- !u!114 &2110623104
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/platforms/unity/Assets/Examples/Scripts/GlobalTempo.cs b/platforms/unity/Assets/Examples/Scripts/GlobalTempo.cs