Merge pull request #17040 from AndreaCatania/patch-2

Deprecated Godot 3D physics engine
This commit is contained in:
Rémi Verschelde 2018-03-13 13:46:08 +01:00 committed by GitHub
commit b1ae5ea407
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -80,6 +80,7 @@ static void _debugger_get_resource_usage(List<ScriptDebuggerRemote::ResourceUsag
ShaderTypes *shader_types = NULL; ShaderTypes *shader_types = NULL;
PhysicsServer *_createGodotPhysicsCallback() { PhysicsServer *_createGodotPhysicsCallback() {
WARN_PRINT("The GodotPhysics 3D physics engine is deprecated and will be removed in Godot 3.2. You should use the Bullet physics engine instead (configurable in your project settings).");
return memnew(PhysicsServerSW); return memnew(PhysicsServerSW);
} }
@ -163,8 +164,8 @@ void register_server_types() {
GLOBAL_DEF(PhysicsServerManager::setting_property_name, "DEFAULT"); GLOBAL_DEF(PhysicsServerManager::setting_property_name, "DEFAULT");
ProjectSettings::get_singleton()->set_custom_property_info(PhysicsServerManager::setting_property_name, PropertyInfo(Variant::STRING, PhysicsServerManager::setting_property_name, PROPERTY_HINT_ENUM, "DEFAULT")); ProjectSettings::get_singleton()->set_custom_property_info(PhysicsServerManager::setting_property_name, PropertyInfo(Variant::STRING, PhysicsServerManager::setting_property_name, PROPERTY_HINT_ENUM, "DEFAULT"));
PhysicsServerManager::register_server("GodotPhysics", &_createGodotPhysicsCallback); PhysicsServerManager::register_server("GodotPhysics - deprecated", &_createGodotPhysicsCallback);
PhysicsServerManager::set_default_server("GodotPhysics"); PhysicsServerManager::set_default_server("GodotPhysics - deprecated");
} }
void unregister_server_types() { void unregister_server_types() {