Browse Source

*** empty log message ***

Jesse Schell 25 years ago
parent
commit
5fef212fe2
1 changed files with 14 additions and 12 deletions
  1. 14 12
      direct/src/distributed/DistributedNode.py

+ 14 - 12
direct/src/distributed/DistributedNode.py

@@ -46,37 +46,38 @@ class DistributedNode(DistributedObject.DistributedObject, NodePath.NodePath):
             taskName = self.taskName("correctionPos")
             taskName = self.taskName("correctionPos")
             taskMgr.removeTasksNamed(taskName)
             taskMgr.removeTasksNamed(taskName)
 
 
-    def setPos(self, x, y, z):
+    def setDRPos(self, x, y, z):
         if self.DeadReconing:
         if self.DeadReconing:
             self.Predictor.newTelemetry(Point3(x, y, z))
             self.Predictor.newTelemetry(Point3(x, y, z))
         else:
         else:
             NodePath.NodePath.setPos(self, x, y, z)
             NodePath.NodePath.setPos(self, x, y, z)
 
 
-    def setHpr(self, h, p, r):
+    def setDRHpr(self, h, p, r):
         NodePath.NodePath.setHpr(self, h, p, r)
         NodePath.NodePath.setHpr(self, h, p, r)
 
 
-    def setPosHpr(self, x, y, z, h, p, r):
+    def setDRPosHpr(self, x, y, z, h, p, r):
         if self.DeadReconing:
         if self.DeadReconing:
             self.Predictor.newTelemetry(Point3(x, y, z))
             self.Predictor.newTelemetry(Point3(x, y, z))
+            NodePath.NodePath.setHpr(self, h, p, r)
         else:
         else:
             NodePath.NodePath.setPosHpr(self, x, y, z, h, p, r)
             NodePath.NodePath.setPosHpr(self, x, y, z, h, p, r)
 
 
     def d_setDeadReconing(self, state):
     def d_setDeadReconing(self, state):
         self.sendUpdate("setDeadReconing", [state])
         self.sendUpdate("setDeadReconing", [state])
 
 
-    def d_setPos(self, x, y, z):
-        self.sendUpdate("setPos", [x, y, z])
+    def d_setDRPos(self, x, y, z):
+        self.sendUpdate("setDRPos", [x, y, z])
 
 
-    def d_setHpr(self, h, p, r):
-        self.sendUpdate("setHpr", [h, p, r])
+    def d_setDRHpr(self, h, p, r):
+        self.sendUpdate("setDRHpr", [h, p, r])
 
 
-    def d_broadcastPosHpr(self):
+    def d_broadcastDRPosHpr(self):
         
         
-        self.d_setPosHpr(self.getX(), self.getY(), self.getZ(),
-                         self.getH(), self.getP(), self.getR())
+        self.d_setDRPosHpr(self.getX(), self.getY(), self.getZ(),
+                           self.getH(), self.getP(), self.getR())
 
 
-    def d_setPosHpr(self, x, y, z, h, p, r):
-        self.sendUpdate("setPosHpr", [x, y, z, h, p, r])
+    def d_setDRPosHpr(self, x, y, z, h, p, r):
+        self.sendUpdate("setDRPosHpr", [x, y, z, h, p, r])
 
 
     def correctPos(self, task):
     def correctPos(self, task):
         self.Corrector.newTarget(self.Predictor.getPos(),
         self.Corrector.newTarget(self.Predictor.getPos(),
@@ -84,3 +85,4 @@ class DistributedNode(DistributedObject.DistributedObject, NodePath.NodePath):
         self.Corrector.step()
         self.Corrector.step()
         NodePath.NodePath.setPos(self, self.Corrector.getPos())
         NodePath.NodePath.setPos(self, self.Corrector.getPos())
         return Task.cont
         return Task.cont
+