mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-14 15:31:49 +00:00
add 'material' entity property
This commit is contained in:
parent
4adf3e2456
commit
53027cf153
3 changed files with 5 additions and 0 deletions
|
|
@ -87,6 +87,7 @@ template<> void ContentUnitLoader<EntityDef>::loadUnit(
|
||||||
BodyTypeMeta.getItem(bodyTypeName, def.bodyType);
|
BodyTypeMeta.getItem(bodyTypeName, def.bodyType);
|
||||||
|
|
||||||
root.at("skeleton-name").get(def.skeletonName);
|
root.at("skeleton-name").get(def.skeletonName);
|
||||||
|
root.at("material").get(def.material);
|
||||||
root.at("blocking").get(def.blocking);
|
root.at("blocking").get(def.blocking);
|
||||||
root.at("solid").get(def.solid);
|
root.at("solid").get(def.solid);
|
||||||
root.at("mass").get(def.mass);
|
root.at("mass").get(def.mass);
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,9 @@ struct EntityDef {
|
||||||
/// @brief Skeleton ID
|
/// @brief Skeleton ID
|
||||||
std::string skeletonName = name;
|
std::string skeletonName = name;
|
||||||
|
|
||||||
|
/// @brief Solid entity material material
|
||||||
|
std::string material;
|
||||||
|
|
||||||
/// @brief Does entity prevent blocks setup
|
/// @brief Does entity prevent blocks setup
|
||||||
bool blocking = true;
|
bool blocking = true;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -87,4 +87,5 @@ void Rigidbody::initialize(
|
||||||
create_sensor_callback<scripting::on_sensor_exit>(entities)};
|
create_sensor_callback<scripting::on_sensor_exit>(entities)};
|
||||||
}
|
}
|
||||||
hitbox.stepHeight = def.stepHeight;
|
hitbox.stepHeight = def.stepHeight;
|
||||||
|
hitbox.material = def.material;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue