mikymod 12 лет назад
Родитель
Сommit
03390ed317
2 измененных файлов с 0 добавлено и 66 удалено
  1. 0 24
      engine/physics/PhysicsWorld.cpp
  2. 0 42
      engine/physics/PhysicsWorld.h

+ 0 - 24
engine/physics/PhysicsWorld.cpp

@@ -321,30 +321,6 @@ void PhysicsWorld::set_gravity(const Vector3& g)
 	m_scene->setGravity(PxVec3(g.x, g.y, g.z));
 	m_scene->setGravity(PxVec3(g.x, g.y, g.z));
 }
 }
 
 
-//-----------------------------------------------------------------------------
-void PhysicsWorld::set_filtering(ActorId id, uint32_t group, uint32_t mask)
-{
-	Actor* actor_instance = lookup_actor(id);
-	PxRigidActor* actor = actor_instance->m_actor;
-
-	PxFilterData filter_data;
-	filter_data.word0 = (PxU32) group;	// word0 = own ID
-	filter_data.word1 = (PxU32) mask;	// word1 = ID mask to filter pairs that trigger a contact callback;
-
-	const PxU32 num_shapes = actor->getNbShapes();
-
-	PxShape** shapes = (PxShape**) default_allocator().allocate((sizeof(PxShape*) * num_shapes));
-	actor->getShapes(shapes, num_shapes);
-
-	for(PxU32 i = 0; i < num_shapes; i++)
-	{
-		PxShape* shape = shapes[i];
-		shape->setSimulationFilterData(filter_data);
-	}
-
-	default_allocator().deallocate(shapes);
-}
-
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 void PhysicsWorld::update(float dt)
 void PhysicsWorld::update(float dt)
 {
 {

+ 0 - 42
engine/physics/PhysicsWorld.h

@@ -70,46 +70,6 @@ struct Quaternion;
 class SceneGraph;
 class SceneGraph;
 class PhysicsSimulationCallback;
 class PhysicsSimulationCallback;
 
 
-//-----------------------------------------------------------------------------
-struct FilterGroup
-{
-	enum Enum
-	{
-		GROUP_0		= (1<<0),
-		GROUP_1		= (1<<1),
-		GROUP_2		= (1<<2),
-		GROUP_3		= (1<<3),
-		GROUP_4		= (1<<4),
-		GROUP_5		= (1<<5),
-		GROUP_6		= (1<<6),
-		GROUP_7		= (1<<7),
-		GROUP_8		= (1<<8),
-		GROUP_9		= (1<<9),
-		GROUP_10	= (1<<10),
-		GROUP_11	= (1<<11),
-		GROUP_12	= (1<<12),
-		GROUP_13	= (1<<13),
-		GROUP_14	= (1<<14),
-		GROUP_15	= (1<<15),
-		GROUP_16	= (1<<16),
-		GROUP_17	= (1<<17),
-		GROUP_18	= (1<<18),
-		GROUP_19	= (1<<19),
-		GROUP_20	= (1<<20),
-		GROUP_21	= (1<<21),
-		GROUP_22	= (1<<22),
-		GROUP_23	= (1<<23),
-		GROUP_24	= (1<<24),
-		GROUP_25	= (1<<25),
-		GROUP_26	= (1<<26),
-		GROUP_27	= (1<<27),
-		GROUP_28	= (1<<28),
-		GROUP_29	= (1<<29),
-		GROUP_30	= (1<<30),
-		GROUP_31	= (1<<31)
-	};
-};
-
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 class PhysicsWorld
 class PhysicsWorld
 {
 {
@@ -134,8 +94,6 @@ public:
 	Vector3						gravity() const;
 	Vector3						gravity() const;
 	void						set_gravity(const Vector3& g);
 	void						set_gravity(const Vector3& g);
 
 
-	void						set_filtering(ActorId actor, uint32_t group, uint32_t mask);
-
 	void						update(float dt);
 	void						update(float dt);
 
 
 public:
 public: