AstralTransRocketries/mcedit2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

destroyLists -> destroy, explicit None checks in scene/rendergraph

Browse Source
This commit is contained in:
David Vierra 2015-03-16 14:14:26 -10:00
parent 422f2c2892
commit 92de1874a1
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mcedit2/rendering/rendergraph.py
View File

@ -37,10 +37,10 @@ class RenderNode(object):
@parent.setter @parent.setter
def parent(self, value): def parent(self, value):
if value: if value is not None:
self._parent = weakref.ref(value) self._parent = weakref.ref(value)
else: else:
self._parent = value self._parent = None
def addChild(self, node): def addChild(self, node):
self.children.append(node) self.children.append(node)
@ -112,12 +112,11 @@ class RenderNode(object):
def drawSelf(self): def drawSelf(self):
pass pass
def destroyLists(self): def destroy(self):
for child in self.children: for child in self.children:
child.destroyLists() child.destroy()
self.displayList.destroy() self.displayList.destroy()
class RenderstateRenderNode(RenderNode): class RenderstateRenderNode(RenderNode):
def draw(self): def draw(self):
self.enter() self.enter()
@ -374,7 +373,7 @@ def updateChildren(renderNode):
for dc in deadChildren: for dc in deadChildren:
renderNode.removeChild(dc) renderNode.removeChild(dc)
dc.destroyLists() dc.destroy()
for index, sceneChild in enumerate(sceneNode.children): for index, sceneChild in enumerate(sceneNode.children):
renderChild = renderNode.childrenBySceneNode.get(sceneChild) renderChild = renderNode.childrenBySceneNode.get(sceneChild)

6
src/mcedit2/rendering/scenegraph.py
View File

@ -28,15 +28,15 @@ class Node(object):
_parent = None _parent = None
@property @property
def parent(self): def parent(self):
if self._parent: if self._parent is not None:
return self._parent() return self._parent()
@parent.setter @parent.setter
def parent(self, value): def parent(self, value):
if value: if value is not None:
self._parent = weakref.ref(value) self._parent = weakref.ref(value)
else: else:
self._parent = value self._parent = None
def touchChildren(self): def touchChildren(self):
node = self node = self