Skip to content

Commit 73f5eeb

Browse files
akien-mgaakien-mga
committed
Merge pull request godotengine#66744 from aaronfranke/group-2d
Reorganize some code to have 2D things grouped together
2 parents 2886511 + 6dd4a68 commit 73f5eeb

File tree

6 files changed

+93
-90
lines changed

6 files changed

+93
-90
lines changed

‎editor/plugins/canvas_item_editor_plugin.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ class CanvasItemEditor : public VBoxContainer {
297297
};
298298

299299
HashMap<BoneKey, BoneList> bone_list;
300+
MenuButton *skeleton_menu = nullptr;
300301

301302
struct PoseClipboard {
302303
Vector2 pos;
@@ -329,7 +330,6 @@ class CanvasItemEditor : public VBoxContainer {
329330
Button *group_button = nullptr;
330331
Button *ungroup_button = nullptr;
331332

332-
MenuButton *skeleton_menu = nullptr;
333333
Button *override_camera_button = nullptr;
334334
MenuButton *view_menu = nullptr;
335335
PopupMenu *grid_menu = nullptr;

‎editor/plugins/sprite_frames_editor_plugin.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2317,15 +2317,15 @@ void SpriteFramesEditorPlugin::edit(Object *p_object) {
23172317
}
23182318

23192319
bool SpriteFramesEditorPlugin::handles(Object *p_object) const {
2320-
AnimatedSprite2D *animated_sprite = Object::cast_to<AnimatedSprite2D>(p_object);
2321-
AnimatedSprite3D *animated_sprite_3d = Object::cast_to<AnimatedSprite3D>(p_object);
2322-
if (animated_sprite && *animated_sprite->get_sprite_frames()) {
2320+
AnimatedSprite2D *animated_sprite_2d = Object::cast_to<AnimatedSprite2D>(p_object);
2321+
if (animated_sprite_2d && *animated_sprite_2d->get_sprite_frames()) {
23232322
return true;
2324-
} else if (animated_sprite_3d && *animated_sprite_3d->get_sprite_frames()) {
2323+
}
2324+
AnimatedSprite3D *animated_sprite_3d = Object::cast_to<AnimatedSprite3D>(p_object);
2325+
if (animated_sprite_3d && *animated_sprite_3d->get_sprite_frames()) {
23252326
return true;
2326-
} else {
2327-
return p_object->is_class("SpriteFrames");
23282327
}
2328+
return p_object->is_class("SpriteFrames");
23292329
}
23302330

23312331
void SpriteFramesEditorPlugin::make_visible(bool p_visible) {

‎main/main.cpp‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,18 @@
6969
#include "servers/display_server.h"
7070
#include "servers/movie_writer/movie_writer.h"
7171
#include "servers/movie_writer/movie_writer_mjpeg.h"
72-
#include "servers/navigation_server_2d.h"
73-
#include "servers/navigation_server_2d_dummy.h"
7472
#include "servers/navigation_server_3d.h"
7573
#include "servers/navigation_server_3d_dummy.h"
76-
#include "servers/physics_server_2d.h"
7774
#include "servers/register_server_types.h"
7875
#include "servers/rendering/rendering_server_default.h"
7976
#include "servers/text/text_server_dummy.h"
8077
#include "servers/text_server.h"
8178

79+
// 2D
80+
#include "servers/navigation_server_2d.h"
81+
#include "servers/navigation_server_2d_dummy.h"
82+
#include "servers/physics_server_2d.h"
83+
8284
#ifndef _3D_DISABLED
8385
#include "servers/physics_server_3d.h"
8486
#include "servers/xr_server.h"
@@ -143,15 +145,15 @@ static MessageQueue *message_queue = nullptr;
143145

144146
// Initialized in setup2()
145147
static AudioServer *audio_server = nullptr;
148+
static CameraServer *camera_server = nullptr;
146149
static DisplayServer *display_server = nullptr;
147150
static RenderingServer *rendering_server = nullptr;
148-
static CameraServer *camera_server = nullptr;
149151
static TextServerManager *tsman = nullptr;
152+
static ThemeDB *theme_db = nullptr;
153+
static NavigationServer2D *navigation_server_2d = nullptr;
150154
static PhysicsServer2DManager *physics_server_2d_manager = nullptr;
151155
static PhysicsServer2D *physics_server_2d = nullptr;
152156
static NavigationServer3D *navigation_server_3d = nullptr;
153-
static NavigationServer2D *navigation_server_2d = nullptr;
154-
static ThemeDB *theme_db = nullptr;
155157
#ifndef _3D_DISABLED
156158
static PhysicsServer3DManager *physics_server_3d_manager = nullptr;
157159
static PhysicsServer3D *physics_server_3d = nullptr;

‎main/performance.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@
3636
#include "scene/main/scene_tree.h"
3737
#include "servers/audio_server.h"
3838
#include "servers/navigation_server_3d.h"
39-
#include "servers/physics_server_2d.h"
4039
#include "servers/rendering_server.h"
4140

41+
// 2D
42+
#include "servers/physics_server_2d.h"
43+
4244
#ifndef _3D_DISABLED
4345
#include "servers/physics_server_3d.h"
4446
#endif // _3D_DISABLED

‎scene/register_scene_types.cpp‎

Lines changed: 71 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -33,53 +33,6 @@
3333
#include "core/config/project_settings.h"
3434
#include "core/object/class_db.h"
3535
#include "core/os/os.h"
36-
#include "scene/2d/animated_sprite_2d.h"
37-
#include "scene/2d/audio_listener_2d.h"
38-
#include "scene/2d/audio_stream_player_2d.h"
39-
#include "scene/2d/back_buffer_copy.h"
40-
#include "scene/2d/camera_2d.h"
41-
#include "scene/2d/canvas_group.h"
42-
#include "scene/2d/canvas_modulate.h"
43-
#include "scene/2d/cpu_particles_2d.h"
44-
#include "scene/2d/gpu_particles_2d.h"
45-
#include "scene/2d/light_2d.h"
46-
#include "scene/2d/light_occluder_2d.h"
47-
#include "scene/2d/line_2d.h"
48-
#include "scene/2d/marker_2d.h"
49-
#include "scene/2d/mesh_instance_2d.h"
50-
#include "scene/2d/multimesh_instance_2d.h"
51-
#include "scene/2d/navigation_agent_2d.h"
52-
#include "scene/2d/navigation_link_2d.h"
53-
#include "scene/2d/navigation_obstacle_2d.h"
54-
#include "scene/2d/navigation_region_2d.h"
55-
#include "scene/2d/parallax_2d.h"
56-
#include "scene/2d/parallax_background.h"
57-
#include "scene/2d/parallax_layer.h"
58-
#include "scene/2d/path_2d.h"
59-
#include "scene/2d/physics/animatable_body_2d.h"
60-
#include "scene/2d/physics/area_2d.h"
61-
#include "scene/2d/physics/character_body_2d.h"
62-
#include "scene/2d/physics/collision_polygon_2d.h"
63-
#include "scene/2d/physics/collision_shape_2d.h"
64-
#include "scene/2d/physics/joints/damped_spring_joint_2d.h"
65-
#include "scene/2d/physics/joints/groove_joint_2d.h"
66-
#include "scene/2d/physics/joints/joint_2d.h"
67-
#include "scene/2d/physics/joints/pin_joint_2d.h"
68-
#include "scene/2d/physics/kinematic_collision_2d.h"
69-
#include "scene/2d/physics/physical_bone_2d.h"
70-
#include "scene/2d/physics/physics_body_2d.h"
71-
#include "scene/2d/physics/ray_cast_2d.h"
72-
#include "scene/2d/physics/rigid_body_2d.h"
73-
#include "scene/2d/physics/shape_cast_2d.h"
74-
#include "scene/2d/physics/static_body_2d.h"
75-
#include "scene/2d/polygon_2d.h"
76-
#include "scene/2d/remote_transform_2d.h"
77-
#include "scene/2d/skeleton_2d.h"
78-
#include "scene/2d/sprite_2d.h"
79-
#include "scene/2d/tile_map.h"
80-
#include "scene/2d/tile_map_layer.h"
81-
#include "scene/2d/touch_screen_button.h"
82-
#include "scene/2d/visible_on_screen_notifier_2d.h"
8336
#include "scene/animation/animation_blend_space_1d.h"
8437
#include "scene/animation/animation_blend_space_2d.h"
8538
#include "scene/animation/animation_blend_tree.h"
@@ -146,29 +99,11 @@
14699
#include "scene/main/multiplayer_api.h"
147100
#include "scene/main/resource_preloader.h"
148101
#include "scene/main/scene_tree.h"
102+
#include "scene/main/shader_globals_override.h"
149103
#include "scene/main/status_indicator.h"
150104
#include "scene/main/timer.h"
151105
#include "scene/main/viewport.h"
152106
#include "scene/main/window.h"
153-
#include "scene/resources/2d/capsule_shape_2d.h"
154-
#include "scene/resources/2d/circle_shape_2d.h"
155-
#include "scene/resources/2d/concave_polygon_shape_2d.h"
156-
#include "scene/resources/2d/convex_polygon_shape_2d.h"
157-
#include "scene/resources/2d/polygon_path_finder.h"
158-
#include "scene/resources/2d/rectangle_shape_2d.h"
159-
#include "scene/resources/2d/segment_shape_2d.h"
160-
#include "scene/resources/2d/separation_ray_shape_2d.h"
161-
#include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
162-
#include "scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.h"
163-
#include "scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.h"
164-
#include "scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.h"
165-
#include "scene/resources/2d/skeleton/skeleton_modification_2d_lookat.h"
166-
#include "scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.h"
167-
#include "scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.h"
168-
#include "scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.h"
169-
#include "scene/resources/2d/skeleton/skeleton_modification_stack_2d.h"
170-
#include "scene/resources/2d/tile_set.h"
171-
#include "scene/resources/2d/world_boundary_shape_2d.h"
172107
#include "scene/resources/animated_texture.h"
173108
#include "scene/resources/animation_library.h"
174109
#include "scene/resources/atlas_texture.h"
@@ -226,7 +161,73 @@
226161
#include "scene/scene_string_names.h"
227162
#include "scene/theme/theme_db.h"
228163

229-
#include "scene/main/shader_globals_override.h"
164+
// 2D
165+
#include "scene/2d/animated_sprite_2d.h"
166+
#include "scene/2d/audio_listener_2d.h"
167+
#include "scene/2d/audio_stream_player_2d.h"
168+
#include "scene/2d/back_buffer_copy.h"
169+
#include "scene/2d/camera_2d.h"
170+
#include "scene/2d/canvas_group.h"
171+
#include "scene/2d/canvas_modulate.h"
172+
#include "scene/2d/cpu_particles_2d.h"
173+
#include "scene/2d/gpu_particles_2d.h"
174+
#include "scene/2d/light_2d.h"
175+
#include "scene/2d/light_occluder_2d.h"
176+
#include "scene/2d/line_2d.h"
177+
#include "scene/2d/marker_2d.h"
178+
#include "scene/2d/mesh_instance_2d.h"
179+
#include "scene/2d/multimesh_instance_2d.h"
180+
#include "scene/2d/navigation_agent_2d.h"
181+
#include "scene/2d/navigation_link_2d.h"
182+
#include "scene/2d/navigation_obstacle_2d.h"
183+
#include "scene/2d/navigation_region_2d.h"
184+
#include "scene/2d/parallax_2d.h"
185+
#include "scene/2d/parallax_background.h"
186+
#include "scene/2d/parallax_layer.h"
187+
#include "scene/2d/path_2d.h"
188+
#include "scene/2d/physics/animatable_body_2d.h"
189+
#include "scene/2d/physics/area_2d.h"
190+
#include "scene/2d/physics/character_body_2d.h"
191+
#include "scene/2d/physics/collision_polygon_2d.h"
192+
#include "scene/2d/physics/collision_shape_2d.h"
193+
#include "scene/2d/physics/joints/damped_spring_joint_2d.h"
194+
#include "scene/2d/physics/joints/groove_joint_2d.h"
195+
#include "scene/2d/physics/joints/joint_2d.h"
196+
#include "scene/2d/physics/joints/pin_joint_2d.h"
197+
#include "scene/2d/physics/kinematic_collision_2d.h"
198+
#include "scene/2d/physics/physical_bone_2d.h"
199+
#include "scene/2d/physics/physics_body_2d.h"
200+
#include "scene/2d/physics/ray_cast_2d.h"
201+
#include "scene/2d/physics/rigid_body_2d.h"
202+
#include "scene/2d/physics/shape_cast_2d.h"
203+
#include "scene/2d/physics/static_body_2d.h"
204+
#include "scene/2d/polygon_2d.h"
205+
#include "scene/2d/remote_transform_2d.h"
206+
#include "scene/2d/skeleton_2d.h"
207+
#include "scene/2d/sprite_2d.h"
208+
#include "scene/2d/tile_map.h"
209+
#include "scene/2d/tile_map_layer.h"
210+
#include "scene/2d/touch_screen_button.h"
211+
#include "scene/2d/visible_on_screen_notifier_2d.h"
212+
#include "scene/resources/2d/capsule_shape_2d.h"
213+
#include "scene/resources/2d/circle_shape_2d.h"
214+
#include "scene/resources/2d/concave_polygon_shape_2d.h"
215+
#include "scene/resources/2d/convex_polygon_shape_2d.h"
216+
#include "scene/resources/2d/polygon_path_finder.h"
217+
#include "scene/resources/2d/rectangle_shape_2d.h"
218+
#include "scene/resources/2d/segment_shape_2d.h"
219+
#include "scene/resources/2d/separation_ray_shape_2d.h"
220+
#include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
221+
#include "scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.h"
222+
#include "scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.h"
223+
#include "scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.h"
224+
#include "scene/resources/2d/skeleton/skeleton_modification_2d_lookat.h"
225+
#include "scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.h"
226+
#include "scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.h"
227+
#include "scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.h"
228+
#include "scene/resources/2d/skeleton/skeleton_modification_stack_2d.h"
229+
#include "scene/resources/2d/tile_set.h"
230+
#include "scene/resources/2d/world_boundary_shape_2d.h"
230231

231232
#ifndef _3D_DISABLED
232233
#include "scene/3d/audio_listener_3d.h"
@@ -858,6 +859,7 @@ void register_scene_types() {
858859
GDREGISTER_CLASS(MeshDataTool);
859860

860861
#ifndef _3D_DISABLED
862+
GDREGISTER_CLASS(AudioStreamPlayer3D);
861863
GDREGISTER_VIRTUAL_CLASS(PrimitiveMesh);
862864
GDREGISTER_CLASS(BoxMesh);
863865
GDREGISTER_CLASS(CapsuleMesh);
@@ -969,7 +971,6 @@ void register_scene_types() {
969971
GDREGISTER_CLASS(StyleBoxLine);
970972
GDREGISTER_CLASS(Theme);
971973

972-
GDREGISTER_CLASS(PolygonPathFinder);
973974
GDREGISTER_CLASS(BitMap);
974975
GDREGISTER_CLASS(Gradient);
975976

@@ -980,16 +981,13 @@ void register_scene_types() {
980981
OS::get_singleton()->yield(); // may take time to init
981982

982983
GDREGISTER_CLASS(AudioStreamPlayer);
983-
GDREGISTER_CLASS(AudioStreamPlayer2D);
984-
#ifndef _3D_DISABLED
985-
GDREGISTER_CLASS(AudioStreamPlayer3D);
986-
#endif
987984
GDREGISTER_CLASS(AudioStreamWAV);
988985
GDREGISTER_CLASS(AudioStreamPolyphonic);
989986
GDREGISTER_ABSTRACT_CLASS(AudioStreamPlaybackPolyphonic);
990987

991988
OS::get_singleton()->yield(); // may take time to init
992989

990+
GDREGISTER_CLASS(AudioStreamPlayer2D);
993991
GDREGISTER_ABSTRACT_CLASS(Shape2D);
994992
GDREGISTER_CLASS(WorldBoundaryShape2D);
995993
GDREGISTER_CLASS(SegmentShape2D);
@@ -1002,6 +1000,7 @@ void register_scene_types() {
10021000
GDREGISTER_CLASS(Curve2D);
10031001
GDREGISTER_CLASS(Path2D);
10041002
GDREGISTER_CLASS(PathFollow2D);
1003+
GDREGISTER_CLASS(PolygonPathFinder);
10051004

10061005
GDREGISTER_CLASS(NavigationMesh);
10071006
GDREGISTER_CLASS(NavigationMeshSourceGeometryData2D);

‎scene/resources/world_2d.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ RID World2D::get_navigation_map() const {
6666
return navigation_map;
6767
}
6868

69+
PhysicsDirectSpaceState2D *World2D::get_direct_space_state() {
70+
return PhysicsServer2D::get_singleton()->space_get_direct_state(get_space());
71+
}
72+
6973
void World2D::_bind_methods() {
7074
ClassDB::bind_method(D_METHOD("get_canvas"), &World2D::get_canvas);
7175
ClassDB::bind_method(D_METHOD("get_space"), &World2D::get_space);
@@ -79,10 +83,6 @@ void World2D::_bind_methods() {
7983
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "direct_space_state", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsDirectSpaceState2D", PROPERTY_USAGE_NONE), "", "get_direct_space_state");
8084
}
8185

82-
PhysicsDirectSpaceState2D *World2D::get_direct_space_state() {
83-
return PhysicsServer2D::get_singleton()->space_get_direct_state(get_space());
84-
}
85-
8686
void World2D::register_viewport(Viewport *p_viewport) {
8787
viewports.insert(p_viewport);
8888
}

0 commit comments

Comments
 (0)