Switched scene update to state event

src/dawn/scene/Scene.cpp

@@ -36,8 +36,8 @@ void Scene::update() {
   // TODO: Cleanup old scene items
 
   // TODO: Tick scene items(?)
-  this->eventSceneUpdate.invoke();
+  this->eventSceneUpdate.invoke(game->timeManager.delta);
-  if(!this->game->timeManager.isPaused) this->eventSceneUnpausedUpdate.invoke();
+  if(!this->game->timeManager.isPaused) this->eventSceneUnpausedUpdate.invoke(game->timeManager.delta);
 }
 
 SceneItem * Scene::createSceneItem() {

src/dawn/scene/Scene.hpp

@@ -21,7 +21,7 @@ namespace Dawn {
   template<class T>
   T * _sceneForwardGetComponent(SceneItem *item);
 
-  class Scene : public StateOwner {
+  class Scene {
     private:
       sceneitemid_t nextId;
       std::map<sceneitemid_t, SceneItem*> items;
@@ -30,8 +30,8 @@ namespace Dawn {
     public:
       DawnGame *game;
       ScenePhysicsManager *physics;
-      Event<> eventSceneUpdate;
+      StateEvent<float_t> eventSceneUpdate;
-      Event<> eventSceneUnpausedUpdate;
+      StateEvent<float_t> eventSceneUnpausedUpdate;
 
       /**
        * Construct a new Scene instance.

src/dawn/scene/components/display/AnimationController.cpp

@@ -22,10 +22,10 @@ void AnimationController::addAnimation(Animation *animation) {
 void AnimationController::onStart() {
   SceneItemComponent::onStart();
 
-  useEventLegacy([&]{
+  useEvent([&](float_t delta){
     auto it = this->animations.begin();
     while(it != this->animations.end()) {
-      (*it)->tick(this->getGame()->timeManager.delta);
+      (*it)->tick(delta);
       ++it;
     }
   }, getScene()->eventSceneUnpausedUpdate);

src/dawn/scene/components/example/ExampleSpin.cpp

@@ -28,11 +28,11 @@ ExampleSpin::ExampleSpin(SceneItem *item) :
 }
 
 void ExampleSpin::onStart() {
-  useEventLegacy([&]{
+  useEvent([&](float_t delta){
     auto quat = this->transform->getLocalRotation();
-    quat = glm::rotate(quat, getGame()->timeManager.delta, glm::vec3(0, 1, 0));
+    quat = glm::rotate(quat, delta, glm::vec3(0, 1, 0));
-    quat = glm::rotate(quat, getGame()->timeManager.delta / 2.0f, glm::vec3(1, 0, 0));
+    quat = glm::rotate(quat, delta / 2.0f, glm::vec3(1, 0, 0));
-    quat = glm::rotate(quat, getGame()->timeManager.delta / 4.0f, glm::vec3(0, 0, 1));
+    quat = glm::rotate(quat, delta / 4.0f, glm::vec3(0, 0, 1));
     this->transform->setLocalRotation(quat);
   }, getScene()->eventSceneUnpausedUpdate);
 }

src/dawn/scene/components/scene/SubSceneController.cpp

@@ -14,13 +14,13 @@ SubSceneController::SubSceneController(SceneItem *i)  : SceneItemComponent(i) {
 void SubSceneController::onStart() {
   auto myScene = this->getScene();
 
-  useEventLegacy([&]{
+  useEvent([&](float_t d){
     if(!this->onlyUpdateUnpaused) return;
     if(this->subScene == nullptr) return;
     this->subScene->update();
   }, myScene->eventSceneUnpausedUpdate);
 
-  useEventLegacy([&]{
+  useEvent([&](float_t d){
     if(this->onlyUpdateUnpaused) return;
     if(this->subScene == nullptr) return;
     this->subScene->update();

src/dawn/scene/components/ui/UICanvas.cpp

@@ -67,7 +67,7 @@ void UICanvas::onStart() {
   }, this->currentMenu);
 
   // Scene Update
-  useEventLegacy([&]{
+  useEvent([&](float_t delta){
     if(this->currentMenu == nullptr) return;
     this->currentMenu->onTick();
   }, getScene()->eventSceneUpdate);

src/dawnopenal/scene/components/audio/AudioSource.cpp

@@ -8,7 +8,10 @@
 
 using namespace Dawn;
 
-AudioSource::AudioSource(SceneItem *i) : SceneItemComponent(i) {
+AudioSource::AudioSource(SceneItem *i) :
+  SceneItemComponent(i),
+  playMode(AUDIO_PLAY_MODE_UNPAUSED)
+{
 
 }
 
@@ -107,59 +110,12 @@ void AudioSource::onStart() {
   this->ready = true;
 
   // Listen for events
-  this->transform->eventTransformUpdated.addListener(this, &AudioSource::onTransformUpdate);
+  useEventLegacy([&]{
-  this->getScene()->eventSceneUpdate.addListener(this, &AudioSource::onSceneUpdate);
+    glm::vec3 position = this->transform->getWorldPosition();
-}
+    alSource3f(this->source, AL_POSITION, position.x, position.y, position.z);
+  }, this->transform->eventTransformUpdated);
 
-AudioSourceState AudioSource::getRealState() {
+  useEvent([&](float_t delta){
-  return this->internalState;
-}
-
-void AudioSource::rewind() {
-  this->bufferPosition = 0;
-}
-
-AudioAsset * AudioSource::getAudioData() {
-  return this->data;
-}
-
-void AudioSource::setAudioData(AudioAsset *data) {
-  this->data = data;
-  this->rewind();
-}
-
-enum AudioSourcePlayMode AudioSource::getPlayMode() {
-  return this->playMode;
-}
-
-void AudioSource::setPlayMode(enum AudioSourcePlayMode playMode) {
-  this->playMode = playMode;
-}
-
-void AudioSource::stop() {
-  this->state = AUDIO_SOURCE_STATE_STOPPED;
-}
-
-void AudioSource::play() {
-  this->state = AUDIO_SOURCE_STATE_PLAYING;
-}
-
-void AudioSource::pause() {
-  this->state = AUDIO_SOURCE_STATE_PAUSED;
-}
-
-void AudioSource::onDispose() {
-  assertTrue(this->ready);
-  this->ready = false;
-
-  this->getScene()->eventSceneUpdate.removeListener(this, &AudioSource::onSceneUpdate);
-  this->transform->eventTransformUpdated.removeListener(this, &AudioSource::onTransformUpdate);
-
-  alDeleteSources((ALuint)1, &this->source);
-  alDeleteBuffers((ALuint)AUDIO_SOURCE_BUFFER_COUNT, this->buffers);
-}
-
-void AudioSource::onSceneUpdate() {
     ALuint bufferId;
     ALint buffersProcessed;
 
@@ -260,9 +216,42 @@ void AudioSource::onSceneUpdate() {
     } else {
       assertUnreachable();
     }
+  }, getScene()->eventSceneUpdate);
 }
 
-void AudioSource::onTransformUpdate() {
+AudioSourceState AudioSource::getRealState() {
-  glm::vec3 position = this->transform->getWorldPosition();
+  return this->internalState;
-  alSource3f(this->source, AL_POSITION, position.x, position.y, position.z);
+}
+
+void AudioSource::rewind() {
+  this->bufferPosition = 0;
+}
+
+AudioAsset * AudioSource::getAudioData() {
+  return this->data;
+}
+
+void AudioSource::setAudioData(AudioAsset *data) {
+  this->data = data;
+  this->rewind();
+}
+
+void AudioSource::stop() {
+  this->state = AUDIO_SOURCE_STATE_STOPPED;
+}
+
+void AudioSource::play() {
+  this->state = AUDIO_SOURCE_STATE_PLAYING;
+}
+
+void AudioSource::pause() {
+  this->state = AUDIO_SOURCE_STATE_PAUSED;
+}
+
+void AudioSource::onDispose() {
+  assertTrue(this->ready);
+  this->ready = false;
+
+  alDeleteSources((ALuint)1, &this->source);
+  alDeleteBuffers((ALuint)AUDIO_SOURCE_BUFFER_COUNT, this->buffers);
 }

src/dawnopenal/scene/components/audio/AudioSource.hpp

@@ -34,7 +34,6 @@ namespace Dawn {
       enum AudioSourceState internalState = AUDIO_SOURCE_STATE_STOPPED;
       int32_t layer = 0;
       AudioAsset *data = nullptr;
-      AudioSourcePlayMode playMode = AUDIO_PLAY_MODE_UNPAUSED;
 
       /**
        * Internally update the audio's state based on the current settings.
@@ -47,11 +46,11 @@ namespace Dawn {
 
       // Events
       void onSceneUpdate();
-      void onTransformUpdate();
 
     public:
       bool_t loop = false;
       enum AudioSourceState state = AUDIO_SOURCE_STATE_STOPPED;
+      AudioSourcePlayMode playMode;
 
       Event<> eventPlaying;
       Event<> eventResumed;
@@ -98,20 +97,6 @@ namespace Dawn {
        */
       void setAudioData(AudioAsset *data);
 
-      /**
-       * Returns the play mode for the source.
-       * 
-       * @return Current play mode.
-       */
-      enum AudioSourcePlayMode getPlayMode();
-
-      /**
-       * Sets the play mode for the source.
-       * 
-       * @param mode Play Mode to use.
-       */
-      void setPlayMode(enum AudioSourcePlayMode mode);
-
       /**
        * Stop playing this audio source. Shorthand for setting the state.
        */

src/dawntictactoe/components/TicTacToeGame.cpp

@@ -14,22 +14,15 @@ TicTacToeGame::TicTacToeGame(SceneItem *item) : SceneItemComponent(item) {}
 
 void TicTacToeGame::onStart() {
   // Map tiles by tile number = tile
-  auto tiles = getScene()->findComponents<TicTacToeTile>();
+  auto ts = getScene()->findComponents<TicTacToeTile>();
-  auto itTiles = tiles.begin();
+  auto itTiles = ts.begin();
-  while(itTiles != tiles.end()) {
+  while(itTiles != ts.end()) {
     this->tiles[(*itTiles)->tile] = *itTiles;
     ++itTiles;
   }
 
   // Listen
-  getScene()->eventSceneUpdate.addListener(this, &TicTacToeGame::onSceneUpdate);
+  useEvent([&](float_t delta) {
-}
-
-void TicTacToeGame::onDispose() {
-  getScene()->eventSceneUpdate.removeListener(this, &TicTacToeGame::onSceneUpdate);
-}
-
-void TicTacToeGame::onSceneUpdate() {
     // Get mouse in screen space.
     auto mouse = getGame()->inputManager.getAxis2D(INPUT_BIND_MOUSE_X, INPUT_BIND_MOUSE_Y);
     mouse *= 2.0f;
@@ -83,4 +76,5 @@ void TicTacToeGame::onSceneUpdate() {
     // Determine winner
     std::vector<uint8_t> winningCombo;
     auto winner = ticTacToeDetermineWinner(tileMap, &winningCombo);
+  }, getScene()->eventSceneUpdate);
 }

src/dawntictactoe/components/TicTacToeGame.hpp

@@ -17,8 +17,5 @@ namespace Dawn {
       TicTacToeGame(SceneItem *item);
 
       void onStart() override;
-      void onDispose() override;
-
-      void onSceneUpdate();
   };
 }