diff --git a/direct/src/distributed/ClientRepository.py b/direct/src/distributed/ClientRepository.py index 5d4e63a525..a59a37002b 100644 --- a/direct/src/distributed/ClientRepository.py +++ b/direct/src/distributed/ClientRepository.py @@ -32,6 +32,7 @@ class ClientRepository(DirectObject.DirectObject): readResult = self.dcFile.read(fname) if not readResult: self.notify.error("Could not read dcfile: " + dcFileName) + self.hashVal = self.dcFile.getHash() return self.parseDcClasses(self.dcFile) def parseDcClasses(self, dcFile): diff --git a/direct/src/distributed/DistributedNode.py b/direct/src/distributed/DistributedNode.py index 5f4c635639..aff0cfd4fa 100644 --- a/direct/src/distributed/DistributedNode.py +++ b/direct/src/distributed/DistributedNode.py @@ -59,6 +59,24 @@ class DistributedNode(DistributedObject.DistributedObject, NodePath.NodePath): taskMgr.removeTasksNamed(taskName) return self.deadReckoningFlag + ### setParent ### + + def b_setParent(self, parentString): + self.setParent(parentString) + self.d_setParent(parentString) + return None + + def d_setParent(self, parentString): + self.sendUpdate("setParent", [parentString]) + return None + + def setParent(self, parentString): + print "setting parent of %s to %s" % (self.getName(), parentString) + assert(self.cr.name2nodePath.has_key(parentString)) + parent = self.cr.name2nodePath[parentString] + self.wrtReparentTo(parent) + return None + ###### set pos and hpr functions ####### # setX provided by NodePath