Sfoglia il codice sorgente

added back convert_to_hermite

Dave Schuyler 25 anni fa
parent
commit
e5e25daa19
1 ha cambiato i file con 1 aggiunte e 24 eliminazioni
  1. 1 24
      panda/src/parametrics/curve.h

+ 1 - 24
panda/src/parametrics/curve.h

@@ -82,11 +82,6 @@ class NurbsCurve;
 ////////////////////////////////////////////////////////////////////
 class EXPCL_PANDA ParametricCurve : public TypedWriteableReferenceCount,
     public Namable {
-
-////////////////////////////////////////////////////////////////////
-// Member functions visible to Scheme
-////////////////////////////////////////////////////////////////////
-
 PUBLISHED:
   virtual bool is_valid() const;
 
@@ -103,6 +98,7 @@ PUBLISHED:
   double compute_t(double start_t, double length_offset, double guess,
 		   double threshold) const;
 
+  bool convert_to_hermite(HermiteCurve &hc) const;
   bool convert_to_nurbs(NurbsCurve &nc) const;
 
   void ascii_draw() const;
@@ -113,9 +109,6 @@ public:
   virtual bool get_pt(double t, LVector3f &point, LVector3f &tangent) const=0;
   virtual bool get_2ndtangent(double t, LVector3f &tangent2) const=0;
 
-////////////////////////////////////////////////////////////////////
-// Member functions not visible to Scheme
-////////////////////////////////////////////////////////////////////
 public:
 
   struct BezierSeg {
@@ -181,11 +174,6 @@ private:
 //               definable.
 ////////////////////////////////////////////////////////////////////
 class EXPCL_PANDA PiecewiseCurve : public ParametricCurve {
-public:
-
-////////////////////////////////////////////////////////////////////
-// Member functions visible to Scheme
-////////////////////////////////////////////////////////////////////
 PUBLISHED:
   virtual bool is_valid() const;
   virtual double get_max_t() const;
@@ -203,9 +191,6 @@ PUBLISHED:
 		    float px, float py, float pz,
 		    float tx, float ty, float tz);
 
-////////////////////////////////////////////////////////////////////
-// Member functions not visible to Scheme
-////////////////////////////////////////////////////////////////////
 public:
   PiecewiseCurve();
 
@@ -302,20 +287,12 @@ private:
 //               in a subclass (for instance, HermiteCurve).
 ////////////////////////////////////////////////////////////////////
 class EXPCL_PANDA CubicCurveseg : public ParametricCurve {
-
-////////////////////////////////////////////////////////////////////
-// Member functions visible to Scheme
-////////////////////////////////////////////////////////////////////
-
 PUBLISHED:
   virtual bool get_point(double t, LVector3f &point) const;
   virtual bool get_tangent(double t, LVector3f &tangent) const;
   virtual bool get_pt(double t, LVector3f &point, LVector3f &tangent) const;
   virtual bool get_2ndtangent(double t, LVector3f &tangent2) const;
 
-////////////////////////////////////////////////////////////////////
-// Member functions not visible to Scheme
-////////////////////////////////////////////////////////////////////
 public:
   CubicCurveseg();
   CubicCurveseg(const LMatrix4f &basis);