Merge pull request #3 from carbonengine/force-reclustering

Force re-clustering when the user changes the distance threshold value

Author: phevosccp

ObjectCluster/SoundEnginePlugin/KMeans.h

@@ -223,6 +223,11 @@ class KMeans {
         float minDistanceThreshold = 10.f,
         float maxDistanceThreshold = 1000.f);
 
+    /**
+     * @brief Resets the KMeans instance, clearing all clusters and centroids.
+     */
+    void reset();
+
     /**
      * @brief Sets the convergence tolerance.
      * @param newValue The new tolerance value.

ObjectCluster/SoundEnginePlugin/Kmeans.cpp

@@ -342,6 +342,15 @@ KMeans::KMeans(float tolerance, float distanceThreshold, float minDistanceThresh
     seed = rd();
 }
 
+void KMeans::reset()
+{
+	centroids.clear();
+	labels.clear();
+	clusters.clear();
+	sse_values.clear();
+	unassignedPoints.clear();
+}
+
 void KMeans::setTolerance(float newValue) {
     m_tolerance = clamp(newValue, 0.001f, 1.0f);
 }

ObjectCluster/SoundEnginePlugin/ObjectClusterFX.cpp

@@ -117,6 +117,21 @@ void ObjectClusterFX::Execute(
     UpdateClusterPositions(inObjects);
 }
 
+void ObjectClusterFX::ForceReclustering()
+{
+	m_clusters.clear();
+
+    auto it = m_mapInObjsToOutObjs.Begin();
+    while (it != m_mapInObjsToOutObjs.End()) {
+        if ((*it).pUserData && (*it).pUserData->isClustered) {
+            (*it).pUserData->isClustered = false;
+        }
+        ++it;
+    }
+
+	m_kmeans->reset();
+}
+
 void ObjectClusterFX::PrepareAudioObjects(const AkAudioObjects& inObjects)
 {
     FeedPositionsToKMeans(inObjects);
@@ -369,28 +384,29 @@ void ObjectClusterFX::MixToCluster(const AkAudioObject* inObject, AkAudioBuffer*
     AKPLATFORM::AkMemCpy(pGeneratedObject->volumeMatrix, currentVolumes, uTransmixSize);
 }
 
-void ObjectClusterFX::FeedPositionsToKMeans(const AkAudioObjects& inObjects)
-{
-
+void ObjectClusterFX::FeedPositionsToKMeans(const AkAudioObjects& inObjects) {
+    // Check for threshold change before normal processing
     if (m_lastDistanceThreshold != m_pParams->RTPC.distanceThreshold) {
         m_kmeans->setDistanceThreshold(m_pParams->RTPC.distanceThreshold);
         m_lastDistanceThreshold = m_pParams->RTPC.distanceThreshold;
+        ForceReclustering();
     }
 
     std::vector<ObjectPosition> objectPositions;
     objectPositions.reserve(inObjects.uNumObjects);
 
+    // Check if objects should be clustered based on spatialization mode
     for (AkUInt32 i = 0; i < inObjects.uNumObjects; ++i) {
         AkAudioObject* inobj = inObjects.ppObjects[i];
 
-        // Check if this is either position-only or position+orientation
         bool shouldCluster = (inobj->positioning.behavioral.spatMode == AK_SpatializationMode_PositionOnly ||
             inobj->positioning.behavioral.spatMode == AK_SpatializationMode_PositionAndOrientation);
 
         if (shouldCluster) {
             objectPositions.push_back({ inobj->positioning.threeD.xform.Position(), inobj->key });
         }
     }
+
     // Perform clustering only if there are objects
     m_clusters.clear();
     if (!objectPositions.empty()) {

ObjectCluster/SoundEnginePlugin/ObjectClusterFX.h

@@ -114,6 +114,11 @@ class ObjectClusterFX : public AK::IAkOutOfPlaceObjectPlugin
     AK::IAkPluginMemAlloc* m_pAllocator;
     AK::IAkEffectPluginContext* m_pContext;
 
+    /**
+     * @brief Forces reclustering by clearing current clusters and resetting the KMeans algorithm.
+     */
+    void ForceReclustering();
+
     /**
      * @brief Updates KMeans algorithm with input object positions
      * @param inObjects Input audio objects