Browse Source

fixed ClassDB inconsistencies

fixes #7960
Karroffel 8 years ago
parent
commit
6ab3213a55

+ 1 - 1
core/bind/core_bind.cpp

@@ -2078,7 +2078,7 @@ void _Marshalls::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("base64_to_variant:Variant", "base64_str"), &_Marshalls::base64_to_variant);
 
 	ClassDB::bind_method(D_METHOD("raw_to_base64:String", "array"), &_Marshalls::raw_to_base64);
-	ClassDB::bind_method(D_METHOD("base64_to_raw:RawArray", "base64_str"), &_Marshalls::base64_to_raw);
+	ClassDB::bind_method(D_METHOD("base64_to_raw:PoolByteArray", "base64_str"), &_Marshalls::base64_to_raw);
 
 	ClassDB::bind_method(D_METHOD("utf8_to_base64:String", "utf8_str"), &_Marshalls::utf8_to_base64);
 	ClassDB::bind_method(D_METHOD("base64_to_utf8:String", "base64_str"), &_Marshalls::base64_to_utf8);

+ 1 - 1
core/object.cpp

@@ -1587,7 +1587,7 @@ void Object::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_class"), &Object::get_class);
 	ClassDB::bind_method(D_METHOD("is_class", "type"), &Object::is_class);
 	ClassDB::bind_method(D_METHOD("set", "property", "value"), &Object::_set_bind);
-	ClassDB::bind_method(D_METHOD("get", "property"), &Object::_get_bind);
+	ClassDB::bind_method(D_METHOD("get:Variant", "property"), &Object::_get_bind);
 	ClassDB::bind_method(D_METHOD("get_property_list"), &Object::_get_property_list_bind);
 	ClassDB::bind_method(D_METHOD("get_method_list"), &Object::_get_method_list_bind);
 	ClassDB::bind_method(D_METHOD("notification", "what", "reversed"), &Object::notification, DEFVAL(false));

+ 1 - 1
core/variant.cpp

@@ -166,7 +166,7 @@ String Variant::get_type_name(Variant::Type p_type) {
 		} break;
 		case POOL_REAL_ARRAY: {
 
-			return "PoolFloatArray";
+			return "PoolRealArray";
 
 		} break;
 		case POOL_STRING_ARRAY: {

+ 2 - 2
scene/gui/control.cpp

@@ -692,7 +692,7 @@ Size2 Control::get_minimum_size() const {
 	if (si) {
 
 		Variant::CallError ce;
-		Variant s = si->call(SceneStringNames::get_singleton()->get_minimum_size, NULL, 0, ce);
+		Variant s = si->call(SceneStringNames::get_singleton()->_get_minimum_size, NULL, 0, ce);
 		if (ce.error == Variant::CallError::CALL_OK)
 			return s;
 	}
@@ -2419,7 +2419,7 @@ void Control::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_font_changed"), &Control::_font_changed);
 
 	BIND_VMETHOD(MethodInfo("_gui_input", PropertyInfo(Variant::INPUT_EVENT, "event")));
-	BIND_VMETHOD(MethodInfo(Variant::VECTOR2, "get_minimum_size"));
+	BIND_VMETHOD(MethodInfo(Variant::VECTOR2, "_get_minimum_size"));
 	BIND_VMETHOD(MethodInfo(Variant::OBJECT, "get_drag_data", PropertyInfo(Variant::VECTOR2, "pos")));
 	BIND_VMETHOD(MethodInfo(Variant::BOOL, "can_drop_data", PropertyInfo(Variant::VECTOR2, "pos"), PropertyInfo(Variant::NIL, "data")));
 	BIND_VMETHOD(MethodInfo("drop_data", PropertyInfo(Variant::VECTOR2, "pos"), PropertyInfo(Variant::NIL, "data")));

+ 1 - 1
scene/scene_string_names.cpp

@@ -145,7 +145,7 @@ SceneStringNames::SceneStringNames() {
 	_update_remote = StaticCString::create("_update_remote");
 	_update_pairs = StaticCString::create("_update_pairs");
 
-	get_minimum_size = StaticCString::create("get_minimum_size");
+	_get_minimum_size = StaticCString::create("_get_minimum_size");
 
 	area_entered = StaticCString::create("area_entered");
 	area_exited = StaticCString::create("area_exited");

+ 1 - 1
scene/scene_string_names.h

@@ -167,7 +167,7 @@ public:
 	StringName area_entered;
 	StringName area_exited;
 
-	StringName get_minimum_size;
+	StringName _get_minimum_size;
 
 	StringName play_play;
 

+ 15 - 15
servers/audio_server.cpp

@@ -864,39 +864,39 @@ void AudioServer::remove_callback(AudioCallback p_callback, void *p_userdata) {
 	unlock();
 }
 
-void AudioServer::set_bus_layout(const Ref<AudioBusLayout> &p_state) {
+void AudioServer::set_bus_layout(const Ref<AudioBusLayout> &p_bus_layout) {
 
-	ERR_FAIL_COND(p_state.is_null() || p_state->buses.size() == 0);
+	ERR_FAIL_COND(p_bus_layout.is_null() || p_bus_layout->buses.size() == 0);
 
 	lock();
 	for (int i = 0; i < buses.size(); i++) {
 		memdelete(buses[i]);
 	}
-	buses.resize(p_state->buses.size());
+	buses.resize(p_bus_layout->buses.size());
 	bus_map.clear();
-	for (int i = 0; i < p_state->buses.size(); i++) {
+	for (int i = 0; i < p_bus_layout->buses.size(); i++) {
 		Bus *bus = memnew(Bus);
 		if (i == 0) {
 			bus->name = "Master";
 		} else {
-			bus->name = p_state->buses[i].name;
-			bus->send = p_state->buses[i].send;
+			bus->name = p_bus_layout->buses[i].name;
+			bus->send = p_bus_layout->buses[i].send;
 		}
 
-		bus->solo = p_state->buses[i].solo;
-		bus->mute = p_state->buses[i].mute;
-		bus->bypass = p_state->buses[i].bypass;
-		bus->volume_db = p_state->buses[i].volume_db;
+		bus->solo = p_bus_layout->buses[i].solo;
+		bus->mute = p_bus_layout->buses[i].mute;
+		bus->bypass = p_bus_layout->buses[i].bypass;
+		bus->volume_db = p_bus_layout->buses[i].volume_db;
 
-		for (int j = 0; j < p_state->buses[i].effects.size(); j++) {
+		for (int j = 0; j < p_bus_layout->buses[i].effects.size(); j++) {
 
-			Ref<AudioEffect> fx = p_state->buses[i].effects[j].effect;
+			Ref<AudioEffect> fx = p_bus_layout->buses[i].effects[j].effect;
 
 			if (fx.is_valid()) {
 
 				Bus::Effect bfx;
 				bfx.effect = fx;
-				bfx.enabled = p_state->buses[i].effects[j].enabled;
+				bfx.enabled = p_bus_layout->buses[i].effects[j].enabled;
 				bus->effects.push_back(bfx);
 			}
 		}
@@ -988,8 +988,8 @@ void AudioServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_speaker_mode"), &AudioServer::get_speaker_mode);
 	ClassDB::bind_method(D_METHOD("get_mix_rate"), &AudioServer::get_mix_rate);
 
-	ClassDB::bind_method(D_METHOD("set_state", "state:AudioServerState"), &AudioServer::set_bus_layout);
-	ClassDB::bind_method(D_METHOD("generate_state:AudioServerState"), &AudioServer::generate_bus_layout);
+	ClassDB::bind_method(D_METHOD("set_bus_layout", "bus_layout:AudioBusLayout"), &AudioServer::set_bus_layout);
+	ClassDB::bind_method(D_METHOD("generate_bus_layout:AudioBusLayout"), &AudioServer::generate_bus_layout);
 
 	ADD_SIGNAL(MethodInfo("bus_layout_changed"));
 }

+ 1 - 1
servers/audio_server.h

@@ -275,7 +275,7 @@ public:
 	void add_callback(AudioCallback p_callback, void *p_userdata);
 	void remove_callback(AudioCallback p_callback, void *p_userdata);
 
-	void set_bus_layout(const Ref<AudioBusLayout> &p_state);
+	void set_bus_layout(const Ref<AudioBusLayout> &p_bus_layout);
 	Ref<AudioBusLayout> generate_bus_layout() const;
 
 	AudioServer();