TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Mark Mine 2000-10-31 08:46:38 +00:00
parent 97c64f8820
commit 40ae72cd2e
3 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
direct/src/configfiles/direct.init
View File

@ -10,3 +10,4 @@ MODREL PYTHONPATH src/showbase
MODREL PYTHONPATH src/directutil MODREL PYTHONPATH src/directutil
MODREL PYTHONPATH src/tkwidgets MODREL PYTHONPATH src/tkwidgets
MODREL PYTHONPATH src/tkpanels MODREL PYTHONPATH src/tkpanels
MODREL PYTHONPATH src/leveleditor

2
direct/src/directutil/DirectSession.py
View File

@ -117,6 +117,8 @@ class DirectSession(PandaObject):
self.in2DWidget = 1 self.in2DWidget = 1
def enable(self): def enable(self):
# Make sure old tasks are shut down
self.disable()
# Start all display region context tasks # Start all display region context tasks
for context in self.contextList: for context in self.contextList:
context.spawnContextTask() context.spawnContextTask()

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

@ -292,7 +292,7 @@ class LevelEditor(NodePath, PandaObject):
def getWallTexture(self): def getWallTexture(self):
return self.attributeDictionary['wallTexture'] return self.attributeDictionary['wallTexture']
def getWallTexture(self, dnaString): def getWallTextureDNA(self, dnaString):
self.attributeDictionary['wallTexture'] = dnaString self.attributeDictionary['wallTexture'] = dnaString
def getWallTextures(self): def getWallTextures(self):
@ -1934,25 +1934,25 @@ class LevelEditor(NodePath, PandaObject):
newDNAFlatBuilding.add(self.createWall(20.0)) newDNAFlatBuilding.add(self.createWall(20.0))
elif selectedType == 'toonTenTwenty': elif selectedType == 'toonTenTwenty':
self.setBuildingHeight(30.0) self.setBuildingHeight(30.0)
newDNAFlatBuilding(self.createWall(10.0)) newDNAFlatBuilding.add(self.createWall(10.0))
newDNAFlatBuilding(self.createWall(20.0)) newDNAFlatBuilding.add(self.createWall(20.0))
elif selectedType == 'toonTwentyTen': elif selectedType == 'toonTwentyTen':
self.setBuildingHeight(30.0) self.setBuildingHeight(30.0)
newDNAFlatBuilding(self.createWall(20.0)) newDNAFlatBuilding.add(self.createWall(20.0))
newDNAFlatBuilding(self.createWall(10.0)) newDNAFlatBuilding.add(self.createWall(10.0))
elif selectedType == 'toonTenTenTen': elif selectedType == 'toonTenTenTen':
self.setBuildingHeight(30.0) self.setBuildingHeight(30.0)
newDNAFlatBuilding(self.createWall(10.0)) newDNAFlatBuilding.add(self.createWall(10.0))
newDNAFlatBuilding(self.createWall(10.0)) newDNAFlatBuilding.add(self.createWall(10.0))
newDNAFlatBuilding(self.createWall(10.0)) newDNAFlatBuilding.add(self.createWall(10.0))
elif selectedType == 'toonTenTwenty': elif selectedType == 'toonTenTwenty':
newDNAFlatBuilding(self.createWall(10.0)) newDNAFlatBuilding.add(self.createWall(10.0))
newDNAFlatBuilding(self.createWall(20.0)) newDNAFlatBuilding.add(self.createWall(20.0))
elif selectedType == 'toonTwentyTen': elif selectedType == 'toonTwentyTen':
newDNAFlatBuilding(self.createWall(20.0)) newDNAFlatBuilding.add(self.createWall(20.0))
newDNAFlatBuilding(self.createWall(10.0)) newDNAFlatBuilding.add(self.createWall(10.0))
elif selectedType == 'toonThirty': elif selectedType == 'toonThirty':
newDNAFlatBuilding(self.createWall(30.0)) newDNAFlatBuilding.add(self.createWall(30.0))
# Pick a style for this building # Pick a style for this building
self.setRandomBuildingStyle(newDNAFlatBuilding) self.setRandomBuildingStyle(newDNAFlatBuilding)
@ -1970,7 +1970,7 @@ class LevelEditor(NodePath, PandaObject):
newDNALandmarkBuilding.setCode(self.getDNACode(landmarkType)) newDNALandmarkBuilding.setCode(self.getDNACode(landmarkType))
newDNALandmarkBuilding.setPos(VBase3(0)) newDNALandmarkBuilding.setPos(VBase3(0))
newDNALandmarkBuilding.setHpr(VBase3(self.lastAngle,0.0,0.0)) newDNALandmarkBuilding.setHpr(VBase3(self.lastAngle,0.0,0.0))
newDNADoor = self.createDoor(self.doorTexture) newDNADoor = self.createDoor(self.getDoorTexture())
newDNALandmarkBuilding.add(newDNADoor) newDNALandmarkBuilding.add(newDNADoor)
# Now place new building in the world # Now place new building in the world
self.addDNAGroup(newDNALandmarkBuilding) self.addDNAGroup(newDNALandmarkBuilding)
@ -1990,7 +1990,7 @@ class LevelEditor(NodePath, PandaObject):
newDNAProp.setHpr(VBase3(self.lastAngle,0.0,0.0)) newDNAProp.setHpr(VBase3(self.lastAngle,0.0,0.0))
# Now place new building in the world # Now place new building in the world
self.addDNAGroup(newDNAProp) self.addDNAGroup(newDNAProp)
self.propType(newPropType) self.setPropType(newPropType)
def addStreetModule(self, streetType): def addStreetModule(self, streetType):
newDNAStreet = DNAStreet(streetType) newDNAStreet = DNAStreet(streetType)
@ -2009,8 +2009,8 @@ class LevelEditor(NodePath, PandaObject):
newDNAWall = self.createWallWithDNA(dnaString, height) newDNAWall = self.createWallWithDNA(dnaString, height)
# Pick a default window # Pick a default window
newDNAWindows = DNAWindows() newDNAWindows = DNAWindows()
self.windowTexture(self.getRandomWindowTexture()) self.setWindowTexture(self.getRandomWindowTexture())
newDNAWindows.setCode(self.getDNACode(self.windowTexture)) newDNAWindows.setCode(self.getDNACode(self.getWindowTexture()))
newDNAWindows.setCount(self.getRandomNumWindows(height)) newDNAWindows.setCount(self.getRandomNumWindows(height))
# MRM Need to randomize # MRM Need to randomize
newDNAWindows.setColor(self.getWallColors()) newDNAWindows.setColor(self.getWallColors())
@ -2028,7 +2028,8 @@ class LevelEditor(NodePath, PandaObject):
newDNADoor = DNADoor() newDNADoor = DNADoor()
newDNADoor.setCode(self.getDNACode(dnaString)) newDNADoor.setCode(self.getDNACode(dnaString))
# MRM Need to randomize # MRM Need to randomize
newDNADoor.setColor(self.getDoorColors()) colors = self.getDoorColors()
newDNADoor.setColor(colors[randint(0,len(colors) - 1)])
return newDNADoor return newDNADoor
def createNewLevelGroup(self): def createNewLevelGroup(self):
@ -2075,18 +2076,18 @@ class LevelEditor(NodePath, PandaObject):
# Pick a default window # Pick a default window
newDNAWindows = DNAWindows() newDNAWindows = DNAWindows()
newDNAWindows.setCode(self.getDNACode(self.windowTexture)) newDNAWindows.setCode(self.getDNACode(self.getWindowTexture()))
newDNAWindows.setCount(1) newDNAWindows.setCount(1)
newDNAWindows.setColor(self.windowColor) newDNAWindows.setColor(self.getWindowColor())
newDNAWall.add(newDNAWindows) newDNAWall.add(newDNAWindows)
return newDNAWall return newDNAWall
def createWindows(self, numWindows): def createWindows(self, numWindows):
newDNAWindows = DNAWindows() newDNAWindows = DNAWindows()
newDNAWindows.setCode(self.getDNACode(self.windowTexture)) newDNAWindows.setCode(self.getDNACode(self.getWindowTexture()))
newDNAWindows.setCount(numWindows) newDNAWindows.setCount(numWindows)
newDNAWindows.setColor(self.windowColor) newDNAWindows.setColor(self.getWindowColor())
return newDNAWindows return newDNAWindows
def getCatalogCodes(self, category): def getCatalogCodes(self, category):
@ -2108,7 +2109,7 @@ class LevelEditor(NodePath, PandaObject):
lastWall = self.getLastWall(aDNAFlatBuilding) lastWall = self.getLastWall(aDNAFlatBuilding)
if lastWall: if lastWall:
for i in range(lastWall.getNumChildren()): for i in range(lastWall.getNumChildren()):
child = lastWall[i] child = lastWall.at(i)
if child.getClassType().eq(DNACornice.getClassType()): if child.getClassType().eq(DNACornice.getClassType()):
return child return child
# Not found # Not found
@ -2132,7 +2133,7 @@ class LevelEditor(NodePath, PandaObject):
def getDoor(self, aDNAGroup): def getDoor(self, aDNAGroup):
for i in range(aDNAGroup.getNumChildren()): for i in range(aDNAGroup.getNumChildren()):
child = aDNAGroup[i] child = aDNAGroup.at(i)
# MRM CLASS INFO? # MRM CLASS INFO?
if child.getClassType().eq(DNADoor.getClassType()): if child.getClassType().eq(DNADoor.getClassType()):
return child return child
@ -2142,7 +2143,7 @@ class LevelEditor(NodePath, PandaObject):
def getLastWall(self, aDNAFlatBuilding): def getLastWall(self, aDNAFlatBuilding):
lastWall = None lastWall = None
for i in range(aDNAFlatBuilding.getNumChildren()): for i in range(aDNAFlatBuilding.getNumChildren()):
child = aDNAFlatBuilding[i] child = aDNAFlatBuilding.at(i)
if child.getClassType().eq(DNAWall.getClassType()): if child.getClassType().eq(DNAWall.getClassType()):
lastWall = child lastWall = child
return lastWall return lastWall
@ -2195,7 +2196,7 @@ class LevelEditor(NodePath, PandaObject):
return None return None
def getRandomStyle(self): def getRandomStyle(self):
return self.getRandomDictionaryEntry(styleDictionary) return self.getRandomDictionaryEntry(self.styleDictionary)
def getRandomWallTexture(self): def getRandomWallTexture(self):
return self.getWallTextures()[ return self.getWallTextures()[
@ -2221,7 +2222,7 @@ class LevelEditor(NodePath, PandaObject):
def getWall(self, aDNAGroup, wallNum): def getWall(self, aDNAGroup, wallNum):
wallCount = 0 wallCount = 0
for i in range(aDNAGroup.getNumChildren()): for i in range(aDNAGroup.getNumChildren()):
child = aDNAGroup[i] child = aDNAGroup.at(i)
if child.getClassType().eq(DNAWall.getClassType()): if child.getClassType().eq(DNAWall.getClassType()):
if wallCount == wallNum: if wallCount == wallNum:
return child return child
@ -2235,7 +2236,7 @@ class LevelEditor(NodePath, PandaObject):
# Compute wall heights # Compute wall heights
for i in range(aDNAFlatBuilding.getNumChildren()): for i in range(aDNAFlatBuilding.getNumChildren()):
child = aDNAFlatBuilding[i] child = aDNAFlatBuilding.at(i)
if child.getClassType().eq(DNAWall.getClassType()): if child.getClassType().eq(DNAWall.getClassType()):
heightTotal = heightTotal + child.getHeight() heightTotal = heightTotal + child.getHeight()
heightList.add(heightTotal) heightList.add(heightTotal)
@ -2255,7 +2256,7 @@ class LevelEditor(NodePath, PandaObject):
def getWindow(self, aDNAGroup, windowNum): def getWindow(self, aDNAGroup, windowNum):
windowCount = 0 windowCount = 0
for i in range(aDNAGroup.getNumChildren()): for i in range(aDNAGroup.getNumChildren()):
child = aDNAGroup[i] child = aDNAGroup.at(i)
if (child.getClassType().eq(DNAWindow.getClassType()) | if (child.getClassType().eq(DNAWindow.getClassType()) |
child.getClassType().eq(DNAWindows.getClassType())): child.getClassType().eq(DNAWindows.getClassType())):
if windowCount == windowNum: if windowCount == windowNum:
@ -2267,7 +2268,7 @@ class LevelEditor(NodePath, PandaObject):
def initDNAGroupWithParent(self, dnaGroup, parent): def initDNAGroupWithParent(self, dnaGroup, parent):
# Create the geometry # Create the geometry
# If it is a flat building, update building DNA to current wall width # If it is a flat building, update building DNA to current wall width
if (dnaGroup.getClassType().eq(DNAFlatBuilding.getClassType)): if (dnaGroup.getClassType().eq(DNAFlatBuilding.getClassType())):
dnaGroup.setWidth(self.getWallWidth()) dnaGroup.setWidth(self.getWallWidth())
newNodePath = dnaGroup.traverse(parent,self.dnaStore) newNodePath = dnaGroup.traverse(parent,self.dnaStore)
# Add it to the level dictionary # Add it to the level dictionary
@ -2276,7 +2277,7 @@ class LevelEditor(NodePath, PandaObject):
self.groupParentDNA.add(dnaGroup) self.groupParentDNA.add(dnaGroup)
# Place the new node path at the current grid origin # Place the new node path at the current grid origin
newNodePath.setPos(grid,0,0,0) newNodePath.setPos(self.grid,0,0,0)
# Initialize angle to match last object # Initialize angle to match last object
newNodePath.setH(self.lastAngle) newNodePath.setH(self.lastAngle)
@ -2319,7 +2320,7 @@ class LevelEditor(NodePath, PandaObject):
def initNewDNAGroupWithParent(self, dnaGroup, rootNode): def initNewDNAGroupWithParent(self, dnaGroup, rootNode):
# Reflect currently selected prop type # Reflect currently selected prop type
if dnaGroup.getClassType().eq(DNAProp.getClassType()): if dnaGroup.getClassType().eq(DNAProp.getClassType()):
self.updatePropType(dnaGroup,self.propType) self.updatePropType(dnaGroup,self.getPropType())
# Create a new copy of dnaGroup's class # Create a new copy of dnaGroup's class
# Extract group's class using __class__ # Extract group's class using __class__
@ -2339,7 +2340,7 @@ class LevelEditor(NodePath, PandaObject):
# Create a new dna Group of the same type a dnaGroup # Create a new dna Group of the same type a dnaGroup
newDNAGroup = dnaGroup.__class__(dnaGroup) newDNAGroup = dnaGroup.__class__(dnaGroup)
if dnaGroup.getClassType().eq(DNAProp.getClassType()): if dnaGroup.getClassType().eq(DNAProp.getClassType()):
self.updatePropType(newDNAGroup,self.propType) self.updatePropType(newDNAGroup,self.getPropType())
self.initDNAGroupWithParentType(newDNAGroup, self.groupParent, type) self.initDNAGroupWithParentType(newDNAGroup, self.groupParent, type)
@ -2426,7 +2427,7 @@ class LevelEditor(NodePath, PandaObject):
def removeDNAObjectFrom(self, aDNAGroup, objectClass): def removeDNAObjectFrom(self, aDNAGroup, objectClass):
# Remove the first object of that type you come across # Remove the first object of that type you come across
for i in range(aDNAGroup.getNumChildren()): for i in range(aDNAGroup.getNumChildren()):
child = aDNAGroup[i] child = aDNAGroup.at(i)
if child.getClassType().eq(objectClass): if child.getClassType().eq(objectClass):
aDNAGroup.remove(child) aDNAGroup.remove(child)
return 1 return 1
@ -2436,8 +2437,8 @@ class LevelEditor(NodePath, PandaObject):
def removeDNAObjectOfClass(self, objectClass, aDNAGroup): def removeDNAObjectOfClass(self, objectClass, aDNAGroup):
# Remove the first object of that type you come across # Remove the first object of that type you come across
for i in range(aDNAGroup.getNumChildren()): for i in range(aDNAGroup.getNumChildren()):
child = aDNAGroup[i] child = aDNAGroup.at(i)
if child.getClassType.eq(objectClass): if child.getClassType().eq(objectClass):
aDNAGroup.remove(child) aDNAGroup.remove(child)
return 1 return 1
# None found # None found
@ -2558,8 +2559,8 @@ class LevelEditor(NodePath, PandaObject):
aDNAFlatBuilding.setWidth(self.getWallWidth()) aDNAFlatBuilding.setWidth(self.getWallWidth())
style = self.getRandomStyle() style = self.getRandomStyle()
for i in range(aDNAFlatBuilding.getNumChildren()): for i in range(aDNAFlatBuilding.getNumChildren()):
child = aDNAFlatBuilding[i] child = aDNAFlatBuilding.at(i)
if child.getClassType.eq(DNAWall): if child.getClassType().eq(DNAWall):
self.setWallStyle(child, style) self.setWallStyle(child, style)
if randint(0,100) < 40: if randint(0,100) < 40:
style = self.getRandomStyle() style = self.getRandomStyle()
@ -2671,7 +2672,7 @@ class LevelEditor(NodePath, PandaObject):
aDNADoor.setCode(self.dnaStore.findCode(dnaString)) aDNADoor.setCode(self.dnaStore.findCode(dnaString))
# Replace object in levelObjects dictionary and scene graph # Replace object in levelObjects dictionary and scene graph
self.replaceLevelObjectNodePath(self.selectedLevelObject) self.replaceLevelObjectNodePath(self.selectedLevelObject)
self.doorTexture(dnaString) self.setDoorTexture(dnaString)
def updateNumWindows(self, numWindows): def updateNumWindows(self, numWindows):
if numWindows < 0: if numWindows < 0:
@ -2747,7 +2748,7 @@ class LevelEditor(NodePath, PandaObject):
if (propNumber < 0): if (propNumber < 0):
dnaString = self.activeMenu.getInitialState() dnaString = self.activeMenu.getInitialState()
else: else:
dnaString = self.propTypes[propNumber] dnaString = self.getPropTypes()[propNumber]
# Now update the texture on the wall with that texture # Now update the texture on the wall with that texture
self.updatePropDNA(aDNAProp,dnaString) self.updatePropDNA(aDNAProp,dnaString)
@ -2756,12 +2757,12 @@ class LevelEditor(NodePath, PandaObject):
aDNAProp.setCode(self.dnaStore.findCode(dnaString)) aDNAProp.setCode(self.dnaStore.findCode(dnaString))
# Replace object in levelObjects dictionary and scene graph # Replace object in levelObjects dictionary and scene graph
self.replaceLevelObjectNodePath(self.selectedLevelObject) self.replaceLevelObjectNodePath(self.selectedLevelObject)
self.propType(dnaString) self.setPropType(dnaString)
def updateRandomNumWindows(self, aDNAFlatBuilding): def updateRandomNumWindows(self, aDNAFlatBuilding):
for i in range(aDNAFlatBuilding.getNumChildren()): for i in range(aDNAFlatBuilding.getNumChildren()):
child = aDNAFlatBuilding[i] child = aDNAFlatBuilding.at(i)
if child.getClassType().eq(DNAWall.getClassType): if child.getClassType().eq(DNAWall.getClassType()):
self.setRandomNumWindows( self.setRandomNumWindows(
child, child,
self.getRandomNumWindows(child.getHeight())) self.getRandomNumWindows(child.getHeight()))
@ -2852,14 +2853,14 @@ class LevelEditor(NodePath, PandaObject):
aDNAWindow.setCode(self.dnaStore.findCode(dnaString)) aDNAWindow.setCode(self.dnaStore.findCode(dnaString))
# Replace object in levelObjects dictionary and scene graph # Replace object in levelObjects dictionary and scene graph
self.replaceLevelObjectNodePath(self.selectedLevelObject) self.replaceLevelObjectNodePath(self.selectedLevelObject)
self.windowTexture(dnaString) self.setWindowTexture(dnaString)
def roundTo(self, value, divisor): def roundTo(self, value, divisor):
return round(value/float(divisor)) * divisor return round(value/float(divisor)) * divisor
def autoPositionGrid(self): def autoPositionGrid(self):
# Move grid to prepare for placement of next object # Move grid to prepare for placement of next object
selectedNode = direct.selected.last selectedNode = self.direct.selected.last
if selectedNode: if selectedNode:
dnaGroup = self.getDNAGroup(selectedNode) dnaGroup = self.getDNAGroup(selectedNode)
groupClass = dnaGroup.getClassType().getName() groupClass = dnaGroup.getClassType().getName()
@ -2934,10 +2935,10 @@ class LevelEditor(NodePath, PandaObject):
if self.grid.getXyzSnap(): if self.grid.getXyzSnap():
# Tighten up grid position # Tighten up grid position
pos = self.grid.getPos() pos = self.grid.getPos()
roundVal = roundTo(self.grid.getGridSpacing(), 1) roundVal = self.roundTo(self.grid.getGridSpacing(), 1)
x = roundTo(pos[0], roundVal) x = self.roundTo(pos[0], roundVal)
y = roundTo(pos[1], roundVal) y = self.roundTo(pos[1], roundVal)
z = rountTo(pos[2], roundVal) z = self.roundTo(pos[2], roundVal)
self.grid.setPos(x,y,z) self.grid.setPos(x,y,z)
# Also move the camera # Also move the camera
@ -2951,7 +2952,7 @@ class LevelEditor(NodePath, PandaObject):
def plantSelectedNodePath(self): def plantSelectedNodePath(self):
# Move grid to prepare for placement of next object # Move grid to prepare for placement of next object
selectedNode = direct.selected.last selectedNode = self.direct.selected.last
if selectedNode: if selectedNode:
# Where is the mouse relative to the grid? # Where is the mouse relative to the grid?
# MRM NEEDED # MRM NEEDED
@ -2992,7 +2993,7 @@ class LevelEditor(NodePath, PandaObject):
def getWallIntersectionPoint(self, intersectionPoint): def getWallIntersectionPoint(self, intersectionPoint):
# Find point of intersection between grid plane and line from cam through mouse # Find point of intersection between grid plane and line from cam through mouse
# Don't do anything if nothing selected # Don't do anything if nothing selected
selectedNode = direct.selected.last selectedNode = self.direct.selected.last
if not selectedNode: if not selectedNode:
return 0 return 0