Fixed DG streets + add occluders option

Author: drewc5131

toontown/leveleditor/LevelEditor.py

@@ -127,6 +127,7 @@ def __init__(self):
         self.collisionsToggled = False
         self.suitPreviewsToggled = False
         self.orthCam = False
+        self.occludersVisible = False
 
     def startUp(self, dnaPath = None):
         # Initialize LevelEditor variables DNAData, DNAToplevel, NPToplevel
@@ -226,6 +227,7 @@ def startUp(self, dnaPath = None):
             ('tab', self.enterGlobalRadialMenu),
             ('s', self.beginBoxSelection),
             ('alt-s', self.toggleSuitBuildingPreviews),
+            ('alt-o', self.toggleVisibleOccluders),
             # This already exists, but we will override it to show an input
             ('p', self.setReparentTarget)
             ]
@@ -821,6 +823,15 @@ def toggleSuitBuildingPreviews(self):
             self.suitBuildings = []
             self.popupNotification("Disabled Suit Building View")
 
+    def toggleVisibleOccluders(self):
+        self.occludersVisible = not self.occludersVisible
+        if occludersVisible:
+            for node in render.findAllMatches('**/+OccluderNode'):
+                node.show()
+        else:
+            for node in render.findAllMatches('**/+OccluderNode'):
+                node.hide()
+
     def setReparentTarget(self):
         if base.direct.selected.last:
             base.direct.setActiveParent(base.direct.selected.last)

toontown/leveleditor/LevelEditorPanel.py

@@ -261,7 +261,7 @@ def __init__(self, levelEditor, parent = None, **kw):
                 text = 'ADD STREET',
                 command = self.addStreet)
         self.addStreetButton.pack(fill = X, padx = 20, pady = 10)
-        streets = [s[7:] for s in self.styleManager.getCatalogCodes(
+        streets = [s for s in self.styleManager.getCatalogCodes(
                 'street')]
         streets.sort()
         self.streetSelector = Pmw.ComboBox(
@@ -277,7 +277,7 @@ def __init__(self, levelEditor, parent = None, **kw):
                 scrolledlist_items = streets
                 )
         self.streetModuleType = self.styleManager.getCatalogCode('street', 0)
-        self.streetSelector.selectitem(self.streetModuleType[7:])
+        self.streetSelector.selectitem(self.streetModuleType)
         self.streetSelector.pack(expand = 1, fill = BOTH)
 
         # TOON BUILDINGS
@@ -1086,7 +1086,7 @@ def toggleMapVis(self):
         self.levelEditor.toggleMapVis(self.fMapVis.get())
 
     def setStreetModuleType(self, name):
-        self.streetModuleType = 'street_' + name
+        self.streetModuleType = name
         self.levelEditor.setCurrent('street_texture', self.streetModuleType)
 
     def addStreet(self):