TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove a few epvectors

Browse Source
This commit is contained in:
David Rose 2011-12-19 18:16:30 +00:00
parent abee07ef0d
commit 1a4f42706b
23 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/collide/collisionBox.h
View File

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

4
panda/src/collide/collisionFloorMesh.h
View File

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

2
panda/src/collide/collisionPolygon.h
View File

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

2
panda/src/collide/collisionVisualizer.h
View File

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

4
panda/src/egg/eggGroupNode.h
View File

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

4
panda/src/gobj/shader.h
View File

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

4
panda/src/grutil/lineSegs.h
View File

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

2
panda/src/grutil/pfmFile.h
View File

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

2
panda/src/mathutil/stackedPerlinNoise2.h
View File

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

2
panda/src/parametrics/curveFitter.h
View File

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

2
panda/src/parametrics/hermiteCurve.h
View File

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

2
panda/src/parametrics/nurbsCurveResult.h
View File

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

2
panda/src/parametrics/parametricCurve.h
View File

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

4
panda/src/parametrics/ropeNode.h
View File

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

2
panda/src/pgraph/occluderNode.I
View File

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

4
panda/src/pgraph/portalClipper.h
View File

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

2
panda/src/pgraph/portalNode.I
View File

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

2
panda/src/pgraph/scissorEffect.h
View File

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

4
panda/src/pgraphnodes/lodNode.h
View File

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

2
panda/src/pgui/pgFrameStyle.I
View File

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

4
panda/src/pgui/pgFrameStyle.h
View File

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

2
panda/src/pgui/pgItem.h
View File

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

2
panda/src/text/dynamicTextFont.h
View File

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