diff options
Diffstat (limited to '')
| -rw-r--r-- | scene/resources/room.cpp | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/scene/resources/room.cpp b/scene/resources/room.cpp index dee2ea8ea..acad538ea 100644 --- a/scene/resources/room.cpp +++ b/scene/resources/room.cpp @@ -30,15 +30,14 @@ #include "servers/visual_server.h" - RID RoomBounds::get_rid() const { return area; } -void RoomBounds::set_bounds( const BSP_Tree& p_bounds ) { +void RoomBounds::set_bounds(const BSP_Tree &p_bounds) { - VisualServer::get_singleton()->room_set_bounds(area,p_bounds); + VisualServer::get_singleton()->room_set_bounds(area, p_bounds); emit_signal("changed"); } @@ -47,9 +46,9 @@ BSP_Tree RoomBounds::get_bounds() const { return VisualServer::get_singleton()->room_get_bounds(area); } -void RoomBounds::set_geometry_hint(const DVector<Face3>& p_geometry_hint) { +void RoomBounds::set_geometry_hint(const DVector<Face3> &p_geometry_hint) { - geometry_hint=p_geometry_hint; + geometry_hint = p_geometry_hint; } DVector<Face3> RoomBounds::get_geometry_hint() const { @@ -61,51 +60,45 @@ void RoomBounds::_regenerate_bsp_cubic() { if (geometry_hint.size()) { - float err=0; - geometry_hint= Geometry::wrap_geometry( geometry_hint, &err ); ///< create a "wrap" that encloses the given geometry + float err = 0; + geometry_hint = Geometry::wrap_geometry(geometry_hint, &err); ///< create a "wrap" that encloses the given geometry - BSP_Tree new_bounds(geometry_hint,err); + BSP_Tree new_bounds(geometry_hint, err); set_bounds(new_bounds); } - } void RoomBounds::_regenerate_bsp() { if (geometry_hint.size()) { - BSP_Tree new_bounds(geometry_hint,0); + BSP_Tree new_bounds(geometry_hint, 0); set_bounds(new_bounds); } } void RoomBounds::_bind_methods() { - ObjectTypeDB::bind_method(_MD("set_bounds","bsp_tree"),&RoomBounds::set_bounds); - ObjectTypeDB::bind_method(_MD("get_bounds"),&RoomBounds::get_bounds); + ObjectTypeDB::bind_method(_MD("set_bounds", "bsp_tree"), &RoomBounds::set_bounds); + ObjectTypeDB::bind_method(_MD("get_bounds"), &RoomBounds::get_bounds); - ObjectTypeDB::bind_method(_MD("set_geometry_hint","triangles"),&RoomBounds::set_geometry_hint); - ObjectTypeDB::bind_method(_MD("get_geometry_hint"),&RoomBounds::get_geometry_hint); - ObjectTypeDB::bind_method(_MD("regenerate_bsp"),&RoomBounds::_regenerate_bsp); - ObjectTypeDB::set_method_flags(get_type_static(),_SCS("regenerate_bsp"),METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR); - ObjectTypeDB::bind_method(_MD("regenerate_bsp_cubic"),&RoomBounds::_regenerate_bsp_cubic); - ObjectTypeDB::set_method_flags(get_type_static(),_SCS("regenerate_bsp_cubic"),METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR); - - ADD_PROPERTY( PropertyInfo( Variant::DICTIONARY, "bounds"), _SCS("set_bounds"),_SCS("get_bounds") ); - ADD_PROPERTY( PropertyInfo( Variant::VECTOR3_ARRAY, "geometry_hint"),_SCS("set_geometry_hint"),_SCS("get_geometry_hint") ); + ObjectTypeDB::bind_method(_MD("set_geometry_hint", "triangles"), &RoomBounds::set_geometry_hint); + ObjectTypeDB::bind_method(_MD("get_geometry_hint"), &RoomBounds::get_geometry_hint); + ObjectTypeDB::bind_method(_MD("regenerate_bsp"), &RoomBounds::_regenerate_bsp); + ObjectTypeDB::set_method_flags(get_type_static(), _SCS("regenerate_bsp"), METHOD_FLAGS_DEFAULT | METHOD_FLAG_EDITOR); + ObjectTypeDB::bind_method(_MD("regenerate_bsp_cubic"), &RoomBounds::_regenerate_bsp_cubic); + ObjectTypeDB::set_method_flags(get_type_static(), _SCS("regenerate_bsp_cubic"), METHOD_FLAGS_DEFAULT | METHOD_FLAG_EDITOR); + ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "bounds"), _SCS("set_bounds"), _SCS("get_bounds")); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3_ARRAY, "geometry_hint"), _SCS("set_geometry_hint"), _SCS("get_geometry_hint")); } RoomBounds::RoomBounds() { - area=VisualServer::get_singleton()->room_create(); + area = VisualServer::get_singleton()->room_create(); } - RoomBounds::~RoomBounds() { VisualServer::get_singleton()->free(area); - } - - |