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

add more asserts

Browse Source
This commit is contained in:
David Rose 2003-11-21 07:05:00 +00:00
parent 75762f560a
commit 211cf35eb5
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/pgraph/nodePath.I
View File

@ -444,6 +444,7 @@ set_state(const RenderState *state) {
////////////////////////////////////////////////////////////////////
INLINE CPT(RenderState) NodePath::
get_net_state() const {
nassertr(_error_type == ET_ok, RenderState::make_empty());
return r_get_net_state(_head);
}
@ -498,6 +499,7 @@ clear_transform(const NodePath &other) {
////////////////////////////////////////////////////////////////////
INLINE CPT(TransformState) NodePath::
get_net_transform() const {
nassertr(_error_type == ET_ok, TransformState::make_identity());
return r_get_net_transform(_head);
}
@ -536,6 +538,7 @@ set_prev_transform(const TransformState *transform) {
////////////////////////////////////////////////////////////////////
INLINE CPT(TransformState) NodePath::
get_net_prev_transform() const {
nassertr(_error_type == ET_ok, TransformState::make_identity());
return r_get_net_prev_transform(_head);
}

14
panda/src/pgraph/nodePath.cxx
View File

@ -291,6 +291,7 @@ reparent_to(const NodePath &other, int sort) {
nassertv(verify_complete());
nassertv(other.verify_complete());
nassertv_always(!is_empty());
nassertv(other._error_type == ET_ok);
// Reparenting implicitly resents the delta vector.
node()->reset_prev_transform();
@ -313,6 +314,7 @@ wrt_reparent_to(const NodePath &other, int sort) {
nassertv(verify_complete());
nassertv(other.verify_complete());
nassertv_always(!is_empty());
nassertv(other._error_type == ET_ok);
if (get_transform() == get_prev_transform()) {
set_transform(get_transform(other));
@ -347,6 +349,7 @@ instance_to(const NodePath &other, int sort) const {
nassertr(verify_complete(), NodePath::fail());
nassertr(other.verify_complete(), NodePath::fail());
nassertr_always(!is_empty(), NodePath::fail());
nassertr(other._error_type == ET_ok, NodePath::fail());
NodePath new_instance;
@ -402,6 +405,7 @@ copy_to(const NodePath &other, int sort) const {
nassertr(other.verify_complete(), fail());
nassertr_always(!is_empty(), fail());
nassertr(!other.is_empty(), fail());
nassertr(other._error_type == ET_ok, fail());
PandaNode *source_node = node();
PT(PandaNode) copy_node = source_node->copy_subgraph();
@ -431,8 +435,8 @@ copy_to(const NodePath &other, int sort) const {
NodePath NodePath::
attach_new_node(PandaNode *node, int sort) const {
nassertr(verify_complete(), NodePath::fail());
nassertr_always(!is_empty(), NodePath());
nassertr(node != (PandaNode *)NULL, NodePath());
nassertr_always(!is_empty(), NodePath::fail());
nassertr(node != (PandaNode *)NULL, NodePath::fail());
NodePath new_path(*this);
new_path._head = PandaNode::attach(_head, node, sort);
@ -551,6 +555,8 @@ output(ostream &out) const {
////////////////////////////////////////////////////////////////////
CPT(RenderState) NodePath::
get_state(const NodePath &other) const {
nassertr(_error_type == ET_ok && other._error_type == ET_ok, RenderState::make_empty());
if (is_empty()) {
return other.get_net_state();
}
@ -608,6 +614,8 @@ set_state(const NodePath &other, const RenderState *state) {
////////////////////////////////////////////////////////////////////
CPT(TransformState) NodePath::
get_transform(const NodePath &other) const {
nassertr(_error_type == ET_ok && other._error_type == ET_ok, TransformState::make_identity());
if (other.is_empty()) {
return get_net_transform();
}
@ -670,6 +678,8 @@ set_transform(const NodePath &other, const TransformState *transform) {
////////////////////////////////////////////////////////////////////
CPT(TransformState) NodePath::
get_prev_transform(const NodePath &other) const {
nassertr(_error_type == ET_ok && other._error_type == ET_ok, TransformState::make_identity());
if (other.is_empty()) {
return get_net_prev_transform();
}