diff --git a/panda/src/collide/collisionBox.h b/panda/src/collide/collisionBox.h index c2e5f385bb..2afe521d1e 100644 --- a/panda/src/collide/collisionBox.h +++ b/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 Points; + typedef pvector Points; static void compute_vectors(Points &points); void draw_polygon(GeomNode *viz_geom_node, GeomNode *bounds_viz_geom_node, diff --git a/panda/src/collide/collisionFloorMesh.h b/panda/src/collide/collisionFloorMesh.h index b9908ce186..b162cb8f64 100755 --- a/panda/src/collide/collisionFloorMesh.h +++ b/panda/src/collide/collisionFloorMesh.h @@ -85,8 +85,8 @@ protected: virtual void fill_viz_geom(); private: - typedef epvector Vertices; - typedef epvector Triangles; + typedef pvector Vertices; + typedef pvector Triangles; Vertices _vertices; Triangles _triangles; diff --git a/panda/src/collide/collisionPolygon.h b/panda/src/collide/collisionPolygon.h index e9c2c4a75c..a102a678c0 100644 --- a/panda/src/collide/collisionPolygon.h +++ b/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 Points; + typedef pvector Points; static void compute_vectors(Points &points); void draw_polygon(GeomNode *viz_geom_node, GeomNode *bounds_viz_geom_node, diff --git a/panda/src/collide/collisionVisualizer.h b/panda/src/collide/collisionVisualizer.h index c9ec990c8c..1578bdce9f 100644 --- a/panda/src/collide/collisionVisualizer.h +++ b/panda/src/collide/collisionVisualizer.h @@ -80,7 +80,7 @@ private: LVector3 _surface_normal; LPoint3 _interior_point; }; - typedef epvector Points; + typedef pvector Points; class VizInfo { public: diff --git a/panda/src/egg/eggGroupNode.h b/panda/src/egg/eggGroupNode.h index 04fae0f66e..7e6bc358f9 100644 --- a/panda/src/egg/eggGroupNode.h +++ b/panda/src/egg/eggGroupNode.h @@ -202,7 +202,7 @@ private: LNormald _normal; size_t _vertex; }; - typedef epvector NVertexGroup; + typedef pvector NVertexGroup; typedef pmap NVertexCollection; void r_collect_vertex_normals(NVertexCollection &collection, @@ -226,7 +226,7 @@ private: LTexCoordd _uv; bool _facing; }; - typedef epvector TBNVertexGroup; + typedef pvector TBNVertexGroup; typedef pmap TBNVertexCollection; void r_collect_tangent_binormal(const GlobPattern &uv_name, diff --git a/panda/src/gobj/shader.h b/panda/src/gobj/shader.h index 2676a22de3..4fb905cf94 100755 --- a/panda/src/gobj/shader.h +++ b/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; }; diff --git a/panda/src/grutil/lineSegs.h b/panda/src/grutil/lineSegs.h index 37e85c594e..adc3d3cd35 100644 --- a/panda/src/grutil/lineSegs.h +++ b/panda/src/grutil/lineSegs.h @@ -76,10 +76,10 @@ private: INLINE void operator = (const Point ©); LVertex _point; - LColor _color; + UnalignedLVecBase4 _color; }; - typedef epvector SegmentList; + typedef pvector SegmentList; typedef pvector LineList; LineList _list; diff --git a/panda/src/grutil/pfmFile.h b/panda/src/grutil/pfmFile.h index c07f425fff..4d66fcc8c3 100755 --- a/panda/src/grutil/pfmFile.h +++ b/panda/src/grutil/pfmFile.h @@ -104,7 +104,7 @@ private: int xi, int yi, int dist, int ti) const; private: - typedef epvector Table; + typedef pvector Table; Table _table; int _x_size; diff --git a/panda/src/mathutil/stackedPerlinNoise2.h b/panda/src/mathutil/stackedPerlinNoise2.h index b59614ab4e..fcbf2c1e49 100644 --- a/panda/src/mathutil/stackedPerlinNoise2.h +++ b/panda/src/mathutil/stackedPerlinNoise2.h @@ -52,7 +52,7 @@ private: double _amp; }; - typedef epvector Noises; + typedef pvector Noises; Noises _noises; }; diff --git a/panda/src/parametrics/curveFitter.h b/panda/src/parametrics/curveFitter.h index 0287480f3a..c5c67138f3 100644 --- a/panda/src/parametrics/curveFitter.h +++ b/panda/src/parametrics/curveFitter.h @@ -75,7 +75,7 @@ public: LVecBase3 _hpr_tangent; }; - typedef epvector Data; + typedef pvector Data; Data _data; bool _got_xyz; diff --git a/panda/src/parametrics/hermiteCurve.h b/panda/src/parametrics/hermiteCurve.h index 90330aaefa..124913fb23 100644 --- a/panda/src/parametrics/hermiteCurve.h +++ b/panda/src/parametrics/hermiteCurve.h @@ -152,7 +152,7 @@ protected: int find_cv(PN_stdfloat t); void recompute_basis(); - epvector _points; + pvector _points; // TypedWritable stuff public: diff --git a/panda/src/parametrics/nurbsCurveResult.h b/panda/src/parametrics/nurbsCurveResult.h index c2e94f0d34..0829bb0bdb 100644 --- a/panda/src/parametrics/nurbsCurveResult.h +++ b/panda/src/parametrics/nurbsCurveResult.h @@ -96,7 +96,7 @@ private: PN_stdfloat _t; LPoint3 _point; }; - typedef epvector AdaptiveResult; + typedef pvector AdaptiveResult; AdaptiveResult _adaptive_result; }; diff --git a/panda/src/parametrics/parametricCurve.h b/panda/src/parametrics/parametricCurve.h index 4c5ba9dbb2..a90e79780c 100644 --- a/panda/src/parametrics/parametricCurve.h +++ b/panda/src/parametrics/parametricCurve.h @@ -105,7 +105,7 @@ public: LVecBase3 _v[4]; PN_stdfloat _t; }; - typedef epvector BezierSegs; + typedef pvector BezierSegs; virtual bool get_bezier_segs(BezierSegs &) const; virtual bool get_bezier_seg(BezierSeg &) const; diff --git a/panda/src/parametrics/ropeNode.h b/panda/src/parametrics/ropeNode.h index 4e54d8eeb2..aadb65b955 100644 --- a/panda/src/parametrics/ropeNode.h +++ b/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 CurveSegment; + typedef pvector CurveSegment; typedef pvector CurveSegments; int get_connected_segments(CurveSegments &curve_segments, diff --git a/panda/src/pgraph/occluderNode.I b/panda/src/pgraph/occluderNode.I index 30342404e6..1e47ce5ffa 100644 --- a/panda/src/pgraph/occluderNode.I +++ b/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]; } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/pgraph/portalClipper.h b/panda/src/pgraph/portalClipper.h index b461c7c812..4a2b15e264 100755 --- a/panda/src/pgraph/portalClipper.h +++ b/panda/src/pgraph/portalClipper.h @@ -105,10 +105,10 @@ private: INLINE void operator = (const Point ©); LVertex _point; - LColor _color; + UnalignedLVecBase4 _color; }; - typedef epvector SegmentList; + typedef pvector SegmentList; typedef pvector LineList; LineList _list; diff --git a/panda/src/pgraph/portalNode.I b/panda/src/pgraph/portalNode.I index a298e4f6fc..c8798e1da3 100755 --- a/panda/src/pgraph/portalNode.I +++ b/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]; } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/pgraph/scissorEffect.h b/panda/src/pgraph/scissorEffect.h index 6afef46e86..bde3aa16d2 100644 --- a/panda/src/pgraph/scissorEffect.h +++ b/panda/src/pgraph/scissorEffect.h @@ -77,7 +77,7 @@ private: private: bool _screen; LVecBase4 _frame; - typedef epvector Points; + typedef pvector Points; Points _points; bool _clip; diff --git a/panda/src/pgraphnodes/lodNode.h b/panda/src/pgraphnodes/lodNode.h index e952592f28..769b32aa83 100644 --- a/panda/src/pgraphnodes/lodNode.h +++ b/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 SwitchVector; + typedef pvector SwitchVector; private: class EXPCL_PANDA_PGRAPH CData : public CycleData { diff --git a/panda/src/pgui/pgFrameStyle.I b/panda/src/pgui/pgFrameStyle.I index 2968bfcc92..50be64ca7c 100644 --- a/panda/src/pgui/pgFrameStyle.I +++ b/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; } diff --git a/panda/src/pgui/pgFrameStyle.h b/panda/src/pgui/pgFrameStyle.h index 5df91dc130..8402d77bb4 100644 --- a/panda/src/pgui/pgFrameStyle.h +++ b/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; diff --git a/panda/src/pgui/pgItem.h b/panda/src/pgui/pgItem.h index 6fe950d29f..f71cb1800a 100644 --- a/panda/src/pgui/pgItem.h +++ b/panda/src/pgui/pgItem.h @@ -232,7 +232,7 @@ private: NodePath _frame; bool _frame_stale; }; - typedef epvector StateDefs; + typedef pvector StateDefs; StateDefs _state_defs; #ifdef HAVE_AUDIO diff --git a/panda/src/text/dynamicTextFont.h b/panda/src/text/dynamicTextFont.h index 4cbf7ffaaa..f379960b08 100644 --- a/panda/src/text/dynamicTextFont.h +++ b/panda/src/text/dynamicTextFont.h @@ -178,7 +178,7 @@ private: LPoint2 _p; LVector2 _in, _out; // tangents into and out of the vertex. }; - typedef epvector Points; + typedef pvector Points; class Contour { public: