From cad885b343ffb9e84acd844850b78e43d4028a23 Mon Sep 17 00:00:00 2001 From: Dave Schuyler Date: Wed, 1 Sep 2004 03:28:09 +0000 Subject: [PATCH] allowing physics objects to be named in debug versions --- panda/src/physics/actorNode.cxx | 3 +++ panda/src/physics/physicsObject.cxx | 2 +- panda/src/physics/physicsObject.h | 13 +++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/panda/src/physics/actorNode.cxx b/panda/src/physics/actorNode.cxx index 9bdd742723..5cde769c73 100644 --- a/panda/src/physics/actorNode.cxx +++ b/panda/src/physics/actorNode.cxx @@ -36,6 +36,9 @@ ActorNode(const string &name) : add_physical(new Physical(1, true)); _mass_center = get_physical(0)->get_phys_body(); _mass_center->set_active(true); + #ifndef NDEBUG + _mass_center->set_name(name); + #endif _ok_to_callback = true; } diff --git a/panda/src/physics/physicsObject.cxx b/panda/src/physics/physicsObject.cxx index 9f320c3c42..33f3ba8a48 100644 --- a/panda/src/physics/physicsObject.cxx +++ b/panda/src/physics/physicsObject.cxx @@ -137,7 +137,7 @@ void PhysicsObject:: write(ostream &out, unsigned int indent) const { #ifndef NDEBUG //[ out.width(indent); - out<<""<<"PhysicsObject:\n"; + out<<""<<"PhysicsObject "<<_name<<"\n"; out.width(indent+2); out<<""; out<<"_position "<<_position<<"\n"; out.width(indent+2); out<<""; out<<"_last_position "<<_last_position<<"\n"; out.width(indent+2); out<<""; out<<"_velocity "<<_velocity<<"\n"; diff --git a/panda/src/physics/physicsObject.h b/panda/src/physics/physicsObject.h index d466a49d60..ff774baa8a 100644 --- a/panda/src/physics/physicsObject.h +++ b/panda/src/physics/physicsObject.h @@ -81,6 +81,15 @@ PUBLISHED: virtual LMatrix4f get_lcs() const; virtual PhysicsObject *make_copy() const; + #ifndef NDEBUG + void set_name(const string &name) { + _name = name; + } + const string& get_name() { + return _name; + } + #endif + virtual void output(ostream &out) const; virtual void write(ostream &out, unsigned int indent=0) const; @@ -99,6 +108,10 @@ private: bool _process_me; bool _oriented; + + #ifndef NDEBUG + string _name; + #endif public: static TypeHandle get_class_type() {