Main: QueuedRenderableCollection - sort instanced groups

as it improves instancing efficiency
Joilnen · Jul 26, 2024 · e6bbedf · e6bbedf
1 parent 7f4feb3
commit e6bbedf
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/OgreMain/src/OgreRenderQueueSortingGrouping.cpp b/OgreMain/src/OgreRenderQueueSortingGrouping.cpp
@@ -27,6 +27,7 @@ THE SOFTWARE.
 */
 #include "OgreStableHeaders.h"
 #include "OgreRenderQueueSortingGrouping.h"
+#include <algorithm>
 
 namespace Ogre {
 namespace {
@@ -358,9 +359,26 @@ namespace {
                     DistanceSortDescendingLess(cam));
             }
         }
-
-        // Nothing needs to be done for pass groups, they auto-organise
-
+        else if (mOrganisationMode & OM_PASS_GROUP)
+        {
+            // sort
+            for(auto& it : mGrouped)
+            {
+                auto instanced = it.first->hasVertexProgram() && it.first->getVertexProgram()->isInstancingIncluded();
+                if (!instanced)
+                    continue;
+
+                std::sort(it.second.begin(), it.second.end(),
+                          [](const Renderable* a, const Renderable* b)
+                          {
+                              auto sa = dynamic_cast<const SubEntity*>(a);
+                              auto sb = dynamic_cast<const SubEntity*>(b);
+                              if (!sa || !sb)
+                                  return a < b;
+                              return sa->getSubMesh() < sb->getSubMesh();
+                          });
+            }
+        }
     }
     //-----------------------------------------------------------------------
     void QueuedRenderableCollection::addRenderable(Pass* pass, Renderable* rend)