Fix various issues in bam2egg:

rdb · rdb · commit 0bdafe45ceeb · 2016-09-14T21:54:35.000+02:00
* No longer inserts an extra root group for the ModelRoot
 * Support depth test, offset and cull bin attributes
 * Preserve non-GeomNodes under Character
 * Render attributes are applied on group level if possible
diff --git a/panda/src/egg/eggLine.cxx b/panda/src/egg/eggLine.cxx
@@ -17,7 +17,6 @@
 
 TypeHandle EggLine::_type_handle;
 
-
 /**
  *
  */
@@ -26,6 +25,14 @@ EggLine::
   clear();
 }
 
+/**
+ * Makes a copy of this object.
+ */
+EggLine *EggLine::
+make_copy() const {
+  return new EggLine(*this);
+}
+
 /**
  * Writes the point to the indicated output stream in Egg format.
  */
diff --git a/panda/src/egg/eggLine.h b/panda/src/egg/eggLine.h
@@ -29,6 +29,8 @@ class EXPCL_PANDAEGG EggLine : public EggCompositePrimitive {
   INLINE EggLine &operator = (const EggLine &copy);
   virtual ~EggLine();
 
+  virtual EggLine *make_copy() const OVERRIDE;
+
   virtual void write(ostream &out, int indent_level) const;
 
   INLINE bool has_thick() const;
diff --git a/panda/src/egg/eggNurbsCurve.cxx b/panda/src/egg/eggNurbsCurve.cxx
@@ -17,6 +17,14 @@
 
 TypeHandle EggNurbsCurve::_type_handle;
 
+/**
+ * Makes a copy of this object.
+ */
+EggNurbsCurve *EggNurbsCurve::
+make_copy() const {
+  return new EggNurbsCurve(*this);
+}
+
 /**
  * Prepares a new curve definition with the indicated order and number of
  * knots.  This also implies a particular number of vertices as well (the
diff --git a/panda/src/egg/eggNurbsCurve.h b/panda/src/egg/eggNurbsCurve.h
@@ -29,6 +29,8 @@ class EXPCL_PANDAEGG EggNurbsCurve : public EggCurve {
   INLINE EggNurbsCurve(const EggNurbsCurve &copy);
   INLINE EggNurbsCurve &operator = (const EggNurbsCurve &copy);
 
+  virtual EggNurbsCurve *make_copy() const OVERRIDE;
+
   void setup(int order, int num_knots);
 
   INLINE void set_order(int order);
diff --git a/panda/src/egg/eggNurbsSurface.cxx b/panda/src/egg/eggNurbsSurface.cxx
@@ -17,6 +17,14 @@
 
 TypeHandle EggNurbsSurface::_type_handle;
 
+/**
+ * Makes a copy of this object.
+ */
+EggNurbsSurface *EggNurbsSurface::
+make_copy() const {
+  return new EggNurbsSurface(*this);
+}
+
 /**
  * Prepares a new surface definition with the indicated order and number of
  * knots in each dimension.  This also implies a particular number of vertices
diff --git a/panda/src/egg/eggNurbsSurface.h b/panda/src/egg/eggNurbsSurface.h
@@ -36,6 +36,8 @@ class EXPCL_PANDAEGG EggNurbsSurface : public EggSurface {
   INLINE EggNurbsSurface(const EggNurbsSurface &copy);
   INLINE EggNurbsSurface &operator = (const EggNurbsSurface &copy);
 
+  virtual EggNurbsSurface *make_copy() const OVERRIDE;
+
   void setup(int u_order, int v_order,
              int num_u_knots, int num_v_knots);
 
diff --git a/panda/src/egg/eggPatch.cxx b/panda/src/egg/eggPatch.cxx
@@ -21,6 +21,13 @@
 
 TypeHandle EggPatch::_type_handle;
 
+/**
+ * Makes a copy of this object.
+ */
+EggPatch *EggPatch::
+make_copy() const {
+  return new EggPatch(*this);
+}
 
 /**
  * Writes the patch to the indicated output stream in Egg format.
diff --git a/panda/src/egg/eggPatch.h b/panda/src/egg/eggPatch.h
@@ -28,6 +28,8 @@ class EXPCL_PANDAEGG EggPatch : public EggPrimitive {
   INLINE EggPatch(const EggPatch &copy);
   INLINE EggPatch &operator = (const EggPatch &copy);
 
+  virtual EggPatch *make_copy() const OVERRIDE;
+
   virtual void write(ostream &out, int indent_level) const;
 
 public:
diff --git a/panda/src/egg/eggPoint.cxx b/panda/src/egg/eggPoint.cxx
@@ -17,6 +17,13 @@
 
 TypeHandle EggPoint::_type_handle;
 
+/**
+ * Makes a copy of this object.
+ */
+EggPoint *EggPoint::
+make_copy() const {
+  return new EggPoint(*this);
+}
 
 /**
  * Cleans up modeling errors in whatever context this makes sense.  For
diff --git a/panda/src/egg/eggPoint.h b/panda/src/egg/eggPoint.h
@@ -28,6 +28,8 @@ class EXPCL_PANDAEGG EggPoint : public EggPrimitive {
   INLINE EggPoint(const EggPoint &copy);
   INLINE EggPoint &operator = (const EggPoint &copy);
 
+  virtual EggPoint *make_copy() const OVERRIDE;
+
   INLINE bool has_thick() const;
   INLINE double get_thick() const;
   INLINE void set_thick(double thick);
diff --git a/panda/src/egg/eggPolygon.cxx b/panda/src/egg/eggPolygon.cxx
@@ -21,6 +21,13 @@
 
 TypeHandle EggPolygon::_type_handle;
 
+/**
+ * Makes a copy of this object.
+ */
+EggPolygon *EggPolygon::
+make_copy() const {
+  return new EggPolygon(*this);
+}
 
 /**
  * Cleans up modeling errors in whatever context this makes sense.  For
diff --git a/panda/src/egg/eggPolygon.h b/panda/src/egg/eggPolygon.h
@@ -27,6 +27,8 @@ class EXPCL_PANDAEGG EggPolygon : public EggPrimitive {
   INLINE EggPolygon(const EggPolygon &copy);
   INLINE EggPolygon &operator = (const EggPolygon &copy);
 
+  virtual EggPolygon *make_copy() const OVERRIDE;
+
   virtual bool cleanup();
 
   bool calculate_normal(LNormald &result, CoordinateSystem cs = CS_default) const;
diff --git a/panda/src/egg/eggPrimitive.h b/panda/src/egg/eggPrimitive.h
@@ -72,6 +72,8 @@ class EXPCL_PANDAEGG EggPrimitive : public EggNode, public EggAttributes,
   INLINE EggPrimitive &operator = (const EggPrimitive &copy);
   INLINE ~EggPrimitive();
 
+  virtual EggPrimitive *make_copy() const=0;
+
   virtual EggRenderMode *determine_alpha_mode();
   virtual EggRenderMode *determine_depth_write_mode();
   virtual EggRenderMode *determine_depth_test_mode();
diff --git a/panda/src/egg/eggTriangleFan.cxx b/panda/src/egg/eggTriangleFan.cxx
@@ -18,7 +18,6 @@
 
 TypeHandle EggTriangleFan::_type_handle;
 
-
 /**
  *
  */
@@ -27,6 +26,14 @@ EggTriangleFan::
   clear();
 }
 
+/**
+ * Makes a copy of this object.
+ */
+EggTriangleFan *EggTriangleFan::
+make_copy() const {
+  return new EggTriangleFan(*this);
+}
+
 /**
  * Writes the triangle fan to the indicated output stream in Egg format.
  */
diff --git a/panda/src/egg/eggTriangleFan.h b/panda/src/egg/eggTriangleFan.h
@@ -29,6 +29,8 @@ class EXPCL_PANDAEGG EggTriangleFan : public EggCompositePrimitive {
   INLINE EggTriangleFan &operator = (const EggTriangleFan &copy);
   virtual ~EggTriangleFan();
 
+  virtual EggTriangleFan *make_copy() const OVERRIDE;
+
   virtual void write(ostream &out, int indent_level) const;
   virtual void apply_first_attribute();
 
diff --git a/panda/src/egg/eggTriangleStrip.cxx b/panda/src/egg/eggTriangleStrip.cxx
@@ -18,7 +18,6 @@
 
 TypeHandle EggTriangleStrip::_type_handle;
 
-
 /**
  *
  */
@@ -27,6 +26,14 @@ EggTriangleStrip::
   clear();
 }
 
+/**
+ * Makes a copy of this object.
+ */
+EggTriangleStrip *EggTriangleStrip::
+make_copy() const {
+  return new EggTriangleStrip(*this);
+}
+
 /**
  * Writes the triangle strip to the indicated output stream in Egg format.
  */
diff --git a/panda/src/egg/eggTriangleStrip.h b/panda/src/egg/eggTriangleStrip.h
@@ -29,6 +29,8 @@ class EXPCL_PANDAEGG EggTriangleStrip : public EggCompositePrimitive {
   INLINE EggTriangleStrip &operator = (const EggTriangleStrip &copy);
   virtual ~EggTriangleStrip();
 
+  virtual EggTriangleStrip *make_copy() const OVERRIDE;
+
   virtual void write(ostream &out, int indent_level) const;
 
 protected:
diff --git a/panda/src/egg2pg/eggSaver.cxx b/panda/src/egg2pg/eggSaver.cxx
diff --git a/panda/src/egg2pg/eggSaver.h b/panda/src/egg2pg/eggSaver.h
diff --git a/panda/src/egg2pg/save_egg_file.cxx b/panda/src/egg2pg/save_egg_file.cxx
