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

*** empty log message ***

Browse Source
This commit is contained in:
Joe Shochet 2000-12-16 02:58:40 +00:00
parent eab6f0393b
commit a43b3e1df7
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,14 +16,20 @@ class OnscreenText(PandaObject, NodePath):
# make a text node # make a text node
self.textNode = textNode = TextNode() self.textNode = textNode = TextNode()
# Freeze the node while we set all the properties
textNode.freeze()
textNode.setBillboard(0) textNode.setBillboard(0)
textNode.setTextColor(0.0, 0.0, 0.0, 1.0) textNode.setTextColor(0.0, 0.0, 0.0, 1.0)
textNode.setCardColor(1.0, 1.0, 1.0, 1.0) textNode.setCardColor(1.0, 1.0, 1.0, 1.0)
textNode.setCardAsMargin(0.1, 0.1, 0.1, 0.1) textNode.setCardAsMargin(0.1, 0.1, 0.1, 0.1)
textNode.setFrameColor(0.0, 0.0, 0.0, 1.0) # textNode.setFrameColor(0.0, 0.0, 0.0, 1.0)
textNode.setFrameAsMargin(0.1, 0.1, 0.1, 0.1) # textNode.setFrameAsMargin(0.15, 0.15, 0.15, 0.15)
textNode.setFont(OnscreenText.Font) textNode.setFont(OnscreenText.Font)
textNode.setText(string) textNode.setText(string)
textNode.clearCardBorder()
textNode.clearFrame()
# Ok, now update the node
textNode.thaw()
# put the text node into the 2d scene graph # put the text node into the 2d scene graph
textNodePath = render2d.attachNewNode(textNode) textNodePath = render2d.attachNewNode(textNode)

1
direct/src/task/Task.py
View File

@ -213,7 +213,6 @@ class TaskManager:
self.taskList.remove(task) self.taskList.remove(task)
except: except:
pass pass
# TODO: upon death
if task.uponDeath: if task.uponDeath:
task.uponDeath(task) task.uponDeath(task)