remove a few epvectors

panda/src/collide/collisionBox.h

@@ -115,7 +115,7 @@ public:
     LPoint2 _p;  // the point in 2-d space
     LVector2 _v; // the normalized vector to the next point
   };
-  typedef epvector<PointDef> Points;
+  typedef pvector<PointDef> Points;
 
   static void compute_vectors(Points &points);
   void draw_polygon(GeomNode *viz_geom_node, GeomNode *bounds_viz_geom_node,

panda/src/collide/collisionFloorMesh.h

@@ -85,8 +85,8 @@ protected:
   virtual void fill_viz_geom();
 
 private:
-  typedef epvector<LPoint3> Vertices;
-  typedef epvector<TriangleIndices> Triangles;
+  typedef pvector<LPoint3> Vertices;
+  typedef pvector<TriangleIndices> Triangles;
 
   Vertices _vertices;
   Triangles _triangles;

panda/src/collide/collisionPolygon.h

@@ -111,7 +111,7 @@ private:
     LPoint2 _p;  // the point in 2-d space
     LVector2 _v; // the normalized vector to the next point
   };
-  typedef epvector<PointDef> Points;
+  typedef pvector<PointDef> Points;
 
   static void compute_vectors(Points &points);
   void draw_polygon(GeomNode *viz_geom_node, GeomNode *bounds_viz_geom_node,

panda/src/collide/collisionVisualizer.h

@@ -80,7 +80,7 @@ private:
     LVector3 _surface_normal;
     LPoint3 _interior_point;
   };
-  typedef epvector<CollisionPoint> Points;
+  typedef pvector<CollisionPoint> Points;
 
   class VizInfo {
   public:

panda/src/egg/eggGroupNode.h

@@ -202,7 +202,7 @@ private:
     LNormald _normal;
     size_t _vertex;
   };
-  typedef epvector<NVertexReference> NVertexGroup;
+  typedef pvector<NVertexReference> NVertexGroup;
   typedef pmap<LVertexd, NVertexGroup> NVertexCollection;
 
   void r_collect_vertex_normals(NVertexCollection &collection,
@@ -226,7 +226,7 @@ private:
     LTexCoordd _uv;
     bool _facing;
   };
-  typedef epvector<TBNVertexReference> TBNVertexGroup;
+  typedef pvector<TBNVertexReference> TBNVertexGroup;
   typedef pmap<TBNVertexValue, TBNVertexGroup> TBNVertexCollection;
 
   void r_collect_tangent_binormal(const GlobPattern &uv_name,

panda/src/gobj/shader.h

@@ -309,8 +309,8 @@ public:
     ShaderMatInput    _part[2];
     PT(InternalName)  _arg[2];
     int               _dep[2];
-    LMatrix4         _cache[2];
-    LMatrix4         _value;
+    LMatrix4          _cache[2];
+    LMatrix4          _value;
     ShaderMatPiece    _piece;
   };
 

panda/src/grutil/lineSegs.h

@@ -76,10 +76,10 @@ private:
     INLINE void operator = (const Point &copy);
 
     LVertex _point;
-    LColor _color;
+    UnalignedLVecBase4 _color;
   };
 
-  typedef epvector<Point> SegmentList;
+  typedef pvector<Point> SegmentList;
   typedef pvector<SegmentList> LineList;
 
   LineList _list;

panda/src/grutil/pfmFile.h

@@ -104,7 +104,7 @@ private:
                       int xi, int yi, int dist, int ti) const;
 
 private:
-  typedef epvector<LPoint3> Table;
+  typedef pvector<LPoint3> Table;
   Table _table;
 
   int _x_size;

panda/src/mathutil/stackedPerlinNoise2.h

@@ -52,7 +52,7 @@ private:
     double _amp;
   };
 
-  typedef epvector<Noise> Noises;
+  typedef pvector<Noise> Noises;
   Noises _noises;
 };
 

panda/src/parametrics/curveFitter.h

@@ -75,7 +75,7 @@ public:
     LVecBase3 _hpr_tangent;
   };
 
-  typedef epvector<DataPoint> Data;
+  typedef pvector<DataPoint> Data;
   Data _data;
 
   bool _got_xyz;

panda/src/parametrics/hermiteCurve.h

@@ -152,7 +152,7 @@ protected:
   int find_cv(PN_stdfloat t);
   void recompute_basis();
 
-  epvector<HermiteCurveCV> _points;
+  pvector<HermiteCurveCV> _points;
 
 // TypedWritable stuff
 public:

panda/src/parametrics/nurbsCurveResult.h

@@ -96,7 +96,7 @@ private:
     PN_stdfloat _t;
     LPoint3 _point;
   };
-  typedef epvector<AdaptiveSample> AdaptiveResult;
+  typedef pvector<AdaptiveSample> AdaptiveResult;
   AdaptiveResult _adaptive_result;
 };
 

panda/src/parametrics/parametricCurve.h

@@ -105,7 +105,7 @@ public:
     LVecBase3 _v[4];
     PN_stdfloat _t;
   };
-  typedef epvector<BezierSeg> BezierSegs;
+  typedef pvector<BezierSeg> BezierSegs;
 
   virtual bool get_bezier_segs(BezierSegs &) const;
   virtual bool get_bezier_seg(BezierSeg &) const;

panda/src/parametrics/ropeNode.h

@@ -166,11 +166,11 @@ private:
   class CurveVertex {
   public:
     LPoint3 _p;
-    LColor _c;
+    UnalignedLVecBase4 _c;
     PN_stdfloat _thickness;
     PN_stdfloat _t;
   };
-  typedef epvector<CurveVertex> CurveSegment;
+  typedef pvector<CurveVertex> CurveSegment;
   typedef pvector<CurveSegment> CurveSegments;
 
   int get_connected_segments(CurveSegments &curve_segments,

panda/src/pgraph/occluderNode.I

@@ -50,7 +50,7 @@ get_num_vertices() const {
 INLINE const LPoint3 &OccluderNode::
 get_vertex(int n) const {
   nassertr(n >= 0 && n < (int)_vertices.size(), LPoint3::zero());
-  return LPoint3(_vertices[n]);
+  return _vertices[n];
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/pgraph/portalClipper.h

@@ -105,10 +105,10 @@ private:
     INLINE void operator = (const Point &copy);
 
     LVertex _point;
-    LColor _color;
+    UnalignedLVecBase4 _color;
   };
 
-  typedef epvector<Point> SegmentList;
+  typedef pvector<Point> SegmentList;
   typedef pvector<SegmentList> LineList;
 
   LineList _list;

panda/src/pgraph/portalNode.I

@@ -161,7 +161,7 @@ get_num_vertices() const {
 INLINE const LPoint3 &PortalNode::
 get_vertex(int n) const {
   nassertr(n >= 0 && n < (int)_vertices.size(), LPoint3::zero());
-  return LPoint3(_vertices[n]);
+  return _vertices[n];
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/pgraph/scissorEffect.h

@@ -77,7 +77,7 @@ private:
 private:
   bool _screen;
   LVecBase4 _frame;
-  typedef epvector<PointDef> Points;
+  typedef pvector<PointDef> Points;
   Points _points;
   bool _clip;
 

panda/src/pgraphnodes/lodNode.h

@@ -145,7 +145,7 @@ protected:
     PN_stdfloat _in;
     PN_stdfloat _out;
     bool _shown;
-    LColor _show_color;
+    UnalignedLVecBase4 _show_color;
     PT(PandaNode) _ring_viz;
     PT(PandaNode) _spindle_viz;
     CPT(RenderState) _viz_model_state;
@@ -154,7 +154,7 @@ protected:
     UpdateSeq _bounds_seq;
     bool _verify_ok;
   };
-  typedef epvector<Switch> SwitchVector;
+  typedef pvector<Switch> SwitchVector;
 
 private:
   class EXPCL_PANDA_PGRAPH CData : public CycleData {

panda/src/pgui/pgFrameStyle.I

@@ -112,7 +112,7 @@ set_color(const LColor &color) {
 //       Access: Published
 //  Description: Returns the dominant color of the frame.
 ////////////////////////////////////////////////////////////////////
-INLINE const LColor &PGFrameStyle::
+INLINE LColor PGFrameStyle::
 get_color() const {
   return _color;
 }

panda/src/pgui/pgFrameStyle.h

@@ -51,7 +51,7 @@ PUBLISHED:
 
   INLINE void set_color(PN_stdfloat r, PN_stdfloat g, PN_stdfloat b, PN_stdfloat a);
   INLINE void set_color(const LColor &color);
-  INLINE const LColor &get_color() const;
+  INLINE LColor get_color() const;
 
   INLINE void set_texture(Texture *texture);
   INLINE bool has_texture() const;
@@ -87,7 +87,7 @@ private:
 
 private:
   Type _type;
-  LColor _color;
+  UnalignedLVecBase4 _color;
   PT(Texture) _texture;
   LVecBase2 _width;
   LVecBase2 _uv_width;

panda/src/pgui/pgItem.h

@@ -232,7 +232,7 @@ private:
     NodePath _frame;
     bool _frame_stale;
   };
-  typedef epvector<StateDef> StateDefs;
+  typedef pvector<StateDef> StateDefs;
   StateDefs _state_defs;
 
 #ifdef HAVE_AUDIO

panda/src/text/dynamicTextFont.h

@@ -178,7 +178,7 @@ private:
     LPoint2 _p;
     LVector2 _in, _out;  // tangents into and out of the vertex.
   };
-  typedef epvector<ContourPoint> Points;
+  typedef pvector<ContourPoint> Points;
 
   class Contour {
   public: