mirror of
				https://github.com/godotengine/godot.git
				synced 2025-10-31 05:31:01 +00:00 
			
		
		
		
	 2091f20443
			
		
	
	
		2091f20443
		
	
	
	
	
		
			
			Fixes the following GCC 5 warnings: ``` core/object.h:193:11: warning: 'MethodInfo::flags' will be initialized after [-Wreorder] core/object.h:192:15: warning: 'PropertyInfo MethodInfo::return_val' [-Wreorder] core/object.cpp:278:1: warning: when initialized here [-Wreorder] core/script_debugger_remote.h:97:6: warning: 'ScriptDebuggerRemote::max_cps' will be initialized after [-Wreorder] core/script_debugger_remote.h:91:6: warning: 'int ScriptDebuggerRemote::max_messages_per_frame' [-Wreorder] core/script_debugger_remote.cpp:1086:1: warning: when initialized here [-Wreorder] core/script_debugger_remote.h:98:6: warning: 'ScriptDebuggerRemote::char_count' will be initialized after [-Wreorder] core/script_debugger_remote.h:92:6: warning: 'int ScriptDebuggerRemote::n_messages_dropped' [-Wreorder] core/script_debugger_remote.cpp:1086:1: warning: when initialized here [-Wreorder] modules/bullet/area_bullet.h:102:7: warning: 'AreaBullet::isScratched' will be initialized after [-Wreorder] modules/bullet/area_bullet.h:92:39: warning: 'PhysicsServer::AreaSpaceOverrideMode AreaBullet::spOv_mode' [-Wreorder] modules/bullet/area_bullet.cpp:46:1: warning: when initialized here [-Wreorder] modules/bullet/collision_object_bullet.h:127:15: warning: 'CollisionObjectBullet::space' will be initialized after [-Wreorder] modules/bullet/collision_object_bullet.h:117:7: warning: 'CollisionObjectBullet::Type CollisionObjectBullet::type' [-Wreorder] modules/bullet/collision_object_bullet.cpp:67:1: warning: when initialized here [-Wreorder] modules/bullet/godot_ray_world_algorithm.h:48:7: warning: 'GodotRayWorldAlgorithm::m_ownManifol1d' will be initialized after [-Wreorder] modules/bullet/godot_ray_world_algorithm.h:46:33: warning: 'const btDiscreteDynamicsWorld* GodotRayWorldAlgorithm::m_world' [-Wreorder] modules/bullet/godot_ray_world_algorithm.cpp:50:1: warning: when initialized here [-Wreorder] modules/bullet/godot_result_callbacks.h:91:18: warning: 'GodotAllConvexResultCallback::m_exclude' will be initialized after [-Wreorder] modules/bullet/godot_result_callbacks.h:89:6: warning: 'int GodotAllConvexResultCallback::m_resultMax' [-Wreorder] modules/bullet/godot_result_callbacks.h:93:2: warning: when initialized here [-Wreorder] modules/bullet/godot_result_callbacks.h:142:18: warning: 'GodotAllContactResultCallback::m_exclude' will be initialized after [-Wreorder] modules/bullet/godot_result_callbacks.h:140:6: warning: 'int GodotAllContactResultCallback::m_resultMax' [-Wreorder] modules/bullet/godot_result_callbacks.h:147:2: warning: when initialized here [-Wreorder] modules/bullet/godot_result_callbacks.h:168:18: warning: 'GodotContactPairContactResultCallback::m_exclude' will be initialized after [-Wreorder] modules/bullet/godot_result_callbacks.h:166:6: warning: 'int GodotContactPairContactResultCallback::m_resultMax' [-Wreorder] modules/bullet/godot_result_callbacks.h:173:2: warning: when initialized here [-Wreorder] modules/bullet/godot_result_callbacks.h:195:18: warning: 'GodotRestInfoContactResultCallback::m_exclude' will be initialized after [-Wreorder] modules/bullet/godot_result_callbacks.h:191:7: warning: 'bool GodotRestInfoContactResultCallback::m_collided' [-Wreorder] modules/bullet/godot_result_callbacks.h:199:2: warning: when initialized here [-Wreorder] modules/bullet/rigid_body_bullet.h:200:9: warning: 'RigidBodyBullet::gravity_scale' will be initialized after [-Wreorder] modules/bullet/rigid_body_bullet.h:199:9: warning: 'real_t RigidBodyBullet::mass' [-Wreorder] modules/bullet/rigid_body_bullet.cpp:258:1: warning: when initialized here [-Wreorder] modules/bullet/rigid_body_bullet.h:222:28: warning: 'RigidBodyBullet::force_integration_callback' will be initialized after [-Wreorder] modules/bullet/rigid_body_bullet.h:219:7: warning: 'bool RigidBodyBullet::isTransformChanged' [-Wreorder] modules/bullet/rigid_body_bullet.cpp:258:1: warning: when initialized here [-Wreorder] modules/bullet/rigid_body_bullet.h:220:7: warning: 'RigidBodyBullet::previousActiveState' will be initialized after [-Wreorder] modules/bullet/rigid_body_bullet.h:208:6: warning: 'int RigidBodyBullet::maxCollisionsDetection' [-Wreorder] modules/bullet/rigid_body_bullet.cpp:258:1: warning: when initialized here [-Wreorder] modules/bullet/soft_body_bullet.h:69:9: warning: 'SoftBodyBullet::total_mass' will be initialized after [-Wreorder] modules/bullet/soft_body_bullet.h:68:6: warning: 'int SoftBodyBullet::simulation_precision' [-Wreorder] modules/bullet/soft_body_bullet.cpp:38:1: warning: when initialized here [-Wreorder] modules/bullet/soft_body_bullet.h:76:9: warning: 'SoftBodyBullet::drag_coefficient' will be initialized after [-Wreorder] modules/bullet/soft_body_bullet.h:61:14: warning: 'btSoftBody* SoftBodyBullet::bt_soft_body' [-Wreorder] modules/bullet/soft_body_bullet.cpp:38:1: warning: when initialized here [-Wreorder] modules/bullet/space_bullet.h:97:22: warning: 'SpaceBullet::solver' will be initialized after [-Wreorder] modules/bullet/space_bullet.h:95:35: warning: 'btDefaultCollisionConfiguration* SpaceBullet::collisionConfiguration' [-Wreorder] modules/bullet/space_bullet.cpp:333:1: warning: when initialized here [-Wreorder] modules/bullet/space_bullet.h:101:23: warning: 'SpaceBullet::soft_body_world_info' will be initialized after [-Wreorder] modules/bullet/space_bullet.h:99:23: warning: 'btGhostPairCallback* SpaceBullet::ghostPairCallback' [-Wreorder] modules/bullet/space_bullet.cpp:333:1: warning: when initialized here [-Wreorder] modules/gdnative/nativescript/nativescript.h:79:13: warning: 'NativeScriptDesc::base_native_type' will be initialized after [-Wreorder] modules/gdnative/nativescript/nativescript.h:73:9: warning: 'String NativeScriptDesc::documentation' [-Wreorder] modules/gdnative/nativescript/nativescript.h:88:9: warning: when initialized here [-Wreorder] modules/gdscript/gdscript.h:296:6: warning: 'GDScriptWarning::line' will be initialized after [-Wreorder] modules/gdscript/gdscript.h:294:4: warning: 'GDScriptWarning::Code GDScriptWarning::code' [-Wreorder] modules/gdscript/gdscript.h:303:2: warning: when initialized here [-Wreorder] scene/3d/physics_body.h:544:7: warning: 'PhysicalBone::simulate_physics' will be initialized after [-Wreorder] scene/3d/physics_body.h:543:7: warning: 'bool PhysicalBone::_internal_static_body' [-Wreorder] scene/3d/physics_body.cpp:2502:1: warning: when initialized here [-Wreorder] scene/3d/physics_body.h:546:6: warning: 'PhysicalBone::bone_id' will be initialized after [-Wreorder] scene/3d/physics_body.h:539:12: warning: 'Skeleton* PhysicalBone::parent_skeleton' [-Wreorder] scene/3d/physics_body.cpp:2502:1: warning: when initialized here [-Wreorder] scene/3d/spring_arm.h:44:11: warning: 'SpringArm::mask' will be initialized after [-Wreorder] scene/3d/spring_arm.h:43:8: warning: 'float SpringArm::current_spring_length' [-Wreorder] scene/3d/spring_arm.cpp:37:1: warning: when initialized here [-Wreorder] scene/animation/skeleton_ik.h:159:11: warning: 'SkeletonIK::target_node_override' will be initialized after [-Wreorder] scene/animation/skeleton_ik.h:152:7: warning: 'bool SkeletonIK::use_magnet' [-Wreorder] scene/animation/skeleton_ik.cpp:418:1: warning: when initialized here [-Wreorder] scene/resources/tile_set.h:84:9: warning: 'TileSet::AutotileData::size' will be initialized after [-Wreorder] scene/resources/tile_set.h:83:7: warning: 'int TileSet::AutotileData::spacing' [-Wreorder] scene/resources/tile_set.h:92:12: warning: when initialized here [-Wreorder] scene/resources/tile_set.h:115:12: warning: 'TileSet::TileData::tile_mode' will be initialized after [-Wreorder] scene/resources/tile_set.h:114:9: warning: 'Color TileSet::TileData::modulate' [-Wreorder] scene/resources/tile_set.h:120:12: warning: when initialized here [-Wreorder] servers/physics/body_sw.h:84:19: warning: 'BodySW::direct_state_query_list' will be initialized after [-Wreorder] servers/physics/body_sw.h:57:11: warning: 'uint16_t BodySW::locked_axis' [-Wreorder] servers/physics/body_sw.cpp:756:1: warning: when initialized here [-Wreorder] ``` Nothing really relevant for us, but it's not a bad consistency improvement anyway so worth taking.
		
			
				
	
	
		
			235 lines
		
	
	
	
		
			10 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			235 lines
		
	
	
	
		
			10 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| /*************************************************************************/
 | |
| /*  godot_result_callbacks.h                                             */
 | |
| /*************************************************************************/
 | |
| /*                       This file is part of:                           */
 | |
| /*                           GODOT ENGINE                                */
 | |
| /*                      https://godotengine.org                          */
 | |
| /*************************************************************************/
 | |
| /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur.                 */
 | |
| /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md)    */
 | |
| /*                                                                       */
 | |
| /* Permission is hereby granted, free of charge, to any person obtaining */
 | |
| /* a copy of this software and associated documentation files (the       */
 | |
| /* "Software"), to deal in the Software without restriction, including   */
 | |
| /* without limitation the rights to use, copy, modify, merge, publish,   */
 | |
| /* distribute, sublicense, and/or sell copies of the Software, and to    */
 | |
| /* permit persons to whom the Software is furnished to do so, subject to */
 | |
| /* the following conditions:                                             */
 | |
| /*                                                                       */
 | |
| /* The above copyright notice and this permission notice shall be        */
 | |
| /* included in all copies or substantial portions of the Software.       */
 | |
| /*                                                                       */
 | |
| /* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
 | |
| /* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
 | |
| /* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
 | |
| /* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
 | |
| /* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
 | |
| /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 | |
| /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 | |
| /*************************************************************************/
 | |
| 
 | |
| #ifndef GODOT_RESULT_CALLBACKS_H
 | |
| #define GODOT_RESULT_CALLBACKS_H
 | |
| 
 | |
| #include "servers/physics_server.h"
 | |
| 
 | |
| #include <BulletCollision/BroadphaseCollision/btBroadphaseProxy.h>
 | |
| #include <btBulletDynamicsCommon.h>
 | |
| 
 | |
| /**
 | |
| 	@author AndreaCatania
 | |
| */
 | |
| 
 | |
| class RigidBodyBullet;
 | |
| 
 | |
| /// This callback is injected inside bullet server and allow me to smooth contacts against trimesh
 | |
| bool godotContactAddedCallback(btManifoldPoint &cp, const btCollisionObjectWrapper *colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper *colObj1Wrap, int partId1, int index1);
 | |
| 
 | |
| /// This class is required to implement custom collision behaviour in the broadphase
 | |
| struct GodotFilterCallback : public btOverlapFilterCallback {
 | |
| 	static bool test_collision_filters(uint32_t body0_collision_layer, uint32_t body0_collision_mask, uint32_t body1_collision_layer, uint32_t body1_collision_mask);
 | |
| 
 | |
| 	// return true when pairs need collision
 | |
| 	virtual bool needBroadphaseCollision(btBroadphaseProxy *proxy0, btBroadphaseProxy *proxy1) const;
 | |
| };
 | |
| 
 | |
| /// It performs an additional check allow exclusions.
 | |
| struct GodotClosestRayResultCallback : public btCollisionWorld::ClosestRayResultCallback {
 | |
| 	const Set<RID> *m_exclude;
 | |
| 	bool m_pickRay;
 | |
| 	int m_shapeId;
 | |
| 
 | |
| 	bool collide_with_bodies;
 | |
| 	bool collide_with_areas;
 | |
| 
 | |
| public:
 | |
| 	GodotClosestRayResultCallback(const btVector3 &rayFromWorld, const btVector3 &rayToWorld, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) :
 | |
| 			btCollisionWorld::ClosestRayResultCallback(rayFromWorld, rayToWorld),
 | |
| 			m_exclude(p_exclude),
 | |
| 			m_pickRay(false),
 | |
| 			m_shapeId(0),
 | |
| 			collide_with_bodies(p_collide_with_bodies),
 | |
| 			collide_with_areas(p_collide_with_areas) {}
 | |
| 
 | |
| 	virtual bool needsCollision(btBroadphaseProxy *proxy0) const;
 | |
| 
 | |
| 	virtual btScalar addSingleResult(btCollisionWorld::LocalRayResult &rayResult, bool normalInWorldSpace) {
 | |
| 		if (rayResult.m_localShapeInfo)
 | |
| 			m_shapeId = rayResult.m_localShapeInfo->m_triangleIndex; // "m_triangleIndex" Is a odd name but contains the compound shape ID
 | |
| 		else
 | |
| 			m_shapeId = 0;
 | |
| 		return btCollisionWorld::ClosestRayResultCallback::addSingleResult(rayResult, normalInWorldSpace);
 | |
| 	}
 | |
| };
 | |
| 
 | |
| // store all colliding object
 | |
| struct GodotAllConvexResultCallback : public btCollisionWorld::ConvexResultCallback {
 | |
| public:
 | |
| 	PhysicsDirectSpaceState::ShapeResult *m_results;
 | |
| 	int m_resultMax;
 | |
| 	const Set<RID> *m_exclude;
 | |
| 	int count;
 | |
| 
 | |
| 	GodotAllConvexResultCallback(PhysicsDirectSpaceState::ShapeResult *p_results, int p_resultMax, const Set<RID> *p_exclude) :
 | |
| 			m_results(p_results),
 | |
| 			m_resultMax(p_resultMax),
 | |
| 			m_exclude(p_exclude),
 | |
| 			count(0) {}
 | |
| 
 | |
| 	virtual bool needsCollision(btBroadphaseProxy *proxy0) const;
 | |
| 
 | |
| 	virtual btScalar addSingleResult(btCollisionWorld::LocalConvexResult &convexResult, bool normalInWorldSpace);
 | |
| };
 | |
| 
 | |
| struct GodotKinClosestConvexResultCallback : public btCollisionWorld::ClosestConvexResultCallback {
 | |
| public:
 | |
| 	const RigidBodyBullet *m_self_object;
 | |
| 	const bool m_infinite_inertia;
 | |
| 
 | |
| 	GodotKinClosestConvexResultCallback(const btVector3 &convexFromWorld, const btVector3 &convexToWorld, const RigidBodyBullet *p_self_object, bool p_infinite_inertia) :
 | |
| 			btCollisionWorld::ClosestConvexResultCallback(convexFromWorld, convexToWorld),
 | |
| 			m_self_object(p_self_object),
 | |
| 			m_infinite_inertia(p_infinite_inertia) {}
 | |
| 
 | |
| 	virtual bool needsCollision(btBroadphaseProxy *proxy0) const;
 | |
| };
 | |
| 
 | |
| struct GodotClosestConvexResultCallback : public btCollisionWorld::ClosestConvexResultCallback {
 | |
| public:
 | |
| 	const Set<RID> *m_exclude;
 | |
| 	int m_shapeId;
 | |
| 
 | |
| 	bool collide_with_bodies;
 | |
| 	bool collide_with_areas;
 | |
| 
 | |
| 	GodotClosestConvexResultCallback(const btVector3 &convexFromWorld, const btVector3 &convexToWorld, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) :
 | |
| 			btCollisionWorld::ClosestConvexResultCallback(convexFromWorld, convexToWorld),
 | |
| 			m_exclude(p_exclude),
 | |
| 			m_shapeId(0),
 | |
| 			collide_with_bodies(p_collide_with_bodies),
 | |
| 			collide_with_areas(p_collide_with_areas) {}
 | |
| 
 | |
| 	virtual bool needsCollision(btBroadphaseProxy *proxy0) const;
 | |
| 
 | |
| 	virtual btScalar addSingleResult(btCollisionWorld::LocalConvexResult &convexResult, bool normalInWorldSpace);
 | |
| };
 | |
| 
 | |
| struct GodotAllContactResultCallback : public btCollisionWorld::ContactResultCallback {
 | |
| public:
 | |
| 	const btCollisionObject *m_self_object;
 | |
| 	PhysicsDirectSpaceState::ShapeResult *m_results;
 | |
| 	int m_resultMax;
 | |
| 	const Set<RID> *m_exclude;
 | |
| 	int m_count;
 | |
| 
 | |
| 	bool collide_with_bodies;
 | |
| 	bool collide_with_areas;
 | |
| 
 | |
| 	GodotAllContactResultCallback(btCollisionObject *p_self_object, PhysicsDirectSpaceState::ShapeResult *p_results, int p_resultMax, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) :
 | |
| 			m_self_object(p_self_object),
 | |
| 			m_results(p_results),
 | |
| 			m_resultMax(p_resultMax),
 | |
| 			m_exclude(p_exclude),
 | |
| 			m_count(0),
 | |
| 			collide_with_bodies(p_collide_with_bodies),
 | |
| 			collide_with_areas(p_collide_with_areas) {}
 | |
| 
 | |
| 	virtual bool needsCollision(btBroadphaseProxy *proxy0) const;
 | |
| 
 | |
| 	virtual btScalar addSingleResult(btManifoldPoint &cp, const btCollisionObjectWrapper *colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper *colObj1Wrap, int partId1, int index1);
 | |
| };
 | |
| 
 | |
| /// Returns the list of contacts pairs in this order: Local contact, other body contact
 | |
| struct GodotContactPairContactResultCallback : public btCollisionWorld::ContactResultCallback {
 | |
| public:
 | |
| 	const btCollisionObject *m_self_object;
 | |
| 	Vector3 *m_results;
 | |
| 	int m_resultMax;
 | |
| 	const Set<RID> *m_exclude;
 | |
| 	int m_count;
 | |
| 
 | |
| 	bool collide_with_bodies;
 | |
| 	bool collide_with_areas;
 | |
| 
 | |
| 	GodotContactPairContactResultCallback(btCollisionObject *p_self_object, Vector3 *p_results, int p_resultMax, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) :
 | |
| 			m_self_object(p_self_object),
 | |
| 			m_results(p_results),
 | |
| 			m_resultMax(p_resultMax),
 | |
| 			m_exclude(p_exclude),
 | |
| 			m_count(0),
 | |
| 			collide_with_bodies(p_collide_with_bodies),
 | |
| 			collide_with_areas(p_collide_with_areas) {}
 | |
| 
 | |
| 	virtual bool needsCollision(btBroadphaseProxy *proxy0) const;
 | |
| 
 | |
| 	virtual btScalar addSingleResult(btManifoldPoint &cp, const btCollisionObjectWrapper *colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper *colObj1Wrap, int partId1, int index1);
 | |
| };
 | |
| 
 | |
| struct GodotRestInfoContactResultCallback : public btCollisionWorld::ContactResultCallback {
 | |
| public:
 | |
| 	const btCollisionObject *m_self_object;
 | |
| 	PhysicsDirectSpaceState::ShapeRestInfo *m_result;
 | |
| 	const Set<RID> *m_exclude;
 | |
| 	bool m_collided;
 | |
| 	real_t m_min_distance;
 | |
| 	const btCollisionObject *m_rest_info_collision_object;
 | |
| 	btVector3 m_rest_info_bt_point;
 | |
| 	bool collide_with_bodies;
 | |
| 	bool collide_with_areas;
 | |
| 
 | |
| 	GodotRestInfoContactResultCallback(btCollisionObject *p_self_object, PhysicsDirectSpaceState::ShapeRestInfo *p_result, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) :
 | |
| 			m_self_object(p_self_object),
 | |
| 			m_result(p_result),
 | |
| 			m_exclude(p_exclude),
 | |
| 			m_collided(false),
 | |
| 			m_min_distance(0),
 | |
| 			collide_with_bodies(p_collide_with_bodies),
 | |
| 			collide_with_areas(p_collide_with_areas) {}
 | |
| 
 | |
| 	virtual bool needsCollision(btBroadphaseProxy *proxy0) const;
 | |
| 
 | |
| 	virtual btScalar addSingleResult(btManifoldPoint &cp, const btCollisionObjectWrapper *colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper *colObj1Wrap, int partId1, int index1);
 | |
| };
 | |
| 
 | |
| struct GodotDeepPenetrationContactResultCallback : public btManifoldResult {
 | |
| 	btVector3 m_pointNormalWorld;
 | |
| 	btVector3 m_pointWorld;
 | |
| 	btScalar m_penetration_distance;
 | |
| 	int m_other_compound_shape_index;
 | |
| 
 | |
| 	GodotDeepPenetrationContactResultCallback(const btCollisionObjectWrapper *body0Wrap, const btCollisionObjectWrapper *body1Wrap) :
 | |
| 			btManifoldResult(body0Wrap, body1Wrap),
 | |
| 			m_penetration_distance(0),
 | |
| 			m_other_compound_shape_index(0) {}
 | |
| 
 | |
| 	void reset() {
 | |
| 		m_penetration_distance = 0;
 | |
| 	}
 | |
| 
 | |
| 	bool hasHit() {
 | |
| 		return m_penetration_distance < 0;
 | |
| 	}
 | |
| 
 | |
| 	virtual void addContactPoint(const btVector3 &normalOnBInWorld, const btVector3 &pointInWorldOnB, btScalar depth);
 | |
| };
 | |
| #endif // GODOT_RESULT_CALLBACKS_H
 |