added transition and the world music

15 files changed, 342 insertions, 2 deletions

@@ -36,6 +36,7 @@
     <object class="SingleSound" id="{2e1aae44-3e34-4f3c-b7ea-219fc2f610cb}"/>
     <object class="EventMixerGroup" id="{46fce461-1c11-49c1-93c1-3ebeb917fb68}"/>
     <object class="LoopRegion" id="{04eb3e5e-90d1-4bd6-8ab8-19cee8511d55}"/>
+    <object class="ADSRModulator" id="{d7d6bfb3-eb09-4739-815b-34432735d093}"/>
     <object class="MixerBusEffectChain" id="{f14bc47b-e50f-4aee-9792-59f5919a7848}"/>
     <object class="MixerBusPanner" id="{fd195a95-1360-427b-955e-4582768889b4}"/>
     <object class="MixerBusFader" id="{78e09892-0e07-4c72-98ee-132122892837}"/>
@@ -41,6 +41,7 @@
     <object class="SingleSound" id="{7dc4512f-172b-423c-9fae-ca36a9c988e5}"/>
     <object class="EventMixerGroup" id="{f2adf259-6eb7-4052-973e-8fc29630bf46}"/>
     <object class="LoopRegion" id="{ce6b2b00-2634-446a-9046-01deb8ae4981}"/>
+    <object class="ADSRModulator" id="{9717afe5-fde9-458b-8521-5ffd341d46fd}"/>
     <object class="MixerBusEffectChain" id="{883e01ca-d7e5-4d12-8e8c-0aef033c3390}"/>
     <object class="MixerBusPanner" id="{560f2c6b-b85c-4c42-848e-3ff425fd0776}"/>
     <object class="MixerBusFader" id="{e3116fa6-9182-44b8-8441-972dda056bb3}"/>
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects serializationModel="Studio.01.10.00">
+    <object class="Event" id="{90a8e470-61b2-4f80-a597-f8c9b0341fab}">
+        <relationship name="selectables">
+            <destination>{6e452d5e-5bf7-4827-af9a-8004e6d36ca1}</destination>
+        </relationship>
+        <relationship name="uiLastParameterSelection">
+            <destination>{ef5c4690-ec80-418a-84de-a4dfd37f138c}</destination>
+        </relationship>
+    </object>
+    <object class="MasterTrack" id="{141265f9-4c9c-4ca5-87e7-7e782e452f0e}"/>
+    <object class="MixerInput" id="{3fd15b13-7a5e-4116-98a1-67ac72f427a0}"/>
+    <object class="EventAutomatableProperties" id="{a4cf578c-3cf5-4447-800e-4e1d6fd06043}"/>
+    <object class="MarkerTrack" id="{6616acb0-2201-43eb-91c4-212bbbddd198}"/>
+    <object class="GroupTrack" id="{09db67e2-5f36-45b5-96e2-a230642fafe5}"/>
+    <object class="Timeline" id="{ef5c4690-ec80-418a-84de-a4dfd37f138c}">
+        <property name="uiLastRulerScaleRatio">
+            <value>0.0092614869293602322</value>
+        </property>
+    </object>
+    <object class="EventMixerMaster" id="{a2b220d8-a415-499a-84ce-c723263b372c}">
+        <relationship name="input">
+            <destination>{8f3e4509-baf7-4882-b9ea-8129db6bdebc}</destination>
+        </relationship>
+    </object>
+    <object class="MixerBusEffectChain" id="{8d461d61-bd25-4cca-94be-3fccce828cd7}"/>
+    <object class="MixerBusPanner" id="{9570e1ee-6afd-4143-9c9f-e1b7819ae3d6}"/>
+    <object class="SingleSound" id="{6e452d5e-5bf7-4827-af9a-8004e6d36ca1}"/>
+    <object class="EventMixerGroup" id="{8f3e4509-baf7-4882-b9ea-8129db6bdebc}"/>
+    <object class="MixerBusEffectChain" id="{5dca91d8-e6fd-4027-9028-1992d986543d}"/>
+    <object class="MixerBusPanner" id="{d205406a-2c3c-4909-8cdc-db61197df975}"/>
+    <object class="MixerBusFader" id="{0c312cc0-360a-48d9-834a-6f448c1f6448}"/>
+    <object class="MixerBusEffectChain" id="{d187417a-6a8d-43d9-9b7c-e9fb0ede344d}"/>
+    <object class="MixerBusPanner" id="{ff8df20f-7581-4164-a600-a0a47ff48ea0}"/>
+    <object class="MixerBusFader" id="{f422dcf8-7754-4dab-a09d-d0cf521e6b54}"/>
+    <object class="MixerBusFader" id="{5910ec09-2558-4f9d-a61a-fb1f2c6a1e9c}"/>
+</objects>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects serializationModel="Studio.01.10.00">
+    <object class="AudioFile" id="{4950f6ef-9130-45d0-8b66-14551c459bf7}">
+        <property name="assetPath">
+            <value>transition2.wav</value>
+        </property>
+        <property name="isStreaming">
+            <value>true</value>
+        </property>
+        <property name="frequencyInKHz">
+            <value>44.0999985</value>
+        </property>
+        <property name="channelCount">
+            <value>2</value>
+        </property>
+        <property name="length">
+            <value>16.262857142857143</value>
+        </property>
+        <relationship name="masterAssetFolder">
+            <destination>{4c4e21c6-cc51-4a2c-b05e-fb67da4f7ed1}</destination>
+        </relationship>
+    </object>
+</objects>
@@ -99,6 +99,9 @@
         </relationship>
     </object>
     <object class="EventMixerMaster" id="{11988232-27c1-46ce-a702-72f0ebca0568}">
+        <relationship name="modulators">
+            <destination>{d7d6bfb3-eb09-4739-815b-34432735d093}</destination>
+        </relationship>
         <relationship name="effectChain">
             <destination>{f14bc47b-e50f-4aee-9792-59f5919a7848}</destination>
         </relationship>
@@ -189,6 +192,23 @@
             <destination>{07e04557-2cf3-4129-81e4-b053182f1e64}</destination>
         </relationship>
     </object>
+    <object class="ADSRModulator" id="{d7d6bfb3-eb09-4739-815b-34432735d093}">
+        <property name="nameOfPropertyBeingModulated">
+            <value>volume</value>
+        </property>
+        <property name="initialValue">
+            <value>-80</value>
+        </property>
+        <property name="attackTime">
+            <value>0</value>
+        </property>
+        <property name="peakValue">
+            <value>-0.577777863</value>
+        </property>
+        <property name="releaseTime">
+            <value>3019.23145</value>
+        </property>
+    </object>
     <object class="MixerBusEffectChain" id="{f14bc47b-e50f-4aee-9792-59f5919a7848}">
         <relationship name="effects">
             <destination>{467c1d30-2bc6-4dbc-a22c-c5a90e4f0efd}</destination>
@@ -112,6 +112,9 @@
         </relationship>
     </object>
     <object class="EventMixerMaster" id="{775d1eed-cc67-4ea8-b10f-96e5737e51e2}">
+        <relationship name="modulators">
+            <destination>{9717afe5-fde9-458b-8521-5ffd341d46fd}</destination>
+        </relationship>
         <relationship name="effectChain">
             <destination>{883e01ca-d7e5-4d12-8e8c-0aef033c3390}</destination>
         </relationship>
@@ -241,6 +244,26 @@
             <destination>{b9682560-6a3d-4266-a362-9c44d0be0f85}</destination>
         </relationship>
     </object>
+    <object class="ADSRModulator" id="{9717afe5-fde9-458b-8521-5ffd341d46fd}">
+        <property name="nameOfPropertyBeingModulated">
+            <value>volume</value>
+        </property>
+        <property name="initialValue">
+            <value>-80</value>
+        </property>
+        <property name="attackTime">
+            <value>0</value>
+        </property>
+        <property name="peakValue">
+            <value>-0.577777863</value>
+        </property>
+        <property name="releaseTime">
+            <value>3019.23022</value>
+        </property>
+        <property name="releaseShape">
+            <value>0.0316919424</value>
+        </property>
+    </object>
     <object class="MixerBusEffectChain" id="{883e01ca-d7e5-4d12-8e8c-0aef033c3390}">
         <relationship name="effects">
             <destination>{8b3bb0b1-2f04-42f1-bf22-caecda4ce070}</destination>
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects serializationModel="Studio.01.10.00">
+    <object class="Event" id="{90a8e470-61b2-4f80-a597-f8c9b0341fab}">
+        <property name="name">
+            <value>transition</value>
+        </property>
+        <property name="outputFormat">
+            <value>1</value>
+        </property>
+        <relationship name="folder">
+            <destination>{b10a4c1b-72f0-4676-bbef-b450aaa46cb6}</destination>
+        </relationship>
+        <relationship name="mixer">
+            <destination>{cfb15eaa-432d-4df9-9a07-3a225c72d03e}</destination>
+        </relationship>
+        <relationship name="masterTrack">
+            <destination>{141265f9-4c9c-4ca5-87e7-7e782e452f0e}</destination>
+        </relationship>
+        <relationship name="mixerInput">
+            <destination>{3fd15b13-7a5e-4116-98a1-67ac72f427a0}</destination>
+        </relationship>
+        <relationship name="automatableProperties">
+            <destination>{a4cf578c-3cf5-4447-800e-4e1d6fd06043}</destination>
+        </relationship>
+        <relationship name="markerTracks">
+            <destination>{6616acb0-2201-43eb-91c4-212bbbddd198}</destination>
+        </relationship>
+        <relationship name="groupTracks">
+            <destination>{09db67e2-5f36-45b5-96e2-a230642fafe5}</destination>
+        </relationship>
+        <relationship name="timeline">
+            <destination>{ef5c4690-ec80-418a-84de-a4dfd37f138c}</destination>
+        </relationship>
+        <relationship name="banks">
+            <destination>{a23d2b1c-914e-48d4-8df9-80f6edad6c28}</destination>
+        </relationship>
+    </object>
+    <object class="EventMixer" id="{cfb15eaa-432d-4df9-9a07-3a225c72d03e}">
+        <relationship name="masterBus">
+            <destination>{a2b220d8-a415-499a-84ce-c723263b372c}</destination>
+        </relationship>
+    </object>
+    <object class="MasterTrack" id="{141265f9-4c9c-4ca5-87e7-7e782e452f0e}">
+        <relationship name="mixerGroup">
+            <destination>{a2b220d8-a415-499a-84ce-c723263b372c}</destination>
+        </relationship>
+    </object>
+    <object class="MixerInput" id="{3fd15b13-7a5e-4116-98a1-67ac72f427a0}">
+        <relationship name="effectChain">
+            <destination>{8d461d61-bd25-4cca-94be-3fccce828cd7}</destination>
+        </relationship>
+        <relationship name="panner">
+            <destination>{9570e1ee-6afd-4143-9c9f-e1b7819ae3d6}</destination>
+        </relationship>
+        <relationship name="output">
+            <destination>{a028aeaa-4166-48ea-881f-bb967c81e6f1}</destination>
+        </relationship>
+    </object>
+    <object class="EventAutomatableProperties" id="{a4cf578c-3cf5-4447-800e-4e1d6fd06043}"/>
+    <object class="MarkerTrack" id="{6616acb0-2201-43eb-91c4-212bbbddd198}"/>
+    <object class="GroupTrack" id="{09db67e2-5f36-45b5-96e2-a230642fafe5}">
+        <relationship name="modules">
+            <destination>{6e452d5e-5bf7-4827-af9a-8004e6d36ca1}</destination>
+        </relationship>
+        <relationship name="mixerGroup">
+            <destination>{8f3e4509-baf7-4882-b9ea-8129db6bdebc}</destination>
+        </relationship>
+    </object>
+    <object class="Timeline" id="{ef5c4690-ec80-418a-84de-a4dfd37f138c}">
+        <relationship name="modules">
+            <destination>{6e452d5e-5bf7-4827-af9a-8004e6d36ca1}</destination>
+        </relationship>
+    </object>
+    <object class="EventMixerMaster" id="{a2b220d8-a415-499a-84ce-c723263b372c}">
+        <relationship name="effectChain">
+            <destination>{5dca91d8-e6fd-4027-9028-1992d986543d}</destination>
+        </relationship>
+        <relationship name="panner">
+            <destination>{d205406a-2c3c-4909-8cdc-db61197df975}</destination>
+        </relationship>
+        <relationship name="mixer">
+            <destination>{cfb15eaa-432d-4df9-9a07-3a225c72d03e}</destination>
+        </relationship>
+    </object>
+    <object class="MixerBusEffectChain" id="{8d461d61-bd25-4cca-94be-3fccce828cd7}">
+        <relationship name="effects">
+            <destination>{0c312cc0-360a-48d9-834a-6f448c1f6448}</destination>
+        </relationship>
+    </object>
+    <object class="MixerBusPanner" id="{9570e1ee-6afd-4143-9c9f-e1b7819ae3d6}"/>
+    <object class="SingleSound" id="{6e452d5e-5bf7-4827-af9a-8004e6d36ca1}">
+        <property name="start">
+            <value>3</value>
+        </property>
+        <property name="length">
+            <value>9</value>
+        </property>
+        <relationship name="fadeOutCurve">
+            <destination>{bf90cdf2-31f3-4500-ae87-e7d7e7ad083b}</destination>
+        </relationship>
+        <relationship name="audioFile">
+            <destination>{4950f6ef-9130-45d0-8b66-14551c459bf7}</destination>
+        </relationship>
+    </object>
+    <object class="EventMixerGroup" id="{8f3e4509-baf7-4882-b9ea-8129db6bdebc}">
+        <property name="name">
+            <value>Audio 1</value>
+        </property>
+        <relationship name="effectChain">
+            <destination>{d187417a-6a8d-43d9-9b7c-e9fb0ede344d}</destination>
+        </relationship>
+        <relationship name="panner">
+            <destination>{ff8df20f-7581-4164-a600-a0a47ff48ea0}</destination>
+        </relationship>
+        <relationship name="output">
+            <destination>{a2b220d8-a415-499a-84ce-c723263b372c}</destination>
+        </relationship>
+    </object>
+    <object class="MixerBusEffectChain" id="{5dca91d8-e6fd-4027-9028-1992d986543d}">
+        <relationship name="effects">
+            <destination>{f422dcf8-7754-4dab-a09d-d0cf521e6b54}</destination>
+        </relationship>
+    </object>
+    <object class="MixerBusPanner" id="{d205406a-2c3c-4909-8cdc-db61197df975}"/>
+    <object class="MixerBusFader" id="{0c312cc0-360a-48d9-834a-6f448c1f6448}"/>
+    <object class="FadeCurve" id="{bf90cdf2-31f3-4500-ae87-e7d7e7ad083b}">
+        <relationship name="startPoint">
+            <destination>{80da9461-aed2-4945-bcc2-1cf3d134eee2}</destination>
+        </relationship>
+        <relationship name="endPoint">
+            <destination>{edb78426-fb94-4e1b-ae37-eeba2c3625fb}</destination>
+        </relationship>
+    </object>
+    <object class="MixerBusEffectChain" id="{d187417a-6a8d-43d9-9b7c-e9fb0ede344d}">
+        <relationship name="effects">
+            <destination>{5910ec09-2558-4f9d-a61a-fb1f2c6a1e9c}</destination>
+        </relationship>
+    </object>
+    <object class="MixerBusPanner" id="{ff8df20f-7581-4164-a600-a0a47ff48ea0}"/>
+    <object class="MixerBusFader" id="{f422dcf8-7754-4dab-a09d-d0cf521e6b54}"/>
+    <object class="AutomationPoint" id="{80da9461-aed2-4945-bcc2-1cf3d134eee2}">
+        <property name="position">
+            <value>11.624999999999989</value>
+        </property>
+        <property name="value">
+            <value>1</value>
+        </property>
+        <property name="curveShape">
+            <value>0.25471893</value>
+        </property>
+    </object>
+    <object class="AutomationPoint" id="{edb78426-fb94-4e1b-ae37-eeba2c3625fb}">
+        <property name="position">
+            <value>11.999999999999989</value>
+        </property>
+        <property name="value">
+            <value>0</value>
+        </property>
+    </object>
+    <object class="MixerBusFader" id="{5910ec09-2558-4f9d-a61a-fb1f2c6a1e9c}"/>
+</objects>
@@ -419,8 +419,12 @@ void setZoom(Game& game, size_t zoom)
     game.muxer.setMusicLevel(0);
   } else if (zoomLevel < 3) {
     game.muxer.setMusicLevel(1);
-  } else {
+  } else if (zoomLevel < 5) {
     game.muxer.setMusicLevel(2);
+  } else if (zoomLevel < 7) {
+    game.muxer.setMusicLevel(3);
+  } else {
+    game.muxer.setMusicLevel(4);
   }
 }
 
@@ -493,6 +497,7 @@ int main(int, char**)
             quit = true;
           } else {
             losing = LoseState::PoppingLamps;
+            game.muxer.stopMusic();
           }
         } else if (e.type == SDL_KEYDOWN)
         {
@@ -505,6 +510,7 @@ int main(int, char**)
                 quit = true;
               } else {
                 losing = LoseState::PoppingLamps;
+                game.muxer.stopMusic();
               }
 
               break;
@@ -62,9 +62,65 @@ void Muxer::playSoundAtPosition(std::string name, float x, float y) {
 }
 
 void Muxer::setMusicLevel(int level) {
-  ERRCHECK(exploration_event_->setParameterByName("level", level));
+  if (transition_state_ == TransitionState::Pre) {
+    if (level >= 3) {
+      transition_state_ = TransitionState::Transition;
+      ERRCHECK(exploration_event_->stop(FMOD_STUDIO_STOP_ALLOWFADEOUT));
+      ERRCHECK(exploration_event_->release());
+
+      FMOD::Studio::EventDescription* eventDescription = nullptr;
+      ERRCHECK(system_->getEvent("event:/transition", &eventDescription));
+      ERRCHECK(eventDescription->createInstance(&transition_event_));
+      ERRCHECK(transition_event_->start());
+    } else {
+      ERRCHECK(exploration_event_->setParameterByName("level", level));
+    }
+  } else if (transition_state_ == TransitionState::Post) {
+    if (level <= 3) {
+      ERRCHECK(the_world_event_->setParameterByName("level_full", 0));
+    } else {
+      ERRCHECK(the_world_event_->setParameterByName("level_full", level - 3));
+    }
+  }
+}
+
+void Muxer::stopMusic() {
+  switch (transition_state_) {
+    case TransitionState::Pre: {
+      ERRCHECK(exploration_event_->stop(FMOD_STUDIO_STOP_ALLOWFADEOUT));
+      break;
+    }
+    case TransitionState::Transition: {
+      ERRCHECK(transition_event_->stop(FMOD_STUDIO_STOP_ALLOWFADEOUT));
+      break;
+    }
+    case TransitionState::Post: {
+      ERRCHECK(the_world_event_->stop(FMOD_STUDIO_STOP_ALLOWFADEOUT));
+      break;
+    }
+    case TransitionState::Stopped: {
+      // Do nothing.
+      break;
+    }
+  }
+
+  transition_state_ = TransitionState::Stopped;
 }
 
 void Muxer::update() {
+  if (transition_state_ == TransitionState::Transition) {
+    FMOD_STUDIO_PLAYBACK_STATE playbackState;
+    ERRCHECK(transition_event_->getPlaybackState(&playbackState));
+    if (playbackState == FMOD_STUDIO_PLAYBACK_STOPPED) {
+      transition_state_ = TransitionState::Post;
+      transition_event_->release();
+
+      FMOD::Studio::EventDescription* eventDescription = nullptr;
+      ERRCHECK(system_->getEvent("event:/the_world", &eventDescription));
+      ERRCHECK(eventDescription->createInstance(&the_world_event_));
+      ERRCHECK(the_world_event_->start());
+    }
+  }
+
   ERRCHECK(system_->update());
 }
@@ -15,6 +15,13 @@ public:
 
 using fmod_system_ptr = std::unique_ptr<FMOD::Studio::System, fmod_system_deleter>;
 
+enum class TransitionState {
+  Pre,
+  Transition,
+  Post,
+  Stopped
+};
+
 class Muxer {
 public:
   Muxer();
@@ -25,11 +32,16 @@ public:
 
   void setMusicLevel(int level);
 
+  void stopMusic();
+
   void update();
 
 private:
   fmod_system_ptr system_;
   FMOD::Studio::EventInstance* exploration_event_;
+  FMOD::Studio::EventInstance* transition_event_;
+  FMOD::Studio::EventInstance* the_world_event_;
+  TransitionState transition_state_ = TransitionState::Pre;
 };
 
 #endif /* end of include guard: MUXER_H_3146C802 */