From f3148f3fc0f85ed5b7f870d048fb1b7743800f81 Mon Sep 17 00:00:00 2001
From: Samir Naik <samir.naik@gmail.com>
Date: Thu, 19 Aug 2004 05:38:15 +0000
Subject: [PATCH] let ship setup actorNode on it's own

---
 direct/src/controls/ControlManager.py |  1 +
 direct/src/controls/ShipPilot.py      | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/direct/src/controls/ControlManager.py b/direct/src/controls/ControlManager.py
index 34ee0ca2e9..3a7f887c7f 100755
--- a/direct/src/controls/ControlManager.py
+++ b/direct/src/controls/ControlManager.py
@@ -107,6 +107,7 @@ class ControlManager:
         """
         assert self.notify.debugCall(id(self))
         controls = self.controls.get(name)
+
         if controls is not None:
             if controls is not self.currentControls:
                 if self.currentControls is not None:
diff --git a/direct/src/controls/ShipPilot.py b/direct/src/controls/ShipPilot.py
index 411e7b7ad6..11dd6b91df 100755
--- a/direct/src/controls/ShipPilot.py
+++ b/direct/src/controls/ShipPilot.py
@@ -186,10 +186,9 @@ class ShipPilot(PhysicsWalker.PhysicsWalker):
             return
         assert not avatarNodePath.isEmpty()
 
-        if not hasattr(self,'actorNode'):
-            
+        if 0:
             # Connect to Physics Manager:
-            self.actorNode=ActorNode("ship physicsActor")
+            self.actorNode=ActorNode("ship-physicsActor")
             self.actorNode.getPhysicsObject().setOriented(1)
             self.actorNode.getPhysical(0).setViscosity(0.1)
             physicsActor=render.attachNewNode(self.actorNode)
@@ -199,6 +198,14 @@ class ShipPilot(PhysicsWalker.PhysicsWalker):
             avatarNodePath.setPos(Vec3(0))
             avatarNodePath.setHpr(Vec3(0))
             avatarNodePath.assign(physicsActor)
+        else:
+            print "doing getPhysicsObject"
+            physicsActor = avatarNodePath
+            self.actorNode = physicsActor.node()
+            self.actorNode.getPhysicsObject().setOriented(1)
+            self.actorNode.getPhysical(0).setViscosity(0.1)
+
+        if not hasattr(self, "phys"):
             self.phys=PhysicsManager.PhysicsManager()
             
             fn=ForceNode("ship gravity")
@@ -209,7 +216,7 @@ class ShipPilot(PhysicsWalker.PhysicsWalker):
             fn.addForce(gravity)
             self.phys.addLinearForce(gravity)
             self.gravity = gravity
-            
+
             fn=ForceNode("ship keel")
             fnp=NodePath(fn)
             #fnp.reparentTo(physicsActor)