Merge pull request #820 from MihailRis/entity-material-property

Entity material property

doc/en/entity-properties.md

@@ -112,6 +112,10 @@ Defines the entity's elasticity (affects the bounce on collision).
 
 Defines the maximum height of an obstacle an entity can step onto without jumping.
 
+### *material*
+
+Defines the entity's material (same as for blocks).
+
 ## View
 
 ### *skeleton-name*

doc/ru/entity-properties.md

@@ -112,6 +112,10 @@
 
 Определяет максимальную высоту препятствия, на которое сущность может шагнуть без прыжка.
 
+### Материал - *material*
+
+Определяет материал сущности (то же, что и у блоков).
+
 ## Вид
 
 ### Имя скелета - *skeleton-name*

src/content/loading/EntityLoader.cpp

@@ -87,6 +87,7 @@ template<> void ContentUnitLoader<EntityDef>::loadUnit(
     BodyTypeMeta.getItem(bodyTypeName, def.bodyType);
 
     root.at("skeleton-name").get(def.skeletonName);
+    root.at("material").get(def.material);
     root.at("blocking").get(def.blocking);
     root.at("solid").get(def.solid);
     root.at("mass").get(def.mass);

src/objects/EntityDef.hpp

@@ -39,6 +39,9 @@ struct EntityDef {
     /// @brief Skeleton ID
     std::string skeletonName = name;
 
+    /// @brief Solid entity material material
+    std::string material;
+
     /// @brief Does entity prevent blocks setup
     bool blocking = true;
 

src/objects/Rigidbody.cpp

@@ -87,4 +87,5 @@ void Rigidbody::initialize(
             create_sensor_callback<scripting::on_sensor_exit>(entities)};
     }
     hitbox.stepHeight = def.stepHeight;
+    hitbox.material = def.material;
 }