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

Begin naming Nodes

Browse Source
This commit is contained in:
David Vierra 2015-10-28 19:09:03 -10:00
parent 45c6ab9031
commit af264492c2
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mcedit2/rendering/scenegraph/scenenode.py
View File

@ -13,17 +13,18 @@ log = logging.getLogger(__name__)
class Node(object): class Node(object):
RenderNodeClass = rendernode.RenderNode RenderNodeClass = rendernode.RenderNode
def __init__(self): def __init__(self, name=None):
super(Node, self).__init__() super(Node, self).__init__()
self._children = [] self._children = []
self._dirty = True self._dirty = True
self._parents = [] self._parents = []
self.states = [] self.states = []
self.name = name
self.childrenChanged = False self.childrenChanged = False
self.descendentNeedsUpdate = False self.descendentNeedsUpdate = False
def __repr__(self): 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): def addState(self, obj):
self.states.append(obj) self.states.append(obj)

6
src/mcedit2/worldview/worldview.py
View File

@ -164,7 +164,7 @@ class WorldView(QGLWidget):
self.worldNode = None self.worldNode = None
self.skyNode = None self.skyNode = None
self.overlayNode = scenenode.Node() self.overlayNode = scenenode.Node("WorldView Overlay")
self.sceneGraph = None self.sceneGraph = None
self.renderGraph = None self.renderGraph = None
@ -253,7 +253,7 @@ class WorldView(QGLWidget):
return worldscene.WorldScene(self.dimension, self.textureAtlas, self.geometryCache) return worldscene.WorldScene(self.dimension, self.textureAtlas, self.geometryCache)
def createSceneGraph(self): def createSceneGraph(self):
sceneGraph = scenenode.Node() sceneGraph = scenenode.Node("WorldView SceneGraph")
self.worldScene = self.createWorldScene() self.worldScene = self.createWorldScene()
self.worldScene.setVisibleLayers(self.layerToggleGroup.getVisibleLayers()) self.worldScene.setVisibleLayers(self.layerToggleGroup.getVisibleLayers())
@ -261,7 +261,7 @@ class WorldView(QGLWidget):
self.skyNode = sky.SkyNode() self.skyNode = sky.SkyNode()
self.loadableChunksNode = loadablechunks.LoadableChunksNode(self.dimension) self.loadableChunksNode = loadablechunks.LoadableChunksNode(self.dimension)
self.worldNode = Node() self.worldNode = Node("World Container")
self.matrixState = MatrixState() self.matrixState = MatrixState()
self.worldNode.addState(self.matrixState) self.worldNode.addState(self.matrixState)
self._updateMatrices() self._updateMatrices()