TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
Dave Schuyler 2006-03-17 23:17:57 +00:00
parent 3429171dc5
commit f66d4151fc
4 changed files with 84 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/controls/ShipPilot2.py
View File

@ -204,6 +204,7 @@ class ShipPilot2(PhysicsWalker):
cBowSphereNode.addSolid(self.cBowSphere)
self.cBowSphereNodePath = self.avatarNodePath.attachNewNode(
cBowSphereNode)
#self.cBowSphereNodePath.show()
cBowSphereNode.setFromCollideMask(self.cSphereBitMask)
cBowSphereNode.setIntoCollideMask(BitMask32.allOff())
@ -220,6 +221,7 @@ class ShipPilot2(PhysicsWalker):
cSternSphereNode.addSolid(self.cSternSphere)
self.cSternSphereNodePath = self.avatarNodePath.attachNewNode(
cSternSphereNode)
#self.cSternSphereNodePath.show()
self.cSternSphereBitMask = bitmask
cSternSphereNode.setFromCollideMask(self.cSphereBitMask)

44
direct/src/extensions/NodePath-extensions.py
View File

@ -108,7 +108,7 @@
from pandac import Point3
v1 = Point3.Point3(0)
v2 = Point3.Point3(0)
self.calcTightBounds(v1,v2)
self.calcTightBounds(v1, v2)
return v1, v2
def pPrintString(self, other = None):
@ -265,39 +265,39 @@
child.printTransform(other, sd, fRecursive)
def iPos(self, other = None):
""" Set node path's pos to 0,0,0 """
""" Set node path's pos to 0, 0, 0 """
if other:
self.setPos(other, 0,0,0)
self.setPos(other, 0, 0, 0)
else:
self.setPos(0,0,0)
self.setPos(0, 0, 0)
def iHpr(self, other = None):
""" Set node path's hpr to 0,0,0 """
""" Set node path's hpr to 0, 0, 0 """
if other:
self.setHpr(other, 0,0,0)
self.setHpr(other, 0, 0, 0)
else:
self.setHpr(0,0,0)
self.setHpr(0, 0, 0)
def iScale(self, other = None):
""" SEt node path's scale to 1,1,1 """
""" SEt node path's scale to 1, 1, 1 """
if other:
self.setScale(other, 1,1,1)
self.setScale(other, 1, 1, 1)
else:
self.setScale(1,1,1)
self.setScale(1, 1, 1)
def iPosHpr(self, other = None):
""" Set node path's pos and hpr to 0,0,0 """
""" Set node path's pos and hpr to 0, 0, 0 """
if other:
self.setPosHpr(other,0,0,0,0,0,0)
self.setPosHpr(other, 0, 0, 0, 0, 0, 0)
else:
self.setPosHpr(0,0,0,0,0,0)
self.setPosHpr(0, 0, 0, 0, 0, 0)
def iPosHprScale(self, other = None):
""" Set node path's pos and hpr to 0,0,0 and scale to 1,1,1 """
""" Set node path's pos and hpr to 0, 0, 0 and scale to 1, 1, 1 """
if other:
self.setPosHprScale(other, 0,0,0,0,0,0,1,1,1)
self.setPosHprScale(other, 0, 0, 0, 0, 0, 0, 1, 1, 1)
else:
self.setPosHprScale(0,0,0,0,0,0,1,1,1)
self.setPosHprScale(0, 0, 0, 0, 0, 0, 1, 1, 1)
# private methods
@ -1041,10 +1041,10 @@
from direct.interval import LerpInterval
return LerpInterval.LerpColorScaleInterval(self, *args, **kw)
def attachCollisionSphere(self, name, cx,cy,cz,r, fromCollide, intoCollide):
def attachCollisionSphere(self, name, cx, cy, cz, r, fromCollide, intoCollide):
from pandac import CollisionSphere
from pandac import CollisionNode
coll = CollisionSphere.CollisionSphere(cx,cy,cz,r)
coll = CollisionSphere.CollisionSphere(cx, cy, cz, r)
collNode = CollisionNode.CollisionNode(name)
collNode.addSolid(coll)
collNode.setFromCollideMask(fromCollide)
@ -1052,10 +1052,10 @@
collNodePath = self.attachNewNode(collNode)
return collNodePath
def attachCollisionSegment(self, name, ax,ay,az, bx,by,bz, fromCollide, intoCollide):
def attachCollisionSegment(self, name, ax, ay, az, bx, by, bz, fromCollide, intoCollide):
from pandac import CollisionSegment
from pandac import CollisionNode
coll = CollisionSegment.CollisionSegment(ax,ay,az, bx,by,bz)
coll = CollisionSegment.CollisionSegment(ax, ay, az, bx, by, bz)
collNode = CollisionNode.CollisionNode(name)
collNode.addSolid(coll)
collNode.setFromCollideMask(fromCollide)
@ -1063,10 +1063,10 @@
collNodePath = self.attachNewNode(collNode)
return collNodePath
def attachCollisionRay(self, name, ox,oy,oz, dx,dy,dz, fromCollide, intoCollide):
def attachCollisionRay(self, name, ox, oy, oz, dx, dy, dz, fromCollide, intoCollide):
from pandac import CollisionRay
from pandac import CollisionNode
coll = CollisionRay.CollisionRay(ox,oy,oz, dx,dy,dz)
coll = CollisionRay.CollisionRay(ox, oy, oz, dx, dy, dz)
collNode = CollisionNode.CollisionNode(name)
collNode.addSolid(coll)
collNode.setFromCollideMask(fromCollide)

6
direct/src/extensions/VBase3-extensions.py
View File

@ -5,11 +5,11 @@
"""
def __repr__(self):
return '%s(%s,%s,%s)' % (
self.__class__.__name__,self[0],self[1],self[2])
return '%s(%s, %s, %s)' % (
self.__class__.__name__, self[0], self[1], self[2])
def pPrintValues(self):
"""
Pretty print
"""
return "% 10.4f, % 10.4f, % 10.4f" % (self[0],self[1],self[2])
return "% 10.4f, % 10.4f, % 10.4f" % (self[0], self[1], self[2])

6
direct/src/extensions/VBase4-extensions.py
View File

@ -5,11 +5,11 @@
"""
def __repr__(self):
return '%s(%s,%s,%s,%s)' % (
self.__class__.__name__,self[0],self[1],self[2],self[3])
return '%s(%s, %s, %s, %s)' % (
self.__class__.__name__, self[0], self[1], self[2], self[3])
def pPrintValues(self):
"""
Pretty print
"""
return '% 10.4f, % 10.4f, % 10.4f, % 10.4f' % (self[0],self[1],self[2],self[3])
return '% 10.4f, % 10.4f, % 10.4f, % 10.4f' % (self[0], self[1], self[2], self[3])