diff --git a/panda/src/collide/collisionDSSolid.cxx b/panda/src/collide/collisionDSSolid.cxx index e5d7bac828..95d80feafd 100755 --- a/panda/src/collide/collisionDSSolid.cxx +++ b/panda/src/collide/collisionDSSolid.cxx @@ -132,7 +132,7 @@ get_collision_origin() const { // number of bounding volume tests made against a solid // of this type in a given frame. //////////////////////////////////////////////////////////////////// -PStatCollector CollisionDSSolid:: +PStatCollector &CollisionDSSolid:: get_volume_pcollector() { return _volume_pcollector; } @@ -144,7 +144,7 @@ get_volume_pcollector() { // number of intersection tests made against a solid // of this type in a given frame. //////////////////////////////////////////////////////////////////// -PStatCollector CollisionDSSolid:: +PStatCollector &CollisionDSSolid:: get_test_pcollector() { return _test_pcollector; } diff --git a/panda/src/collide/collisionDSSolid.h b/panda/src/collide/collisionDSSolid.h index 8ad3c432e1..ec23e0c2eb 100755 --- a/panda/src/collide/collisionDSSolid.h +++ b/panda/src/collide/collisionDSSolid.h @@ -56,8 +56,8 @@ public: virtual void xform(const LMatrix4f &mat); virtual LPoint3f get_collision_origin() const; - virtual PStatCollector get_volume_pcollector(); - virtual PStatCollector get_test_pcollector(); + virtual PStatCollector &get_volume_pcollector(); + virtual PStatCollector &get_test_pcollector(); virtual void output(ostream &out) const; diff --git a/panda/src/collide/collisionGeom.cxx b/panda/src/collide/collisionGeom.cxx index ad6c0d0b40..ef22d413d6 100644 --- a/panda/src/collide/collisionGeom.cxx +++ b/panda/src/collide/collisionGeom.cxx @@ -39,7 +39,7 @@ make_copy() { // number of bounding volume tests made against a solid // of this type in a given frame. //////////////////////////////////////////////////////////////////// -PStatCollector CollisionGeom:: +PStatCollector &CollisionGeom:: get_volume_pcollector() { return _volume_pcollector; } @@ -51,7 +51,7 @@ get_volume_pcollector() { // number of intersection tests made against a solid // of this type in a given frame. //////////////////////////////////////////////////////////////////// -PStatCollector CollisionGeom:: +PStatCollector &CollisionGeom:: get_test_pcollector() { return _test_pcollector; } diff --git a/panda/src/collide/collisionGeom.h b/panda/src/collide/collisionGeom.h index 8096fe8f22..8fc24e01dd 100644 --- a/panda/src/collide/collisionGeom.h +++ b/panda/src/collide/collisionGeom.h @@ -43,8 +43,8 @@ private: public: virtual CollisionSolid *make_copy(); - virtual PStatCollector get_volume_pcollector(); - virtual PStatCollector get_test_pcollector(); + virtual PStatCollector &get_volume_pcollector(); + virtual PStatCollector &get_test_pcollector(); virtual void output(ostream &out) const; diff --git a/panda/src/collide/collisionInvSphere.cxx b/panda/src/collide/collisionInvSphere.cxx index aa88e08b7e..de4960790f 100644 --- a/panda/src/collide/collisionInvSphere.cxx +++ b/panda/src/collide/collisionInvSphere.cxx @@ -66,7 +66,7 @@ test_intersection(const CollisionEntry &) const { // number of bounding volume tests made against a solid // of this type in a given frame. //////////////////////////////////////////////////////////////////// -PStatCollector CollisionInvSphere:: +PStatCollector &CollisionInvSphere:: get_volume_pcollector() { return _volume_pcollector; } @@ -78,7 +78,7 @@ get_volume_pcollector() { // number of intersection tests made against a solid // of this type in a given frame. //////////////////////////////////////////////////////////////////// -PStatCollector CollisionInvSphere:: +PStatCollector &CollisionInvSphere:: get_test_pcollector() { return _test_pcollector; } diff --git a/panda/src/collide/collisionInvSphere.h b/panda/src/collide/collisionInvSphere.h index a76f88f28b..f2b4754926 100644 --- a/panda/src/collide/collisionInvSphere.h +++ b/panda/src/collide/collisionInvSphere.h @@ -47,8 +47,8 @@ public: virtual PT(CollisionEntry) test_intersection(const CollisionEntry &entry) const; - virtual PStatCollector get_volume_pcollector(); - virtual PStatCollector get_test_pcollector(); + virtual PStatCollector &get_volume_pcollector(); + virtual PStatCollector &get_test_pcollector(); virtual void output(ostream &out) const; diff --git a/panda/src/collide/collisionPlane.cxx b/panda/src/collide/collisionPlane.cxx index 31dbaf86a5..50387012ba 100644 --- a/panda/src/collide/collisionPlane.cxx +++ b/panda/src/collide/collisionPlane.cxx @@ -86,7 +86,7 @@ get_collision_origin() const { // number of bounding volume tests made against a solid // of this type in a given frame. //////////////////////////////////////////////////////////////////// -PStatCollector CollisionPlane:: +PStatCollector &CollisionPlane:: get_volume_pcollector() { return _volume_pcollector; } @@ -98,7 +98,7 @@ get_volume_pcollector() { // number of intersection tests made against a solid // of this type in a given frame. //////////////////////////////////////////////////////////////////// -PStatCollector CollisionPlane:: +PStatCollector &CollisionPlane:: get_test_pcollector() { return _test_pcollector; } diff --git a/panda/src/collide/collisionPlane.h b/panda/src/collide/collisionPlane.h index 5538a186a9..30c8b5d61c 100644 --- a/panda/src/collide/collisionPlane.h +++ b/panda/src/collide/collisionPlane.h @@ -44,8 +44,8 @@ public: virtual void xform(const LMatrix4f &mat); virtual LPoint3f get_collision_origin() const; - virtual PStatCollector get_volume_pcollector(); - virtual PStatCollector get_test_pcollector(); + virtual PStatCollector &get_volume_pcollector(); + virtual PStatCollector &get_test_pcollector(); virtual void output(ostream &out) const; diff --git a/panda/src/collide/collisionPolygon.cxx b/panda/src/collide/collisionPolygon.cxx index 705c808d98..10001bfe8d 100644 --- a/panda/src/collide/collisionPolygon.cxx +++ b/panda/src/collide/collisionPolygon.cxx @@ -329,7 +329,7 @@ get_viz(const CullTraverser *trav, const CullTraverserData &data, // number of bounding volume tests made against a solid // of this type in a given frame. //////////////////////////////////////////////////////////////////// -PStatCollector CollisionPolygon:: +PStatCollector &CollisionPolygon:: get_volume_pcollector() { return _volume_pcollector; } @@ -341,7 +341,7 @@ get_volume_pcollector() { // number of intersection tests made against a solid // of this type in a given frame. //////////////////////////////////////////////////////////////////// -PStatCollector CollisionPolygon:: +PStatCollector &CollisionPolygon:: get_test_pcollector() { return _test_pcollector; } diff --git a/panda/src/collide/collisionPolygon.h b/panda/src/collide/collisionPolygon.h index 2a8f85ebf0..4acd211014 100644 --- a/panda/src/collide/collisionPolygon.h +++ b/panda/src/collide/collisionPolygon.h @@ -65,8 +65,8 @@ public: const CullTraverserData &data, bool bounds_only) const; - virtual PStatCollector get_volume_pcollector(); - virtual PStatCollector get_test_pcollector(); + virtual PStatCollector &get_volume_pcollector(); + virtual PStatCollector &get_test_pcollector(); virtual void output(ostream &out) const; virtual void write(ostream &out, int indent_level = 0) const; diff --git a/panda/src/collide/collisionSolid.cxx b/panda/src/collide/collisionSolid.cxx index fa34404d03..64181ebe91 100644 --- a/panda/src/collide/collisionSolid.cxx +++ b/panda/src/collide/collisionSolid.cxx @@ -158,7 +158,7 @@ get_viz(const CullTraverser *, const CullTraverserData &, bool bounds_only) cons // number of bounding volume tests made against a solid // of this type in a given frame. //////////////////////////////////////////////////////////////////// -PStatCollector CollisionSolid:: +PStatCollector &CollisionSolid:: get_volume_pcollector() { return _volume_pcollector; } @@ -170,7 +170,7 @@ get_volume_pcollector() { // number of intersection tests made against a solid // of this type in a given frame. //////////////////////////////////////////////////////////////////// -PStatCollector CollisionSolid:: +PStatCollector &CollisionSolid:: get_test_pcollector() { return _test_pcollector; } diff --git a/panda/src/collide/collisionSolid.h b/panda/src/collide/collisionSolid.h index 00aba7c621..525d8420df 100644 --- a/panda/src/collide/collisionSolid.h +++ b/panda/src/collide/collisionSolid.h @@ -84,8 +84,8 @@ public: const CullTraverserData &data, bool bounds_only) const; - virtual PStatCollector get_volume_pcollector(); - virtual PStatCollector get_test_pcollector(); + virtual PStatCollector &get_volume_pcollector(); + virtual PStatCollector &get_test_pcollector(); PUBLISHED: virtual void output(ostream &out) const; diff --git a/panda/src/collide/collisionSphere.cxx b/panda/src/collide/collisionSphere.cxx index 6c6128dc39..21e238a038 100644 --- a/panda/src/collide/collisionSphere.cxx +++ b/panda/src/collide/collisionSphere.cxx @@ -100,7 +100,7 @@ get_collision_origin() const { // number of bounding volume tests made against a solid // of this type in a given frame. //////////////////////////////////////////////////////////////////// -PStatCollector CollisionSphere:: +PStatCollector &CollisionSphere:: get_volume_pcollector() { return _volume_pcollector; } @@ -112,7 +112,7 @@ get_volume_pcollector() { // number of intersection tests made against a solid // of this type in a given frame. //////////////////////////////////////////////////////////////////// -PStatCollector CollisionSphere:: +PStatCollector &CollisionSphere:: get_test_pcollector() { return _test_pcollector; } diff --git a/panda/src/collide/collisionSphere.h b/panda/src/collide/collisionSphere.h index 7b9a025c4c..780803bd81 100644 --- a/panda/src/collide/collisionSphere.h +++ b/panda/src/collide/collisionSphere.h @@ -45,8 +45,8 @@ public: virtual void xform(const LMatrix4f &mat); virtual LPoint3f get_collision_origin() const; - virtual PStatCollector get_volume_pcollector(); - virtual PStatCollector get_test_pcollector(); + virtual PStatCollector &get_volume_pcollector(); + virtual PStatCollector &get_test_pcollector(); virtual void output(ostream &out) const; diff --git a/panda/src/collide/collisionTube.cxx b/panda/src/collide/collisionTube.cxx index c4bf0cb5ee..ee7a29de07 100644 --- a/panda/src/collide/collisionTube.cxx +++ b/panda/src/collide/collisionTube.cxx @@ -92,7 +92,7 @@ get_collision_origin() const { // number of bounding volume tests made against a solid // of this type in a given frame. //////////////////////////////////////////////////////////////////// -PStatCollector CollisionTube:: +PStatCollector &CollisionTube:: get_volume_pcollector() { return _volume_pcollector; } @@ -104,7 +104,7 @@ get_volume_pcollector() { // number of intersection tests made against a solid // of this type in a given frame. //////////////////////////////////////////////////////////////////// -PStatCollector CollisionTube:: +PStatCollector &CollisionTube:: get_test_pcollector() { return _test_pcollector; } diff --git a/panda/src/collide/collisionTube.h b/panda/src/collide/collisionTube.h index 0c82b282d7..3cd6fd7f90 100644 --- a/panda/src/collide/collisionTube.h +++ b/panda/src/collide/collisionTube.h @@ -49,8 +49,8 @@ public: virtual void xform(const LMatrix4f &mat); virtual LPoint3f get_collision_origin() const; - virtual PStatCollector get_volume_pcollector(); - virtual PStatCollector get_test_pcollector(); + virtual PStatCollector &get_volume_pcollector(); + virtual PStatCollector &get_test_pcollector(); virtual void output(ostream &out) const;