[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39241] branches/soc-2011-cucumber/source/ gameengine/Physics/Bullet: RayCasting makes use of collision masks.

[Daniel Stokes]

Revision: 39241
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39241
Author:   kupoman
Date:     2011-08-10 04:30:44 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
RayCasting makes use of collision masks. This needed to be updated to accommodate user settable collision groups and collision masks.

Modified Paths:
--------------
    branches/soc-2011-cucumber/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2011-cucumber/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp

Modified: branches/soc-2011-cucumber/source/gameengine/Physics/Bullet/CcdPhysicsController.h
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/Physics/Bullet/CcdPhysicsController.h	2011-08-10 00:46:20 UTC (rev 39240)
+++ branches/soc-2011-cucumber/source/gameengine/Physics/Bullet/CcdPhysicsController.h	2011-08-10 04:30:44 UTC (rev 39241)
@@ -221,7 +221,8 @@
 	        KinematicFilter = 4,
 	        DebrisFilter = 8,
 			SensorFilter = 16,
-	        AllFilter = StaticFilter | KinematicFilter | DebrisFilter | SensorFilter,
+			UserFilter = 1<<8 | 1<<9 | 1<<10 | 1<<11 | 1<<12 | 1<<13 | 1<<14 | 1<<15,
+	        AllFilter = StaticFilter | KinematicFilter | DebrisFilter | SensorFilter | UserFilter,
 	};
 
 

Modified: branches/soc-2011-cucumber/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp	2011-08-10 00:46:20 UTC (rev 39240)
+++ branches/soc-2011-cucumber/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp	2011-08-10 04:30:44 UTC (rev 39241)
@@ -1095,6 +1095,7 @@
 
 	// don't collision with sensor object
 	rayCallback.m_collisionFilterMask = CcdConstructionInfo::AllFilter ^ CcdConstructionInfo::SensorFilter;
+	rayCallback.m_collisionFilterGroup = CcdConstructionInfo::AllFilter;
 	//, ,filterCallback.m_faceNormal);
 
 	m_dynamicsWorld->rayTest(rayFrom,rayTo,rayCallback);