destroyLists -> destroy, explicit None checks in scene/rendergraph
This commit is contained in:
parent
422f2c2892
commit
92de1874a1
@ -37,10 +37,10 @@ class RenderNode(object):
|
||||
|
||||
@parent.setter
|
||||
def parent(self, value):
|
||||
if value:
|
||||
if value is not None:
|
||||
self._parent = weakref.ref(value)
|
||||
else:
|
||||
self._parent = value
|
||||
self._parent = None
|
||||
|
||||
def addChild(self, node):
|
||||
self.children.append(node)
|
||||
@ -112,12 +112,11 @@ class RenderNode(object):
|
||||
def drawSelf(self):
|
||||
pass
|
||||
|
||||
def destroyLists(self):
|
||||
def destroy(self):
|
||||
for child in self.children:
|
||||
child.destroyLists()
|
||||
child.destroy()
|
||||
self.displayList.destroy()
|
||||
|
||||
|
||||
class RenderstateRenderNode(RenderNode):
|
||||
def draw(self):
|
||||
self.enter()
|
||||
@ -374,7 +373,7 @@ def updateChildren(renderNode):
|
||||
|
||||
for dc in deadChildren:
|
||||
renderNode.removeChild(dc)
|
||||
dc.destroyLists()
|
||||
dc.destroy()
|
||||
|
||||
for index, sceneChild in enumerate(sceneNode.children):
|
||||
renderChild = renderNode.childrenBySceneNode.get(sceneChild)
|
||||
|
@ -28,15 +28,15 @@ class Node(object):
|
||||
_parent = None
|
||||
@property
|
||||
def parent(self):
|
||||
if self._parent:
|
||||
if self._parent is not None:
|
||||
return self._parent()
|
||||
|
||||
@parent.setter
|
||||
def parent(self, value):
|
||||
if value:
|
||||
if value is not None:
|
||||
self._parent = weakref.ref(value)
|
||||
else:
|
||||
self._parent = value
|
||||
self._parent = None
|
||||
|
||||
def touchChildren(self):
|
||||
node = self
|
||||
|
Reference in New Issue
Block a user