mirror of
https://github.com/godotengine/godot.git
synced 2026-01-06 10:11:57 +03:00
Make core/ includes absolute, remove subfolders from include path
This allows more consistency in the manner we include core headers, where previously there would be a mix of absolute, relative and include path-dependent includes.
This commit is contained in:
@@ -32,7 +32,7 @@
|
||||
#define AREA_SW_H
|
||||
|
||||
#include "collision_object_sw.h"
|
||||
#include "self_list.h"
|
||||
#include "core/self_list.h"
|
||||
#include "servers/physics_server.h"
|
||||
//#include "servers/physics/query_sw.h"
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "body_pair_sw.h"
|
||||
|
||||
#include "collision_solver_sw.h"
|
||||
#include "os/os.h"
|
||||
#include "core/os/os.h"
|
||||
#include "space_sw.h"
|
||||
|
||||
/*
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
#include "area_sw.h"
|
||||
#include "collision_object_sw.h"
|
||||
#include "vset.h"
|
||||
#include "core/vset.h"
|
||||
|
||||
class ConstraintSW;
|
||||
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
/*************************************************************************/
|
||||
|
||||
#include "broad_phase_basic.h"
|
||||
#include "list.h"
|
||||
#include "print_string.h"
|
||||
#include "core/list.h"
|
||||
#include "core/print_string.h"
|
||||
|
||||
BroadPhaseSW::ID BroadPhaseBasic::create(CollisionObjectSW *p_object, int p_subindex) {
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
#define BROAD_PHASE_BASIC_H
|
||||
|
||||
#include "broad_phase_sw.h"
|
||||
#include "map.h"
|
||||
#include "core/map.h"
|
||||
|
||||
class BroadPhaseBasic : public BroadPhaseSW {
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
#define BROAD_PHASE_OCTREE_H
|
||||
|
||||
#include "broad_phase_sw.h"
|
||||
#include "octree.h"
|
||||
#include "core/math/octree.h"
|
||||
|
||||
class BroadPhaseOctree : public BroadPhaseSW {
|
||||
|
||||
|
||||
@@ -31,8 +31,8 @@
|
||||
#ifndef BROAD_PHASE_SW_H
|
||||
#define BROAD_PHASE_SW_H
|
||||
|
||||
#include "aabb.h"
|
||||
#include "math_funcs.h"
|
||||
#include "core/math/aabb.h"
|
||||
#include "core/math/math_funcs.h"
|
||||
|
||||
class CollisionObjectSW;
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
#define COLLISION_OBJECT_SW_H
|
||||
|
||||
#include "broad_phase_sw.h"
|
||||
#include "self_list.h"
|
||||
#include "core/self_list.h"
|
||||
#include "servers/physics_server.h"
|
||||
#include "shape_sw.h"
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
/*************************************************************************/
|
||||
|
||||
#include "collision_solver_sat.h"
|
||||
#include "geometry.h"
|
||||
#include "core/math/geometry.h"
|
||||
|
||||
#define _EDGE_IS_VALID_SUPPORT_THRESHOLD 0.02
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ subject to the following restrictions:
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
*/
|
||||
|
||||
#include "transform.h"
|
||||
#include "core/math/transform.h"
|
||||
|
||||
class JacobianEntrySW {
|
||||
public:
|
||||
|
||||
@@ -32,13 +32,13 @@
|
||||
|
||||
#include "broad_phase_basic.h"
|
||||
#include "broad_phase_octree.h"
|
||||
#include "core/os/os.h"
|
||||
#include "core/script_language.h"
|
||||
#include "joints/cone_twist_joint_sw.h"
|
||||
#include "joints/generic_6dof_joint_sw.h"
|
||||
#include "joints/hinge_joint_sw.h"
|
||||
#include "joints/pin_joint_sw.h"
|
||||
#include "joints/slider_joint_sw.h"
|
||||
#include "os/os.h"
|
||||
#include "script_language.h"
|
||||
|
||||
RID PhysicsServerSW::shape_create(ShapeType p_shape) {
|
||||
|
||||
|
||||
@@ -30,9 +30,9 @@
|
||||
|
||||
#include "shape_sw.h"
|
||||
|
||||
#include "geometry.h"
|
||||
#include "quick_hull.h"
|
||||
#include "sort.h"
|
||||
#include "core/math/geometry.h"
|
||||
#include "core/math/quick_hull.h"
|
||||
#include "core/sort.h"
|
||||
|
||||
#define _POINT_SNAP 0.001953125
|
||||
#define _EDGE_IS_VALID_SUPPORT_THRESHOLD 0.0002
|
||||
|
||||
@@ -31,8 +31,8 @@
|
||||
#ifndef SHAPE_SW_H
|
||||
#define SHAPE_SW_H
|
||||
|
||||
#include "bsp_tree.h"
|
||||
#include "geometry.h"
|
||||
#include "core/math/bsp_tree.h"
|
||||
#include "core/math/geometry.h"
|
||||
#include "servers/physics_server.h"
|
||||
/*
|
||||
|
||||
|
||||
@@ -31,8 +31,8 @@
|
||||
#include "space_sw.h"
|
||||
|
||||
#include "collision_solver_sw.h"
|
||||
#include "core/project_settings.h"
|
||||
#include "physics_server_sw.h"
|
||||
#include "project_settings.h"
|
||||
|
||||
_FORCE_INLINE_ static bool _can_collide_with(CollisionObjectSW *p_object, uint32_t p_collision_mask, bool p_collide_with_bodies, bool p_collide_with_areas) {
|
||||
|
||||
|
||||
@@ -37,9 +37,9 @@
|
||||
#include "body_sw.h"
|
||||
#include "broad_phase_sw.h"
|
||||
#include "collision_object_sw.h"
|
||||
#include "hash_map.h"
|
||||
#include "project_settings.h"
|
||||
#include "typedefs.h"
|
||||
#include "core/hash_map.h"
|
||||
#include "core/project_settings.h"
|
||||
#include "core/typedefs.h"
|
||||
|
||||
class PhysicsDirectSpaceStateSW : public PhysicsDirectSpaceState {
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "step_sw.h"
|
||||
#include "joints_sw.h"
|
||||
|
||||
#include "os/os.h"
|
||||
#include "core/os/os.h"
|
||||
|
||||
void StepSW::_populate_island(BodySW *p_body, BodySW **p_island, ConstraintSW **p_constraint_island) {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user