Separate EAXCONTEXT_DISTANCEFACTOR and AL_METERS_PER_UNIT

kcat · Sep 11, 2024 · 7ac9a5c · 7ac9a5c
1 parent ad32044
commit 7ac9a5c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/al/state.cpp b/al/state.cpp
@@ -615,7 +615,11 @@ void UpdateContextProps(ALCcontext *context)
  props->OrientAt = listener.OrientAt;
  props->OrientUp = listener.OrientUp;
  props->Gain = listener.Gain;
- props->MetersPerUnit = listener.mMetersPerUnit;
+ props->MetersPerUnit = listener.mMetersPerUnit
+#ifdef ALSOFT_EAX
+ * context->eaxGetDistanceFactor()
+#endif
+ ;
 
  props->AirAbsorptionGainHF = context->mAirAbsorptionGainHF;
  props->DopplerFactor = context->mDopplerFactor;

diff --git a/alc/context.cpp b/alc/context.cpp
@@ -212,11 +212,19 @@ void ALCcontext::init()
  mExtensionsString = std::move(extensions);
  }
 
+#ifdef ALSOFT_EAX
+ eax_set_defaults();
+#endif
+
  mParams.Position = alu::Vector{0.0f, 0.0f, 0.0f, 1.0f};
  mParams.Matrix = alu::Matrix::Identity();
  mParams.Velocity = alu::Vector{};
  mParams.Gain = mListener.Gain;
- mParams.MetersPerUnit = mListener.mMetersPerUnit;
+ mParams.MetersPerUnit = mListener.mMetersPerUnit
+#ifdef ALSOFT_EAX
+ * eaxGetDistanceFactor()
+#endif
+ ;
  mParams.AirAbsorptionGainHF = mAirAbsorptionGainHF;
  mParams.DopplerFactor = mDopplerFactor;
  mParams.SpeedOfSound = mSpeedOfSound * mDopplerVelocity;
@@ -746,10 +754,7 @@ void ALCcontext::eax_context_commit_primary_fx_slot_id()
 
 void ALCcontext::eax_context_commit_distance_factor()
 {
- if(mListener.mMetersPerUnit == mEax.flDistanceFactor)
- return;
-
- mListener.mMetersPerUnit = mEax.flDistanceFactor;
+ /* mEax.flDistanceFactor was changed, so the context props are dirty. */
  mPropsDirty = true;
 }
 

diff --git a/alc/context.h b/alc/context.h
@@ -232,7 +232,11 @@ struct ALCcontext : public al::intrusive_ref<ALCcontext>, ContextBase {
 
  void eaxSetLastError() noexcept;
 
- EaxFxSlotIndex eaxGetPrimaryFxSlotIndex() const noexcept
+ [[nodiscard]]
+ auto eaxGetDistanceFactor() const noexcept -> float { return mEax.flDistanceFactor; }
+
+ [[nodiscard]]
+ auto eaxGetPrimaryFxSlotIndex() const noexcept -> EaxFxSlotIndex
  { return mEaxPrimaryFxSlotIndex; }
 
  const ALeffectslot& eaxGetFxSlot(EaxFxSlotIndexValue fx_slot_index) const