Resolve first-frame visual artifacts

justindriggers · Jan 19, 2024 · 2bc50f0 · 2bc50f0
1 parent 29a7c86
commit 2bc50f0
Show file tree

Hide file tree

Showing 21 changed files with 146 additions and 85 deletions.
diff --git a/linguine/include/Engine.h b/linguine/include/Engine.h
@@ -4,6 +4,7 @@
 
 #include "LifecycleManager.h"
 #include "Logger.h"
+#include "Scene.h"
 #include "TimeManager.h"
 #include "audio/AudioManager.h"
 #include "entity/EntityManagerFactory.h"

diff --git a/linguine/include/Scene.h b/linguine/include/Scene.h
@@ -4,15 +4,21 @@
 
 #include "System.h"
 
+#include "ServiceLocator.h"
+#import "entity/EntityManagerFactory.h"
+
 namespace linguine {
 
 class Scene {
   public:
-    explicit Scene(std::unique_ptr<EntityManager> entityManager)
-        : _entityManager(std::move(entityManager)) {}
+    explicit Scene(ServiceLocator& serviceLocator)
+        : _serviceLocator(serviceLocator),
+          _entityManager(serviceLocator.get<EntityManagerFactory>().create()) {}
 
     virtual ~Scene() = default;
 
+    virtual void init() = 0;
+
     void update(float deltaTime) {
       for (const auto& system : _systems) {
         system->update(deltaTime);
@@ -26,6 +32,10 @@ class Scene {
     }
 
   protected:
+    template<typename T> inline T& get() {
+      return _serviceLocator.get<T>();
+    }
+
     inline EntityManager& getEntityManager() {
       return *_entityManager;
     }
@@ -39,6 +49,7 @@ class Scene {
     }
 
   private:
+    ServiceLocator& _serviceLocator;
     std::unique_ptr<EntityManager> _entityManager;
     std::vector<std::unique_ptr<System>> _systems;
 };

diff --git a/linguine/include/SceneManager.h b/linguine/include/SceneManager.h
@@ -2,10 +2,10 @@
 
 #include <memory>
 
-#include "Scene.h"
-
 namespace linguine {
 
+class Scene;
+
 class SceneManager {
   public:
     virtual void load(std::unique_ptr<Scene> scene) = 0;

diff --git a/linguine/include/ServiceLocator.h b/linguine/include/ServiceLocator.h
@@ -61,6 +61,11 @@ class ServiceLocator {
       return getSceneManager();
     }
 
+    template<>
+    inline ServiceLocator& get<ServiceLocator>() {
+      return *this;
+    }
+
     template<>
     inline TimeManager& get<TimeManager>() {
       return getTimeManager();

diff --git a/linguine/include/TimeManager.h b/linguine/include/TimeManager.h
@@ -46,7 +46,7 @@ class TimeManager {
     inline void reset() {
       _lastTickTime = currentTime();
       _currentTickTime = _lastTickTime;
-      _accumulator = 0.0f;
+      _accumulator = _fixedDeltaTime;
     }
 
     inline float tick() {
@@ -75,7 +75,7 @@ class TimeManager {
   private:
     constexpr static float _fixedDeltaTime = 0.02f;
 
-    float _accumulator = 0.0f;
+    float _accumulator = _fixedDeltaTime;
     float _timeScale = 1.0f;
 
     time_t _startTime;

diff --git a/linguine/src/Engine.cpp b/linguine/src/Engine.cpp
@@ -24,6 +24,7 @@ Engine::Engine(
   _audioManager->setMusicEnabled(_saveManager->isMusicEnabled());
   _audioManager->setSoundEffectsEnabled(_saveManager->isSoundEffectsEnabled());
   _currentScene = std::make_unique<TitleScene>(*this);
+  _currentScene->init();
 }
 
 void Engine::run() {
@@ -56,6 +57,8 @@ void Engine::tick() {
 
     _renderer->reset();
     _timeManager->reset();
+
+    _currentScene->init();
   }
 }
 

diff --git a/linguine/src/components/Attachment.h b/linguine/src/components/Attachment.h
@@ -7,6 +7,7 @@ namespace linguine {
 struct Attachment {
   uint64_t parentId{};
   glm::vec2 offset = { 0.0f, 0.0f };
+  bool useFixedUpdate = true;
 };
 
 }  // namespace lingiune
diff --git a/linguine/src/components/Button.h b/linguine/src/components/Button.h
@@ -15,6 +15,7 @@ struct Button {
   glm::vec2 minSize = glm::vec2(1.0f);
   glm::vec3 color = Palette::Primary;
   glm::vec3 activeColor = Palette::PrimaryAccent;
+  bool visible = true;
 
   std::string text;
   glm::vec3 textColor = glm::vec3(1.0f);

diff --git a/linguine/src/scenes/GameOverScene.cpp b/linguine/src/scenes/GameOverScene.cpp
@@ -28,23 +28,23 @@
 
 namespace linguine {
 
-GameOverScene::GameOverScene(ServiceLocator& serviceLocator, int32_t points)
-    : Scene(serviceLocator.get<EntityManagerFactory>().create()) {
-  registerSystem(std::make_unique<FpsSystem>(getEntityManager(), serviceLocator.get<Logger>()));
-  registerSystem(std::make_unique<GestureRecognitionSystem>(getEntityManager(), serviceLocator.get<InputManager>(), serviceLocator.get<Renderer>(), serviceLocator.get<TimeManager>()));
-  registerSystem(std::make_unique<PhysicsInterpolationSystem>(getEntityManager(), serviceLocator.get<TimeManager>()));
-  registerSystem(std::make_unique<ButtonSystem>(getEntityManager(), serviceLocator.get<Renderer>(), serviceLocator.get<AudioManager>()));
+void GameOverScene::init() {
+  registerSystem(std::make_unique<FpsSystem>(getEntityManager(), get<Logger>()));
+  registerSystem(std::make_unique<GestureRecognitionSystem>(getEntityManager(), get<InputManager>(), get<Renderer>(), get<TimeManager>()));
+  registerSystem(std::make_unique<PhysicsInterpolationSystem>(getEntityManager(), get<TimeManager>()));
+  registerSystem(std::make_unique<ButtonSystem>(getEntityManager(), get<Renderer>(), get<AudioManager>()));
   registerSystem(std::make_unique<ToastSystem>(getEntityManager()));
-  registerSystem(std::make_unique<ShakeSystem>(getEntityManager(), serviceLocator.get<SaveManager>()));
+  registerSystem(std::make_unique<ShakeSystem>(getEntityManager(), get<SaveManager>()));
 
-  registerSystem(std::make_unique<LevelTrackingSystem>(getEntityManager(), serviceLocator.get<AudioManager>(), _upgradeDatabase));
+  registerSystem(std::make_unique<LevelTrackingSystem>(getEntityManager(), get<AudioManager>(), _upgradeDatabase));
 
   registerSystem(std::make_unique<TransformationSystem>(getEntityManager()));
-  registerSystem(std::make_unique<CameraSystem>(getEntityManager(), serviceLocator.get<Renderer>()));
+  registerSystem(std::make_unique<CameraSystem>(getEntityManager(), get<Renderer>()));
 
-  auto& renderer = serviceLocator.get<Renderer>();
-  auto& sceneManager = serviceLocator.get<SceneManager>();
-  auto& saveManager = serviceLocator.get<SaveManager>();
+  auto& renderer = get<Renderer>();
+  auto& sceneManager = get<SceneManager>();
+  auto& saveManager = get<SaveManager>();
+  auto& serviceLocator = get<ServiceLocator>();
 
   {
     auto uiCameraEntity = createEntity();
@@ -101,9 +101,9 @@ GameOverScene::GameOverScene(ServiceLocator& serviceLocator, int32_t points)
 
   {
     auto progressBarEntity = createEntity();
-    progressBarEntity->add<LevelTracker>(saveManager.getPoints(), saveManager.getPoints() + points);
+    progressBarEntity->add<LevelTracker>(saveManager.getPoints(), saveManager.getPoints() + _points);
 
-    saveManager.addPoints(points);
+    saveManager.addPoints(_points);
 
     auto transform = progressBarEntity->add<Transform>();
     transform->scale = { 192.0f, 12.0f, 1.0f };
@@ -200,7 +200,7 @@ GameOverScene::GameOverScene(ServiceLocator& serviceLocator, int32_t points)
     text->renderable->setEnabled(false);
   }
 
-  auto& audioManager = serviceLocator.get<AudioManager>();
+  auto& audioManager = get<AudioManager>();
   audioManager.play(SongType::GameOver, Mode::Once);
 }
 

diff --git a/linguine/src/scenes/GameOverScene.h b/linguine/src/scenes/GameOverScene.h
@@ -9,9 +9,13 @@ namespace linguine {
 
 class GameOverScene : public Scene {
   public:
-    GameOverScene(ServiceLocator& serviceLocator, int32_t points);
+    GameOverScene(ServiceLocator& serviceLocator, int32_t points)
+        : Scene(serviceLocator), _points(points) {}
+
+    void init() override;
 
   private:
+    int32_t _points;
     UpgradeDatabase _upgradeDatabase;
 };
 

diff --git a/linguine/src/scenes/InfiniteRunnerScene.cpp b/linguine/src/scenes/InfiniteRunnerScene.cpp
@@ -58,38 +58,36 @@
 
 namespace linguine {
 
-InfiniteRunnerScene::InfiniteRunnerScene(ServiceLocator& serviceLocator)
-    : Scene(serviceLocator.get<EntityManagerFactory>().create()),
-      _spellDatabase(std::make_unique<SpellDatabase>(serviceLocator, getEntityManager())) {
-  registerSystem(std::make_unique<FpsSystem>(getEntityManager(), serviceLocator.get<Logger>()));
-  registerSystem(std::make_unique<GestureRecognitionSystem>(getEntityManager(), serviceLocator.get<InputManager>(), serviceLocator.get<Renderer>(), serviceLocator.get<TimeManager>()));
-  registerSystem(std::make_unique<PlayerControllerSystem>(getEntityManager(), serviceLocator.get<InputManager>(), serviceLocator.get<AudioManager>()));
+void InfiniteRunnerScene::init() {
+  registerSystem(std::make_unique<FpsSystem>(getEntityManager(), get<Logger>()));
+  registerSystem(std::make_unique<GestureRecognitionSystem>(getEntityManager(), get<InputManager>(), get<Renderer>(), get<TimeManager>()));
+  registerSystem(std::make_unique<PlayerControllerSystem>(getEntityManager(), get<InputManager>(), get<AudioManager>()));
   registerSystem(std::make_unique<VelocitySystem>(getEntityManager()));
   registerSystem(std::make_unique<CameraFollowSystem>(getEntityManager()));
   registerSystem(std::make_unique<AttachmentSystem>(getEntityManager()));
-  registerSystem(std::make_unique<PhysicsInterpolationSystem>(getEntityManager(), serviceLocator.get<TimeManager>()));
+  registerSystem(std::make_unique<PhysicsInterpolationSystem>(getEntityManager(), get<TimeManager>()));
   registerSystem(std::make_unique<CollisionSystem>(getEntityManager()));
   registerSystem(std::make_unique<EffectSystem>(getEntityManager(), *_spellDatabase));
-  registerSystem(std::make_unique<HudSystem>(getEntityManager(), serviceLocator.get<Renderer>()));
+  registerSystem(std::make_unique<HudSystem>(getEntityManager(), get<Renderer>()));
   registerSystem(std::make_unique<HealthProgressSystem>(getEntityManager()));
-  registerSystem(std::make_unique<LivenessSystem>(getEntityManager(), serviceLocator.get<Renderer>(), serviceLocator.get<AudioManager>(), serviceLocator.get<SaveManager>(), serviceLocator));
+  registerSystem(std::make_unique<LivenessSystem>(getEntityManager(), get<Renderer>(), get<AudioManager>(), get<SaveManager>(), get<ServiceLocator>()));
   registerSystem(std::make_unique<CooldownProgressSystem>(getEntityManager()));
   registerSystem(std::make_unique<CastSystem>(getEntityManager()));
   registerSystem(std::make_unique<ParticleSystem>(getEntityManager()));
   registerSystem(std::make_unique<FireSystem>(getEntityManager()));
   registerSystem(std::make_unique<ToastSystem>(getEntityManager()));
-  registerSystem(std::make_unique<ShakeSystem>(getEntityManager(), serviceLocator.get<SaveManager>()));
+  registerSystem(std::make_unique<ShakeSystem>(getEntityManager(), get<SaveManager>()));
 
   // Scene-specific
-  registerSystem(std::make_unique<SpawnSystem>(getEntityManager(), serviceLocator.get<Renderer>()));
-  registerSystem(std::make_unique<ScoringSystem>(getEntityManager(), *_spellDatabase, serviceLocator.get<Renderer>(), serviceLocator.get<AudioManager>()));
+  registerSystem(std::make_unique<SpawnSystem>(getEntityManager(), get<Renderer>()));
+  registerSystem(std::make_unique<ScoringSystem>(getEntityManager(), *_spellDatabase, get<Renderer>(), get<AudioManager>()));
   registerSystem(std::make_unique<TutorialSystem>(getEntityManager()));
 
   registerSystem(std::make_unique<TransformationSystem>(getEntityManager()));
-  registerSystem(std::make_unique<CameraSystem>(getEntityManager(), serviceLocator.get<Renderer>()));
+  registerSystem(std::make_unique<CameraSystem>(getEntityManager(), get<Renderer>()));
 
-  auto& renderer = serviceLocator.get<Renderer>();
-  auto& saveManager = serviceLocator.get<SaveManager>();
+  auto& renderer = get<Renderer>();
+  auto& saveManager = get<SaveManager>();
 
   if (saveManager.isNewPlayer()) {
     auto tutorialEntity = createEntity();
@@ -470,7 +468,7 @@ InfiniteRunnerScene::InfiniteRunnerScene(ServiceLocator& serviceLocator)
     text->renderable->setEnabled(false);
   }
 
-  auto& audioManager = serviceLocator.get<AudioManager>();
+  auto& audioManager = get<AudioManager>();
   audioManager.play(SongType::Theme, Mode::Repeat);
 }
 

diff --git a/linguine/src/scenes/InfiniteRunnerScene.h b/linguine/src/scenes/InfiniteRunnerScene.h
@@ -12,7 +12,11 @@ namespace linguine {
 
 class InfiniteRunnerScene : public Scene {
   public:
-    explicit InfiniteRunnerScene(ServiceLocator& serviceLocator);
+    explicit InfiniteRunnerScene(ServiceLocator& serviceLocator)
+        : Scene(serviceLocator),
+          _spellDatabase(std::make_unique<SpellDatabase>(serviceLocator, getEntityManager())) {}
+
+    void init() override;
 
   private:
     std::random_device _random;

diff --git a/linguine/src/scenes/OptionsScene.cpp b/linguine/src/scenes/OptionsScene.cpp
@@ -15,20 +15,20 @@
 
 namespace linguine {
 
-OptionsScene::OptionsScene(ServiceLocator& serviceLocator)
-    : Scene(serviceLocator.get<EntityManagerFactory>().create()) {
-  registerSystem(std::make_unique<FpsSystem>(getEntityManager(), serviceLocator.get<Logger>()));
-  registerSystem(std::make_unique<GestureRecognitionSystem>(getEntityManager(), serviceLocator.get<InputManager>(), serviceLocator.get<Renderer>(), serviceLocator.get<TimeManager>()));
+void OptionsScene::init() {
+  registerSystem(std::make_unique<FpsSystem>(getEntityManager(), get<Logger>()));
+  registerSystem(std::make_unique<GestureRecognitionSystem>(getEntityManager(), get<InputManager>(), get<Renderer>(), get<TimeManager>()));
   registerSystem(std::make_unique<ToggleSystem>(getEntityManager()));
-  registerSystem(std::make_unique<ButtonSystem>(getEntityManager(), serviceLocator.get<Renderer>(), serviceLocator.get<AudioManager>()));
+  registerSystem(std::make_unique<ButtonSystem>(getEntityManager(), get<Renderer>(), get<AudioManager>()));
 
   registerSystem(std::make_unique<TransformationSystem>(getEntityManager()));
-  registerSystem(std::make_unique<CameraSystem>(getEntityManager(), serviceLocator.get<Renderer>()));
+  registerSystem(std::make_unique<CameraSystem>(getEntityManager(), get<Renderer>()));
 
-  auto& audioManager = serviceLocator.get<AudioManager>();
-  auto& renderer = serviceLocator.get<Renderer>();
-  auto& saveManager = serviceLocator.get<SaveManager>();
-  auto& sceneManager = serviceLocator.get<SceneManager>();
+  auto& audioManager = get<AudioManager>();
+  auto& renderer = get<Renderer>();
+  auto& saveManager = get<SaveManager>();
+  auto& sceneManager = get<SceneManager>();
+  auto& serviceLocator = get<ServiceLocator>();
 
   {
     auto uiCameraEntity = createEntity();

diff --git a/linguine/src/scenes/OptionsScene.h b/linguine/src/scenes/OptionsScene.h
@@ -8,7 +8,10 @@ namespace linguine {
 
 class OptionsScene : public Scene {
   public:
-    explicit OptionsScene(ServiceLocator& serviceLocator);
+    explicit OptionsScene(ServiceLocator& serviceLocator)
+        : Scene(serviceLocator) {}
+
+    void init() override;
 };
 
 }  // namespace linguine
diff --git a/linguine/src/scenes/TitleScene.cpp b/linguine/src/scenes/TitleScene.cpp
@@ -41,30 +41,30 @@
 
 namespace linguine {
 
-TitleScene::TitleScene(ServiceLocator &serviceLocator)
-    : Scene(serviceLocator.get<EntityManagerFactory>().create()) {
-  registerSystem(std::make_unique<FpsSystem>(getEntityManager(), serviceLocator.get<Logger>()));
-  registerSystem(std::make_unique<GestureRecognitionSystem>(getEntityManager(), serviceLocator.get<InputManager>(), serviceLocator.get<Renderer>(), serviceLocator.get<TimeManager>()));
+void TitleScene::init() {
+  registerSystem(std::make_unique<FpsSystem>(getEntityManager(), get<Logger>()));
+  registerSystem(std::make_unique<GestureRecognitionSystem>(getEntityManager(), get<InputManager>(), get<Renderer>(), get<TimeManager>()));
   registerSystem(std::make_unique<VelocitySystem>(getEntityManager()));
   registerSystem(std::make_unique<CameraFollowSystem>(getEntityManager()));
-  registerSystem(std::make_unique<ButtonSystem>(getEntityManager(), serviceLocator.get<Renderer>(), serviceLocator.get<AudioManager>()));
+  registerSystem(std::make_unique<DialogSystem>(getEntityManager()));
+  registerSystem(std::make_unique<ButtonSystem>(getEntityManager(), get<Renderer>(), get<AudioManager>()));
+  registerSystem(std::make_unique<FooterSystem>(getEntityManager(), get<Renderer>()));
   registerSystem(std::make_unique<AttachmentSystem>(getEntityManager()));
-  registerSystem(std::make_unique<PhysicsInterpolationSystem>(getEntityManager(), serviceLocator.get<TimeManager>()));
+  registerSystem(std::make_unique<PhysicsInterpolationSystem>(getEntityManager(), get<TimeManager>()));
   registerSystem(std::make_unique<CollisionSystem>(getEntityManager()));
   registerSystem(std::make_unique<ParticleSystem>(getEntityManager()));
   registerSystem(std::make_unique<FireSystem>(getEntityManager()));
 
-  registerSystem(std::make_unique<SpawnSystem>(getEntityManager(), serviceLocator.get<Renderer>()));
-  registerSystem(std::make_unique<DialogSystem>(getEntityManager()));
-  registerSystem(std::make_unique<FooterSystem>(getEntityManager(), serviceLocator.get<Renderer>()));
+  registerSystem(std::make_unique<SpawnSystem>(getEntityManager(), get<Renderer>()));
 
   registerSystem(std::make_unique<TransformationSystem>(getEntityManager()));
-  registerSystem(std::make_unique<CameraSystem>(getEntityManager(), serviceLocator.get<Renderer>()));
+  registerSystem(std::make_unique<CameraSystem>(getEntityManager(), get<Renderer>()));
 
-  auto& audioManager = serviceLocator.get<AudioManager>();
-  auto& renderer = serviceLocator.get<Renderer>();
-  auto& sceneManager = serviceLocator.get<SceneManager>();
-  auto& saveManager = serviceLocator.get<SaveManager>();
+  auto& audioManager = get<AudioManager>();
+  auto& renderer = get<Renderer>();
+  auto& sceneManager = get<SceneManager>();
+  auto& saveManager = get<SaveManager>();
+  auto& serviceLocator = get<ServiceLocator>();
 
   {
     auto cameraEntity = createEntity();
@@ -522,8 +522,6 @@ TitleScene::TitleScene(ServiceLocator &serviceLocator)
     transform->position = { 0.0f, 0.0f, 10.0f };
     transform->scale = { 240.0f, 48.0f, 1.0f };
 
-    footerPanelEntity->add<PhysicalState>(transform->position, 0.0f);
-
     auto drawable = footerPanelEntity->add<Drawable>();
     drawable->feature = new ColoredFeature();
     drawable->feature->color = Palette::SecondaryAccent;
@@ -539,11 +537,10 @@ TitleScene::TitleScene(ServiceLocator &serviceLocator)
       footerTextTransform->position = { 0.0f, 0.0f, 5.0f };
       footerTextTransform->scale = { 8.0f, 8.0f, 1.0f };
 
-      footerTextEntity->add<PhysicalState>(footerTextTransform->position, 0.0f);
-
       auto attachment = footerTextEntity->add<Attachment>();
       attachment->parentId = footerPanelEntity->getId();
       attachment->offset = { -56.0f, 8.0f };
+      attachment->useFixedUpdate = false;
 
       auto text = footerTextEntity->add<Text>();
       text->feature = new TextFeature();
@@ -561,11 +558,10 @@ TitleScene::TitleScene(ServiceLocator &serviceLocator)
       footerTextTransform->position = { 0.0f, 0.0f, 5.0f };
       footerTextTransform->scale = { 5.0f, 5.0f, 1.0f };
 
-      footerTextEntity->add<PhysicalState>(footerTextTransform->position, 0.0f);
-
       auto attachment = footerTextEntity->add<Attachment>();
       attachment->parentId = footerPanelEntity->getId();
       attachment->offset = { -72.5f, -8.0f };
+      attachment->useFixedUpdate = false;
 
       auto text = footerTextEntity->add<Text>();
       text->feature = new TextFeature();