diff --git a/servers/audio/audio_driver_dummy.h b/servers/audio/audio_driver_dummy.h index b03414011..45ebb1c73 100644 --- a/servers/audio/audio_driver_dummy.h +++ b/servers/audio/audio_driver_dummy.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_DRIVER_DUMMY_H +#define AUDIO_DRIVER_DUMMY_H /*************************************************************************/ /* audio_driver_dummy.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_DRIVER_DUMMY_H -#define AUDIO_DRIVER_DUMMY_H + + #include "servers/audio_server.h" diff --git a/servers/audio/audio_effect.h b/servers/audio/audio_effect.h index f22712b32..704f9289c 100644 --- a/servers/audio/audio_effect.h +++ b/servers/audio/audio_effect.h @@ -1,3 +1,5 @@ +#ifndef AUDIOEFFECT_H +#define AUDIOEFFECT_H /*************************************************************************/ /* audio_effect.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECT_H -#define AUDIOEFFECT_H + + #include "core/math/audio_frame.h" #include "core/resource.h" diff --git a/servers/audio/audio_filter_sw.h b/servers/audio/audio_filter_sw.h index 9e55662d0..e8ffb1816 100644 --- a/servers/audio/audio_filter_sw.h +++ b/servers/audio/audio_filter_sw.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_FILTER_SW_H +#define AUDIO_FILTER_SW_H /*************************************************************************/ /* audio_filter_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_FILTER_SW_H -#define AUDIO_FILTER_SW_H + + #include "core/math/math_funcs.h" diff --git a/servers/audio/audio_rb_resampler.h b/servers/audio/audio_rb_resampler.h index 2ec841692..67c749eae 100644 --- a/servers/audio/audio_rb_resampler.h +++ b/servers/audio/audio_rb_resampler.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_RB_RESAMPLER_H +#define AUDIO_RB_RESAMPLER_H /*************************************************************************/ /* audio_rb_resampler.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_RB_RESAMPLER_H -#define AUDIO_RB_RESAMPLER_H + + #include "core/os/memory.h" #include "core/safe_refcount.h" diff --git a/servers/audio/audio_stream.h b/servers/audio/audio_stream.h index f8c67f662..8dcb1909e 100644 --- a/servers/audio/audio_stream.h +++ b/servers/audio/audio_stream.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_STREAM_H +#define AUDIO_STREAM_H /*************************************************************************/ /* audio_stream.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_STREAM_H -#define AUDIO_STREAM_H + + #include "core/image.h" #include "core/resource.h" diff --git a/servers/audio/effects/audio_effect_amplify.h b/servers/audio/effects/audio_effect_amplify.h index d332e006c..27dbbf168 100644 --- a/servers/audio/effects/audio_effect_amplify.h +++ b/servers/audio/effects/audio_effect_amplify.h @@ -1,3 +1,5 @@ +#ifndef AUDIOEFFECTAMPLIFY_H +#define AUDIOEFFECTAMPLIFY_H /*************************************************************************/ /* audio_effect_amplify.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTAMPLIFY_H -#define AUDIOEFFECTAMPLIFY_H + + #include "servers/audio/audio_effect.h" diff --git a/servers/audio/effects/audio_effect_capture.h b/servers/audio/effects/audio_effect_capture.h index fbab2c00c..ed7c12a11 100644 --- a/servers/audio/effects/audio_effect_capture.h +++ b/servers/audio/effects/audio_effect_capture.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_EFFECT_CAPTURE_H +#define AUDIO_EFFECT_CAPTURE_H /*************************************************************************/ /* audio_effect_capture.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_EFFECT_CAPTURE_H -#define AUDIO_EFFECT_CAPTURE_H + + #include "core/engine.h" #include "core/math/audio_frame.h" diff --git a/servers/audio/effects/audio_effect_chorus.h b/servers/audio/effects/audio_effect_chorus.h index 573f5cc1f..b4901b640 100644 --- a/servers/audio/effects/audio_effect_chorus.h +++ b/servers/audio/effects/audio_effect_chorus.h @@ -1,3 +1,5 @@ +#ifndef AUDIOEFFECTCHORUS_H +#define AUDIOEFFECTCHORUS_H /*************************************************************************/ /* audio_effect_chorus.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTCHORUS_H -#define AUDIOEFFECTCHORUS_H + + #include "servers/audio/audio_effect.h" diff --git a/servers/audio/effects/audio_effect_compressor.h b/servers/audio/effects/audio_effect_compressor.h index bee74aff8..659a6ce44 100644 --- a/servers/audio/effects/audio_effect_compressor.h +++ b/servers/audio/effects/audio_effect_compressor.h @@ -1,3 +1,5 @@ +#ifndef AUDIOEFFECTCOMPRESSOR_H +#define AUDIOEFFECTCOMPRESSOR_H /*************************************************************************/ /* audio_effect_compressor.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTCOMPRESSOR_H -#define AUDIOEFFECTCOMPRESSOR_H + + #include "servers/audio/audio_effect.h" diff --git a/servers/audio/effects/audio_effect_delay.h b/servers/audio/effects/audio_effect_delay.h index 5778a0260..da27b0cb0 100644 --- a/servers/audio/effects/audio_effect_delay.h +++ b/servers/audio/effects/audio_effect_delay.h @@ -1,3 +1,5 @@ +#ifndef AUDIOEFFECTDELAY_H +#define AUDIOEFFECTDELAY_H /*************************************************************************/ /* audio_effect_delay.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTDELAY_H -#define AUDIOEFFECTDELAY_H + + #include "servers/audio/audio_effect.h" diff --git a/servers/audio/effects/audio_effect_distortion.h b/servers/audio/effects/audio_effect_distortion.h index fdb6f74cd..3376d927b 100644 --- a/servers/audio/effects/audio_effect_distortion.h +++ b/servers/audio/effects/audio_effect_distortion.h @@ -1,3 +1,5 @@ +#ifndef AUDIOEFFECTDISTORTION_H +#define AUDIOEFFECTDISTORTION_H /*************************************************************************/ /* audio_effect_distortion.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTDISTORTION_H -#define AUDIOEFFECTDISTORTION_H + + #include "servers/audio/audio_effect.h" diff --git a/servers/audio/effects/audio_effect_eq.h b/servers/audio/effects/audio_effect_eq.h index 8f11f210a..047f6cabf 100644 --- a/servers/audio/effects/audio_effect_eq.h +++ b/servers/audio/effects/audio_effect_eq.h @@ -1,3 +1,5 @@ +#ifndef AUDIOEFFECTEQ_H +#define AUDIOEFFECTEQ_H /*************************************************************************/ /* audio_effect_eq.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTEQ_H -#define AUDIOEFFECTEQ_H + + #include "servers/audio/audio_effect.h" #include "servers/audio/effects/eq.h" diff --git a/servers/audio/effects/audio_effect_filter.h b/servers/audio/effects/audio_effect_filter.h index cf76b094d..c9591c60d 100644 --- a/servers/audio/effects/audio_effect_filter.h +++ b/servers/audio/effects/audio_effect_filter.h @@ -1,3 +1,5 @@ +#ifndef AUDIOEFFECTFILTER_H +#define AUDIOEFFECTFILTER_H /*************************************************************************/ /* audio_effect_filter.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTFILTER_H -#define AUDIOEFFECTFILTER_H + + #include "servers/audio/audio_effect.h" #include "servers/audio/audio_filter_sw.h" diff --git a/servers/audio/effects/audio_effect_limiter.h b/servers/audio/effects/audio_effect_limiter.h index c520ce032..c3802924c 100644 --- a/servers/audio/effects/audio_effect_limiter.h +++ b/servers/audio/effects/audio_effect_limiter.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_EFFECT_LIMITER_H +#define AUDIO_EFFECT_LIMITER_H /*************************************************************************/ /* audio_effect_limiter.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_EFFECT_LIMITER_H -#define AUDIO_EFFECT_LIMITER_H + + #include "servers/audio/audio_effect.h" diff --git a/servers/audio/effects/audio_effect_panner.h b/servers/audio/effects/audio_effect_panner.h index 752cb9377..1cf15a35f 100644 --- a/servers/audio/effects/audio_effect_panner.h +++ b/servers/audio/effects/audio_effect_panner.h @@ -1,3 +1,5 @@ +#ifndef AUDIOEFFECTPANNER_H +#define AUDIOEFFECTPANNER_H /*************************************************************************/ /* audio_effect_panner.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTPANNER_H -#define AUDIOEFFECTPANNER_H + + #include "servers/audio/audio_effect.h" diff --git a/servers/audio/effects/audio_effect_phaser.h b/servers/audio/effects/audio_effect_phaser.h index 78152d10b..124e14399 100644 --- a/servers/audio/effects/audio_effect_phaser.h +++ b/servers/audio/effects/audio_effect_phaser.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_EFFECT_PHASER_H +#define AUDIO_EFFECT_PHASER_H /*************************************************************************/ /* audio_effect_phaser.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_EFFECT_PHASER_H -#define AUDIO_EFFECT_PHASER_H + + #include "servers/audio/audio_effect.h" diff --git a/servers/audio/effects/audio_effect_pitch_shift.h b/servers/audio/effects/audio_effect_pitch_shift.h index 6559752e8..fce076e29 100644 --- a/servers/audio/effects/audio_effect_pitch_shift.h +++ b/servers/audio/effects/audio_effect_pitch_shift.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_EFFECT_PITCH_SHIFT_H +#define AUDIO_EFFECT_PITCH_SHIFT_H /*************************************************************************/ /* audio_effect_pitch_shift.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_EFFECT_PITCH_SHIFT_H -#define AUDIO_EFFECT_PITCH_SHIFT_H + + #include "servers/audio/audio_effect.h" diff --git a/servers/audio/effects/audio_effect_record.h b/servers/audio/effects/audio_effect_record.h index 59a31b2c8..acd14f9a8 100644 --- a/servers/audio/effects/audio_effect_record.h +++ b/servers/audio/effects/audio_effect_record.h @@ -1,3 +1,5 @@ +#ifndef AUDIOEFFECTRECORD_H +#define AUDIOEFFECTRECORD_H /*************************************************************************/ /* audio_effect_record.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTRECORD_H -#define AUDIOEFFECTRECORD_H + + #include "core/io/marshalls.h" #include "core/os/file_access.h" diff --git a/servers/audio/effects/audio_effect_reverb.h b/servers/audio/effects/audio_effect_reverb.h index 6116d9a45..4fcc5627a 100644 --- a/servers/audio/effects/audio_effect_reverb.h +++ b/servers/audio/effects/audio_effect_reverb.h @@ -1,3 +1,5 @@ +#ifndef AUDIOEFFECTREVERB_H +#define AUDIOEFFECTREVERB_H /*************************************************************************/ /* audio_effect_reverb.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTREVERB_H -#define AUDIOEFFECTREVERB_H + + #include "servers/audio/audio_effect.h" #include "servers/audio/effects/reverb.h" diff --git a/servers/audio/effects/audio_effect_spectrum_analyzer.h b/servers/audio/effects/audio_effect_spectrum_analyzer.h index 4011f2650..ef96db283 100644 --- a/servers/audio/effects/audio_effect_spectrum_analyzer.h +++ b/servers/audio/effects/audio_effect_spectrum_analyzer.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_EFFECT_SPECTRUM_ANALYZER_H +#define AUDIO_EFFECT_SPECTRUM_ANALYZER_H /*************************************************************************/ /* audio_effect_spectrum_analyzer.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_EFFECT_SPECTRUM_ANALYZER_H -#define AUDIO_EFFECT_SPECTRUM_ANALYZER_H + + #include "servers/audio/audio_effect.h" diff --git a/servers/audio/effects/audio_effect_stereo_enhance.h b/servers/audio/effects/audio_effect_stereo_enhance.h index 79530f73d..75f98a037 100644 --- a/servers/audio/effects/audio_effect_stereo_enhance.h +++ b/servers/audio/effects/audio_effect_stereo_enhance.h @@ -1,3 +1,5 @@ +#ifndef AUDIOEFFECTSTEREOENHANCE_H +#define AUDIOEFFECTSTEREOENHANCE_H /*************************************************************************/ /* audio_effect_stereo_enhance.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIOEFFECTSTEREOENHANCE_H -#define AUDIOEFFECTSTEREOENHANCE_H + + #include "servers/audio/audio_effect.h" diff --git a/servers/audio/effects/audio_stream_generator.h b/servers/audio/effects/audio_stream_generator.h index 88bad5d1d..4f8d7c7b6 100644 --- a/servers/audio/effects/audio_stream_generator.h +++ b/servers/audio/effects/audio_stream_generator.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_STREAM_GENERATOR_H +#define AUDIO_STREAM_GENERATOR_H /*************************************************************************/ /* audio_stream_generator.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_STREAM_GENERATOR_H -#define AUDIO_STREAM_GENERATOR_H + + #include "core/ring_buffer.h" #include "servers/audio/audio_stream.h" diff --git a/servers/audio/effects/eq.h b/servers/audio/effects/eq.h index 19306d19f..58b07ba82 100644 --- a/servers/audio/effects/eq.h +++ b/servers/audio/effects/eq.h @@ -1,3 +1,5 @@ +#ifndef EQ_FILTER_H +#define EQ_FILTER_H /*************************************************************************/ /* eq.h */ /*************************************************************************/ @@ -30,8 +32,8 @@ // Author: reduzio@gmail.com (C) 2006 -#ifndef EQ_FILTER_H -#define EQ_FILTER_H + + #include "core/typedefs.h" #include "core/vector.h" diff --git a/servers/audio/effects/reverb.h b/servers/audio/effects/reverb.h index 4e52c0dcb..0a0cb0d3f 100644 --- a/servers/audio/effects/reverb.h +++ b/servers/audio/effects/reverb.h @@ -1,3 +1,5 @@ +#ifndef REVERB_H +#define REVERB_H /*************************************************************************/ /* reverb.h */ /*************************************************************************/ @@ -30,8 +32,8 @@ // Author: Juan Linietsky , (C) 2006 -#ifndef REVERB_H -#define REVERB_H + + #include "core/math/audio_frame.h" #include "core/os/memory.h" diff --git a/servers/audio_server.h b/servers/audio_server.h index 1092b12a2..afcc69f6d 100644 --- a/servers/audio_server.h +++ b/servers/audio_server.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_SERVER_H +#define AUDIO_SERVER_H /*************************************************************************/ /* audio_server.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_SERVER_H -#define AUDIO_SERVER_H + + #include "core/math/audio_frame.h" #include "core/object.h" diff --git a/servers/navigation_2d_server.h b/servers/navigation_2d_server.h index d629496db..fb448ed65 100644 --- a/servers/navigation_2d_server.h +++ b/servers/navigation_2d_server.h @@ -1,3 +1,5 @@ +#ifndef NAVIGATION_2D_SERVER_H +#define NAVIGATION_2D_SERVER_H /*************************************************************************/ /* navigation_2d_server.h */ /*************************************************************************/ @@ -32,8 +34,8 @@ @author AndreaCatania */ -#ifndef NAVIGATION_2D_SERVER_H -#define NAVIGATION_2D_SERVER_H + + #include "core/object.h" #include "core/rid.h" diff --git a/servers/navigation_server.h b/servers/navigation_server.h index 7b326362c..95ba6bb64 100644 --- a/servers/navigation_server.h +++ b/servers/navigation_server.h @@ -1,3 +1,5 @@ +#ifndef NAVIGATION_SERVER_H +#define NAVIGATION_SERVER_H /*************************************************************************/ /* navigation_server.h */ /*************************************************************************/ @@ -32,8 +34,8 @@ @author AndreaCatania */ -#ifndef NAVIGATION_SERVER_H -#define NAVIGATION_SERVER_H + + #include "core/object.h" #include "core/rid.h" diff --git a/servers/physics/area_pair_sw.h b/servers/physics/area_pair_sw.h index 2623f825e..97379f679 100644 --- a/servers/physics/area_pair_sw.h +++ b/servers/physics/area_pair_sw.h @@ -1,3 +1,5 @@ +#ifndef AREA_PAIR_SW_H +#define AREA_PAIR_SW_H /*************************************************************************/ /* area_pair_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AREA_PAIR_SW_H -#define AREA_PAIR_SW_H + + #include "area_sw.h" #include "body_sw.h" diff --git a/servers/physics/area_sw.h b/servers/physics/area_sw.h index c5ceb3ff1..2d771cb3c 100644 --- a/servers/physics/area_sw.h +++ b/servers/physics/area_sw.h @@ -1,3 +1,5 @@ +#ifndef AREA_SW_H +#define AREA_SW_H /*************************************************************************/ /* area_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AREA_SW_H -#define AREA_SW_H + + #include "collision_object_sw.h" #include "core/self_list.h" diff --git a/servers/physics/body_pair_sw.h b/servers/physics/body_pair_sw.h index 23f5eb1e0..49e88c880 100644 --- a/servers/physics/body_pair_sw.h +++ b/servers/physics/body_pair_sw.h @@ -1,3 +1,5 @@ +#ifndef BODY_PAIR_SW_H +#define BODY_PAIR_SW_H /*************************************************************************/ /* body_pair_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BODY_PAIR_SW_H -#define BODY_PAIR_SW_H + + #include "body_sw.h" #include "constraint_sw.h" diff --git a/servers/physics/body_sw.h b/servers/physics/body_sw.h index 02fff887b..9cbbab544 100644 --- a/servers/physics/body_sw.h +++ b/servers/physics/body_sw.h @@ -1,3 +1,5 @@ +#ifndef BODY_SW_H +#define BODY_SW_H /*************************************************************************/ /* body_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BODY_SW_H -#define BODY_SW_H + + #include "area_sw.h" #include "collision_object_sw.h" diff --git a/servers/physics/broad_phase_basic.h b/servers/physics/broad_phase_basic.h index f16984ea0..745099259 100644 --- a/servers/physics/broad_phase_basic.h +++ b/servers/physics/broad_phase_basic.h @@ -1,3 +1,5 @@ +#ifndef BROAD_PHASE_BASIC_H +#define BROAD_PHASE_BASIC_H /*************************************************************************/ /* broad_phase_basic.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BROAD_PHASE_BASIC_H -#define BROAD_PHASE_BASIC_H + + #include "broad_phase_sw.h" #include "core/map.h" diff --git a/servers/physics/broad_phase_bvh.h b/servers/physics/broad_phase_bvh.h index fb3176ab8..5260d9362 100644 --- a/servers/physics/broad_phase_bvh.h +++ b/servers/physics/broad_phase_bvh.h @@ -1,3 +1,5 @@ +#ifndef BROAD_PHASE_BVH_H +#define BROAD_PHASE_BVH_H /*************************************************************************/ /* broad_phase_bvh.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BROAD_PHASE_BVH_H -#define BROAD_PHASE_BVH_H + + #include "broad_phase_sw.h" #include "core/math/bvh.h" diff --git a/servers/physics/broad_phase_octree.h b/servers/physics/broad_phase_octree.h index 0e6706e4e..3f7b45865 100644 --- a/servers/physics/broad_phase_octree.h +++ b/servers/physics/broad_phase_octree.h @@ -1,3 +1,5 @@ +#ifndef BROAD_PHASE_OCTREE_H +#define BROAD_PHASE_OCTREE_H /*************************************************************************/ /* broad_phase_octree.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BROAD_PHASE_OCTREE_H -#define BROAD_PHASE_OCTREE_H + + #include "broad_phase_sw.h" #include "core/math/octree.h" diff --git a/servers/physics/broad_phase_sw.h b/servers/physics/broad_phase_sw.h index e275fa943..1ff9f6c0c 100644 --- a/servers/physics/broad_phase_sw.h +++ b/servers/physics/broad_phase_sw.h @@ -1,3 +1,5 @@ +#ifndef BROAD_PHASE_SW_H +#define BROAD_PHASE_SW_H /*************************************************************************/ /* broad_phase_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BROAD_PHASE_SW_H -#define BROAD_PHASE_SW_H + + #include "core/math/aabb.h" #include "core/math/math_funcs.h" diff --git a/servers/physics/collision_object_sw.h b/servers/physics/collision_object_sw.h index 3bbf94b36..d4d258164 100644 --- a/servers/physics/collision_object_sw.h +++ b/servers/physics/collision_object_sw.h @@ -1,3 +1,5 @@ +#ifndef COLLISION_OBJECT_SW_H +#define COLLISION_OBJECT_SW_H /*************************************************************************/ /* collision_object_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef COLLISION_OBJECT_SW_H -#define COLLISION_OBJECT_SW_H + + #include "broad_phase_sw.h" #include "core/self_list.h" diff --git a/servers/physics/collision_solver_sat.h b/servers/physics/collision_solver_sat.h index 7a3df316e..1fae05e5b 100644 --- a/servers/physics/collision_solver_sat.h +++ b/servers/physics/collision_solver_sat.h @@ -1,3 +1,5 @@ +#ifndef COLLISION_SOLVER_SAT_H +#define COLLISION_SOLVER_SAT_H /*************************************************************************/ /* collision_solver_sat.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef COLLISION_SOLVER_SAT_H -#define COLLISION_SOLVER_SAT_H + + #include "collision_solver_sw.h" diff --git a/servers/physics/collision_solver_sw.h b/servers/physics/collision_solver_sw.h index 2a1035c3e..97c43827a 100644 --- a/servers/physics/collision_solver_sw.h +++ b/servers/physics/collision_solver_sw.h @@ -1,3 +1,5 @@ +#ifndef COLLISION_SOLVER_SW_H +#define COLLISION_SOLVER_SW_H /*************************************************************************/ /* collision_solver_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef COLLISION_SOLVER_SW_H -#define COLLISION_SOLVER_SW_H + + #include "shape_sw.h" diff --git a/servers/physics/constraint_sw.h b/servers/physics/constraint_sw.h index 69e3ecd0c..5132dd539 100644 --- a/servers/physics/constraint_sw.h +++ b/servers/physics/constraint_sw.h @@ -1,3 +1,5 @@ +#ifndef CONSTRAINT_SW_H +#define CONSTRAINT_SW_H /*************************************************************************/ /* constraint_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef CONSTRAINT_SW_H -#define CONSTRAINT_SW_H + + #include "body_sw.h" diff --git a/servers/physics/gjk_epa.h b/servers/physics/gjk_epa.h index 453692206..6275f04c0 100644 --- a/servers/physics/gjk_epa.h +++ b/servers/physics/gjk_epa.h @@ -1,3 +1,5 @@ +#ifndef GJK_EPA_H +#define GJK_EPA_H /*************************************************************************/ /* gjk_epa.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GJK_EPA_H -#define GJK_EPA_H + + #include "collision_solver_sw.h" #include "shape_sw.h" diff --git a/servers/physics/joints/cone_twist_joint_sw.h b/servers/physics/joints/cone_twist_joint_sw.h index 070e816f9..53e797a99 100644 --- a/servers/physics/joints/cone_twist_joint_sw.h +++ b/servers/physics/joints/cone_twist_joint_sw.h @@ -1,3 +1,5 @@ +#ifndef CONE_TWIST_JOINT_SW_H +#define CONE_TWIST_JOINT_SW_H /*************************************************************************/ /* cone_twist_joint_sw.h */ /*************************************************************************/ @@ -49,8 +51,8 @@ subject to the following restrictions: Written by: Marcus Hennix */ -#ifndef CONE_TWIST_JOINT_SW_H -#define CONE_TWIST_JOINT_SW_H + + #include "servers/physics/joints/jacobian_entry_sw.h" #include "servers/physics/joints_sw.h" diff --git a/servers/physics/joints/generic_6dof_joint_sw.h b/servers/physics/joints/generic_6dof_joint_sw.h index 1af3ce582..39eca4855 100644 --- a/servers/physics/joints/generic_6dof_joint_sw.h +++ b/servers/physics/joints/generic_6dof_joint_sw.h @@ -1,3 +1,5 @@ +#ifndef GENERIC_6DOF_JOINT_SW_H +#define GENERIC_6DOF_JOINT_SW_H /*************************************************************************/ /* generic_6dof_joint_sw.h */ /*************************************************************************/ @@ -32,8 +34,8 @@ Adapted to Godot from the Bullet library. */ -#ifndef GENERIC_6DOF_JOINT_SW_H -#define GENERIC_6DOF_JOINT_SW_H + + #include "servers/physics/joints/jacobian_entry_sw.h" #include "servers/physics/joints_sw.h" diff --git a/servers/physics/joints/hinge_joint_sw.h b/servers/physics/joints/hinge_joint_sw.h index 109759d9d..7bfccaa8a 100644 --- a/servers/physics/joints/hinge_joint_sw.h +++ b/servers/physics/joints/hinge_joint_sw.h @@ -1,3 +1,5 @@ +#ifndef HINGE_JOINT_SW_H +#define HINGE_JOINT_SW_H /*************************************************************************/ /* hinge_joint_sw.h */ /*************************************************************************/ @@ -32,8 +34,8 @@ Adapted to Godot from the Bullet library. */ -#ifndef HINGE_JOINT_SW_H -#define HINGE_JOINT_SW_H + + #include "servers/physics/joints/jacobian_entry_sw.h" #include "servers/physics/joints_sw.h" diff --git a/servers/physics/joints/jacobian_entry_sw.h b/servers/physics/joints/jacobian_entry_sw.h index 991be5aec..5458db496 100644 --- a/servers/physics/joints/jacobian_entry_sw.h +++ b/servers/physics/joints/jacobian_entry_sw.h @@ -1,3 +1,5 @@ +#ifndef JACOBIAN_ENTRY_SW_H +#define JACOBIAN_ENTRY_SW_H /*************************************************************************/ /* jacobian_entry_sw.h */ /*************************************************************************/ @@ -32,8 +34,8 @@ Adapted to Godot from the Bullet library. */ -#ifndef JACOBIAN_ENTRY_SW_H -#define JACOBIAN_ENTRY_SW_H + + /* Bullet Continuous Collision Detection and Physics Library diff --git a/servers/physics/joints/pin_joint_sw.h b/servers/physics/joints/pin_joint_sw.h index 04b449991..242e0b639 100644 --- a/servers/physics/joints/pin_joint_sw.h +++ b/servers/physics/joints/pin_joint_sw.h @@ -1,3 +1,5 @@ +#ifndef PIN_JOINT_SW_H +#define PIN_JOINT_SW_H /*************************************************************************/ /* pin_joint_sw.h */ /*************************************************************************/ @@ -32,8 +34,8 @@ Adapted to Godot from the Bullet library. */ -#ifndef PIN_JOINT_SW_H -#define PIN_JOINT_SW_H + + #include "servers/physics/joints/jacobian_entry_sw.h" #include "servers/physics/joints_sw.h" diff --git a/servers/physics/joints/slider_joint_sw.h b/servers/physics/joints/slider_joint_sw.h index f3f01b92f..1a1b0aa75 100644 --- a/servers/physics/joints/slider_joint_sw.h +++ b/servers/physics/joints/slider_joint_sw.h @@ -1,3 +1,5 @@ +#ifndef SLIDER_JOINT_SW_H +#define SLIDER_JOINT_SW_H /*************************************************************************/ /* slider_joint_sw.h */ /*************************************************************************/ @@ -32,8 +34,8 @@ Adapted to Godot from the Bullet library. */ -#ifndef SLIDER_JOINT_SW_H -#define SLIDER_JOINT_SW_H + + #include "servers/physics/joints/jacobian_entry_sw.h" #include "servers/physics/joints_sw.h" diff --git a/servers/physics/joints_sw.h b/servers/physics/joints_sw.h index 114c17c1e..f72092386 100644 --- a/servers/physics/joints_sw.h +++ b/servers/physics/joints_sw.h @@ -1,3 +1,5 @@ +#ifndef JOINTS_SW_H +#define JOINTS_SW_H /*************************************************************************/ /* joints_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef JOINTS_SW_H -#define JOINTS_SW_H + + #include "body_sw.h" #include "constraint_sw.h" diff --git a/servers/physics/physics_server_sw.h b/servers/physics/physics_server_sw.h index 610518d0a..1158742ce 100644 --- a/servers/physics/physics_server_sw.h +++ b/servers/physics/physics_server_sw.h @@ -1,3 +1,5 @@ +#ifndef PHYSICS_SERVER_SW +#define PHYSICS_SERVER_SW /*************************************************************************/ /* physics_server_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PHYSICS_SERVER_SW -#define PHYSICS_SERVER_SW + + #include "joints_sw.h" #include "servers/physics_server.h" diff --git a/servers/physics/shape_sw.h b/servers/physics/shape_sw.h index c4369369e..00a60a059 100644 --- a/servers/physics/shape_sw.h +++ b/servers/physics/shape_sw.h @@ -1,3 +1,5 @@ +#ifndef SHAPE_SW_H +#define SHAPE_SW_H /*************************************************************************/ /* shape_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SHAPE_SW_H -#define SHAPE_SW_H + + #include "core/local_vector.h" #include "core/math/bsp_tree.h" diff --git a/servers/physics/space_sw.h b/servers/physics/space_sw.h index 30e6709df..43b0b4ade 100644 --- a/servers/physics/space_sw.h +++ b/servers/physics/space_sw.h @@ -1,3 +1,5 @@ +#ifndef SPACE_SW_H +#define SPACE_SW_H /*************************************************************************/ /* space_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SPACE_SW_H -#define SPACE_SW_H + + #include "area_pair_sw.h" #include "area_sw.h" diff --git a/servers/physics/step_sw.h b/servers/physics/step_sw.h index b0267f463..5d78667b6 100644 --- a/servers/physics/step_sw.h +++ b/servers/physics/step_sw.h @@ -1,3 +1,5 @@ +#ifndef STEP_SW_H +#define STEP_SW_H /*************************************************************************/ /* step_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef STEP_SW_H -#define STEP_SW_H + + #include "space_sw.h" diff --git a/servers/physics_2d/area_2d_sw.h b/servers/physics_2d/area_2d_sw.h index 5566c451d..a244e87ec 100644 --- a/servers/physics_2d/area_2d_sw.h +++ b/servers/physics_2d/area_2d_sw.h @@ -1,3 +1,5 @@ +#ifndef AREA_2D_SW_H +#define AREA_2D_SW_H /*************************************************************************/ /* area_2d_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AREA_2D_SW_H -#define AREA_2D_SW_H + + #include "collision_object_2d_sw.h" #include "core/self_list.h" diff --git a/servers/physics_2d/area_pair_2d_sw.h b/servers/physics_2d/area_pair_2d_sw.h index 8e66604cf..a98f7914b 100644 --- a/servers/physics_2d/area_pair_2d_sw.h +++ b/servers/physics_2d/area_pair_2d_sw.h @@ -1,3 +1,5 @@ +#ifndef AREA_PAIR_2D_SW_H +#define AREA_PAIR_2D_SW_H /*************************************************************************/ /* area_pair_2d_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AREA_PAIR_2D_SW_H -#define AREA_PAIR_2D_SW_H + + #include "area_2d_sw.h" #include "body_2d_sw.h" diff --git a/servers/physics_2d/body_2d_sw.h b/servers/physics_2d/body_2d_sw.h index 5fe40d7e5..1aeedff43 100644 --- a/servers/physics_2d/body_2d_sw.h +++ b/servers/physics_2d/body_2d_sw.h @@ -1,3 +1,5 @@ +#ifndef BODY_2D_SW_H +#define BODY_2D_SW_H /*************************************************************************/ /* body_2d_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BODY_2D_SW_H -#define BODY_2D_SW_H + + #include "area_2d_sw.h" #include "collision_object_2d_sw.h" diff --git a/servers/physics_2d/body_pair_2d_sw.h b/servers/physics_2d/body_pair_2d_sw.h index 25a87cd65..477dd2ad7 100644 --- a/servers/physics_2d/body_pair_2d_sw.h +++ b/servers/physics_2d/body_pair_2d_sw.h @@ -1,3 +1,5 @@ +#ifndef BODY_PAIR_2D_SW_H +#define BODY_PAIR_2D_SW_H /*************************************************************************/ /* body_pair_2d_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BODY_PAIR_2D_SW_H -#define BODY_PAIR_2D_SW_H + + #include "body_2d_sw.h" #include "constraint_2d_sw.h" diff --git a/servers/physics_2d/broad_phase_2d_basic.h b/servers/physics_2d/broad_phase_2d_basic.h index de1ced35e..987d9cff8 100644 --- a/servers/physics_2d/broad_phase_2d_basic.h +++ b/servers/physics_2d/broad_phase_2d_basic.h @@ -1,3 +1,5 @@ +#ifndef BROAD_PHASE_2D_BASIC_H +#define BROAD_PHASE_2D_BASIC_H /*************************************************************************/ /* broad_phase_2d_basic.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BROAD_PHASE_2D_BASIC_H -#define BROAD_PHASE_2D_BASIC_H + + #include "core/map.h" #include "space_2d_sw.h" diff --git a/servers/physics_2d/broad_phase_2d_bvh.h b/servers/physics_2d/broad_phase_2d_bvh.h index 2f87dafc1..c1e3a5d62 100644 --- a/servers/physics_2d/broad_phase_2d_bvh.h +++ b/servers/physics_2d/broad_phase_2d_bvh.h @@ -1,3 +1,5 @@ +#ifndef BROAD_PHASE_2D_BVH_H +#define BROAD_PHASE_2D_BVH_H /*************************************************************************/ /* broad_phase_2d_bvh.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BROAD_PHASE_2D_BVH_H -#define BROAD_PHASE_2D_BVH_H + + #include "broad_phase_2d_sw.h" #include "core/math/bvh.h" diff --git a/servers/physics_2d/broad_phase_2d_hash_grid.h b/servers/physics_2d/broad_phase_2d_hash_grid.h index 4cb240c38..65c6405b4 100644 --- a/servers/physics_2d/broad_phase_2d_hash_grid.h +++ b/servers/physics_2d/broad_phase_2d_hash_grid.h @@ -1,3 +1,5 @@ +#ifndef BROAD_PHASE_2D_HASH_GRID_H +#define BROAD_PHASE_2D_HASH_GRID_H /*************************************************************************/ /* broad_phase_2d_hash_grid.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BROAD_PHASE_2D_HASH_GRID_H -#define BROAD_PHASE_2D_HASH_GRID_H + + #include "broad_phase_2d_sw.h" #include "core/map.h" diff --git a/servers/physics_2d/broad_phase_2d_sw.h b/servers/physics_2d/broad_phase_2d_sw.h index fc9052955..5533c4048 100644 --- a/servers/physics_2d/broad_phase_2d_sw.h +++ b/servers/physics_2d/broad_phase_2d_sw.h @@ -1,3 +1,5 @@ +#ifndef BROAD_PHASE_2D_SW_H +#define BROAD_PHASE_2D_SW_H /*************************************************************************/ /* broad_phase_2d_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BROAD_PHASE_2D_SW_H -#define BROAD_PHASE_2D_SW_H + + #include "core/math/math_funcs.h" #include "core/math/rect2.h" diff --git a/servers/physics_2d/collision_object_2d_sw.h b/servers/physics_2d/collision_object_2d_sw.h index 9359b7e27..a882636db 100644 --- a/servers/physics_2d/collision_object_2d_sw.h +++ b/servers/physics_2d/collision_object_2d_sw.h @@ -1,3 +1,5 @@ +#ifndef COLLISION_OBJECT_2D_SW_H +#define COLLISION_OBJECT_2D_SW_H /*************************************************************************/ /* collision_object_2d_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef COLLISION_OBJECT_2D_SW_H -#define COLLISION_OBJECT_2D_SW_H + + #include "broad_phase_2d_sw.h" #include "core/self_list.h" diff --git a/servers/physics_2d/collision_solver_2d_sat.h b/servers/physics_2d/collision_solver_2d_sat.h index 58e769315..d0a133e8c 100644 --- a/servers/physics_2d/collision_solver_2d_sat.h +++ b/servers/physics_2d/collision_solver_2d_sat.h @@ -1,3 +1,5 @@ +#ifndef COLLISION_SOLVER_2D_SAT_H +#define COLLISION_SOLVER_2D_SAT_H /*************************************************************************/ /* collision_solver_2d_sat.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef COLLISION_SOLVER_2D_SAT_H -#define COLLISION_SOLVER_2D_SAT_H + + #include "collision_solver_2d_sw.h" diff --git a/servers/physics_2d/collision_solver_2d_sw.h b/servers/physics_2d/collision_solver_2d_sw.h index 9d284b5ed..e7852cb62 100644 --- a/servers/physics_2d/collision_solver_2d_sw.h +++ b/servers/physics_2d/collision_solver_2d_sw.h @@ -1,3 +1,5 @@ +#ifndef COLLISION_SOLVER_2D_SW_H +#define COLLISION_SOLVER_2D_SW_H /*************************************************************************/ /* collision_solver_2d_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef COLLISION_SOLVER_2D_SW_H -#define COLLISION_SOLVER_2D_SW_H + + #include "shape_2d_sw.h" diff --git a/servers/physics_2d/constraint_2d_sw.h b/servers/physics_2d/constraint_2d_sw.h index 5169d31fc..4c2de1ae3 100644 --- a/servers/physics_2d/constraint_2d_sw.h +++ b/servers/physics_2d/constraint_2d_sw.h @@ -1,3 +1,5 @@ +#ifndef CONSTRAINT_2D_SW_H +#define CONSTRAINT_2D_SW_H /*************************************************************************/ /* constraint_2d_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef CONSTRAINT_2D_SW_H -#define CONSTRAINT_2D_SW_H + + #include "body_2d_sw.h" diff --git a/servers/physics_2d/joints_2d_sw.h b/servers/physics_2d/joints_2d_sw.h index 618f864da..f23b9a430 100644 --- a/servers/physics_2d/joints_2d_sw.h +++ b/servers/physics_2d/joints_2d_sw.h @@ -1,3 +1,5 @@ +#ifndef JOINTS_2D_SW_H +#define JOINTS_2D_SW_H /*************************************************************************/ /* joints_2d_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef JOINTS_2D_SW_H -#define JOINTS_2D_SW_H + + #include "body_2d_sw.h" #include "constraint_2d_sw.h" diff --git a/servers/physics_2d/physics_2d_server_sw.h b/servers/physics_2d/physics_2d_server_sw.h index dec688066..9b811e398 100644 --- a/servers/physics_2d/physics_2d_server_sw.h +++ b/servers/physics_2d/physics_2d_server_sw.h @@ -1,3 +1,5 @@ +#ifndef PHYSICS_2D_SERVER_SW +#define PHYSICS_2D_SERVER_SW /*************************************************************************/ /* physics_2d_server_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PHYSICS_2D_SERVER_SW -#define PHYSICS_2D_SERVER_SW + + #include "joints_2d_sw.h" #include "servers/physics_2d_server.h" diff --git a/servers/physics_2d/physics_2d_server_wrap_mt.h b/servers/physics_2d/physics_2d_server_wrap_mt.h index e6f485c4e..f8529acd3 100644 --- a/servers/physics_2d/physics_2d_server_wrap_mt.h +++ b/servers/physics_2d/physics_2d_server_wrap_mt.h @@ -1,3 +1,5 @@ +#ifndef PHYSICS2DSERVERWRAPMT_H +#define PHYSICS2DSERVERWRAPMT_H /*************************************************************************/ /* physics_2d_server_wrap_mt.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PHYSICS2DSERVERWRAPMT_H -#define PHYSICS2DSERVERWRAPMT_H + + #include "core/command_queue_mt.h" #include "core/os/thread.h" diff --git a/servers/physics_2d/shape_2d_sw.h b/servers/physics_2d/shape_2d_sw.h index 0513657a7..ab800e98b 100644 --- a/servers/physics_2d/shape_2d_sw.h +++ b/servers/physics_2d/shape_2d_sw.h @@ -1,3 +1,5 @@ +#ifndef SHAPE_2D_2DSW_H +#define SHAPE_2D_2DSW_H /*************************************************************************/ /* shape_2d_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SHAPE_2D_2DSW_H -#define SHAPE_2D_2DSW_H + + #include "servers/physics_2d_server.h" #define _SEGMENT_IS_VALID_SUPPORT_THRESHOLD 0.99998 diff --git a/servers/physics_2d/space_2d_sw.h b/servers/physics_2d/space_2d_sw.h index f75a02c78..1f5005f1c 100644 --- a/servers/physics_2d/space_2d_sw.h +++ b/servers/physics_2d/space_2d_sw.h @@ -1,3 +1,5 @@ +#ifndef SPACE_2D_SW_H +#define SPACE_2D_SW_H /*************************************************************************/ /* space_2d_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SPACE_2D_SW_H -#define SPACE_2D_SW_H + + #include "area_2d_sw.h" #include "area_pair_2d_sw.h" diff --git a/servers/physics_2d/step_2d_sw.h b/servers/physics_2d/step_2d_sw.h index 4e1ef904a..8e0914b0d 100644 --- a/servers/physics_2d/step_2d_sw.h +++ b/servers/physics_2d/step_2d_sw.h @@ -1,3 +1,5 @@ +#ifndef STEP_2D_SW_H +#define STEP_2D_SW_H /*************************************************************************/ /* step_2d_sw.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef STEP_2D_SW_H -#define STEP_2D_SW_H + + #include "space_2d_sw.h" diff --git a/servers/physics_2d_server.h b/servers/physics_2d_server.h index f34247889..4e1af6352 100644 --- a/servers/physics_2d_server.h +++ b/servers/physics_2d_server.h @@ -1,3 +1,5 @@ +#ifndef PHYSICS_2D_SERVER_H +#define PHYSICS_2D_SERVER_H /*************************************************************************/ /* physics_2d_server.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PHYSICS_2D_SERVER_H -#define PHYSICS_2D_SERVER_H + + #include "core/object.h" #include "core/reference.h" diff --git a/servers/physics_server.h b/servers/physics_server.h index c642943d7..3e2b5aad6 100644 --- a/servers/physics_server.h +++ b/servers/physics_server.h @@ -1,3 +1,5 @@ +#ifndef PHYSICS_SERVER_H +#define PHYSICS_SERVER_H /*************************************************************************/ /* physics_server.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PHYSICS_SERVER_H -#define PHYSICS_SERVER_H + + #include "core/object.h" #include "core/resource.h" diff --git a/servers/register_server_types.h b/servers/register_server_types.h index 32fd944be..42c6a0a3f 100644 --- a/servers/register_server_types.h +++ b/servers/register_server_types.h @@ -1,3 +1,5 @@ +#ifndef REGISTER_SERVER_TYPES_H +#define REGISTER_SERVER_TYPES_H /*************************************************************************/ /* register_server_types.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef REGISTER_SERVER_TYPES_H -#define REGISTER_SERVER_TYPES_H + + void register_server_types(); void unregister_server_types(); diff --git a/servers/visual/portals/portal_defines.h b/servers/visual/portals/portal_defines.h index f406f8115..ba4adb15b 100644 --- a/servers/visual/portals/portal_defines.h +++ b/servers/visual/portals/portal_defines.h @@ -1,3 +1,5 @@ +#ifndef PORTAL_DEFINES_H +#define PORTAL_DEFINES_H /*************************************************************************/ /* portal_defines.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PORTAL_DEFINES_H -#define PORTAL_DEFINES_H + + // This file is to allow constants etc to be accessible from outside the visual server, // while keeping the dependencies to an absolute minimum. diff --git a/servers/visual/portals/portal_gameplay_monitor.h b/servers/visual/portals/portal_gameplay_monitor.h index 00d2c44dc..5d541d04b 100644 --- a/servers/visual/portals/portal_gameplay_monitor.h +++ b/servers/visual/portals/portal_gameplay_monitor.h @@ -1,3 +1,5 @@ +#ifndef PORTAL_GAMEPLAY_MONITOR_H +#define PORTAL_GAMEPLAY_MONITOR_H /*************************************************************************/ /* portal_gameplay_monitor.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PORTAL_GAMEPLAY_MONITOR_H -#define PORTAL_GAMEPLAY_MONITOR_H + + #include "core/local_vector.h" #include "servers/visual_server_callbacks.h" diff --git a/servers/visual/portals/portal_occlusion_culler.h b/servers/visual/portals/portal_occlusion_culler.h index 53459503e..d245a9e74 100644 --- a/servers/visual/portals/portal_occlusion_culler.h +++ b/servers/visual/portals/portal_occlusion_culler.h @@ -1,3 +1,5 @@ +#ifndef PORTAL_OCCLUSION_CULLER_H +#define PORTAL_OCCLUSION_CULLER_H /*************************************************************************/ /* portal_occlusion_culler.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PORTAL_OCCLUSION_CULLER_H -#define PORTAL_OCCLUSION_CULLER_H + + class PortalRenderer; #include "core/math/camera_matrix.h" diff --git a/servers/visual/portals/portal_pvs.h b/servers/visual/portals/portal_pvs.h index d758d83e1..4bc71d96a 100644 --- a/servers/visual/portals/portal_pvs.h +++ b/servers/visual/portals/portal_pvs.h @@ -1,3 +1,5 @@ +#ifndef PORTAL_PVS_H +#define PORTAL_PVS_H /*************************************************************************/ /* portal_pvs.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PORTAL_PVS_H -#define PORTAL_PVS_H + + #include "core/local_vector.h" diff --git a/servers/visual/portals/portal_pvs_builder.h b/servers/visual/portals/portal_pvs_builder.h index 44ffe1a4b..35fc116bc 100644 --- a/servers/visual/portals/portal_pvs_builder.h +++ b/servers/visual/portals/portal_pvs_builder.h @@ -1,3 +1,5 @@ +#ifndef PORTAL_PVS_BUILDER_H +#define PORTAL_PVS_BUILDER_H /*************************************************************************/ /* portal_pvs_builder.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PORTAL_PVS_BUILDER_H -#define PORTAL_PVS_BUILDER_H + + #include "core/bitfield_dynamic.h" #include "core/local_vector.h" diff --git a/servers/visual/portals/portal_renderer.h b/servers/visual/portals/portal_renderer.h index 584b64560..aa77fc0ba 100644 --- a/servers/visual/portals/portal_renderer.h +++ b/servers/visual/portals/portal_renderer.h @@ -1,3 +1,5 @@ +#ifndef PORTAL_RENDERER_H +#define PORTAL_RENDERER_H /*************************************************************************/ /* portal_renderer.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PORTAL_RENDERER_H -#define PORTAL_RENDERER_H + + #include "core/math/camera_matrix.h" #include "core/math/geometry.h" diff --git a/servers/visual/portals/portal_resources.h b/servers/visual/portals/portal_resources.h index 02a9dcd12..920b48270 100644 --- a/servers/visual/portals/portal_resources.h +++ b/servers/visual/portals/portal_resources.h @@ -1,3 +1,5 @@ +#ifndef PORTAL_RESOURCES_H +#define PORTAL_RESOURCES_H /*************************************************************************/ /* portal_resources.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PORTAL_RESOURCES_H -#define PORTAL_RESOURCES_H + + #include "core/math/geometry.h" #include "portal_types.h" diff --git a/servers/visual/portals/portal_rooms_bsp.h b/servers/visual/portals/portal_rooms_bsp.h index fa72a9049..91584d18e 100644 --- a/servers/visual/portals/portal_rooms_bsp.h +++ b/servers/visual/portals/portal_rooms_bsp.h @@ -1,3 +1,5 @@ +#ifndef PORTAL_ROOMS_BSP_H +#define PORTAL_ROOMS_BSP_H /*************************************************************************/ /* portal_rooms_bsp.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PORTAL_ROOMS_BSP_H -#define PORTAL_ROOMS_BSP_H + + #include "core/local_vector.h" #include "core/math/aabb.h" diff --git a/servers/visual/portals/portal_tracer.h b/servers/visual/portals/portal_tracer.h index d5f85558d..79c89e2d0 100644 --- a/servers/visual/portals/portal_tracer.h +++ b/servers/visual/portals/portal_tracer.h @@ -1,3 +1,5 @@ +#ifndef PORTAL_TRACER_H +#define PORTAL_TRACER_H /*************************************************************************/ /* portal_tracer.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PORTAL_TRACER_H -#define PORTAL_TRACER_H + + #include "core/bitfield_dynamic.h" #include "core/local_vector.h" diff --git a/servers/visual/portals/portal_types.h b/servers/visual/portals/portal_types.h index 6568316ba..4ffe569a9 100644 --- a/servers/visual/portals/portal_types.h +++ b/servers/visual/portals/portal_types.h @@ -1,3 +1,5 @@ +#ifndef PORTAL_TYPES_H +#define PORTAL_TYPES_H /*************************************************************************/ /* portal_types.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PORTAL_TYPES_H -#define PORTAL_TYPES_H + + #include "core/local_vector.h" #include "core/math/aabb.h" diff --git a/servers/visual/rasterizer.h b/servers/visual/rasterizer.h index 36782a753..a639687fe 100644 --- a/servers/visual/rasterizer.h +++ b/servers/visual/rasterizer.h @@ -1,3 +1,5 @@ +#ifndef RASTERIZER_H +#define RASTERIZER_H /*************************************************************************/ /* rasterizer.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZER_H -#define RASTERIZER_H + + #include "core/math/camera_matrix.h" #include "core/math/transform_interpolator.h" diff --git a/servers/visual/shader_language.h b/servers/visual/shader_language.h index 97bfe504c..8d91aa456 100644 --- a/servers/visual/shader_language.h +++ b/servers/visual/shader_language.h @@ -1,3 +1,5 @@ +#ifndef SHADER_LANGUAGE_H +#define SHADER_LANGUAGE_H /*************************************************************************/ /* shader_language.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SHADER_LANGUAGE_H -#define SHADER_LANGUAGE_H + + #include "core/list.h" #include "core/map.h" diff --git a/servers/visual/shader_types.h b/servers/visual/shader_types.h index 2495b1e1a..b90c44cbb 100644 --- a/servers/visual/shader_types.h +++ b/servers/visual/shader_types.h @@ -1,3 +1,5 @@ +#ifndef SHADERTYPES_H +#define SHADERTYPES_H /*************************************************************************/ /* shader_types.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SHADERTYPES_H -#define SHADERTYPES_H + + #include "core/ordered_hash_map.h" #include "servers/visual_server.h" diff --git a/servers/visual/visual_server_canvas.h b/servers/visual/visual_server_canvas.h index d53a21c13..2e06f689f 100644 --- a/servers/visual/visual_server_canvas.h +++ b/servers/visual/visual_server_canvas.h @@ -1,3 +1,5 @@ +#ifndef VISUALSERVERCANVAS_H +#define VISUALSERVERCANVAS_H /*************************************************************************/ /* visual_server_canvas.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VISUALSERVERCANVAS_H -#define VISUALSERVERCANVAS_H + + #include "rasterizer.h" #include "visual_server_viewport.h" diff --git a/servers/visual/visual_server_globals.h b/servers/visual/visual_server_globals.h index fa1ffb3f6..d31bef991 100644 --- a/servers/visual/visual_server_globals.h +++ b/servers/visual/visual_server_globals.h @@ -1,3 +1,5 @@ +#ifndef VISUAL_SERVER_GLOBALS_H +#define VISUAL_SERVER_GLOBALS_H /*************************************************************************/ /* visual_server_globals.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VISUAL_SERVER_GLOBALS_H -#define VISUAL_SERVER_GLOBALS_H + + #include "rasterizer.h" diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h index 740c9a2c2..6b014a34a 100644 --- a/servers/visual/visual_server_raster.h +++ b/servers/visual/visual_server_raster.h @@ -1,3 +1,5 @@ +#ifndef VISUAL_SERVER_RASTER_H +#define VISUAL_SERVER_RASTER_H /*************************************************************************/ /* visual_server_raster.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VISUAL_SERVER_RASTER_H -#define VISUAL_SERVER_RASTER_H + + #include "core/math/octree.h" #include "servers/visual/rasterizer.h" diff --git a/servers/visual/visual_server_scene.h b/servers/visual/visual_server_scene.h index 621108de8..e5f7f9e96 100644 --- a/servers/visual/visual_server_scene.h +++ b/servers/visual/visual_server_scene.h @@ -1,3 +1,5 @@ +#ifndef VISUALSERVERSCENE_H +#define VISUALSERVERSCENE_H /*************************************************************************/ /* visual_server_scene.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VISUALSERVERSCENE_H -#define VISUALSERVERSCENE_H + + #include "servers/visual/rasterizer.h" diff --git a/servers/visual/visual_server_viewport.h b/servers/visual/visual_server_viewport.h index 4630447ea..b79b3bacc 100644 --- a/servers/visual/visual_server_viewport.h +++ b/servers/visual/visual_server_viewport.h @@ -1,3 +1,5 @@ +#ifndef VISUALSERVERVIEWPORT_H +#define VISUALSERVERVIEWPORT_H /*************************************************************************/ /* visual_server_viewport.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VISUALSERVERVIEWPORT_H -#define VISUALSERVERVIEWPORT_H + + #include "core/self_list.h" #include "rasterizer.h" diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/visual/visual_server_wrap_mt.h index 2bf802408..c0802ad24 100644 --- a/servers/visual/visual_server_wrap_mt.h +++ b/servers/visual/visual_server_wrap_mt.h @@ -1,3 +1,5 @@ +#ifndef VISUAL_SERVER_WRAP_MT_H +#define VISUAL_SERVER_WRAP_MT_H /*************************************************************************/ /* visual_server_wrap_mt.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VISUAL_SERVER_WRAP_MT_H -#define VISUAL_SERVER_WRAP_MT_H + + #include "core/command_queue_mt.h" #include "core/os/thread.h" diff --git a/servers/visual_server.h b/servers/visual_server.h index 45a3ef003..60b7beb84 100644 --- a/servers/visual_server.h +++ b/servers/visual_server.h @@ -1,3 +1,5 @@ +#ifndef VISUAL_SERVER_H +#define VISUAL_SERVER_H /*************************************************************************/ /* visual_server.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VISUAL_SERVER_H -#define VISUAL_SERVER_H + + #include "core/image.h" #include "core/math/bsp_tree.h" diff --git a/servers/visual_server_callbacks.h b/servers/visual_server_callbacks.h index d979b537d..75b5dfac4 100644 --- a/servers/visual_server_callbacks.h +++ b/servers/visual_server_callbacks.h @@ -1,3 +1,5 @@ +#ifndef VISUAL_SERVER_CALLBACKS_H +#define VISUAL_SERVER_CALLBACKS_H /*************************************************************************/ /* visual_server_callbacks.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VISUAL_SERVER_CALLBACKS_H -#define VISUAL_SERVER_CALLBACKS_H + + #include "core/local_vector.h" #include "core/object_id.h"