mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 10:22:45 -04:00
group leftover stuff under ATR node
This commit is contained in:
parent
923a4086d8
commit
06fa04a9c8
@ -1123,11 +1123,8 @@ class LevelEditor(NodePath, PandaObject):
|
|||||||
del(self.point2edgeDict[pointOrCell])
|
del(self.point2edgeDict[pointOrCell])
|
||||||
elif (type == 'battleCellMarker'):
|
elif (type == 'battleCellMarker'):
|
||||||
# Get parent vis group
|
# Get parent vis group
|
||||||
try:
|
|
||||||
visGroupNP, visGroupDNA = self.findParentVisGroup(
|
visGroupNP, visGroupDNA = self.findParentVisGroup(
|
||||||
nodePath)
|
nodePath)
|
||||||
except TypeError:
|
|
||||||
visGroupNP, visGroupDNA = None, None
|
|
||||||
print 'Battle Cell:', pointOrCell
|
print 'Battle Cell:', pointOrCell
|
||||||
# Remove cell from vis group
|
# Remove cell from vis group
|
||||||
if visGroupNP and visGroupDNA:
|
if visGroupNP and visGroupDNA:
|
||||||
@ -2228,7 +2225,7 @@ class LevelEditor(NodePath, PandaObject):
|
|||||||
elif nodePath.hasParent():
|
elif nodePath.hasParent():
|
||||||
return self.findParentVisGroup(nodePath.getParent())
|
return self.findParentVisGroup(nodePath.getParent())
|
||||||
else:
|
else:
|
||||||
return None
|
return None, None
|
||||||
|
|
||||||
def showGrid(self,flag):
|
def showGrid(self,flag):
|
||||||
""" toggle direct grid """
|
""" toggle direct grid """
|
||||||
@ -3355,6 +3352,17 @@ class LevelEditor(NodePath, PandaObject):
|
|||||||
self.reparentStreetBuildings(child)
|
self.reparentStreetBuildings(child)
|
||||||
|
|
||||||
def consolidateStreetBuildings(self):
|
def consolidateStreetBuildings(self):
|
||||||
|
# First put everything under the ATR group so the leftover
|
||||||
|
# can be easily deleted
|
||||||
|
originalChildren = self.NPToplevel.getChildrenAsList()
|
||||||
|
self.addGroup(self.NPToplevel)
|
||||||
|
atrGroup = self.NPParent
|
||||||
|
atrGroup.setName('ATR')
|
||||||
|
self.setName(atrGroup, 'ATR')
|
||||||
|
direct.setActiveParent(atrGroup)
|
||||||
|
for child in originalChildren:
|
||||||
|
direct.reparent(child)
|
||||||
|
# Now create a new group with just the buildings
|
||||||
self.addGroup(self.NPToplevel)
|
self.addGroup(self.NPToplevel)
|
||||||
newGroup = self.NPParent
|
newGroup = self.NPParent
|
||||||
newGroup.setName('LongStreet')
|
newGroup.setName('LongStreet')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user