TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

more win32 build issues

Browse Source
This commit is contained in:
David Rose 2011-12-20 20:26:08 +00:00
parent 0053d01843
commit e9b967435e
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
direct/src/motiontrail/cMotionTrail.cxx
View File

@ -359,7 +359,7 @@ update_motion_trail (PN_stdfloat current_time, LMatrix4 *transform) {
total_frames = _frame_list.size ( ); total_frames = _frame_list.size ( );
if (total_frames >= 1) { if (total_frames >= 1) {
list <CMotionTrailFrame>::iterator frame_iterator; FrameList::iterator frame_iterator;
CMotionTrailFrame motion_trail_frame; CMotionTrailFrame motion_trail_frame;
frame_iterator = _frame_list.begin ( ); frame_iterator = _frame_list.begin ( );
@ -435,7 +435,7 @@ update_motion_trail (PN_stdfloat current_time, LMatrix4 *transform) {
PN_stdfloat delta_time; PN_stdfloat delta_time;
CMotionTrailFrame last_motion_trail_frame; CMotionTrailFrame last_motion_trail_frame;
list <CMotionTrailVertex>::iterator vertex_iterator; VertexList::iterator vertex_iterator;
// convert vertex list to vertex array // convert vertex list to vertex array
int index = 0; int index = 0;
@ -494,7 +494,7 @@ update_motion_trail (PN_stdfloat current_time, LMatrix4 *transform) {
segment_index = 0; segment_index = 0;
list <CMotionTrailFrame>::iterator frame_iterator; FrameList::iterator frame_iterator;
frame_iterator = _frame_list.begin ( ); frame_iterator = _frame_list.begin ( );
while (segment_index < total_segments) { while (segment_index < total_segments) {
int vertex_segement_index; int vertex_segement_index;
@ -747,7 +747,7 @@ update_motion_trail (PN_stdfloat current_time, LMatrix4 *transform) {
CMotionTrailFrame motion_trail_frame_end; CMotionTrailFrame motion_trail_frame_end;
segment_index = 0; segment_index = 0;
list <CMotionTrailFrame>::iterator frame_iterator; FrameList::iterator frame_iterator;
frame_iterator = _frame_list.begin ( ); frame_iterator = _frame_list.begin ( );
while (segment_index < total_segments) { while (segment_index < total_segments) {

20
direct/src/motiontrail/cMotionTrail.h
View File

@ -23,25 +23,23 @@
#include "geomTriangles.h" #include "geomTriangles.h"
#include "luse.h" #include "luse.h"
#include "nurbsCurveEvaluator.h" #include "nurbsCurveEvaluator.h"
#include "plist.h"
#include <list> #include "pvector.h"
class CMotionTrailVertex { class CMotionTrailVertex {
public: public:
LVector4 _vertex; LPoint4 _vertex;
LVector4 _start_color; LVecBase4 _start_color;
LVector4 _end_color; LVecBase4 _end_color;
PN_stdfloat _v; PN_stdfloat _v;
PT(NurbsCurveEvaluator) _nurbs_curve_evaluator; PT(NurbsCurveEvaluator) _nurbs_curve_evaluator;
}; };
class CMotionTrailFrame { class CMotionTrailFrame {
public: public:
UnalignedLMatrix4 _transform;
PN_stdfloat _time; PN_stdfloat _time;
LMatrix4 _transform;
}; };
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -126,8 +124,10 @@ public:
PN_stdfloat _last_update_time; PN_stdfloat _last_update_time;
list <CMotionTrailVertex> _vertex_list; typedef epvector<CMotionTrailVertex> VertexList;
list <CMotionTrailFrame> _frame_list; VertexList _vertex_list;
typedef plist<CMotionTrailFrame> FrameList;
FrameList _frame_list;
// parameters // parameters
PN_stdfloat _color_scale; PN_stdfloat _color_scale;

4
panda/src/speedtree/stTerrain.I
View File

@ -94,10 +94,10 @@ get_splat_layer_tiling(int n) const {
// is used just to match the color of the grass to its // is used just to match the color of the grass to its
// terrain. // terrain.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE const LVecBase4 &STTerrain:: INLINE LColor STTerrain::
get_splat_layer_color(int n) const { get_splat_layer_color(int n) const {
nassertr(n >= 0 && n < (int)_splat_layers.size(), _splat_layers[0]._color); nassertr(n >= 0 && n < (int)_splat_layers.size(), _splat_layers[0]._color);
return _splat_layers[n]._color; return LVecBase4(_splat_layers[n]._color);
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

4
panda/src/speedtree/stTerrain.h
View File

@ -54,7 +54,7 @@ PUBLISHED:
INLINE int get_num_splat_layers() const; INLINE int get_num_splat_layers() const;
INLINE const Filename &get_splat_layer(int n) const; INLINE const Filename &get_splat_layer(int n) const;
INLINE PN_stdfloat get_splat_layer_tiling(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(); INLINE const GeomVertexFormat *get_vertex_format();
@ -93,7 +93,7 @@ protected:
public: public:
Filename _filename; Filename _filename;
PN_stdfloat _tiling; PN_stdfloat _tiling;
LVecBase4 _color; UnalignedLVecBase4 _color;
}; };
typedef pvector<SplatLayer> SplatLayers; typedef pvector<SplatLayer> SplatLayers;

8
pandatool/src/mayaegg/mayaEggLoader.cxx
View File

@ -952,14 +952,14 @@ public:
TVertTable _tvert_tab; TVertTable _tvert_tab;
CVertTable _cvert_tab; CVertTable _cvert_tab;
int GetTVert(LTexCoordd uv); int GetTVert(const LTexCoordd &uv);
int GetCVert(LColor col); int GetCVert(const LColor &col);
int AddFace(unsigned numVertices, MIntArray mvertIndices, MIntArray mtvertIndices, MayaEggTex *tex); int AddFace(unsigned numVertices, MIntArray mvertIndices, MIntArray mtvertIndices, MayaEggTex *tex);
void ConnectTextures(void); void ConnectTextures(void);
}; };
int MayaEggMesh::GetTVert(LTexCoordd uv) int MayaEggMesh::GetTVert(const LTexCoordd &uv)
{ {
if (_tvert_tab.count(uv)) { if (_tvert_tab.count(uv)) {
if (mayaloader_cat.is_spam()) { if (mayaloader_cat.is_spam()) {
@ -977,7 +977,7 @@ int MayaEggMesh::GetTVert(LTexCoordd uv)
return idx; return idx;
} }
int MayaEggMesh::GetCVert(LColor col) int MayaEggMesh::GetCVert(const LColor &col)
{ {
// if (_cvert_tab.count(col)) // if (_cvert_tab.count(col))
// return _cvert_tab[col]; // return _cvert_tab[col];

4
pandatool/src/vrmlegg/indexedFaceSet.cxx
View File

@ -114,7 +114,7 @@ get_polys() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void IndexedFaceSet:: void IndexedFaceSet::
get_vrml_colors(const VrmlNode *color_node, double transparency, get_vrml_colors(const VrmlNode *color_node, double transparency,
pvector<LColor> &color_list) { pvector<UnalignedLVecBase4> &color_list) {
const MFArray *color = color_node->get_value("color")._mf; const MFArray *color = color_node->get_value("color")._mf;
MFArray::const_iterator ci; MFArray::const_iterator ci;
for (ci = color->begin(); ci != color->end(); ++ci) { for (ci = color->begin(); ci != color->end(); ++ci) {
@ -171,7 +171,7 @@ get_colors() {
const VrmlNode *color = _geometry->get_value("color")._sfnode._p; const VrmlNode *color = _geometry->get_value("color")._sfnode._p;
if (color != NULL) { if (color != NULL) {
// Vertex or face colors. // Vertex or face colors.
pvector<LColor> color_list; pvector<UnalignedLVecBase4> color_list;
get_vrml_colors(color, _appearance._transparency, color_list); get_vrml_colors(color, _appearance._transparency, color_list);
bool colorPerVertex = _geometry->get_value("colorPerVertex")._sfbool; bool colorPerVertex = _geometry->get_value("colorPerVertex")._sfbool;

4
pandatool/src/vrmlegg/indexedFaceSet.h
View File

@ -42,7 +42,7 @@ private:
void get_coord_values(); void get_coord_values();
void get_polys(); void get_polys();
void get_vrml_colors(const VrmlNode *color_node, double transparency, void get_vrml_colors(const VrmlNode *color_node, double transparency,
pvector<LColor> &color_list); pvector<UnalignedLVecBase4> &color_list);
void get_vrml_normals(const VrmlNode *normal_node, void get_vrml_normals(const VrmlNode *normal_node,
pvector<LNormald> &normal_list); pvector<LNormald> &normal_list);
void get_vrml_uvs(const VrmlNode *texCoord_node, void get_vrml_uvs(const VrmlNode *texCoord_node,
@ -69,7 +69,7 @@ private:
epvector<VrmlVertex> _verts; epvector<VrmlVertex> _verts;
}; };
pvector<LVertexd> _coord_values; pvector<LVertexd> _coord_values;
pvector<VrmlPolygon> _polys; epvector<VrmlPolygon> _polys;
pvector<LTexCoordd> _per_vertex_uvs; pvector<LTexCoordd> _per_vertex_uvs;
pvector<LNormald> _per_vertex_normals; pvector<LNormald> _per_vertex_normals;

2
pandatool/src/xfileegg/xFileAnimationSet.h
View File

@ -60,7 +60,7 @@ public:
LMatrix4d _mat; LMatrix4d _mat;
}; };
typedef pvector<FrameEntry> FrameEntries; typedef epvector<FrameEntry> FrameEntries;
class FrameData { class FrameData {
public: public:

4
pandatool/src/xfileegg/xFileMesh.h
View File

@ -100,11 +100,11 @@ private:
class SkinWeightsData { class SkinWeightsData {
public: public:
LMatrix4d _matrix_offset;
string _joint_name; string _joint_name;
WeightMap _weight_map; WeightMap _weight_map;
LMatrix4d _matrix_offset;
}; };
typedef pvector<SkinWeightsData> SkinWeights; typedef epvector<SkinWeightsData> SkinWeights;
SkinWeights _skin_weights; SkinWeights _skin_weights;
typedef pmap<XFileVertex *, int, IndirectCompareTo<XFileVertex> > UniqueVertices; typedef pmap<XFileVertex *, int, IndirectCompareTo<XFileVertex> > UniqueVertices;