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

*** empty log message ***

Browse Source
This commit is contained in:
David Rose 2001-02-15 17:38:17 +00:00
parent afd84ee8ec
commit 312f7352af
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
direct/src/ffi/FFIExternalObject.py
View File

@ -201,12 +201,18 @@ class FFIExternalObject:
baseRepr = baseRepr + '\n' + lineStream.getLine() baseRepr = baseRepr + '\n' + lineStream.getLine()
except: except:
try: try:
# Ok, no write function, lets try output then # Sometimes write insists on a seconds parameter.
self.output(lineStream) self.write(lineStream, 0)
while lineStream.isTextAvailable(): while lineStream.isTextAvailable():
baseRepr = baseRepr + '\n' + lineStream.getLine() baseRepr = baseRepr + '\n' + lineStream.getLine()
except: except:
pass try:
# Ok, no write function, lets try output then
self.output(lineStream)
while lineStream.isTextAvailable():
baseRepr = baseRepr + '\n' + lineStream.getLine()
except:
pass
# In any case, return the baseRepr # In any case, return the baseRepr
return baseRepr return baseRepr

11
direct/src/showbase/Loader.py
View File

@ -75,12 +75,17 @@ class Loader:
ModelPool.releaseModel(modelPath) ModelPool.releaseModel(modelPath)
# texture loading funcs # texture loading funcs
def loadTexture(self, texturePath): def loadTexture(self, texturePath, alphaPath = None):
"""loadTexture(self, string) """loadTexture(self, string)
Attempt to load a texture from the given file path using Attempt to load a texture from the given file path using
TexturePool class. Returns None if not found""" TexturePool class. Returns None if not found"""
Loader.notify.info("Loading texture: %s" % (texturePath) )
texture = TexturePool.loadTexture(texturePath) if alphaPath == None:
Loader.notify.info("Loading texture: %s" % (texturePath) )
texture = TexturePool.loadTexture(texturePath)
else:
Loader.notify.info("Loading texture: %s %s" % (texturePath, alphaPath) )
texture = TexturePool.loadTexture(texturePath, alphaPath)
return texture return texture
def unloadTexture(self, texture): def unloadTexture(self, texture):