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

Added anim source info update on setTexture(). Added check for successful texture addition before updating the most recently added textures info.

Browse Source
This commit is contained in:
Josh Wilson 2005-09-28 22:15:37 +00:00
parent 6ffd095fdf
commit e660f53c6d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
panda/src/particlesystem/spriteParticleRenderer.I
View File

@ -30,8 +30,10 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void SpriteParticleRenderer:: INLINE void SpriteParticleRenderer::
set_texture(Texture *tex, const string &tex_path, float texels_per_unit) { set_texture(Texture *tex, const string &tex_path, float texels_per_unit) {
set_texture(tex,texels_per_unit); set_texture(tex,texels_per_unit);
get_last_anim()->set_source_info(tex_path);
//moved to "set_texture(Texture *tex, float texels_per_unit)" for backwards compatibility
//get_last_anim()->set_source_info(tex_path);
} }
INLINE void SpriteParticleRenderer:: INLINE void SpriteParticleRenderer::
@ -46,6 +48,8 @@ set_texture(Texture *tex, float texels_per_unit) {
// We scale the particle size by the size of the texture. // We scale the particle size by the size of the texture.
set_size(tex->get_x_size() / texels_per_unit, set_size(tex->get_x_size() / texels_per_unit,
tex->get_y_size() / texels_per_unit); tex->get_y_size() / texels_per_unit);
get_last_anim()->set_source_info(tex->get_filename());
} }
init_geoms(); init_geoms();
} }
@ -60,8 +64,12 @@ set_texture(Texture *tex, float texels_per_unit) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void SpriteParticleRenderer:: INLINE void SpriteParticleRenderer::
add_texture(Texture *tex, const string &tex_path, float texels_per_unit, bool resize) { add_texture(Texture *tex, const string &tex_path, float texels_per_unit, bool resize) {
int anim_count = _anims.size();
add_texture(tex,texels_per_unit,resize); add_texture(tex,texels_per_unit,resize);
get_last_anim()->set_source_info(tex_path); if (anim_count < (int)_anims.size()) {
get_last_anim()->set_source_info(tex_path);
}
} }
INLINE void SpriteParticleRenderer:: INLINE void SpriteParticleRenderer::