Ticket #1920: NoSortingForTrees.patch

binaries/data/mods/public/art/materials/basic_trans_wind.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model_transparent"/>
+    <shader effect="model_transparent_nosort"/>
     <alpha_blending/>
     <define name="USE_TRANSPARENT" value="1"/>
     <renderquery name="sim_time"/>

source/graphics/Material.cpp

@@ -52 +52 @@
     m_Samplers.push_back(texture);
     if (texture.Name == CStrIntern("baseTex"))
         m_DiffuseTexture = texture.Sampler;
+    else if (texture.Name == CStrIntern("normTex"))
+        m_NormalTexture = texture.Sampler;
+    else if (texture.Name == CStrIntern("specTex"))
+        m_SpecularTexture = texture.Sampler;
+    else if (texture.Name == CStrIntern("aoTex"))
+        m_AOTexture = texture.Sampler;
 }
 
 void CMaterial::AddRenderQuery(const char* key)

source/graphics/Model.cpp

@@ -375 +375 @@
     {
         const Prop& prop=m_Props[j];
 
-        CMatrix3D proptransform = prop.m_Point->m_Transform;;
+        CMatrix3D proptransform = prop.m_Point->m_Transform;
         if (prop.m_Point->m_BoneIndex != 0xff)
         {
             CMatrix3D boneMatrix = m_BoneMatrices[prop.m_Point->m_BoneIndex];

source/graphics/Material.h

@@ -48 +48 @@
     bool UsesAlphaBlending() { return m_AlphaBlending; }
 
     const CTexturePtr& GetDiffuseTexture() const { return m_DiffuseTexture; }
+    const CTexturePtr& GetSpecularTexture() const { return m_SpecularTexture; }
+    const CTexturePtr& GetNormalTexture() const { return m_NormalTexture; }
+    const CTexturePtr& GetAOTexture() const { return m_AOTexture; }
 
     void SetShaderEffect(const CStr& effect);
     CStrIntern GetShaderEffect() const { return m_ShaderEffect; }
@@ -72 +75 @@
     // This pointer is kept to make it easier for the fixed pipeline to 
     // access the only texture it's interested in.
     CTexturePtr m_DiffuseTexture;
+    // these other pointers are for easier comparison when batching
+    CTexturePtr m_SpecularTexture;
+    CTexturePtr m_NormalTexture;
+    CTexturePtr m_AOTexture;
     
     SamplersVector m_Samplers;
     

source/renderer/ModelRenderer.cpp

@@ -294 +294 @@
         if (b->GetMaterial().GetDiffuseTexture() < a->GetMaterial().GetDiffuseTexture())
             return false;
 
+        if (a->GetMaterial().GetSpecularTexture() < b->GetMaterial().GetSpecularTexture())
+            return true;
+        if (b->GetMaterial().GetSpecularTexture() < a->GetMaterial().GetSpecularTexture())
+            return false;
+
+        if (a->GetMaterial().GetNormalTexture() < b->GetMaterial().GetNormalTexture())
+            return true;
+        if (b->GetMaterial().GetNormalTexture() < a->GetMaterial().GetNormalTexture())
+            return false;
+
+        if (a->GetMaterial().GetAOTexture() < b->GetMaterial().GetAOTexture())
+            return true;
+        if (b->GetMaterial().GetAOTexture() < a->GetMaterial().GetAOTexture())
+            return false;
+
         return a->GetMaterial().GetStaticUniforms() < b->GetMaterial().GetStaticUniforms();
     }
 };
@@ -401 +416 @@
      * For each material bucket we then look up the appropriate shader technique.
      * If the technique requires sort-by-distance, the model is added to the
      * 'sortByDistItems' list with its computed distance.
-     * Otherwise, the bucket's list of models is sorted by modeldef+texture+uniforms,
+     * Otherwise, the bucket's list of models is sorted by modeldef+textures+uniforms,
      * then the technique and model list is added to 'techBuckets'.
      * 
      * 'techBuckets' is then sorted by technique, to improve batching when multiple
@@ -504 +519 @@
             }
             else
             {
-                // Sort model list by modeldef+texture, for batching
-                // TODO: This only sorts by base texture. While this is an OK approximation
-                // for most cases (as related samplers are usually used together), it would be better
-                // to take all the samplers into account when sorting here.
+                // Sort model list for more efficient batching
+                // this sorts by model def and the 4 basic textures
+                // (diffuse, normal, specular and AO)
+                // TODO: this should probably be made more generic.
                 std::sort(it->second.begin(), it->second.end(), SMRBatchModel());
 
                 // Add a tech bucket pointing at this model list
@@ -625 +640 @@
                 {
                     CModel** models = techBuckets[idx].models;
                     size_t numModels = techBuckets[idx].numModels;
+
                     for (size_t i = 0; i < numModels; ++i)
                     {
                         CModel* model = models[i];