diff --git a/core/templates/command_queue_mt.cpp b/core/templates/command_queue_mt.cpp deleted file mode 100644 index 08b903d92eb..00000000000 --- a/core/templates/command_queue_mt.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************/ -/* command_queue_mt.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 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 */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#include "command_queue_mt.h" - -CommandQueueMT::CommandQueueMT() { - command_mem.reserve(DEFAULT_COMMAND_MEM_SIZE_KB * 1024); -} - -CommandQueueMT::~CommandQueueMT() { -} diff --git a/core/templates/command_queue_mt.h b/core/templates/command_queue_mt.h index 8154796eeea..94a03878d40 100644 --- a/core/templates/command_queue_mt.h +++ b/core/templates/command_queue_mt.h @@ -252,6 +252,7 @@ public: pump_task_id = p_task_id; } - CommandQueueMT(); - ~CommandQueueMT(); + CommandQueueMT() { + command_mem.reserve(DEFAULT_COMMAND_MEM_SIZE_KB * 1024); + } }; diff --git a/core/templates/rid_owner.cpp b/core/templates/rid_owner.cpp deleted file mode 100644 index 459672c1a69..00000000000 --- a/core/templates/rid_owner.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************/ -/* rid_owner.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 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 */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#include "rid_owner.h" - -SafeNumeric RID_AllocBase::base_id{ 1 }; diff --git a/core/templates/rid_owner.h b/core/templates/rid_owner.h index 02b26141ac2..8157275a9b7 100644 --- a/core/templates/rid_owner.h +++ b/core/templates/rid_owner.h @@ -75,7 +75,7 @@ #endif class RID_AllocBase { - static SafeNumeric base_id; + static inline SafeNumeric base_id{ 1 }; protected: static RID _make_from_id(uint64_t p_id) { diff --git a/modules/godot_physics_2d/godot_broad_phase_2d.cpp b/modules/godot_physics_2d/godot_broad_phase_2d.cpp deleted file mode 100644 index eb6bc21d604..00000000000 --- a/modules/godot_physics_2d/godot_broad_phase_2d.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************/ -/* godot_broad_phase_2d.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 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 */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#include "godot_broad_phase_2d.h" - -GodotBroadPhase2D::CreateFunction GodotBroadPhase2D::create_func = nullptr; - -GodotBroadPhase2D::~GodotBroadPhase2D() { -} diff --git a/modules/godot_physics_2d/godot_broad_phase_2d.h b/modules/godot_physics_2d/godot_broad_phase_2d.h index a356e6127e9..65c99872394 100644 --- a/modules/godot_physics_2d/godot_broad_phase_2d.h +++ b/modules/godot_physics_2d/godot_broad_phase_2d.h @@ -39,7 +39,7 @@ class GodotBroadPhase2D { public: typedef GodotBroadPhase2D *(*CreateFunction)(); - static CreateFunction create_func; + static inline CreateFunction create_func = nullptr; typedef uint32_t ID; @@ -64,5 +64,5 @@ public: virtual void update() = 0; - virtual ~GodotBroadPhase2D(); + virtual ~GodotBroadPhase2D() {} }; diff --git a/modules/godot_physics_3d/godot_broad_phase_3d.cpp b/modules/godot_physics_3d/godot_broad_phase_3d.cpp deleted file mode 100644 index ebd11fb51fb..00000000000 --- a/modules/godot_physics_3d/godot_broad_phase_3d.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************/ -/* godot_broad_phase_3d.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 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 */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#include "godot_broad_phase_3d.h" - -GodotBroadPhase3D::CreateFunction GodotBroadPhase3D::create_func = nullptr; - -GodotBroadPhase3D::~GodotBroadPhase3D() { -} diff --git a/modules/godot_physics_3d/godot_broad_phase_3d.h b/modules/godot_physics_3d/godot_broad_phase_3d.h index 1d22b0048a9..852dde3469c 100644 --- a/modules/godot_physics_3d/godot_broad_phase_3d.h +++ b/modules/godot_physics_3d/godot_broad_phase_3d.h @@ -39,7 +39,7 @@ class GodotBroadPhase3D { public: typedef GodotBroadPhase3D *(*CreateFunction)(); - static CreateFunction create_func; + static inline CreateFunction create_func = nullptr; typedef uint32_t ID; @@ -65,5 +65,5 @@ public: virtual void update() = 0; - virtual ~GodotBroadPhase3D(); + virtual ~GodotBroadPhase3D() {} }; diff --git a/platform/web/SCsub b/platform/web/SCsub index bd001fd6dc4..ea974acaa4a 100644 --- a/platform/web/SCsub +++ b/platform/web/SCsub @@ -27,8 +27,6 @@ web_files = [ "http_client_web.cpp", "javascript_bridge_singleton.cpp", "web_main.cpp", - "ip_web.cpp", - "net_socket_web.cpp", "os_web.cpp", ] diff --git a/platform/web/ip_web.cpp b/platform/web/ip_web.cpp deleted file mode 100644 index 3d1fc5618fc..00000000000 --- a/platform/web/ip_web.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************/ -/* ip_web.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 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 */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#include "ip_web.h" - -void IPWeb::_resolve_hostname(List &r_addresses, const String &p_hostname, Type p_type) const { -} - -void IPWeb::get_local_interfaces(HashMap *r_interfaces) const { -} - -void IPWeb::make_default() { - _create = _create_web; -} - -IP *IPWeb::_create_web() { - return memnew(IPWeb); -} - -IPWeb::IPWeb() { -} diff --git a/platform/web/ip_web.h b/platform/web/ip_web.h index b102bbf0fdb..7f9ae44f38f 100644 --- a/platform/web/ip_web.h +++ b/platform/web/ip_web.h @@ -35,14 +35,17 @@ class IPWeb : public IP { GDCLASS(IPWeb, IP); - virtual void _resolve_hostname(List &r_addresses, const String &p_hostname, Type p_type = TYPE_ANY) const override; + virtual void _resolve_hostname(List &r_addresses, const String &p_hostname, Type p_type = TYPE_ANY) const override {} private: - static IP *_create_web(); + static IP *_create_web() { + return memnew(IPWeb); + } public: - virtual void get_local_interfaces(HashMap *r_interfaces) const override; + virtual void get_local_interfaces(HashMap *r_interfaces) const override {} - static void make_default(); - IPWeb(); + static void make_default() { + _create = _create_web; + } }; diff --git a/platform/web/net_socket_web.cpp b/platform/web/net_socket_web.cpp deleted file mode 100644 index db3bac065bd..00000000000 --- a/platform/web/net_socket_web.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************/ -/* net_socket_web.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 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 */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#include "net_socket_web.h" - -NetSocket *NetSocketWeb::_create_func() { - return memnew(NetSocketWeb); -} - -void NetSocketWeb::make_default() { - _create = _create_func; -} diff --git a/platform/web/net_socket_web.h b/platform/web/net_socket_web.h index 03aa57bbddc..ed8da088fd2 100644 --- a/platform/web/net_socket_web.h +++ b/platform/web/net_socket_web.h @@ -36,10 +36,14 @@ class NetSocketWeb : public NetSocket { protected: - static NetSocket *_create_func(); + static NetSocket *_create_func() { + return memnew(NetSocketWeb); + } public: - static void make_default(); + static void make_default() { + _create = _create_func; + } virtual Error open(Type p_sock_type, IP::Type &ip_type) override { return ERR_UNAVAILABLE; } virtual void close() override {} @@ -64,6 +68,4 @@ public: virtual void set_reuse_address_enabled(bool p_enabled) override {} virtual Error join_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) override { return ERR_UNAVAILABLE; } virtual Error leave_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) override { return ERR_UNAVAILABLE; } - - NetSocketWeb() {} }; diff --git a/servers/rendering/dummy/storage/texture_storage.cpp b/servers/rendering/dummy/storage/texture_storage.cpp deleted file mode 100644 index 7f446eb633f..00000000000 --- a/servers/rendering/dummy/storage/texture_storage.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************/ -/* texture_storage.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 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 */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#include "texture_storage.h" - -using namespace RendererDummy; - -TextureStorage *TextureStorage::singleton = nullptr; - -TextureStorage::TextureStorage() { - singleton = this; -} - -TextureStorage::~TextureStorage() { - singleton = nullptr; -} diff --git a/servers/rendering/dummy/storage/texture_storage.h b/servers/rendering/dummy/storage/texture_storage.h index afda5e054c7..0d5d38c9195 100644 --- a/servers/rendering/dummy/storage/texture_storage.h +++ b/servers/rendering/dummy/storage/texture_storage.h @@ -36,7 +36,7 @@ namespace RendererDummy { class TextureStorage : public RendererTextureStorage { private: - static TextureStorage *singleton; + static inline TextureStorage *singleton = nullptr; struct DummyTexture { Ref image; @@ -46,8 +46,8 @@ private: public: static TextureStorage *get_singleton() { return singleton; } - TextureStorage(); - ~TextureStorage(); + TextureStorage() { singleton = this; } + ~TextureStorage() { singleton = nullptr; } /* Canvas Texture API */ diff --git a/servers/rendering/renderer_rd/storage_rd/forward_id_storage.cpp b/servers/rendering/renderer_rd/storage_rd/forward_id_storage.cpp deleted file mode 100644 index 3782d343c25..00000000000 --- a/servers/rendering/renderer_rd/storage_rd/forward_id_storage.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************/ -/* forward_id_storage.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 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 */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#include "forward_id_storage.h" - -using namespace RendererRD; - -ForwardIDStorage *ForwardIDStorage::singleton = nullptr; - -ForwardIDStorage::ForwardIDStorage() { - singleton = this; -} - -ForwardIDStorage::~ForwardIDStorage() { - singleton = nullptr; -} diff --git a/servers/rendering/renderer_rd/storage_rd/forward_id_storage.h b/servers/rendering/renderer_rd/storage_rd/forward_id_storage.h index 0d177abf79a..84ba3f5fb38 100644 --- a/servers/rendering/renderer_rd/storage_rd/forward_id_storage.h +++ b/servers/rendering/renderer_rd/storage_rd/forward_id_storage.h @@ -48,13 +48,13 @@ enum ForwardIDType { class ForwardIDStorage { private: - static ForwardIDStorage *singleton; + static inline ForwardIDStorage *singleton = nullptr; public: static ForwardIDStorage *get_singleton() { return singleton; } - ForwardIDStorage(); - virtual ~ForwardIDStorage(); + ForwardIDStorage() { singleton = this; } + virtual ~ForwardIDStorage() { singleton = nullptr; } virtual RendererRD::ForwardID allocate_forward_id(RendererRD::ForwardIDType p_type) { return -1; } virtual void free_forward_id(RendererRD::ForwardIDType p_type, RendererRD::ForwardID p_id) {} diff --git a/servers/rendering/renderer_rd/storage_rd/render_data_rd.cpp b/servers/rendering/renderer_rd/storage_rd/render_data_rd.cpp deleted file mode 100644 index ddc4d092790..00000000000 --- a/servers/rendering/renderer_rd/storage_rd/render_data_rd.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************/ -/* render_data_rd.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 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 */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#include "render_data_rd.h" - -Ref RenderDataRD::get_render_scene_buffers() const { - return render_buffers; -} - -RenderSceneData *RenderDataRD::get_render_scene_data() const { - return scene_data; -} - -RID RenderDataRD::get_environment() const { - return environment; -} - -RID RenderDataRD::get_camera_attributes() const { - return camera_attributes; -} diff --git a/servers/rendering/renderer_rd/storage_rd/render_data_rd.h b/servers/rendering/renderer_rd/storage_rd/render_data_rd.h index 5f33f5888e5..5fadfeb5250 100644 --- a/servers/rendering/renderer_rd/storage_rd/render_data_rd.h +++ b/servers/rendering/renderer_rd/storage_rd/render_data_rd.h @@ -39,11 +39,11 @@ class RenderDataRD : public RenderData { public: // Access methods to expose data externally - virtual Ref get_render_scene_buffers() const override; - virtual RenderSceneData *get_render_scene_data() const override; + virtual Ref get_render_scene_buffers() const override { return render_buffers; } + virtual RenderSceneData *get_render_scene_data() const override { return scene_data; } - virtual RID get_environment() const override; - virtual RID get_camera_attributes() const override; + virtual RID get_environment() const override { return environment; } + virtual RID get_camera_attributes() const override { return camera_attributes; } // Members are publicly accessible within the render engine. Ref render_buffers; diff --git a/servers/rendering/rendering_method.cpp b/servers/rendering/rendering_method.cpp deleted file mode 100644 index d4737966c65..00000000000 --- a/servers/rendering/rendering_method.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************/ -/* rendering_method.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 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 */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#include "rendering_method.h" - -RenderingMethod::RenderingMethod() { -} - -RenderingMethod::~RenderingMethod() { -} diff --git a/servers/rendering/rendering_method.h b/servers/rendering/rendering_method.h index 38e173bf48f..3cc11eeb1ea 100644 --- a/servers/rendering/rendering_method.h +++ b/servers/rendering/rendering_method.h @@ -368,6 +368,5 @@ public: virtual void tick() = 0; virtual void pre_draw(bool p_will_draw) = 0; - RenderingMethod(); - virtual ~RenderingMethod(); + virtual ~RenderingMethod() {} }; diff --git a/servers/rendering/rendering_server_globals.cpp b/servers/rendering/rendering_server_globals.cpp deleted file mode 100644 index 1d1de2bfafb..00000000000 --- a/servers/rendering/rendering_server_globals.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************/ -/* rendering_server_globals.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 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 */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#include "rendering_server_globals.h" - -bool RenderingServerGlobals::threaded = false; - -RendererUtilities *RenderingServerGlobals::utilities = nullptr; -RendererLightStorage *RenderingServerGlobals::light_storage = nullptr; -RendererMaterialStorage *RenderingServerGlobals::material_storage = nullptr; -RendererMeshStorage *RenderingServerGlobals::mesh_storage = nullptr; -RendererParticlesStorage *RenderingServerGlobals::particles_storage = nullptr; -RendererTextureStorage *RenderingServerGlobals::texture_storage = nullptr; -RendererGI *RenderingServerGlobals::gi = nullptr; -RendererFog *RenderingServerGlobals::fog = nullptr; -RendererCameraAttributes *RenderingServerGlobals::camera_attributes = nullptr; -RendererCanvasRender *RenderingServerGlobals::canvas_render = nullptr; -RendererCompositor *RenderingServerGlobals::rasterizer = nullptr; - -RendererCanvasCull *RenderingServerGlobals::canvas = nullptr; -RendererViewport *RenderingServerGlobals::viewport = nullptr; -RenderingMethod *RenderingServerGlobals::scene = nullptr; diff --git a/servers/rendering/rendering_server_globals.h b/servers/rendering/rendering_server_globals.h index c571eccafaa..7c28e33648a 100644 --- a/servers/rendering/rendering_server_globals.h +++ b/servers/rendering/rendering_server_globals.h @@ -49,23 +49,23 @@ class RenderingMethod; class RenderingServerGlobals { public: - static bool threaded; + static inline bool threaded = false; - static RendererUtilities *utilities; - static RendererLightStorage *light_storage; - static RendererMaterialStorage *material_storage; - static RendererMeshStorage *mesh_storage; - static RendererParticlesStorage *particles_storage; - static RendererTextureStorage *texture_storage; - static RendererGI *gi; - static RendererFog *fog; - static RendererCameraAttributes *camera_attributes; - static RendererCanvasRender *canvas_render; - static RendererCompositor *rasterizer; + static inline RendererUtilities *utilities = nullptr; + static inline RendererLightStorage *light_storage = nullptr; + static inline RendererMaterialStorage *material_storage = nullptr; + static inline RendererMeshStorage *mesh_storage = nullptr; + static inline RendererParticlesStorage *particles_storage = nullptr; + static inline RendererTextureStorage *texture_storage = nullptr; + static inline RendererGI *gi = nullptr; + static inline RendererFog *fog = nullptr; + static inline RendererCameraAttributes *camera_attributes = nullptr; + static inline RendererCanvasRender *canvas_render = nullptr; + static inline RendererCompositor *rasterizer = nullptr; - static RendererCanvasCull *canvas; - static RendererViewport *viewport; - static RenderingMethod *scene; + static inline RendererCanvasCull *canvas = nullptr; + static inline RendererViewport *viewport = nullptr; + static inline RenderingMethod *scene = nullptr; }; #define RSG RenderingServerGlobals diff --git a/servers/xr/xr_controller_tracker.cpp b/servers/xr/xr_controller_tracker.cpp deleted file mode 100644 index 2d6cf44ce87..00000000000 --- a/servers/xr/xr_controller_tracker.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************/ -/* xr_controller_tracker.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 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 */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#include "xr_controller_tracker.h" - -#include "core/input/input.h" - -void XRControllerTracker::_bind_methods() {} - -XRControllerTracker::XRControllerTracker() { - type = XRServer::TRACKER_CONTROLLER; -} diff --git a/servers/xr/xr_controller_tracker.h b/servers/xr/xr_controller_tracker.h index b4b300bfe50..0c99b08e4f3 100644 --- a/servers/xr/xr_controller_tracker.h +++ b/servers/xr/xr_controller_tracker.h @@ -41,9 +41,8 @@ class XRControllerTracker : public XRPositionalTracker { GDCLASS(XRControllerTracker, XRPositionalTracker); _THREAD_SAFE_CLASS_ -protected: - static void _bind_methods(); - public: - XRControllerTracker(); + XRControllerTracker() { + type = XRServer::TRACKER_CONTROLLER; + } };