Browse Source

removed deprecated setCollideGeom calls

Joe Shochet 21 years ago
parent
commit
6ba60ee09e
1 changed files with 1 additions and 7 deletions
  1. 1 7
      direct/src/directtools/DirectSelection.py

+ 1 - 7
direct/src/directtools/DirectSelection.py

@@ -437,8 +437,6 @@ class SelectionQueue(CollisionHandlerQueue):
         # Turn this mask all off since we're not testing for collisions against
         # Turn this mask all off since we're not testing for collisions against
         # collision solids
         # collision solids
         self.collisionNode.setFromCollideMask(bitMask)
         self.collisionNode.setFromCollideMask(bitMask)
-        # Don't test against actual geometry
-        self.collisionNode.setCollideGeom(0)
 
 
     def collideWithGeom(self):
     def collideWithGeom(self):
         # The into collide mask is the bit pattern colliders look at
         # The into collide mask is the bit pattern colliders look at
@@ -450,9 +448,7 @@ class SelectionQueue(CollisionHandlerQueue):
         # compares against the into collide mask of candidate collision solids
         # compares against the into collide mask of candidate collision solids
         # Turn this mask all off since we're not testing for collisions against
         # Turn this mask all off since we're not testing for collisions against
         # collision solids
         # collision solids
-        self.collisionNode.setFromCollideMask(BitMask32().allOff())
-        # What we want to test against is actual geometry
-        self.collisionNode.setCollideGeom(1)
+        self.collisionNode.setFromCollideMask(GeomNode.getDefaultCollideMask())
 
 
     def collideWithWidget(self):
     def collideWithWidget(self):
         # This collision node should not be tested against by any other
         # This collision node should not be tested against by any other
@@ -463,8 +459,6 @@ class SelectionQueue(CollisionHandlerQueue):
         mask = BitMask32()
         mask = BitMask32()
         mask.setWord(0x80000000)
         mask.setWord(0x80000000)
         self.collisionNode.setFromCollideMask(mask)
         self.collisionNode.setFromCollideMask(mask)
-        # But in this case, don't test against actual geometry
-        self.collisionNode.setCollideGeom(0)
 
 
     def addUnpickable(self, item):
     def addUnpickable(self, item):
         if item not in self.unpickable:
         if item not in self.unpickable: