Merge pull request #1 from carbonengine/minor-update-dates

Changed dates to 2025

Author: phevosccp

NOTICE

@@ -1,6 +1,6 @@
 Spatial Audio Object Clustering Plugin for Wwise  
 
-Copyright 2024 CCP Games
+Copyright 2025 CCP Games
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
 

ObjectCluster/SoundEnginePlugin/KMeans.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 CCP ehf.
+ * Copyright 2025 CCP ehf.
  *
  * This software was developed by CCP Games for spatial audio object clustering 
  * in EVE Online and EVE Frontier.
@@ -223,6 +223,15 @@ class KMeans {
         float minDistanceThreshold = 10.f,
         float maxDistanceThreshold = 1000.f);
 
+
+    void reinitializeClustering() {
+        centroids.clear();
+        labels.clear();
+        clusters.clear();
+        sse_values.clear();
+        unassignedPoints.clear();
+    }
+
     /**
      * @brief Sets the convergence tolerance.
      * @param newValue The new tolerance value.

ObjectCluster/SoundEnginePlugin/Kmeans.cpp

@@ -36,8 +36,8 @@ void KMeans::initializeCentroids(const std::vector<ObjectPosition>& objects) {
     std::vector<ObjectMetadata> objectsMetadata;
     objectsMetadata.reserve(objects.size());
 
-    // Calculate local density including origin region
-    const float densityRadius = m_distanceThreshold * 0.5f;
+    // Use a smaller radius for density calculation when threshold is small
+    const float densityRadius = m_distanceThreshold * 0.25f; // More sensitive to local density
     const float densityRadiusSq = densityRadius * densityRadius;
 
     // Track density around origin specifically
@@ -109,25 +109,22 @@ void KMeans::initializeCentroids(const std::vector<ObjectPosition>& objects) {
         size_t bestCandidate = 0;
         bool candidateFound = false;
 
-        // Find point with maximum minimum distance to existing centroids
         for (size_t i = 0; i < objectsMetadata.size(); ++i) {
             float minDist = std::numeric_limits<float>::max();
             for (const auto& centroid : centroids) {
                 float dist = calculateDistance(objectsMetadata[i].object.position, centroid);
                 minDist = std::min(minDist, dist);
             }
 
-            if (minDist > maxMinDistance) {
+            // More likely to create new centroids with smaller thresholds
+            if (minDist > maxMinDistance && minDist > m_distanceThreshold * 0.5f) {
                 maxMinDistance = minDist;
                 bestCandidate = i;
                 candidateFound = true;
             }
         }
 
-        if (!candidateFound || maxMinDistance < m_distanceThreshold) {
-            break;
-        }
-
+        if (!candidateFound) break;
         centroids.push_back(objectsMetadata[bestCandidate].object.position);
     }
 }
@@ -347,16 +344,30 @@ void KMeans::setTolerance(float newValue) {
 }
 
 void KMeans::setDistanceThreshold(float newValue) {
-    m_distanceThreshold = clamp(newValue, m_minThreshold, m_maxThreshold);
+
+    if (newValue != m_distanceThreshold) {
+        m_distanceThreshold = clamp(newValue, m_minThreshold, m_maxThreshold);
+
+        // Clear existing state to force recalculation
+        centroids.clear();
+        labels.clear();
+        clusters.clear();
+        sse_values.clear();
+        unassignedPoints.clear();
+    }
 }
 
 void KMeans::performClustering(const std::vector<ObjectPosition>& objects, unsigned int max_iterations) {
+    // Resize labels vector to match input size
     labels.resize(objects.size(), -1);
+
+    // Recalculate max clusters based on current objects
     maxClusters = determineMaxClusters(objects.size());
+
+    // Always reinitialize centroids
     initializeCentroids(objects);
 
     for (unsigned int iter = 0; iter < max_iterations; ++iter) {
-
         bool changed = assignPointsToClusters(objects);
         adjustClusterCount();
         bool centroidsUpdated = updateCentroids();

ObjectCluster/SoundEnginePlugin/ObjectClusterFX.cpp

@@ -22,7 +22,7 @@ OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License for
 the specific language governing permissions and limitations under the License.
 
   Copyright (c) 2023 Audiokinetic Inc.
-  Copyright (c) 2024 CCP ehf.
+  Copyright (c) 2025 CCP ehf.
 
 This implementation was developed by CCP Games for spatial audio object clustering
 in EVE Online and EVE Frontier. This implementation does not grant any rights to
@@ -369,33 +369,64 @@ void ObjectClusterFX::MixToCluster(const AkAudioObject* inObject, AkAudioBuffer*
     AKPLATFORM::AkMemCpy(pGeneratedObject->volumeMatrix, currentVolumes, uTransmixSize);
 }
 
+void ObjectClusterFX::SafeCleanupForThresholdChange()
+{
+    auto it = m_mapInObjsToOutObjs.Begin();
+    while (it != m_mapInObjsToOutObjs.End()) {
+        if ((*it).pUserData) {
+            // Don't delete the object, just mark it as unclustered
+            (*it).pUserData->isClustered = false;
+            // Reset index to force reassignment
+            (*it).pUserData->index = -1;
+        }
+        ++it;
+    }
+
+    // Clear cluster assignments but maintain existing objects
+    m_clusters.clear();
+}
+
 void ObjectClusterFX::FeedPositionsToKMeans(const AkAudioObjects& inObjects)
 {
+    bool thresholdChanged = false;
+    bool thresholdDecreased = false;
 
     if (m_lastDistanceThreshold != m_pParams->RTPC.distanceThreshold) {
+        thresholdChanged = true;
+        thresholdDecreased = m_pParams->RTPC.distanceThreshold < m_lastDistanceThreshold;
+
         m_kmeans->setDistanceThreshold(m_pParams->RTPC.distanceThreshold);
         m_lastDistanceThreshold = m_pParams->RTPC.distanceThreshold;
+
+        // Safe cleanup when threshold changes
+        SafeCleanupForThresholdChange();
     }
 
     std::vector<ObjectPosition> objectPositions;
     objectPositions.reserve(inObjects.uNumObjects);
 
+    // Collect positions and ensure proper redistribution
     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()) {
+        // Force reinitialization of KMeans when threshold decreases
+        if (thresholdDecreased) {
+            m_kmeans->reinitializeClustering();
+        }
+
         m_kmeans->performClustering(objectPositions);
 
+        // Update clusters with new assignments
+        m_clusters.clear();
         auto tempClusters = m_kmeans->getClusters();
         m_clusters.reserve(tempClusters.size());
 

ObjectCluster/SoundEnginePlugin/ObjectClusterFX.h

@@ -22,7 +22,7 @@ OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License for
 the specific language governing permissions and limitations under the License.
 
   Copyright (c) 2023 Audiokinetic Inc.
-  Copyright (c) 2024 CCP ehf.
+  Copyright (c) 2025 CCP ehf.
 
 This implementation was developed by CCP Games for spatial audio object clustering
 in EVE Online and EVE Frontier. This implementation does not grant any rights to
@@ -114,6 +114,10 @@ class ObjectClusterFX : public AK::IAkOutOfPlaceObjectPlugin
     AK::IAkPluginMemAlloc* m_pAllocator;
     AK::IAkEffectPluginContext* m_pContext;
 
+	bool thresholdChanged = false;
+
+    void SafeCleanupForThresholdChange();
+
     /**
      * @brief Updates KMeans algorithm with input object positions
      * @param inObjects Input audio objects

ObjectCluster/SoundEnginePlugin/Utilities.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 CCP ehf.
+ * Copyright 2025 CCP ehf.
  *
  * This software was developed by CCP Games for spatial audio object clustering 
  * in EVE Online and EVE Frontier.

ObjectCluster/SoundEnginePlugin/Utilities.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 CCP ehf.
+ * Copyright 2025 CCP ehf.
  *
  * This software was developed by CCP Games for spatial audio object clustering 
  * in EVE Online and EVE Frontier.