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

Properly use default and/or configgable sprite textures

Browse Source
This commit is contained in:
Mark Mine 2003-10-14 23:33:44 +00:00
parent f99b1bd350
commit 355f59778f
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
direct/src/tkpanels/ParticlePanel.py
View File

@ -591,7 +591,7 @@ class ParticlePanel(AppShell):
f = Frame(spritePage) f = Frame(spritePage)
Label(f, width = 6, text = 'Texture:').pack(side = LEFT) Label(f, width = 6, text = 'Texture:').pack(side = LEFT)
self.rendererSpriteTexture = StringVar() self.rendererSpriteTexture = StringVar()
self.rendererSpriteTexture.set('phase_3/maps/eyes.jpg') self.rendererSpriteTexture.set(SpriteParticleRenderer.sourceTextureName)
self.rendererSpriteTextureEntry = Entry( self.rendererSpriteTextureEntry = Entry(
f, width = 12, f, width = 12,
textvariable = self.rendererSpriteTexture) textvariable = self.rendererSpriteTexture)
@ -1050,7 +1050,8 @@ class ParticlePanel(AppShell):
parent = self.parent) parent = self.parent)
if particleFilename: if particleFilename:
# Delete existing particles and forces # Delete existing particles and forces
self.particleEffect.loadConfig(Filename(particleFilename)) self.particleEffect.loadConfig(
Filename.fromOsSpecific(particleFilename))
self.selectEffectNamed(self.particleEffect.getName()) self.selectEffectNamed(self.particleEffect.getName())
# Enable effect # Enable effect
self.particleEffect.enable() self.particleEffect.enable()
@ -1468,12 +1469,16 @@ class ParticlePanel(AppShell):
self.getVariable('Sparkle Renderer', 'Life Scale').set(lScale) self.getVariable('Sparkle Renderer', 'Life Scale').set(lScale)
elif isinstance(renderer, SpriteParticleRenderer): elif isinstance(renderer, SpriteParticleRenderer):
color = renderer.getColor() * 255.0 color = renderer.getColor() * 255.0
texture = renderer.getTexture() # Update widgets to reflect current default values
if (texture != None): # Texture
self.rendererSpriteTexture.set(texture.getName()) textureName = renderer.getSourceTextureName()
if textureName != None:
self.rendererSpriteTexture.set(textureName)
# File
fileName = renderer.getSourceFileName() fileName = renderer.getSourceFileName()
if fileName != None: if fileName != None:
self.rendererSpriteFile.set(fileName) self.rendererSpriteFile.set(fileName)
# Node
nodeName = renderer.getSourceNodeName() nodeName = renderer.getSourceNodeName()
if nodeName != None: if nodeName != None:
self.rendererSpriteNode.set(nodeName) self.rendererSpriteNode.set(nodeName)
@ -1610,11 +1615,7 @@ class ParticlePanel(AppShell):
self.rendererSpriteNodeEntry['background'] = 'SystemWindow' self.rendererSpriteNodeEntry['background'] = 'SystemWindow'
def setRendererSpriteTexture(self): def setRendererSpriteTexture(self):
if self.rendererSpriteSourceType.get() == SpriteParticleRenderer.STTexture: if self.rendererSpriteSourceType.get() == SpriteParticleRenderer.STTexture:
t = loader.loadTexture(self.rendererSpriteTexture.get()) self.particles.renderer.setTextureFromFile(self.rendererSpriteTexture.get())
if (t != None):
self.particles.renderer.setTexture(t)
else:
print "Couldn't find rendererSpriteTexture"
else: else:
self.particles.renderer.setTextureFromNode( self.particles.renderer.setTextureFromNode(
self.rendererSpriteFile.get(), self.rendererSpriteNode.get()) self.rendererSpriteFile.get(), self.rendererSpriteNode.get())