From 0d01cfc3dbad0309d1706da3eab035ba8bac57eb Mon Sep 17 00:00:00 2001 From: Joe Shochet Date: Fri, 4 May 2001 02:55:18 +0000 Subject: [PATCH] *** empty log message *** --- direct/src/ffi/FFITypes.py | 5 ----- direct/src/leveleditor/LevelEditor.py | 7 ++++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/direct/src/ffi/FFITypes.py b/direct/src/ffi/FFITypes.py index cc6d8a2d00..5b1e4b2235 100644 --- a/direct/src/ffi/FFITypes.py +++ b/direct/src/ffi/FFITypes.py @@ -612,10 +612,8 @@ class ClassTypeDescriptor(BaseTypeDescriptor): parentTypeName = parent.foreignTypeName fullNestedName = parent.getFullNestedName() if (fullNestedName != parentTypeName): - print "full nested name: ", fullNestedName nestedChain = fullNestedName.split(".") moduleName = nestedChain[0] - print "module name: ", moduleName indent(file, nesting, 'import ' + moduleName + '\n') else: indent(file, nesting, 'import ' + parent.foreignTypeName + '\n') @@ -698,12 +696,9 @@ class ClassTypeDescriptor(BaseTypeDescriptor): # parentClassModule.parentClass.nestedClass fullNestedName = self.parentTypes[i].getFullNestedName() if (fullNestedName != parentTypeName): - print "full nested name: ", fullNestedName nestedChain = fullNestedName.split(".") moduleName = nestedChain[0] - print "module name: ", moduleName parentTypeName = fullNestedName - print "resolved parent name: ", parentTypeName file.write(moduleName + '.' + parentTypeName) file.write(', ') file.write('FFIExternalObject.FFIExternalObject):\n') diff --git a/direct/src/leveleditor/LevelEditor.py b/direct/src/leveleditor/LevelEditor.py index 7c7a0deb2f..cc6a7af734 100644 --- a/direct/src/leveleditor/LevelEditor.py +++ b/direct/src/leveleditor/LevelEditor.py @@ -15,8 +15,8 @@ if sys.argv[1:]: # If you do not run from the command line, we just load all of them # or you can hack this up for your own purposes. else: - hoods = ['TT', 'DD', 'BR', 'DG', 'DL', 'MM'] - # hoods = ['TT' ] + # hoods = ['TT', 'DD', 'BR', 'DG', 'DL', 'MM'] + hoods = ['TT' ] print "Loading LevelEditor for hoods: ", hoods @@ -2309,6 +2309,7 @@ class LevelEditor(NodePath, PandaObject): marker = self.battleCellMarker.copyTo(parent) # Greenish marker.setColor(0.25,0.75,0.25,0.5) + marker.setTransparency(1) marker.setPos(cell.getPos()) # scale to radius which is width/2 marker.setScale(cell.getWidth()/2.0, @@ -2346,7 +2347,7 @@ class LevelEditor(NodePath, PandaObject): # Points numPoints = DNASTORE.getNumSuitPoints() for i in range(numPoints): - point = DNASTORE.getSuitPoint(i) + point = DNASTORE.getSuitPointAtIndex(i) marker = self.drawSuitPoint( point.getPos(), point.getPointType(), self.NPToplevel) self.pointDict[point] = marker