TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove support for old panda

Browse Source
This commit is contained in:
David Rose 2004-04-20 22:51:39 +00:00
parent 96fbd216c7
commit b169b29435
2 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
direct/src/interval/MetaInterval.py
View File

@ -265,16 +265,8 @@ class MetaInterval(CMetaInterval):
# is TRACK_START. # is TRACK_START.
self.pushLevel(name, relTime, relTo) self.pushLevel(name, relTime, relTo)
for tuple in list: for tuple in list:
if isinstance(tuple, Interval.Interval) or \ if isinstance(tuple, types.TupleType) or \
isinstance(tuple, CInterval): isinstance(tuple, types.ListType):
# Actually, it's not a tuple, but just an interval.
# In this case we fall back on the old default of
# assuming a sequential list of intervals. This is a
# temporary feature for backward compatibility.
self.addInterval(tuple, 0.0, PREVIOUS_END)
elif isinstance(tuple, types.TupleType) or \
isinstance(tuple, types.ListType):
relTime = tuple[0] relTime = tuple[0]
ival = tuple[1] ival = tuple[1]
if len(tuple) >= 3: if len(tuple) >= 3:
@ -567,14 +559,6 @@ class Track(MetaInterval):
# this is the same as asking that the component is itself an # this is the same as asking that the component is itself an
# Interval. # Interval.
#if isinstance(tuple, CInterval) or \
# isinstance(tuple, Interval.Interval):
# # Actually, it's not a tuple, but just an interval.
# # In this case we fall back on the old default of
# # assuming a sequential list of intervals. This is a
# # temporary feature for backward compatibility.
# return 1
if not (isinstance(tuple, types.TupleType) or \ if not (isinstance(tuple, types.TupleType) or \
isinstance(tuple, types.ListType)): isinstance(tuple, types.ListType)):
# It's not a tuple. # It's not a tuple.
@ -602,10 +586,3 @@ class Track(MetaInterval):
# Looks good. # Looks good.
return 1 return 1
# Temporary for backward compatibility.
#class MultiTrack(MetaInterval):
# def applyIvals(self, meta, relTime, relTo):
# meta.addParallel(self.ivals, self.getName(),
# relTime, relTo, self.phonyDuration)

25
direct/src/showbase/ShowBase.py
View File

@ -389,20 +389,12 @@ class ShowBase(DirectObject.DirectObject):
name = 'window%s' % (self.nextWindowIndex) name = 'window%s' % (self.nextWindowIndex)
self.nextWindowIndex += 1 self.nextWindowIndex += 1
# Temporary try .. except for old Pandas.
win = None win = None
try: if type == 'onscreen':
if type == 'onscreen': win = self.graphicsEngine.makeWindow(gsg, name, 0)
win = self.graphicsEngine.makeWindow(gsg, name, 0) elif type == 'offscreen':
elif type == 'offscreen': win = self.graphicsEngine.makeBuffer(
win = self.graphicsEngine.makeBuffer( gsg, name, 0, props.getXSize(), props.getYSize(), 0)
gsg, name, 0, props.getXSize(), props.getYSize(), 0)
except:
if type == 'onscreen':
win = self.graphicsEngine.makeWindow(pipe, gsg)
elif type == 'offscreen':
win = self.graphicsEngine.makeBuffer(
pipe, gsg, props.getXSize(), props.getYSize(), 0)
if win == None: if win == None:
# Couldn't create a window! # Couldn't create a window!
@ -514,12 +506,7 @@ class ShowBase(DirectObject.DirectObject):
def isMainWindowOpen(self): def isMainWindowOpen(self):
if self.win != None: if self.win != None:
# Temporary try .. except for old Pandas. return self.win.isValid()
try:
valid = self.win.isValid()
except:
valid = self.win.isOpen()
return valid
return 0 return 0
def openMainWindow(self): def openMainWindow(self):