X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fobject_properties.h;h=082d9a5290ea945e0f7cb6b418acbd9a369fe4b5;hb=7bbd716426bf989bf071e2322a9b797cc5f78acb;hp=edc9c39d670dbd0f8bf715408f9d59123eddc06c;hpb=fc571ad46df8f3dcc04745bc55d9ca6e1e82ed87;p=dragonfireclient.git diff --git a/src/object_properties.h b/src/object_properties.h index edc9c39d6..082d9a529 100644 --- a/src/object_properties.h +++ b/src/object_properties.h @@ -33,7 +33,7 @@ struct ObjectProperties bool physical; bool collideWithObjects; float weight; - core::aabbox3d collisionbox; + aabb3f collisionbox; std::string visual; std::string mesh; v2f visual_size; @@ -46,7 +46,12 @@ struct ObjectProperties float automatic_rotate; f32 stepheight; bool automatic_face_movement_dir; - + f32 automatic_face_movement_dir_offset; + bool backface_culling; + std::string nametag; + video::SColor nametag_color; + f32 automatic_face_movement_max_rotation_per_sec; + std::string infotext; ObjectProperties(); std::string dump(); @@ -55,4 +60,3 @@ struct ObjectProperties }; #endif -