mirror of
https://github.com/godotengine/godot
synced 2024-09-04 22:08:29 +00:00
Rename Joint2D and Joint3D files for consistency
Now matches the class names to be consistent between 2D and 3D and with other node types.
This commit is contained in:
parent
fdd25d7c84
commit
39f6ca96a3
|
@ -43,13 +43,13 @@
|
|||
#include "scene/3d/decal.h"
|
||||
#include "scene/3d/gpu_particles_3d.h"
|
||||
#include "scene/3d/gpu_particles_collision_3d.h"
|
||||
#include "scene/3d/joint_3d.h"
|
||||
#include "scene/3d/light_3d.h"
|
||||
#include "scene/3d/lightmap_gi.h"
|
||||
#include "scene/3d/lightmap_probe.h"
|
||||
#include "scene/3d/mesh_instance_3d.h"
|
||||
#include "scene/3d/navigation_region_3d.h"
|
||||
#include "scene/3d/occluder_instance_3d.h"
|
||||
#include "scene/3d/physics_joint_3d.h"
|
||||
#include "scene/3d/position_3d.h"
|
||||
#include "scene/3d/ray_cast_3d.h"
|
||||
#include "scene/3d/reflection_probe.h"
|
||||
|
|
|
@ -37,9 +37,9 @@
|
|||
#include "editor/plugins/animation_player_editor_plugin.h"
|
||||
#include "node_3d_editor_plugin.h"
|
||||
#include "scene/3d/collision_shape_3d.h"
|
||||
#include "scene/3d/joint_3d.h"
|
||||
#include "scene/3d/mesh_instance_3d.h"
|
||||
#include "scene/3d/physics_body_3d.h"
|
||||
#include "scene/3d/physics_joint_3d.h"
|
||||
#include "scene/resources/capsule_shape_3d.h"
|
||||
#include "scene/resources/sphere_shape_3d.h"
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*************************************************************************/
|
||||
/* joints_2d.cpp */
|
||||
/* joint_2d.cpp */
|
||||
/*************************************************************************/
|
||||
/* This file is part of: */
|
||||
/* GODOT ENGINE */
|
||||
|
@ -28,7 +28,7 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#include "joints_2d.h"
|
||||
#include "joint_2d.h"
|
||||
|
||||
#include "physics_body_2d.h"
|
||||
#include "scene/scene_string_names.h"
|
|
@ -1,5 +1,5 @@
|
|||
/*************************************************************************/
|
||||
/* joints_2d.h */
|
||||
/* joint_2d.h */
|
||||
/*************************************************************************/
|
||||
/* This file is part of: */
|
||||
/* GODOT ENGINE */
|
||||
|
@ -28,8 +28,8 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#ifndef JOINTS_2D_H
|
||||
#define JOINTS_2D_H
|
||||
#ifndef JOINT_2D_H
|
||||
#define JOINT_2D_H
|
||||
|
||||
#include "node_2d.h"
|
||||
|
||||
|
@ -148,4 +148,4 @@ public:
|
|||
DampedSpringJoint2D();
|
||||
};
|
||||
|
||||
#endif // JOINTS_2D_H
|
||||
#endif // JOINT_2D_H
|
|
@ -30,6 +30,8 @@
|
|||
|
||||
#include "physical_bone_2d.h"
|
||||
|
||||
#include "scene/2d/joint_2d.h"
|
||||
|
||||
void PhysicalBone2D::_notification(int p_what) {
|
||||
switch (p_what) {
|
||||
case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: {
|
||||
|
|
|
@ -31,11 +31,11 @@
|
|||
#ifndef PHYSICAL_BONE_2D_H
|
||||
#define PHYSICAL_BONE_2D_H
|
||||
|
||||
#include "scene/2d/joints_2d.h"
|
||||
#include "scene/2d/physics_body_2d.h"
|
||||
|
||||
#include "scene/2d/skeleton_2d.h"
|
||||
|
||||
class Joint2D;
|
||||
|
||||
class PhysicalBone2D : public RigidDynamicBody2D {
|
||||
GDCLASS(PhysicalBone2D, RigidDynamicBody2D);
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*************************************************************************/
|
||||
/* physics_joint_3d.cpp */
|
||||
/* joint_3d.cpp */
|
||||
/*************************************************************************/
|
||||
/* This file is part of: */
|
||||
/* GODOT ENGINE */
|
||||
|
@ -28,7 +28,7 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#include "physics_joint_3d.h"
|
||||
#include "joint_3d.h"
|
||||
|
||||
#include "scene/scene_string_names.h"
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*************************************************************************/
|
||||
/* physics_joint_3d.h */
|
||||
/* joint_3d.h */
|
||||
/*************************************************************************/
|
||||
/* This file is part of: */
|
||||
/* GODOT ENGINE */
|
||||
|
@ -28,8 +28,8 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#ifndef PHYSICS_JOINT_H
|
||||
#define PHYSICS_JOINT_H
|
||||
#ifndef JOINT_3D_H
|
||||
#define JOINT_3D_H
|
||||
|
||||
#include "scene/3d/node_3d.h"
|
||||
#include "scene/3d/physics_body_3d.h"
|
||||
|
@ -334,4 +334,4 @@ public:
|
|||
VARIANT_ENUM_CAST(Generic6DOFJoint3D::Param);
|
||||
VARIANT_ENUM_CAST(Generic6DOFJoint3D::Flag);
|
||||
|
||||
#endif // PHYSICS_JOINT_H
|
||||
#endif // JOINT_3D_H
|
|
@ -46,7 +46,7 @@
|
|||
#include "scene/2d/collision_shape_2d.h"
|
||||
#include "scene/2d/cpu_particles_2d.h"
|
||||
#include "scene/2d/gpu_particles_2d.h"
|
||||
#include "scene/2d/joints_2d.h"
|
||||
#include "scene/2d/joint_2d.h"
|
||||
#include "scene/2d/light_2d.h"
|
||||
#include "scene/2d/light_occluder_2d.h"
|
||||
#include "scene/2d/line_2d.h"
|
||||
|
@ -215,6 +215,7 @@
|
|||
#include "scene/3d/decal.h"
|
||||
#include "scene/3d/gpu_particles_3d.h"
|
||||
#include "scene/3d/gpu_particles_collision_3d.h"
|
||||
#include "scene/3d/joint_3d.h"
|
||||
#include "scene/3d/light_3d.h"
|
||||
#include "scene/3d/lightmap_gi.h"
|
||||
#include "scene/3d/lightmap_probe.h"
|
||||
|
@ -227,7 +228,6 @@
|
|||
#include "scene/3d/occluder_instance_3d.h"
|
||||
#include "scene/3d/path_3d.h"
|
||||
#include "scene/3d/physics_body_3d.h"
|
||||
#include "scene/3d/physics_joint_3d.h"
|
||||
#include "scene/3d/position_3d.h"
|
||||
#include "scene/3d/proximity_group_3d.h"
|
||||
#include "scene/3d/ray_cast_3d.h"
|
||||
|
|
Loading…
Reference in a new issue