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

safety checks for the sprite particle renderer. These are nice for opt 4 builds

Browse Source
This commit is contained in:
Zachary Pavlov 2007-10-02 00:24:08 +00:00
parent a1dc378949
commit de6920d9aa
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/particlesystem/spriteParticleRenderer.cxx
View File

@ -136,10 +136,11 @@ make_copy() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
int SpriteParticleRenderer:: int SpriteParticleRenderer::
extract_textures_from_node(const NodePath &node_path, NodePathCollection &np_col, TextureCollection &tex_col) { extract_textures_from_node(const NodePath &node_path, NodePathCollection &np_col, TextureCollection &tex_col) {
NodePath tex_node_path = node_path, geom_node_path; NodePath tex_node_path = node_path;
NodePath geom_node_path;
// Look for a sequence node first, in case they want animated texture sprites // Look for a sequence node first, in case they want animated texture sprites
if (tex_node_path.node()->get_type() != SequenceNode::get_class_type()) { if (!tex_node_path.is_empty() && tex_node_path.node()->get_type() != SequenceNode::get_class_type()) {
tex_node_path = node_path.find("**/+SequenceNode"); tex_node_path = node_path.find("**/+SequenceNode");
} }
@ -167,7 +168,7 @@ extract_textures_from_node(const NodePath &node_path, NodePathCollection &np_col
// If a sequence node is not found, we just want to look for a regular geom node. // If a sequence node is not found, we just want to look for a regular geom node.
if (geom_node_path.is_empty()) { if (geom_node_path.is_empty()) {
// Find the first GeomNode. // Find the first GeomNode.
if (node_path.node()->get_type() != GeomNode::get_class_type()) { if (!node_path.is_empty() && node_path.node()->get_type() != GeomNode::get_class_type()) {
geom_node_path = node_path.find("**/+GeomNode"); geom_node_path = node_path.find("**/+GeomNode");
if (geom_node_path.is_empty()) { if (geom_node_path.is_empty()) {
particlesystem_cat.error(); particlesystem_cat.error();
@ -244,6 +245,7 @@ void SpriteParticleRenderer::
set_from_node(const NodePath &node_path, bool size_from_texels) { set_from_node(const NodePath &node_path, bool size_from_texels) {
// Clear all texture information // Clear all texture information
_anims.clear(); _anims.clear();
nassertv(node_path.is_empty());
add_from_node(node_path,size_from_texels,true); add_from_node(node_path,size_from_texels,true);
} }