From 20b99f63323d76f7acf445d3930bbde4cb9ab030 Mon Sep 17 00:00:00 2001 From: Josh Wilson Date: Tue, 27 Sep 2005 19:19:25 +0000 Subject: [PATCH] Added return values to test success of texture or model load. --- .../src/particles/SpriteParticleRendererExt.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/direct/src/particles/SpriteParticleRendererExt.py b/direct/src/particles/SpriteParticleRendererExt.py index 754569b63e..1eab45a8d0 100644 --- a/direct/src/particles/SpriteParticleRendererExt.py +++ b/direct/src/particles/SpriteParticleRendererExt.py @@ -36,8 +36,10 @@ class SpriteParticleRendererExt(SpriteParticleRenderer): t = loader.loadTexture(fileName) if (t != None): self.setTexture(t,fileName) + return True else: print "Couldn't find rendererSpriteTexture file: %s" % fileName + return False def addTextureFromFile(self, fileName = None): if(self.getNumAnims == 0): @@ -50,8 +52,10 @@ class SpriteParticleRendererExt(SpriteParticleRenderer): t = loader.loadTexture(fileName) if (t != None): self.addTexture(t,fileName) + return True else: print "Couldn't find rendererSpriteTexture file: %s" % fileName + return False def getSourceFileName(self): if self.sourceFileName == None: @@ -90,16 +94,17 @@ class SpriteParticleRendererExt(SpriteParticleRenderer): m = loader.loadModelOnce(modelName) if (m == None): print "SpriteParticleRendererExt: Couldn't find model: %s!" % modelName - return None + return False nodeName = self.getSourceNodeName() np = m.find(nodeName) if np.isEmpty(): print "SpriteParticleRendererExt: Couldn't find node: %s!" % nodeName m.removeNode() - return None + return False self.setFromNode(np, modelName, nodeName, sizeFromTexels) m.removeNode() + return True def addTextureFromNode(self, modelName = None, nodeName = None, sizeFromTexels = True): if(self.getNumAnims == 0): @@ -116,13 +121,16 @@ class SpriteParticleRendererExt(SpriteParticleRenderer): m = loader.loadModelOnce(modelName) if (m == None): print "SpriteParticleRendererExt: Couldn't find model: %s!" % modelName - return None + return False np = m.find(nodeName) if np.isEmpty(): print "SpriteParticleRendererExt: Couldn't find node: %s!" % nodeName m.removeNode() - return None + return False + self.addFromNode(np, modelName, nodeName, sizeFromTexels) m.removeNode() + + return True