Merge branch 'add-darken-background-option' of https://github.com/Nutzzz/RigelEngine into add-darken-background-option

Author: Nutzzz

src/engine/sprite_rendering_system.cpp

@@ -162,7 +162,9 @@ void collectVisibleSprites(
           sprite.mUseCloakEffect,
           drawTopmost,
           drawOrder,
-          background);
+          background &&
+            entity.component<SpriteBackground>()->mRenderSlotMask.test(
+              slotIndex));
         ++slotIndex;
       }
 

src/engine/visual_components.hpp

@@ -181,7 +181,6 @@ struct Sprite
   std::bitset<NUM_RENDER_SLOTS> mFlashingWhiteStates;
   bool mUseCloakEffect = false;
   bool mShow = true;
-  bool mBackground = false;
 };
 
 
@@ -206,6 +205,13 @@ struct ExtendedFrameList
 
 struct SpriteBackground
 {
+  SpriteBackground()
+  {
+    // Apply to all render slots by default
+    mRenderSlotMask.set();
+  }
+
+  std::bitset<NUM_RENDER_SLOTS> mRenderSlotMask;
 };
 
 

src/game_logic/entity_configuration.ipp

@@ -1670,7 +1670,14 @@ void EntityFactory::configureEntity(
       entity.component<Shootable>()->mDestroyWhenKilled = false;
       entity.assign<AppearsOnRadar>();
       if (mpOptions->mPrisonerIsBackground)
-        entity.assign<SpriteBackground>();
+      {
+        auto background = SpriteBackground{};
+
+        // Keep the grabbing hand in the foreground
+        background.mRenderSlotMask.reset(1);
+
+        entity.assign<SpriteBackground>(background);
+      }
       break;
 
     case ActorID::Passive_prisoner: // Monster in prison cell, passive

src/game_logic/game_world.cpp

@@ -252,6 +252,27 @@ base::Size clampedSectionSize(
     std::min(sectionSize.height, map.height() - sectionStart.y)};
 }
 
+
+base::ScopeGuard
+  applyBrightnessOption(renderer::Renderer* pRenderer, float brightness)
+{
+  if (brightness < 1.0f)
+  {
+    auto guard = renderer::saveState(pRenderer);
+    pRenderer->setColorModulation(base::Color{
+      base::roundTo<uint8_t>(255.0f * brightness),
+      base::roundTo<uint8_t>(255.0f * brightness),
+      base::roundTo<uint8_t>(255.0f * brightness),
+      255});
+    return guard;
+  }
+  else
+  {
+    return base::ScopeGuard{[]() {
+    }};
+  }
+}
+
 } // namespace
 
 
@@ -990,10 +1011,10 @@ void GameWorld::drawMapAndSprites(
     }
     else
     {
+      const auto saved =
+        applyBrightnessOption(mpRenderer, mpOptions->mDropTileBrightness);
       state.mMapRenderer.renderBackdrop(
-        params.mInterpolatedCameraPosition,
-        params.mViewportSize,
-        mpOptions->mDropTileBrightness);
+        params.mInterpolatedCameraPosition, params.mViewportSize);
     }
   };
 
@@ -1010,25 +1031,32 @@ void GameWorld::drawMapAndSprites(
   };
 
   auto renderBackgroundLayers = [&]() {
-    state.mMapRenderer.renderBackground(
-      params.mRenderStartPosition,
-      params.mViewportSize,
-      mpOptions->mBackTileBrightness);
-    state.mDynamicGeometrySystem.renderDynamicBackgroundSections(
-      params.mRenderStartPosition, params.mViewportSize, interpolationFactor);
+    {
+      const auto saved =
+        applyBrightnessOption(mpRenderer, mpOptions->mBackTileBrightness);
+      state.mMapRenderer.renderBackground(
+        params.mRenderStartPosition, params.mViewportSize);
+      state.mDynamicGeometrySystem.renderDynamicBackgroundSections(
+        params.mRenderStartPosition, params.mViewportSize, interpolationFactor);
+    }
+
     state.mSpriteRenderingSystem.renderBackgroundSprites(
       mSpecialEffects, mpOptions->mBackSpriteBrightness);
     state.mSpriteRenderingSystem.renderRegularSprites(
       mSpecialEffects, mpOptions->mRegSpriteBrightness);
   };
 
   auto renderForegroundLayers = [&]() {
-    state.mMapRenderer.renderForeground(
-      params.mRenderStartPosition,
-      params.mViewportSize,
-      mpOptions->mForeTileBrightness);
-    state.mDynamicGeometrySystem.renderDynamicForegroundSections(
-      params.mRenderStartPosition, params.mViewportSize, interpolationFactor);
+    {
+      const auto saved =
+        applyBrightnessOption(mpRenderer, mpOptions->mForeTileBrightness);
+
+      state.mMapRenderer.renderForeground(
+        params.mRenderStartPosition, params.mViewportSize);
+      state.mDynamicGeometrySystem.renderDynamicForegroundSections(
+        params.mRenderStartPosition, params.mViewportSize, interpolationFactor);
+    }
+
     state.mSpriteRenderingSystem.renderForegroundSprites(
       mSpecialEffects, mpOptions->mForeSpriteBrightness);
     renderTileDebris();