Merge branch 'master' of https://github.com/godotengine/godot

1 files changed, 2 insertions, 38 deletions

diff --git a/scene/resources/room.cpp b/scene/resources/room.cpp
index f28220531b..dd833a3f2a 100644
--- a/scene/resources/room.cpp
+++ b/scene/resources/room.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -36,16 +36,6 @@ RID RoomBounds::get_rid() const {
 	return area;
 }
 
-void RoomBounds::set_bounds( const BSP_Tree& p_bounds ) {
-
-	VisualServer::get_singleton()->room_set_bounds(area,p_bounds);
-	emit_signal("changed");
-}
-
-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) {
 
@@ -57,41 +47,15 @@ DVector<Face3> RoomBounds::get_geometry_hint() const {
 	return geometry_hint;
 }
 
-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
 
-		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);
-		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_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::DICTIONARY, "bounds"), _SCS("set_bounds"),_SCS("get_bounds") );
 	ADD_PROPERTY( PropertyInfo( Variant::VECTOR3_ARRAY, "geometry_hint"),_SCS("set_geometry_hint"),_SCS("get_geometry_hint") );
 
 }