Skip to content

Commit 1acebcd

Browse files
smix8smix8
committed
Move PhysicServer enums, structs and sub-objects to dedicated files
Moves PhysicServer enums, structs and sub-objects to dedicated files.
1 parent a3fc1cb commit 1acebcd

198 files changed

Lines changed: 6188 additions & 4797 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎editor/scene/3d/node_3d_editor_plugin.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
#include "scene/resources/3d/sky_material.h"
106106
#include "scene/resources/sky.h"
107107
#include "scene/resources/surface_tool.h"
108+
#include "servers/physics_3d/physics_server_3d_types.h"
108109
#include "servers/rendering/rendering_server.h"
109110

110111
using namespace Node3DEditorConstants;
@@ -2223,7 +2224,7 @@ void Node3DEditor::_snap_selected_nodes_to_floor() {
22232224
}
22242225

22252226
PhysicsDirectSpaceState3D *ss = get_tree()->get_root()->get_world_3d()->get_direct_space_state();
2226-
PhysicsDirectSpaceState3D::RayResult result;
2227+
PS3DT::RayResult result;
22272228

22282229
// The maximum height an object can travel to be snapped
22292230
const float max_snap_height = 500.0;
@@ -2242,7 +2243,7 @@ void Node3DEditor::_snap_selected_nodes_to_floor() {
22422243
Vector3 to = from - Vector3(0.0, max_snap_height, 0.0);
22432244
HashSet<RID> excluded = _get_physics_bodies_rid(sp);
22442245

2245-
PhysicsDirectSpaceState3D::RayParameters ray_params;
2246+
PS3DT::RayParameters ray_params;
22462247
ray_params.from = from;
22472248
ray_params.to = to;
22482249
ray_params.exclude = excluded;
@@ -2265,7 +2266,7 @@ void Node3DEditor::_snap_selected_nodes_to_floor() {
22652266
Vector3 to = from - Vector3(0.0, max_snap_height, 0.0);
22662267
HashSet<RID> excluded = _get_physics_bodies_rid(sp);
22672268

2268-
PhysicsDirectSpaceState3D::RayParameters ray_params;
2269+
PS3DT::RayParameters ray_params;
22692270
ray_params.from = from;
22702271
ray_params.to = to;
22712272
ray_params.exclude = excluded;

‎editor/scene/3d/node_3d_editor_viewport.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
#include "scene/resources/gradient.h"
7373
#include "scene/resources/immediate_mesh.h"
7474
#include "scene/resources/packed_scene.h"
75+
#include "servers/physics_3d/physics_server_3d_types.h"
7576
#include "servers/rendering/rendering_server.h"
7677

7778
using namespace Node3DEditorConstants;
@@ -5416,13 +5417,14 @@ Vector3 Node3DEditorViewport::_get_instance_position(const Point2 &p_pos, Node3D
54165417
}
54175418
}
54185419

5419-
PhysicsDirectSpaceState3D::RayParameters ray_params;
5420+
PS3DT::RayParameters ray_params;
54205421
ray_params.exclude = col_obj_rids_to_exclude;
54215422
ray_params.from = world_pos;
54225423
ray_params.to = world_pos + world_ray * camera->get_far();
54235424

54245425
PhysicsDirectSpaceState3D *ss = get_tree()->get_root()->get_world_3d()->get_direct_space_state();
5425-
PhysicsDirectSpaceState3D::RayResult result;
5426+
PS3DT::RayResult result;
5427+
54265428
if (ss->intersect_ray(ray_params, result) && (preview_node->get_child_count() > 0 || !preview_node->is_inside_tree())) {
54275429
// Calculate an offset for the `p_node` such that the its bounding box is on top of and touching the contact surface's plane.
54285430

‎editor/scene/3d/path_3d_editor_plugin.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ void Path3DGizmo::set_handle(int p_id, bool p_secondary, Camera3D *p_camera, con
131131
if (Path3DEditorPlugin::singleton->snap_to_collider) {
132132
PhysicsDirectSpaceState3D *ss = p_camera->get_world_3d()->get_direct_space_state();
133133

134-
PhysicsDirectSpaceState3D::RayParameters ray_params;
134+
PS3DT::RayParameters ray_params;
135135
ray_params.from = ray_from;
136136
ray_params.to = ray_from + ray_dir * p_camera->get_far();
137-
PhysicsDirectSpaceState3D::RayResult result;
137+
PS3DT::RayResult result;
138138
if (ss->intersect_ray(ray_params, result)) {
139139
Vector3 local = gi.xform(result.position);
140140
c->set_point_position(idx, local);
@@ -964,8 +964,8 @@ void Path3DEditorPlugin::_notification(int p_what) {
964964
EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
965965
PhysicsDirectSpaceState3D *ss = get_tree()->get_root()->get_world_3d()->get_direct_space_state();
966966
if (ss) {
967-
PhysicsDirectSpaceState3D::RayParameters ray_params;
968-
PhysicsDirectSpaceState3D::RayResult result;
967+
PS3DT::RayParameters ray_params;
968+
PS3DT::RayResult result;
969969
ray_params.from = _edit.click_ray_pos;
970970
ray_params.to = ray_params.from + _edit.click_ray_dir;
971971
bool hit_something = false;

‎main/performance.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -286,11 +286,11 @@ double Performance::get_monitor(Monitor p_monitor) const {
286286
return RS::get_singleton()->get_rendering_info(RSE::RENDERING_INFO_PIPELINE_COMPILATIONS_SPECIALIZATION);
287287
#ifndef PHYSICS_2D_DISABLED
288288
case PHYSICS_2D_ACTIVE_OBJECTS:
289-
return PhysicsServer2D::get_singleton()->get_process_info(PhysicsServer2D::INFO_ACTIVE_OBJECTS);
289+
return PhysicsServer2D::get_singleton()->get_process_info(PS2DE::INFO_ACTIVE_OBJECTS);
290290
case PHYSICS_2D_COLLISION_PAIRS:
291-
return PhysicsServer2D::get_singleton()->get_process_info(PhysicsServer2D::INFO_COLLISION_PAIRS);
291+
return PhysicsServer2D::get_singleton()->get_process_info(PS2DE::INFO_COLLISION_PAIRS);
292292
case PHYSICS_2D_ISLAND_COUNT:
293-
return PhysicsServer2D::get_singleton()->get_process_info(PhysicsServer2D::INFO_ISLAND_COUNT);
293+
return PhysicsServer2D::get_singleton()->get_process_info(PS2DE::INFO_ISLAND_COUNT);
294294
#else
295295
case PHYSICS_2D_ACTIVE_OBJECTS:
296296
return 0;
@@ -301,11 +301,11 @@ double Performance::get_monitor(Monitor p_monitor) const {
301301
#endif // PHYSICS_2D_DISABLED
302302
#ifndef PHYSICS_3D_DISABLED
303303
case PHYSICS_3D_ACTIVE_OBJECTS:
304-
return PhysicsServer3D::get_singleton()->get_process_info(PhysicsServer3D::INFO_ACTIVE_OBJECTS);
304+
return PhysicsServer3D::get_singleton()->get_process_info(PS3DE::INFO_ACTIVE_OBJECTS);
305305
case PHYSICS_3D_COLLISION_PAIRS:
306-
return PhysicsServer3D::get_singleton()->get_process_info(PhysicsServer3D::INFO_COLLISION_PAIRS);
306+
return PhysicsServer3D::get_singleton()->get_process_info(PS3DE::INFO_COLLISION_PAIRS);
307307
case PHYSICS_3D_ISLAND_COUNT:
308-
return PhysicsServer3D::get_singleton()->get_process_info(PhysicsServer3D::INFO_ISLAND_COUNT);
308+
return PhysicsServer3D::get_singleton()->get_process_info(PS3DE::INFO_ISLAND_COUNT);
309309
#else
310310
case PHYSICS_3D_ACTIVE_OBJECTS:
311311
return 0;

‎modules/csg/csg_shape.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ void CSGShape3D::set_use_collision(bool p_enable) {
106106
if (use_collision) {
107107
root_collision_shape.instantiate();
108108
root_collision_body = PhysicsServer3D::get_singleton()->body_create();
109-
PhysicsServer3D::get_singleton()->body_set_mode(root_collision_body, PhysicsServer3D::BODY_MODE_STATIC);
110-
PhysicsServer3D::get_singleton()->body_set_state(root_collision_body, PhysicsServer3D::BODY_STATE_TRANSFORM, get_global_transform());
109+
PhysicsServer3D::get_singleton()->body_set_mode(root_collision_body, PS3DE::BODY_MODE_STATIC);
110+
PhysicsServer3D::get_singleton()->body_set_state(root_collision_body, PS3DE::BODY_STATE_TRANSFORM, get_global_transform());
111111
PhysicsServer3D::get_singleton()->body_add_shape(root_collision_body, root_collision_shape->get_rid());
112112
PhysicsServer3D::get_singleton()->body_set_space(root_collision_body, get_world_3d()->get_space());
113113
PhysicsServer3D::get_singleton()->body_attach_object_instance_id(root_collision_body, get_instance_id());
@@ -1035,8 +1035,8 @@ void CSGShape3D::_notification(int p_what) {
10351035
if (use_collision && is_root_shape()) {
10361036
root_collision_shape.instantiate();
10371037
root_collision_body = PhysicsServer3D::get_singleton()->body_create();
1038-
PhysicsServer3D::get_singleton()->body_set_mode(root_collision_body, PhysicsServer3D::BODY_MODE_STATIC);
1039-
PhysicsServer3D::get_singleton()->body_set_state(root_collision_body, PhysicsServer3D::BODY_STATE_TRANSFORM, get_global_transform());
1038+
PhysicsServer3D::get_singleton()->body_set_mode(root_collision_body, PS3DE::BODY_MODE_STATIC);
1039+
PhysicsServer3D::get_singleton()->body_set_state(root_collision_body, PS3DE::BODY_STATE_TRANSFORM, get_global_transform());
10401040
PhysicsServer3D::get_singleton()->body_add_shape(root_collision_body, root_collision_shape->get_rid());
10411041
PhysicsServer3D::get_singleton()->body_set_space(root_collision_body, get_world_3d()->get_space());
10421042
PhysicsServer3D::get_singleton()->body_attach_object_instance_id(root_collision_body, get_instance_id());
@@ -1059,7 +1059,7 @@ void CSGShape3D::_notification(int p_what) {
10591059

10601060
case NOTIFICATION_TRANSFORM_CHANGED: {
10611061
if (use_collision && is_root_shape() && root_collision_body.is_valid()) {
1062-
PhysicsServer3D::get_singleton()->body_set_state(root_collision_body, PhysicsServer3D::BODY_STATE_TRANSFORM, get_global_transform());
1062+
PhysicsServer3D::get_singleton()->body_set_state(root_collision_body, PS3DE::BODY_STATE_TRANSFORM, get_global_transform());
10631063
}
10641064
_on_transform_changed();
10651065
} break;

‎modules/godot_physics_2d/godot_area_2d.cpp‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -112,72 +112,72 @@ void GodotArea2D::set_area_monitor_callback(const Callable &p_callback) {
112112
}
113113
}
114114

115-
void GodotArea2D::_set_space_override_mode(PhysicsServer2D::AreaSpaceOverrideMode &r_mode, PhysicsServer2D::AreaSpaceOverrideMode p_new_mode) {
116-
bool do_override = p_new_mode != PhysicsServer2D::AREA_SPACE_OVERRIDE_DISABLED;
117-
if (do_override == (r_mode != PhysicsServer2D::AREA_SPACE_OVERRIDE_DISABLED)) {
115+
void GodotArea2D::_set_space_override_mode(PS2DE::AreaSpaceOverrideMode &r_mode, PS2DE::AreaSpaceOverrideMode p_new_mode) {
116+
bool do_override = p_new_mode != PS2DE::AREA_SPACE_OVERRIDE_DISABLED;
117+
if (do_override == (r_mode != PS2DE::AREA_SPACE_OVERRIDE_DISABLED)) {
118118
return;
119119
}
120120
_unregister_shapes();
121121
r_mode = p_new_mode;
122122
_shape_changed();
123123
}
124124

125-
void GodotArea2D::set_param(PhysicsServer2D::AreaParameter p_param, const Variant &p_value) {
125+
void GodotArea2D::set_param(PS2DE::AreaParameter p_param, const Variant &p_value) {
126126
switch (p_param) {
127-
case PhysicsServer2D::AREA_PARAM_GRAVITY_OVERRIDE_MODE:
128-
_set_space_override_mode(gravity_override_mode, (PhysicsServer2D::AreaSpaceOverrideMode)(int)p_value);
127+
case PS2DE::AREA_PARAM_GRAVITY_OVERRIDE_MODE:
128+
_set_space_override_mode(gravity_override_mode, (PS2DE::AreaSpaceOverrideMode)(int)p_value);
129129
break;
130-
case PhysicsServer2D::AREA_PARAM_GRAVITY:
130+
case PS2DE::AREA_PARAM_GRAVITY:
131131
gravity = p_value;
132132
break;
133-
case PhysicsServer2D::AREA_PARAM_GRAVITY_VECTOR:
133+
case PS2DE::AREA_PARAM_GRAVITY_VECTOR:
134134
gravity_vector = p_value;
135135
break;
136-
case PhysicsServer2D::AREA_PARAM_GRAVITY_IS_POINT:
136+
case PS2DE::AREA_PARAM_GRAVITY_IS_POINT:
137137
gravity_is_point = p_value;
138138
break;
139-
case PhysicsServer2D::AREA_PARAM_GRAVITY_POINT_UNIT_DISTANCE:
139+
case PS2DE::AREA_PARAM_GRAVITY_POINT_UNIT_DISTANCE:
140140
gravity_point_unit_distance = p_value;
141141
break;
142-
case PhysicsServer2D::AREA_PARAM_LINEAR_DAMP_OVERRIDE_MODE:
143-
_set_space_override_mode(linear_damping_override_mode, (PhysicsServer2D::AreaSpaceOverrideMode)(int)p_value);
142+
case PS2DE::AREA_PARAM_LINEAR_DAMP_OVERRIDE_MODE:
143+
_set_space_override_mode(linear_damping_override_mode, (PS2DE::AreaSpaceOverrideMode)(int)p_value);
144144
break;
145-
case PhysicsServer2D::AREA_PARAM_LINEAR_DAMP:
145+
case PS2DE::AREA_PARAM_LINEAR_DAMP:
146146
linear_damp = p_value;
147147
break;
148-
case PhysicsServer2D::AREA_PARAM_ANGULAR_DAMP_OVERRIDE_MODE:
149-
_set_space_override_mode(angular_damping_override_mode, (PhysicsServer2D::AreaSpaceOverrideMode)(int)p_value);
148+
case PS2DE::AREA_PARAM_ANGULAR_DAMP_OVERRIDE_MODE:
149+
_set_space_override_mode(angular_damping_override_mode, (PS2DE::AreaSpaceOverrideMode)(int)p_value);
150150
break;
151-
case PhysicsServer2D::AREA_PARAM_ANGULAR_DAMP:
151+
case PS2DE::AREA_PARAM_ANGULAR_DAMP:
152152
angular_damp = p_value;
153153
break;
154-
case PhysicsServer2D::AREA_PARAM_PRIORITY:
154+
case PS2DE::AREA_PARAM_PRIORITY:
155155
priority = p_value;
156156
break;
157157
}
158158
}
159159

160-
Variant GodotArea2D::get_param(PhysicsServer2D::AreaParameter p_param) const {
160+
Variant GodotArea2D::get_param(PS2DE::AreaParameter p_param) const {
161161
switch (p_param) {
162-
case PhysicsServer2D::AREA_PARAM_GRAVITY_OVERRIDE_MODE:
162+
case PS2DE::AREA_PARAM_GRAVITY_OVERRIDE_MODE:
163163
return gravity_override_mode;
164-
case PhysicsServer2D::AREA_PARAM_GRAVITY:
164+
case PS2DE::AREA_PARAM_GRAVITY:
165165
return gravity;
166-
case PhysicsServer2D::AREA_PARAM_GRAVITY_VECTOR:
166+
case PS2DE::AREA_PARAM_GRAVITY_VECTOR:
167167
return gravity_vector;
168-
case PhysicsServer2D::AREA_PARAM_GRAVITY_IS_POINT:
168+
case PS2DE::AREA_PARAM_GRAVITY_IS_POINT:
169169
return gravity_is_point;
170-
case PhysicsServer2D::AREA_PARAM_GRAVITY_POINT_UNIT_DISTANCE:
170+
case PS2DE::AREA_PARAM_GRAVITY_POINT_UNIT_DISTANCE:
171171
return gravity_point_unit_distance;
172-
case PhysicsServer2D::AREA_PARAM_LINEAR_DAMP_OVERRIDE_MODE:
172+
case PS2DE::AREA_PARAM_LINEAR_DAMP_OVERRIDE_MODE:
173173
return linear_damping_override_mode;
174-
case PhysicsServer2D::AREA_PARAM_LINEAR_DAMP:
174+
case PS2DE::AREA_PARAM_LINEAR_DAMP:
175175
return linear_damp;
176-
case PhysicsServer2D::AREA_PARAM_ANGULAR_DAMP_OVERRIDE_MODE:
176+
case PS2DE::AREA_PARAM_ANGULAR_DAMP_OVERRIDE_MODE:
177177
return angular_damping_override_mode;
178-
case PhysicsServer2D::AREA_PARAM_ANGULAR_DAMP:
178+
case PS2DE::AREA_PARAM_ANGULAR_DAMP:
179179
return angular_damp;
180-
case PhysicsServer2D::AREA_PARAM_PRIORITY:
180+
case PS2DE::AREA_PARAM_PRIORITY:
181181
return priority;
182182
}
183183

@@ -220,7 +220,7 @@ void GodotArea2D::call_queries() {
220220
continue;
221221
}
222222

223-
res[0] = E->value.state > 0 ? PhysicsServer2D::AREA_BODY_ADDED : PhysicsServer2D::AREA_BODY_REMOVED;
223+
res[0] = E->value.state > 0 ? PS2DE::AREA_BODY_ADDED : PS2DE::AREA_BODY_REMOVED;
224224
res[1] = E->key.rid;
225225
res[2] = E->key.instance_id;
226226
res[3] = E->key.body_shape;
@@ -262,7 +262,7 @@ void GodotArea2D::call_queries() {
262262
continue;
263263
}
264264

265-
res[0] = E->value.state > 0 ? PhysicsServer2D::AREA_BODY_ADDED : PhysicsServer2D::AREA_BODY_REMOVED;
265+
res[0] = E->value.state > 0 ? PS2DE::AREA_BODY_ADDED : PS2DE::AREA_BODY_REMOVED;
266266
res[1] = E->key.rid;
267267
res[2] = E->key.instance_id;
268268
res[3] = E->key.body_shape;

‎modules/godot_physics_2d/godot_area_2d.h‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,18 @@
3232

3333
#include "godot_collision_object_2d.h"
3434

35+
#include "core/templates/hash_set.h"
3536
#include "core/templates/self_list.h"
36-
#include "servers/physics_2d/physics_server_2d.h"
37+
#include "core/variant/callable.h"
3738

3839
class GodotSpace2D;
3940
class GodotBody2D;
4041
class GodotConstraint2D;
4142

4243
class GodotArea2D : public GodotCollisionObject2D {
43-
PhysicsServer2D::AreaSpaceOverrideMode gravity_override_mode = PhysicsServer2D::AREA_SPACE_OVERRIDE_DISABLED;
44-
PhysicsServer2D::AreaSpaceOverrideMode linear_damping_override_mode = PhysicsServer2D::AREA_SPACE_OVERRIDE_DISABLED;
45-
PhysicsServer2D::AreaSpaceOverrideMode angular_damping_override_mode = PhysicsServer2D::AREA_SPACE_OVERRIDE_DISABLED;
44+
PS2DE::AreaSpaceOverrideMode gravity_override_mode = PS2DE::AREA_SPACE_OVERRIDE_DISABLED;
45+
PS2DE::AreaSpaceOverrideMode linear_damping_override_mode = PS2DE::AREA_SPACE_OVERRIDE_DISABLED;
46+
PS2DE::AreaSpaceOverrideMode angular_damping_override_mode = PS2DE::AREA_SPACE_OVERRIDE_DISABLED;
4647

4748
real_t gravity = 9.80665;
4849
Vector2 gravity_vector = Vector2(0, -1);
@@ -96,7 +97,7 @@ class GodotArea2D : public GodotCollisionObject2D {
9697
virtual void _shapes_changed() override;
9798
void _queue_monitor_update();
9899

99-
void _set_space_override_mode(PhysicsServer2D::AreaSpaceOverrideMode &r_mode, PhysicsServer2D::AreaSpaceOverrideMode p_new_mode);
100+
void _set_space_override_mode(PS2DE::AreaSpaceOverrideMode &r_mode, PS2DE::AreaSpaceOverrideMode p_new_mode);
100101

101102
public:
102103
void set_monitor_callback(const Callable &p_callback);
@@ -111,8 +112,8 @@ class GodotArea2D : public GodotCollisionObject2D {
111112
_FORCE_INLINE_ void add_area_to_query(GodotArea2D *p_area, uint32_t p_area_shape, uint32_t p_self_shape);
112113
_FORCE_INLINE_ void remove_area_from_query(GodotArea2D *p_area, uint32_t p_area_shape, uint32_t p_self_shape);
113114

114-
void set_param(PhysicsServer2D::AreaParameter p_param, const Variant &p_value);
115-
Variant get_param(PhysicsServer2D::AreaParameter p_param) const;
115+
void set_param(PS2DE::AreaParameter p_param, const Variant &p_value);
116+
Variant get_param(PS2DE::AreaParameter p_param) const;
116117

117118
_FORCE_INLINE_ void set_gravity(real_t p_gravity) { gravity = p_gravity; }
118119
_FORCE_INLINE_ real_t get_gravity() const { return gravity; }

‎modules/godot_physics_2d/godot_area_pair_2d.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ bool GodotAreaPair2D::setup(real_t p_step) {
4141
process_collision = false;
4242
has_space_override = false;
4343
if (result != colliding) {
44-
if ((int)area->get_param(PhysicsServer2D::AREA_PARAM_GRAVITY_OVERRIDE_MODE) != PhysicsServer2D::AREA_SPACE_OVERRIDE_DISABLED) {
44+
if ((int)area->get_param(PS2DE::AREA_PARAM_GRAVITY_OVERRIDE_MODE) != PS2DE::AREA_SPACE_OVERRIDE_DISABLED) {
4545
has_space_override = true;
46-
} else if ((int)area->get_param(PhysicsServer2D::AREA_PARAM_LINEAR_DAMP_OVERRIDE_MODE) != PhysicsServer2D::AREA_SPACE_OVERRIDE_DISABLED) {
46+
} else if ((int)area->get_param(PS2DE::AREA_PARAM_LINEAR_DAMP_OVERRIDE_MODE) != PS2DE::AREA_SPACE_OVERRIDE_DISABLED) {
4747
has_space_override = true;
48-
} else if ((int)area->get_param(PhysicsServer2D::AREA_PARAM_ANGULAR_DAMP_OVERRIDE_MODE) != PhysicsServer2D::AREA_SPACE_OVERRIDE_DISABLED) {
48+
} else if ((int)area->get_param(PS2DE::AREA_PARAM_ANGULAR_DAMP_OVERRIDE_MODE) != PS2DE::AREA_SPACE_OVERRIDE_DISABLED) {
4949
has_space_override = true;
5050
}
5151
process_collision = has_space_override;
@@ -99,7 +99,7 @@ GodotAreaPair2D::GodotAreaPair2D(GodotBody2D *p_body, int p_body_shape, GodotAre
9999
area_shape = p_area_shape;
100100
body->add_constraint(this, 0);
101101
area->add_constraint(this);
102-
if (p_body->get_mode() == PhysicsServer2D::BODY_MODE_KINEMATIC) { //need to be active to process pair
102+
if (p_body->get_mode() == PS2DE::BODY_MODE_KINEMATIC) { //need to be active to process pair
103103
p_body->set_active(true);
104104
}
105105
}

0 commit comments

Comments
 (0)