RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

This commit is contained in:
Joe Shochet 2001-05-04 02:55:18 +00:00
parent ff9b9bcf4c
commit 0d01cfc3db
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
direct/src/ffi/FFITypes.py
View File

@ -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')

7
direct/src/leveleditor/LevelEditor.py
View File

@ -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