From 7a0a0941f9af85e120eff8d72a4d70a59fdf15f6 Mon Sep 17 00:00:00 2001
From: ejcoumans <ejcoumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Sun, 25 Jun 2006 21:03:10 +0000
Subject: [PATCH] moved filters in CcdConstructionInfo

---
 Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp       |  4 +--
 .../CcdPhysics/CcdPhysicsController.h         | 30 +++++++++++--------
 mk/msvcgen/project7.tlib                      |  1 +
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp b/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp
index 6023c6b4d..cd402f04b 100644
--- a/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp
+++ b/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp
@@ -246,8 +246,8 @@ int main(int argc,char** argv)
 			ccdObjectCi.m_mass = shapeProps.m_mass;
 			ccdObjectCi.m_collisionFlags = CollisionObject::isStatic;
 			
-			ccdObjectCi.m_collisionFilterGroup = CollisionFilterGroups::Static;
-			ccdObjectCi.m_collisionFilterMask = CollisionFilterGroups::All ^ CollisionFilterGroups::Static;
+			ccdObjectCi.m_collisionFilterGroup = CcdConstructionInfo::StaticFilter;
+			ccdObjectCi.m_collisionFilterMask = CcdConstructionInfo::AllFilter ^ CcdConstructionInfo::StaticFilter;
 		}
 		else
 		{
diff --git a/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.h b/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.h
index 7e72d6da5..632d5d776 100644
--- a/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.h
+++ b/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.h
@@ -39,20 +39,24 @@ extern bool gDisableDeactivation;
 class CcdPhysicsEnvironment;
 
 
-///CollisionFilterGroups provides some optional usage of basic collision filtering
-///this is done during broadphase, so very early in the pipeline
-///more advanced collision filtering should be done in CollisionDispatcher::NeedsCollision
-enum CollisionFilterGroups
-{
-	Default	= 1,
-	Static = 2,
-	Kinematic = 4,
-	Debris = 8,
-	All = Default | Static | Kinematic | Debris,
-};
+
 
 struct CcdConstructionInfo
 {
+
+	///CollisionFilterGroups provides some optional usage of basic collision filtering
+	///this is done during broadphase, so very early in the pipeline
+	///more advanced collision filtering should be done in CollisionDispatcher::NeedsCollision
+	enum CollisionFilterGroups
+	{
+	        DefaultFilter = 1,
+	        StaticFilter = 2,
+	        KinematicFilter = 4,
+	        DebrisFilter = 8,
+	        AllFilter = DefaultFilter | StaticFilter | KinematicFilter | DebrisFilter,
+	};
+
+
 	CcdConstructionInfo()
 		: m_gravity(0,0,0),
 		m_scaling(1.f,1.f,1.f),
@@ -62,8 +66,8 @@ struct CcdConstructionInfo
 		m_linearDamping(0.1f),
 		m_angularDamping(0.1f),
 		m_collisionFlags(0),
-		m_collisionFilterGroup(CollisionFilterGroups::Default),
-		m_collisionFilterMask(CollisionFilterGroups::All),
+		m_collisionFilterGroup(DefaultFilter),
+		m_collisionFilterMask(AllFilter),
 		m_MotionState(0),
 		m_physicsEnv(0),
 		m_inertiaFactor(1.f)
diff --git a/mk/msvcgen/project7.tlib b/mk/msvcgen/project7.tlib
index 7121b8ace..8f35783b7 100644
--- a/mk/msvcgen/project7.tlib
+++ b/mk/msvcgen/project7.tlib
@@ -79,6 +79,7 @@ END -%]
 				AdditionalDependencies="[% compose('libs', [], ' ') %]"
 				IgnoreImportLibrary="TRUE"
 				SuppressStartupBanner="TRUE"
+				GenerateManifest="false"
 				AdditionalLibraryDirectories="[% composedirs('libdirs', []) %]"
 				ProgramDatabaseFile="[% workbuild([my.doc.rawtarget.0,'.pdb']) %]"
 				TargetMachine="1"/>