Ticket #3997: terrainbonus.diff

binaries/data/mods/public/art/terrains/biome-alpine/alpine_grass.xml

@@ -6 +6 @@
         <texture name="specTex" file="types/medit_grass_field_spec.png"/>
     </textures>
     <material>terrain_norm_spec.xml</material>
-</terrain>
- No newline at end of file
+    <props classes="test1, test2"/>
+</terrain>

binaries/data/mods/public/art/terrains/terrain_texture.rnc

@@ -19 +19 @@
     }? &
     element props {
         attribute groups { text }? & # comma-separated list of groups
+        attribute classes { text }? & # comma-separated list of classes
         attribute mmap {
             list {
                 xsd:integer { minInclusive = "0" }, # R

binaries/data/mods/public/art/terrains/terrain_texture.rng

@@ -34 +34 @@
             <attribute name="groups"/>
           </optional>
           <optional>
+            <attribute name="classes"/>
+          </optional>
+          <optional>
             <!-- comma-separated list of groups -->
             <attribute name="mmap">
               <list>

binaries/data/mods/public/simulation/components/BuildRestrictions.js

@@ -314 +314 @@
         }
     }
 
+    var cmpTerrain = Engine.QueryInterface(SYSTEM_ENTITY, IID_Terrain);
+    if (cmpTerrain.GetTerrainClasses(pos.x, pos.y).indexOf("test1") != -1)
+    {
+        result.message = "Get a terrain bonus here";
+        result.success = true;
+        result.bonus = 0.4;
+    }
     // Success
     result.success = true;
     result.message = "";

binaries/data/mods/public/simulation/components/GuiInterface.js

@@ -1041 +1041 @@
 
             if (!result.success)
                 cmpVisual.SetShadingColor(1.4, 0.4, 0.4, 1);
+            else if (result.bonus)
+                cmpVisual.SetShadingColor(1 - result.bonus, 1 + result.bonus, 1, 1);
             else
                 cmpVisual.SetShadingColor(1, 1, 1, 1);
         }

source/graphics/Terrain.cpp

@@ -112 +112 @@
     return "default";
 }
 
+std::vector<std::string> CTerrain::GetClasses(fixed x, fixed z) const
+{
+    const ssize_t i = clamp((ssize_t)(x / (int)TERRAIN_TILE_SIZE).ToInt_RoundToZero(), (ssize_t)0, m_MapSize-2);
+    const ssize_t j = clamp((ssize_t)(z / (int)TERRAIN_TILE_SIZE).ToInt_RoundToZero(), (ssize_t)0, m_MapSize-2);
+    CMiniPatch* tile = GetTile(i, j);
+    if (tile && tile->GetTextureEntry())
+        return tile->GetTextureEntry()->GetProperties().GetClasses();
+    return std::vector<std::string>();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // CalcPosition: calculate the world space position of the vertex at (i,j)
 // If i,j is off the map, it acts as if the edges of the terrain are extended

source/graphics/Terrain.h

@@ -81 +81 @@
 
     CStr8 GetMovementClass(ssize_t i, ssize_t j) const;
 
+    std::vector<std::string> GetClasses(fixed x, fixed z) const;
+
     float GetVertexGroundLevel(ssize_t i, ssize_t j) const;
     fixed GetVertexGroundLevelFixed(ssize_t i, ssize_t j) const;
     float GetExactGroundLevel(float x, float z) const;

source/graphics/TerrainProperties.cpp

@@ -96 +96 @@
     // Terrain Attribs
     ATTR(mmap);
     ATTR(groups);
+    ATTR(classes);
     ATTR(movementclass);
     ATTR(angle);
     ATTR(size);
@@ -115 +116 @@
             for(tokenizer::iterator it = tok.begin(); it != tok.end(); ++it)
                 m_Groups.push_back(g_TexMan.FindGroup(*it));
         }
+        else if (attr.Name == attr_classes)
+        {
+            // Parse a comma-separated list of groups, add the new entry to
+            // each of them
+            m_Classes.clear();
+            boost::char_separator<char> sep(", ");
+            typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+            tokenizer tok(attr.Value, sep);
+            for (const CStr& cl : tok)
+                m_Classes.push_back(cl);
+        }
         else if (attr.Name == attr_mmap)
         {
             CColor col;

source/graphics/TerrainProperties.h

@@ -66 +66 @@
     // All terrain type groups we're a member of
     GroupVector m_Groups;
 
+    // Classes of this terrain
+    std::vector<std::string> m_Classes;
+
 public:
     CTerrainProperties(CTerrainPropertiesPtr parent);
 
@@ -112 +115 @@
     {
         return m_Groups;
     }
+
+    std::vector<std::string> GetClasses() const
+    {
+        return m_Classes;
+    }
 };
 
 #endif

source/simulation2/components/CCmpTerrain.cpp

@@ -109 +109 @@
         return (u16)vertices;
     }
 
+    virtual std::vector<std::string> GetTerrainClasses(entity_pos_t x, entity_pos_t z)
+    {
+        return m_Terrain->GetClasses(x, z);
+    }
+
     virtual CTerrain* GetCTerrain()
     {
         return m_Terrain;

source/simulation2/components/ICmpTerrain.cpp

@@ -24 +24 @@
 BEGIN_INTERFACE_WRAPPER(Terrain)
 DEFINE_INTERFACE_METHOD_2("GetGroundLevel", entity_pos_t, ICmpTerrain, GetGroundLevel, entity_pos_t, entity_pos_t)
 DEFINE_INTERFACE_METHOD_2("CalcNormal", CFixedVector3D, ICmpTerrain, CalcNormal, entity_pos_t, entity_pos_t)
+DEFINE_INTERFACE_METHOD_2("GetTerrainClasses", std::vector<std::string>, ICmpTerrain, GetTerrainClasses, entity_pos_t, entity_pos_t)
 DEFINE_INTERFACE_METHOD_0("GetTilesPerSide", u16, ICmpTerrain, GetTilesPerSide)
 END_INTERFACE_WRAPPER(Terrain)

source/simulation2/components/ICmpTerrain.h

@@ -40 +41 @@
 
     virtual float GetExactGroundLevel(float x, float z) = 0;
 
+    virtual std::vector<std::string> GetTerrainClasses(entity_pos_t x, entity_pos_t z) = 0;
+
     /**
      * Returns number of tiles per side on the terrain.
      * Return value is always non-zero.

source/simulation2/system/ComponentTest.h

@@ -207 +207 @@
         return 50.f;
     }
 
+    virtual std::vector<std::string> GetTerrainClasses(entity_pos_t UNUSED(x), entity_pos_t UNUSED(z))
+    {
+        return std::vector<std::string>();
+    }
+
     virtual u16 GetTilesPerSide()
     {
         return 16;