Răsfoiți Sursa

*** empty log message ***

Joe Shochet 25 ani în urmă
părinte
comite
0d01cfc3db
2 a modificat fișierele cu 4 adăugiri și 8 ștergeri
  1. 0 5
      direct/src/ffi/FFITypes.py
  2. 4 3
      direct/src/leveleditor/LevelEditor.py

+ 0 - 5
direct/src/ffi/FFITypes.py

@@ -612,10 +612,8 @@ class ClassTypeDescriptor(BaseTypeDescriptor):
         parentTypeName = parent.foreignTypeName
         parentTypeName = parent.foreignTypeName
         fullNestedName = parent.getFullNestedName()
         fullNestedName = parent.getFullNestedName()
         if (fullNestedName != parentTypeName):
         if (fullNestedName != parentTypeName):
-            print "full nested name: ", fullNestedName
             nestedChain = fullNestedName.split(".") 
             nestedChain = fullNestedName.split(".") 
             moduleName = nestedChain[0]
             moduleName = nestedChain[0]
-            print "module name: ", moduleName
             indent(file, nesting, 'import ' + moduleName + '\n')
             indent(file, nesting, 'import ' + moduleName + '\n')
         else:
         else:
             indent(file, nesting, 'import ' + parent.foreignTypeName + '\n')
             indent(file, nesting, 'import ' + parent.foreignTypeName + '\n')
@@ -698,12 +696,9 @@ class ClassTypeDescriptor(BaseTypeDescriptor):
             #     parentClassModule.parentClass.nestedClass
             #     parentClassModule.parentClass.nestedClass
             fullNestedName = self.parentTypes[i].getFullNestedName()
             fullNestedName = self.parentTypes[i].getFullNestedName()
             if (fullNestedName != parentTypeName):
             if (fullNestedName != parentTypeName):
-                print "full nested name: ", fullNestedName
                 nestedChain = fullNestedName.split(".") 
                 nestedChain = fullNestedName.split(".") 
                 moduleName = nestedChain[0]
                 moduleName = nestedChain[0]
-                print "module name: ", moduleName
                 parentTypeName = fullNestedName
                 parentTypeName = fullNestedName
-                print "resolved parent name: ", parentTypeName
             file.write(moduleName + '.' + parentTypeName)
             file.write(moduleName + '.' + parentTypeName)
             file.write(', ')
             file.write(', ')
         file.write('FFIExternalObject.FFIExternalObject):\n')
         file.write('FFIExternalObject.FFIExternalObject):\n')

+ 4 - 3
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
 # 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.
 # or you can hack this up for your own purposes.
 else:
 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
 print "Loading LevelEditor for hoods: ", hoods
 
 
@@ -2309,6 +2309,7 @@ class LevelEditor(NodePath, PandaObject):
         marker = self.battleCellMarker.copyTo(parent)
         marker = self.battleCellMarker.copyTo(parent)
         # Greenish
         # Greenish
         marker.setColor(0.25,0.75,0.25,0.5)
         marker.setColor(0.25,0.75,0.25,0.5)
+        marker.setTransparency(1)
         marker.setPos(cell.getPos())
         marker.setPos(cell.getPos())
         # scale to radius which is width/2
         # scale to radius which is width/2
         marker.setScale(cell.getWidth()/2.0,
         marker.setScale(cell.getWidth()/2.0,
@@ -2346,7 +2347,7 @@ class LevelEditor(NodePath, PandaObject):
         # Points
         # Points
         numPoints = DNASTORE.getNumSuitPoints()
         numPoints = DNASTORE.getNumSuitPoints()
         for i in range(numPoints):
         for i in range(numPoints):
-            point = DNASTORE.getSuitPoint(i)
+            point = DNASTORE.getSuitPointAtIndex(i)
             marker = self.drawSuitPoint(
             marker = self.drawSuitPoint(
                 point.getPos(), point.getPointType(), self.NPToplevel)
                 point.getPos(), point.getPointType(), self.NPToplevel)
             self.pointDict[point] = marker
             self.pointDict[point] = marker