diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-30 20:32:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-30 20:32:11 +0200 |
| commit | f3c74afd2869859fa117271264e9294d36be16e5 (patch) | |
| tree | 7533def8a2a7fd1a8b52b1fe965c318eb027e781 /servers | |
| parent | 6fed21c7cb85c4dd5842d8cb9fc268957a0429fd (diff) | |
| parent | eaaee63b629d6999fcc0c84e38886b964f6d051d (diff) | |
Merge pull request #37436 from akien-mga/doc-node-renames
doc: Update classref with node renames
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/navigation_server_2d.h | 2 | ||||
| -rw-r--r-- | servers/physics_3d/physics_server_3d_sw.cpp | 2 | ||||
| -rw-r--r-- | servers/register_server_types.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/servers/navigation_server_2d.h b/servers/navigation_server_2d.h index af914e5ba9..d7384bae74 100644 --- a/servers/navigation_server_2d.h +++ b/servers/navigation_server_2d.h @@ -39,7 +39,7 @@ #include "core/rid.h" #include "scene/2d/navigation_region_2d.h" -// This server exposes the 3D `NavigationServer` features in the 2D world. +// This server exposes the `NavigationServer3D` features in the 2D world. class NavigationServer2D : public Object { GDCLASS(NavigationServer2D, Object); diff --git a/servers/physics_3d/physics_server_3d_sw.cpp b/servers/physics_3d/physics_server_3d_sw.cpp index da84630088..11a3b7bbb8 100644 --- a/servers/physics_3d/physics_server_3d_sw.cpp +++ b/servers/physics_3d/physics_server_3d_sw.cpp @@ -70,7 +70,7 @@ RID PhysicsServer3DSW::shape_create(ShapeType p_shape) { } break; case SHAPE_CYLINDER: { - ERR_FAIL_V_MSG(RID(), "CylinderShape is not supported in GodotPhysics. Please switch to Bullet in the Project Settings."); + ERR_FAIL_V_MSG(RID(), "CylinderShape3D is not supported in GodotPhysics. Please switch to Bullet in the Project Settings."); } break; case SHAPE_CONVEX_POLYGON: { diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp index c53ffcc7b5..f96752813d 100644 --- a/servers/register_server_types.cpp +++ b/servers/register_server_types.cpp @@ -194,10 +194,10 @@ void register_server_singletons() { Engine::get_singleton()->add_singleton(Engine::Singleton("RenderingServer", RenderingServer::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("AudioServer", AudioServer::get_singleton())); - Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer3D", PhysicsServer3D::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer2D", PhysicsServer2D::get_singleton())); - Engine::get_singleton()->add_singleton(Engine::Singleton("NavigationServer", NavigationServer3D::get_singleton_mut())); + Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer3D", PhysicsServer3D::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("NavigationServer2D", NavigationServer2D::get_singleton_mut())); + Engine::get_singleton()->add_singleton(Engine::Singleton("NavigationServer3D", NavigationServer3D::get_singleton_mut())); Engine::get_singleton()->add_singleton(Engine::Singleton("ARVRServer", ARVRServer::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("CameraServer", CameraServer::get_singleton())); } |