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

preserve transform of input geom/image

Browse Source
This commit is contained in:
David Rose 2005-09-26 23:29:43 +00:00
parent 2d5ecf1cab
commit 2b6af7a68f
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
direct/src/gui/OnscreenGeom.py
View File

@ -70,16 +70,20 @@ class OnscreenGeom(PandaObject, NodePath):
def setGeom(self, geom, def setGeom(self, geom,
parent = NodePath(), parent = NodePath(),
transform = TransformState.makeIdentity(), transform = None,
sort = 0, sort = 0,
color = None): color = None):
# Get the original parent, transform, and sort, if any, so we can # Get the original parent, transform, and sort, if any, so we can
# preserve them across this call. # preserve them across this call.
if not self.isEmpty(): if not self.isEmpty():
parent = self.getParent() parent = self.getParent()
transform = self.getTransform() if transform == None:
# If we're replacing a previous image, we throw away
# the new image's transform in favor of the original
# image's transform.
transform = self.getTransform()
sort = self.getSort() sort = self.getSort()
if self.hasColor(): if color == None and self.hasColor():
color = self.getColor() color = self.getColor()
self.removeNode() self.removeNode()
@ -92,7 +96,8 @@ class OnscreenGeom(PandaObject, NodePath):
self.reparentTo(parent, sort) self.reparentTo(parent, sort)
if not self.isEmpty(): if not self.isEmpty():
self.setTransform(transform) if transform:
self.setTransform(transform.compose(self.getTransform()))
# Set color, if specified # Set color, if specified
if color: if color:

10
direct/src/gui/OnscreenImage.py
View File

@ -75,13 +75,17 @@ class OnscreenImage(PandaObject, NodePath):
def setImage(self, image, def setImage(self, image,
parent = NodePath(), parent = NodePath(),
transform = TransformState.makeIdentity(), transform = None,
sort = 0): sort = 0):
# Get the original parent, transform, and sort, if any, so we can # Get the original parent, transform, and sort, if any, so we can
# preserve them across this call. # preserve them across this call.
if not self.isEmpty(): if not self.isEmpty():
parent = self.getParent() parent = self.getParent()
transform = self.getTransform() if transform == None:
# If we're replacing a previous image, we throw away
# the new image's transform in favor of the original
# image's transform.
transform = self.getTransform()
sort = self.getSort() sort = self.getSort()
self.removeNode() self.removeNode()
@ -113,7 +117,7 @@ class OnscreenImage(PandaObject, NodePath):
else: else:
print 'OnscreenImage: model %s not found' % image[0] print 'OnscreenImage: model %s not found' % image[0]
if not self.isEmpty(): if transform and not self.isEmpty():
self.setTransform(transform) self.setTransform(transform)
def getImage(self): def getImage(self):