publish get_collision_origin

panda/src/collide/collisionDSSolid.h

@@ -41,6 +41,8 @@ PUBLISHED:
     float bx, float by, float bz, float radius_b,
     const Planef &plane_a, const Planef &plane_b);
 
+  virtual LPoint3f get_collision_origin() const;
+
 protected:
   INLINE CollisionDSSolid();
 
@@ -54,7 +56,6 @@ public:
   INLINE float get_lens_radius() const;
 
   virtual void xform(const LMatrix4f &mat);
-  virtual LPoint3f get_collision_origin() const;
 
   virtual PStatCollector &get_volume_pcollector();
   virtual PStatCollector &get_test_pcollector();

panda/src/collide/collisionPlane.h

@@ -38,11 +38,12 @@ PUBLISHED:
   INLINE CollisionPlane(const Planef &plane);
   INLINE CollisionPlane(const CollisionPlane &copy);
 
+  virtual LPoint3f get_collision_origin() const;
+
 public:
   virtual CollisionSolid *make_copy();
 
   virtual void xform(const LMatrix4f &mat);
-  virtual LPoint3f get_collision_origin() const;
 
   virtual PStatCollector &get_volume_pcollector();
   virtual PStatCollector &get_test_pcollector();

panda/src/collide/collisionPolygon.h

@@ -41,6 +41,8 @@ PUBLISHED:
                           const LVecBase3f &c, const LVecBase3f &d);
   INLINE CollisionPolygon(const LPoint3f *begin, const LPoint3f *end);
 
+  virtual LPoint3f get_collision_origin() const;
+
 private:
   INLINE CollisionPolygon();
 
@@ -59,7 +61,6 @@ public:
   bool is_concave() const;
 
   virtual void xform(const LMatrix4f &mat);
-  virtual LPoint3f get_collision_origin() const;
 
   virtual PT(PandaNode) get_viz(const CullTraverser *trav,
                                 const CullTraverserData &data,

panda/src/collide/collisionRay.h

@@ -40,6 +40,8 @@ PUBLISHED:
   INLINE CollisionRay(float ox, float oy, float oz,
                       float dx, float dy, float dz);
 
+  virtual LPoint3f get_collision_origin() const;
+
 public:
   INLINE CollisionRay(const CollisionRay &copy);
   virtual CollisionSolid *make_copy();
@@ -48,7 +50,6 @@ public:
   test_intersection(const CollisionEntry &entry) const;
 
   virtual void xform(const LMatrix4f &mat);
-  virtual LPoint3f get_collision_origin() const;
 
   virtual void output(ostream &out) const;
 

panda/src/collide/collisionSegment.h

@@ -43,6 +43,8 @@ PUBLISHED:
   INLINE CollisionSegment(float ax, float ay, float az,
                           float bx, float by, float bz);
 
+  virtual LPoint3f get_collision_origin() const;
+
 public:
   INLINE CollisionSegment(const CollisionSegment &copy);
   virtual CollisionSolid *make_copy();
@@ -51,7 +53,6 @@ public:
   test_intersection(const CollisionEntry &entry) const;
 
   virtual void xform(const LMatrix4f &mat);
-  virtual LPoint3f get_collision_origin() const;
 
   virtual void output(ostream &out) const;
 

panda/src/collide/collisionSolid.h

@@ -58,9 +58,10 @@ public:
   virtual ~CollisionSolid();
 
   virtual CollisionSolid *make_copy()=0;
-  virtual LPoint3f get_collision_origin() const=0;
 
 PUBLISHED:
+  virtual LPoint3f get_collision_origin() const=0;
+
   INLINE void set_tangible(bool tangible);
   INLINE bool is_tangible() const;
 

panda/src/collide/collisionSphere.h

@@ -32,6 +32,8 @@ PUBLISHED:
   INLINE CollisionSphere(const LPoint3f &center, float radius);
   INLINE CollisionSphere(float cx, float cy, float cz, float radius);
 
+  virtual LPoint3f get_collision_origin() const;
+
 protected:
   INLINE CollisionSphere();
 
@@ -43,7 +45,6 @@ public:
   test_intersection(const CollisionEntry &entry) const;
 
   virtual void xform(const LMatrix4f &mat);
-  virtual LPoint3f get_collision_origin() const;
 
   virtual PStatCollector &get_volume_pcollector();
   virtual PStatCollector &get_test_pcollector();

panda/src/collide/collisionTube.h

@@ -39,6 +39,8 @@ PUBLISHED:
                        float bx, float by, float bz,
                        float radius);
 
+  virtual LPoint3f get_collision_origin() const;
+
 private:
   INLINE CollisionTube();
 
@@ -47,7 +49,6 @@ public:
   virtual CollisionSolid *make_copy();
 
   virtual void xform(const LMatrix4f &mat);
-  virtual LPoint3f get_collision_origin() const;
 
   virtual PStatCollector &get_volume_pcollector();
   virtual PStatCollector &get_test_pcollector();