Added tag functionality

direct/src/directtools/DirectSelection.py

@@ -46,6 +46,14 @@ class DirectNodePath(NodePath):
 class SelectedNodePaths(PandaObject):
     def __init__(self):
         self.reset()
+        self.tagList = []
+
+    def addTag(self, tag):
+        if tag not in self.tagList:
+            self.tagList.append(tag)
+
+    def removeTag(self, tag):
+        self.tagList.remove(tag)
 
     def reset(self):
         self.selectedDict = {}
@@ -63,6 +71,12 @@ class SelectedNodePaths(PandaObject):
         if not fMultiSelect:
             self.deselectAll()
 
+        # Select tagged object if present
+        for tag in self.tagList:
+            if nodePath.hasNetTag(tag):
+                nodePath = nodePath.findNetTag(tag)
+                break
+        
         # Get this pointer
         id = nodePath.id()
         # First see if its already in the selected dictionary

direct/src/directtools/DirectUtil.py

@@ -8,13 +8,8 @@ def ROUND_TO(value, divisor):
 def ROUND_INT(val):
     return int(round(val))
 
-def CLAMP(val, min, max):
+def CLAMP(val, minVal, maxVal):
-    if val < min:
+    return min(max(val, minVal), maxVal)
-        return min
-    elif val > max:
-        return max
-    else:
-        return val
 
 # Create a tk compatible color string
 def getTkColorString(color):