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

remove support for old panda

Browse Source
This commit is contained in:
David Rose 2004-12-29 15:18:30 +00:00
parent 638fad7bf6
commit 6c4a3de098
1 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -555,18 +555,10 @@ class ShowBase(DirectObject.DirectObject):
if flag: if flag:
if not self.frameRateMeter: if not self.frameRateMeter:
self.frameRateMeter = FrameRateMeter('frameRateMeter') self.frameRateMeter = FrameRateMeter('frameRateMeter')
# Temporary try..except for old pandas. self.frameRateMeter.setupWindow(self.win)
try:
self.frameRateMeter.setupLayer(self.win)
except:
self.frameRateMeter.setupWindow(self.win)
else: else:
if self.frameRateMeter: if self.frameRateMeter:
# Temporary try..except for old pandas. self.frameRateMeter.clearWindow()
try:
self.frameRateMeter.clearLayer()
except:
self.frameRateMeter.clearWindow()
self.frameRateMeter = None self.frameRateMeter = None
@ -708,14 +700,8 @@ class ShowBase(DirectObject.DirectObject):
Makes a new 3-d camera associated with the indicated window, Makes a new 3-d camera associated with the indicated window,
and creates a display region in the indicated subrectangle. and creates a display region in the indicated subrectangle.
""" """
# Temporary test for old pandas. dr = win.makeDisplayRegion(*displayRegion)
if hasattr(win, "getChannel"): dr.setSort(sort)
chan = win.getChannel(0)
layer = chan.makeLayer(sort)
dr = layer.makeDisplayRegion(*displayRegion)
else:
dr = win.makeDisplayRegion(*displayRegion)
dr.setSort(sort)
if scene == None: if scene == None:
scene = self.render scene = self.render
@ -758,14 +744,8 @@ class ShowBase(DirectObject.DirectObject):
Makes a new camera2d associated with the indicated window, and Makes a new camera2d associated with the indicated window, and
assigns it to render the indicated subrectangle of render2d. assigns it to render the indicated subrectangle of render2d.
""" """
# Temporary test for old pandas. dr = win.makeDisplayRegion(*displayRegion)
if hasattr(win, "getChannel"): dr.setSort(sort)
chan = win.getChannel(0)
layer = chan.makeLayer(sort)
dr = layer.makeDisplayRegion(*displayRegion)
else:
dr = win.makeDisplayRegion(*displayRegion)
dr.setSort(sort)
# Enable clearing of the depth buffer on this new display # Enable clearing of the depth buffer on this new display
# region (see the comment in setupRender2d, above). # region (see the comment in setupRender2d, above).
@ -798,14 +778,8 @@ class ShowBase(DirectObject.DirectObject):
Makes a new camera2dp associated with the indicated window, and Makes a new camera2dp associated with the indicated window, and
assigns it to render the indicated subrectangle of render2dp. assigns it to render the indicated subrectangle of render2dp.
""" """
# Temporary test for old pandas. dr = win.makeDisplayRegion(*displayRegion)
if hasattr(win, "getChannel"): dr.setSort(sort)
chan = win.getChannel(0)
layer = chan.makeLayer(sort)
dr = layer.makeDisplayRegion(*displayRegion)
else:
dr = win.makeDisplayRegion(*displayRegion)
dr.setSort(sort)
# Enable clearing of the depth buffer on this new display # Enable clearing of the depth buffer on this new display
# region (see the comment in setupRender2d, above). # region (see the comment in setupRender2d, above).