update parametricCurveDrawer to pgraph

panda/src/parametrics/nurbsCurveDrawer.h

@@ -19,10 +19,10 @@
 #ifndef NURBSCURVEDRAWER_H
 #define NURBSCURVEDRAWER_H
 
-#include <pandabase.h>
+#include "pandabase.h"
 
 #include "parametricCurveDrawer.h"
-#include "lineSegs.h"
+#include "qplineSegs.h"
 
 
 ////////////////////////////////////////////////////////////////////
@@ -56,7 +56,7 @@ PUBLISHED:
 protected:
   LVecBase3f _cv_color, _hull_color, _knot_color;
   int _num_cvs, _num_hull, _num_knots;
-  LineSegs _hull, _knots, _cvs;
+  qpLineSegs _hull, _knots, _cvs;
   pvector<int> _knotnums;
 
   bool _show_cvs, _show_hull, _show_knots;

panda/src/parametrics/parametricCurveDrawer.cxx

@@ -21,10 +21,6 @@
 #include "parametricCurve.h"
 #include "config_parametrics.h"
 
-#include <renderRelation.h>
-#include <transformTransition.h>
-#include <compose_matrix.h>
-
 TypeHandle ParametricCurveDrawer::_type_handle;
 
 ////////////////////////////////////////////////////////////////////
@@ -40,7 +36,7 @@ ParametricCurveDrawer() {
   _num_segs = 100.0;
   _num_ticks = 0.0f;
   _frame_accurate = false;
-  _geom_node = new GeomNode;
+  _geom_node = new qpGeomNode("pcd");
   _drawn = false;
 }
 
@@ -132,7 +128,7 @@ get_curves() {
 //               the GeomNode, and the GeomNode will be emptied when the
 //               drawer destructs.  Also see detach_geom_node().
 ////////////////////////////////////////////////////////////////////
-GeomNode *ParametricCurveDrawer::
+qpGeomNode *ParametricCurveDrawer::
 get_geom_node() {
   return _geom_node;
 }
@@ -148,14 +144,13 @@ get_geom_node() {
 //               will return this new GeomNode which will be empty until
 //               the next call to draw().
 ////////////////////////////////////////////////////////////////////
-GeomNode *ParametricCurveDrawer::
+qpGeomNode *ParametricCurveDrawer::
 detach_geom_node() {
   if (!_drawn) {
     draw();
   }
-  PT(GeomNode) g = _geom_node;
-  _geom_node = new GeomNode;
-  _tick_arcs.clear();
+  PT(qpGeomNode) g = _geom_node;
+  _geom_node = new qpGeomNode("pcd");
   _drawn = false;
   return g;
 }
@@ -242,31 +237,6 @@ set_tick_color(float r, float g, float b) {
   _ticks.set_color(r, g, b);
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: ParametricCurveDrawer::set_tick_geometry
-//       Access: Published
-//  Description: Indicates a piece of geometry that will be instanced
-//               to each tick point along the curve instead of a
-//               cross, representing the direction the curve is
-//               oriented.
-////////////////////////////////////////////////////////////////////
-void ParametricCurveDrawer::
-set_tick_geometry(Node *geom) {
-  _tick_geometry = geom;
-  redraw();
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: ParametricCurveDrawer::clear_tick_geometry
-//       Access: Published
-//  Description: Resets the tick geometry to appear as crosses.
-////////////////////////////////////////////////////////////////////
-void ParametricCurveDrawer::
-clear_tick_geometry() {
-  _tick_geometry.clear();
-  redraw();
-}
-
 
 ////////////////////////////////////////////////////////////////////
 //     Function: ParametricCurveDrawer::set_frame_accurate
@@ -360,7 +330,7 @@ draw() {
   if (_num_ticks > 0.0f) {
     int total_ticks = (int)cfloor(max_t * _num_ticks + 0.5);
     ParametricCurve *xyz_curve = _curves->get_default_curve();
-    ParametricCurve *hpr_curve = _curves->get_hpr_curve();
+    //    ParametricCurve *hpr_curve = _curves->get_hpr_curve();
 
     scale = max_t / (float)(total_ticks-1);
     for (i = 0; i < total_ticks; i++) {
@@ -369,30 +339,14 @@ draw() {
       LVecBase3f tangent;
 
       if (xyz_curve->get_pt(t0, point, tangent)) {
-        if (_tick_geometry == (Node *)NULL) {
-          // Draw crosses.
-          LVecBase3f t1, t2;
-          get_tick_marks(tangent, t1, t2);
-
-          _ticks.move_to(point - t1 * _tick_scale);
-          _ticks.draw_to(point + t1 * _tick_scale);
-          _ticks.move_to(point - t2 * _tick_scale);
-          _ticks.draw_to(point + t2 * _tick_scale);
-
-        } else {
-          // Instance the tick geometry.
-          NodeRelation *arc = new RenderRelation(_geom_node, _tick_geometry);
-          _tick_arcs.push_back(arc);
-
-          LVecBase3f hpr(0.0f, 0.0f, 0.0f);
-          if (hpr_curve != (ParametricCurve *)NULL) {
-            hpr_curve->get_point(t0, hpr);
-          }
-          LMatrix4f mat;
-          compose_matrix(mat, LVecBase3f(_tick_scale, _tick_scale, _tick_scale),
-                         hpr, point);
-          arc->set_transition(new TransformTransition(mat));
-        }
+        // Draw crosses.
+        LVecBase3f t1, t2;
+        get_tick_marks(tangent, t1, t2);
+        
+        _ticks.move_to(point - t1 * _tick_scale);
+        _ticks.draw_to(point + t1 * _tick_scale);
+        _ticks.move_to(point - t2 * _tick_scale);
+        _ticks.draw_to(point + t2 * _tick_scale);
       }
     }
     _ticks.create(_geom_node, _frame_accurate);
@@ -412,14 +366,8 @@ draw() {
 ////////////////////////////////////////////////////////////////////
 void ParametricCurveDrawer::
 hide() {
-  _geom_node->clear();
+  _geom_node->remove_all_geoms();
   _drawn = false;
-
-  TickArcs::iterator ti;
-  for (ti = _tick_arcs.begin(); ti != _tick_arcs.end(); ++ti) {
-    remove_arc(*ti);
-  }
-  _tick_arcs.clear();
 }
 
 

panda/src/parametrics/parametricCurveDrawer.h

@@ -21,11 +21,10 @@
 
 #include "parametricCurveCollection.h"
 
-#include <lineSegs.h>
-#include <node.h>
-#include <vector_PT_NodeRelation.h>
+#include "qplineSegs.h"
+#include "pandaNode.h"
 
-#include <typedObject.h>
+#include "typedObject.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : ParametricCurveDrawer
@@ -42,8 +41,8 @@ PUBLISHED:
   void clear_curves();
   ParametricCurveCollection *get_curves();
 
-  GeomNode *get_geom_node();
-  GeomNode *detach_geom_node();
+  qpGeomNode *get_geom_node();
+  qpGeomNode *detach_geom_node();
 
   void set_num_segs(float num_segs);
   float get_num_segs() const;
@@ -53,8 +52,6 @@ PUBLISHED:
 
   void set_color(float r, float g, float b);
   void set_tick_color(float r, float g, float b);
-  void set_tick_geometry(Node *geom);
-  void clear_tick_geometry();
 
   void set_frame_accurate(bool frame_accurate);
   bool get_frame_accurate() const;
@@ -73,21 +70,17 @@ private:
   static void get_tick_marks(const LVecBase3f &tangent, LVecBase3f &t1, LVecBase3f &t2);
 
 protected:
-  PT(GeomNode) _geom_node;
+  PT(qpGeomNode) _geom_node;
   PT(ParametricCurveCollection) _curves;
   bool _frame_accurate;
 
 private:
   float _num_segs;
-  LineSegs _lines, _ticks;
-  PT(Node) _tick_geometry;
+  qpLineSegs _lines, _ticks;
   bool _drawn;
   float _num_ticks;
   float _tick_scale;
 
-  typedef vector_PT_NodeRelation TickArcs;
-  TickArcs _tick_arcs;
-
 public:
   static TypeHandle get_class_type() {
     return _type_handle;