From af264492c2a728aefd771e7bc3c0b026919f5990 Mon Sep 17 00:00:00 2001 From: David Vierra Date: Wed, 28 Oct 2015 19:09:03 -1000 Subject: [PATCH] Begin naming Nodes --- src/mcedit2/rendering/scenegraph/scenenode.py | 5 +++-- src/mcedit2/worldview/worldview.py | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mcedit2/rendering/scenegraph/scenenode.py b/src/mcedit2/rendering/scenegraph/scenenode.py index 20a637e..067625c 100644 --- a/src/mcedit2/rendering/scenegraph/scenenode.py +++ b/src/mcedit2/rendering/scenegraph/scenenode.py @@ -13,17 +13,18 @@ log = logging.getLogger(__name__) class Node(object): RenderNodeClass = rendernode.RenderNode - def __init__(self): + def __init__(self, name=None): super(Node, self).__init__() self._children = [] self._dirty = True self._parents = [] self.states = [] + self.name = name self.childrenChanged = False self.descendentNeedsUpdate = False def __repr__(self): - return "%s(visible=%s, children=%d)" % (self.__class__.__name__, self.visible, len(self._children)) + return "%s(%r, visible=%s, children=%d)" % (self.name, self.__class__.__name__, self.visible, len(self._children)) def addState(self, obj): self.states.append(obj) diff --git a/src/mcedit2/worldview/worldview.py b/src/mcedit2/worldview/worldview.py index a0b4a84..2df3de8 100644 --- a/src/mcedit2/worldview/worldview.py +++ b/src/mcedit2/worldview/worldview.py @@ -164,7 +164,7 @@ class WorldView(QGLWidget): self.worldNode = None self.skyNode = None - self.overlayNode = scenenode.Node() + self.overlayNode = scenenode.Node("WorldView Overlay") self.sceneGraph = None self.renderGraph = None @@ -253,7 +253,7 @@ class WorldView(QGLWidget): return worldscene.WorldScene(self.dimension, self.textureAtlas, self.geometryCache) def createSceneGraph(self): - sceneGraph = scenenode.Node() + sceneGraph = scenenode.Node("WorldView SceneGraph") self.worldScene = self.createWorldScene() self.worldScene.setVisibleLayers(self.layerToggleGroup.getVisibleLayers()) @@ -261,7 +261,7 @@ class WorldView(QGLWidget): self.skyNode = sky.SkyNode() self.loadableChunksNode = loadablechunks.LoadableChunksNode(self.dimension) - self.worldNode = Node() + self.worldNode = Node("World Container") self.matrixState = MatrixState() self.worldNode.addState(self.matrixState) self._updateMatrices()