From e9b967435ed16809aa5c0aeec36776990e9a1c2a Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 20 Dec 2011 20:26:08 +0000 Subject: [PATCH] more win32 build issues --- direct/src/motiontrail/cMotionTrail.cxx | 10 +++++----- direct/src/motiontrail/cMotionTrail.h | 20 ++++++++++---------- panda/src/speedtree/stTerrain.I | 4 ++-- panda/src/speedtree/stTerrain.h | 4 ++-- pandatool/src/mayaegg/mayaEggLoader.cxx | 8 ++++---- pandatool/src/vrmlegg/indexedFaceSet.cxx | 4 ++-- pandatool/src/vrmlegg/indexedFaceSet.h | 4 ++-- pandatool/src/xfileegg/xFileAnimationSet.h | 2 +- pandatool/src/xfileegg/xFileMesh.h | 4 ++-- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/direct/src/motiontrail/cMotionTrail.cxx b/direct/src/motiontrail/cMotionTrail.cxx index 4c17726cd6..942fd5d021 100644 --- a/direct/src/motiontrail/cMotionTrail.cxx +++ b/direct/src/motiontrail/cMotionTrail.cxx @@ -359,7 +359,7 @@ update_motion_trail (PN_stdfloat current_time, LMatrix4 *transform) { total_frames = _frame_list.size ( ); if (total_frames >= 1) { - list ::iterator frame_iterator; + FrameList::iterator frame_iterator; CMotionTrailFrame motion_trail_frame; frame_iterator = _frame_list.begin ( ); @@ -419,7 +419,7 @@ update_motion_trail (PN_stdfloat current_time, LMatrix4 *transform) { motion_trail_frame._time = current_time; motion_trail_frame._transform = *transform; - _frame_list.push_front (motion_trail_frame); + _frame_list.push_front(motion_trail_frame); } // convert frames and vertices to geometry @@ -435,7 +435,7 @@ update_motion_trail (PN_stdfloat current_time, LMatrix4 *transform) { PN_stdfloat delta_time; CMotionTrailFrame last_motion_trail_frame; - list ::iterator vertex_iterator; + VertexList::iterator vertex_iterator; // convert vertex list to vertex array int index = 0; @@ -494,7 +494,7 @@ update_motion_trail (PN_stdfloat current_time, LMatrix4 *transform) { segment_index = 0; - list ::iterator frame_iterator; + FrameList::iterator frame_iterator; frame_iterator = _frame_list.begin ( ); while (segment_index < total_segments) { int vertex_segement_index; @@ -747,7 +747,7 @@ update_motion_trail (PN_stdfloat current_time, LMatrix4 *transform) { CMotionTrailFrame motion_trail_frame_end; segment_index = 0; - list ::iterator frame_iterator; + FrameList::iterator frame_iterator; frame_iterator = _frame_list.begin ( ); while (segment_index < total_segments) { diff --git a/direct/src/motiontrail/cMotionTrail.h b/direct/src/motiontrail/cMotionTrail.h index 4e91e26066..32f73a5ff5 100644 --- a/direct/src/motiontrail/cMotionTrail.h +++ b/direct/src/motiontrail/cMotionTrail.h @@ -23,25 +23,23 @@ #include "geomTriangles.h" #include "luse.h" #include "nurbsCurveEvaluator.h" - -#include +#include "plist.h" +#include "pvector.h" class CMotionTrailVertex { - public: - LVector4 _vertex; - LVector4 _start_color; - LVector4 _end_color; + LPoint4 _vertex; + LVecBase4 _start_color; + LVecBase4 _end_color; PN_stdfloat _v; PT(NurbsCurveEvaluator) _nurbs_curve_evaluator; }; class CMotionTrailFrame { - public: + UnalignedLMatrix4 _transform; PN_stdfloat _time; - LMatrix4 _transform; }; //////////////////////////////////////////////////////////////////// @@ -126,8 +124,10 @@ public: PN_stdfloat _last_update_time; - list _vertex_list; - list _frame_list; + typedef epvector VertexList; + VertexList _vertex_list; + typedef plist FrameList; + FrameList _frame_list; // parameters PN_stdfloat _color_scale; diff --git a/panda/src/speedtree/stTerrain.I b/panda/src/speedtree/stTerrain.I index 0b47765903..f2fc472642 100644 --- a/panda/src/speedtree/stTerrain.I +++ b/panda/src/speedtree/stTerrain.I @@ -94,10 +94,10 @@ get_splat_layer_tiling(int n) const { // is used just to match the color of the grass to its // terrain. //////////////////////////////////////////////////////////////////// -INLINE const LVecBase4 &STTerrain:: +INLINE LColor STTerrain:: get_splat_layer_color(int n) const { nassertr(n >= 0 && n < (int)_splat_layers.size(), _splat_layers[0]._color); - return _splat_layers[n]._color; + return LVecBase4(_splat_layers[n]._color); } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/speedtree/stTerrain.h b/panda/src/speedtree/stTerrain.h index 080cc31f31..617a9bf26c 100644 --- a/panda/src/speedtree/stTerrain.h +++ b/panda/src/speedtree/stTerrain.h @@ -54,7 +54,7 @@ PUBLISHED: INLINE int get_num_splat_layers() const; INLINE const Filename &get_splat_layer(int n) const; INLINE PN_stdfloat get_splat_layer_tiling(int n) const; - INLINE const LVecBase4 &get_splat_layer_color(int n) const; + INLINE LColor get_splat_layer_color(int n) const; INLINE const GeomVertexFormat *get_vertex_format(); @@ -93,7 +93,7 @@ protected: public: Filename _filename; PN_stdfloat _tiling; - LVecBase4 _color; + UnalignedLVecBase4 _color; }; typedef pvector SplatLayers; diff --git a/pandatool/src/mayaegg/mayaEggLoader.cxx b/pandatool/src/mayaegg/mayaEggLoader.cxx index ebc3102e5d..6a8358295b 100755 --- a/pandatool/src/mayaegg/mayaEggLoader.cxx +++ b/pandatool/src/mayaegg/mayaEggLoader.cxx @@ -952,14 +952,14 @@ public: TVertTable _tvert_tab; CVertTable _cvert_tab; - int GetTVert(LTexCoordd uv); - int GetCVert(LColor col); + int GetTVert(const LTexCoordd &uv); + int GetCVert(const LColor &col); int AddFace(unsigned numVertices, MIntArray mvertIndices, MIntArray mtvertIndices, MayaEggTex *tex); void ConnectTextures(void); }; -int MayaEggMesh::GetTVert(LTexCoordd uv) +int MayaEggMesh::GetTVert(const LTexCoordd &uv) { if (_tvert_tab.count(uv)) { if (mayaloader_cat.is_spam()) { @@ -977,7 +977,7 @@ int MayaEggMesh::GetTVert(LTexCoordd uv) return idx; } -int MayaEggMesh::GetCVert(LColor col) +int MayaEggMesh::GetCVert(const LColor &col) { // if (_cvert_tab.count(col)) // return _cvert_tab[col]; diff --git a/pandatool/src/vrmlegg/indexedFaceSet.cxx b/pandatool/src/vrmlegg/indexedFaceSet.cxx index 932847c9b4..6033b2b1a6 100644 --- a/pandatool/src/vrmlegg/indexedFaceSet.cxx +++ b/pandatool/src/vrmlegg/indexedFaceSet.cxx @@ -114,7 +114,7 @@ get_polys() { //////////////////////////////////////////////////////////////////// void IndexedFaceSet:: get_vrml_colors(const VrmlNode *color_node, double transparency, - pvector &color_list) { + pvector &color_list) { const MFArray *color = color_node->get_value("color")._mf; MFArray::const_iterator ci; for (ci = color->begin(); ci != color->end(); ++ci) { @@ -171,7 +171,7 @@ get_colors() { const VrmlNode *color = _geometry->get_value("color")._sfnode._p; if (color != NULL) { // Vertex or face colors. - pvector color_list; + pvector color_list; get_vrml_colors(color, _appearance._transparency, color_list); bool colorPerVertex = _geometry->get_value("colorPerVertex")._sfbool; diff --git a/pandatool/src/vrmlegg/indexedFaceSet.h b/pandatool/src/vrmlegg/indexedFaceSet.h index c39027fe22..3153c5fae4 100644 --- a/pandatool/src/vrmlegg/indexedFaceSet.h +++ b/pandatool/src/vrmlegg/indexedFaceSet.h @@ -42,7 +42,7 @@ private: void get_coord_values(); void get_polys(); void get_vrml_colors(const VrmlNode *color_node, double transparency, - pvector &color_list); + pvector &color_list); void get_vrml_normals(const VrmlNode *normal_node, pvector &normal_list); void get_vrml_uvs(const VrmlNode *texCoord_node, @@ -69,7 +69,7 @@ private: epvector _verts; }; pvector _coord_values; - pvector _polys; + epvector _polys; pvector _per_vertex_uvs; pvector _per_vertex_normals; diff --git a/pandatool/src/xfileegg/xFileAnimationSet.h b/pandatool/src/xfileegg/xFileAnimationSet.h index d85355f4b0..9a13c66d63 100644 --- a/pandatool/src/xfileegg/xFileAnimationSet.h +++ b/pandatool/src/xfileegg/xFileAnimationSet.h @@ -60,7 +60,7 @@ public: LMatrix4d _mat; }; - typedef pvector FrameEntries; + typedef epvector FrameEntries; class FrameData { public: diff --git a/pandatool/src/xfileegg/xFileMesh.h b/pandatool/src/xfileegg/xFileMesh.h index 7eff4bb906..89e2b18b4c 100644 --- a/pandatool/src/xfileegg/xFileMesh.h +++ b/pandatool/src/xfileegg/xFileMesh.h @@ -100,11 +100,11 @@ private: class SkinWeightsData { public: + LMatrix4d _matrix_offset; string _joint_name; WeightMap _weight_map; - LMatrix4d _matrix_offset; }; - typedef pvector SkinWeights; + typedef epvector SkinWeights; SkinWeights _skin_weights; typedef pmap > UniqueVertices;