TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-18 20:53:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
David Rose 2001-05-02 21:58:42 +00:00
parent 62f1fc0882
commit 1883b289f5
4 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/egg/Sources.pp
View File

@ -23,7 +23,9 @@
eggMaterialCollection.I eggMaterialCollection.cxx \ eggMaterialCollection.I eggMaterialCollection.cxx \
eggMaterialCollection.h \ eggMaterialCollection.h \
eggMiscFuncs.I \ eggMiscFuncs.I \
eggMiscFuncs.cxx eggMiscFuncs.h eggNamedObject.I eggNamedObject.cxx \ eggMiscFuncs.cxx eggMiscFuncs.h \
eggMorph.I eggMorph.h eggMorphList.I eggMorphList.h \
eggNamedObject.I eggNamedObject.cxx \
eggNamedObject.h eggNameUniquifier.cxx eggNameUniquifier.h \ eggNamedObject.h eggNameUniquifier.cxx eggNameUniquifier.h \
eggNode.I eggNode.cxx eggNode.h eggNurbsCurve.I \ eggNode.I eggNode.cxx eggNode.h eggNurbsCurve.I \
eggNurbsCurve.cxx eggNurbsCurve.h eggNurbsSurface.I \ eggNurbsCurve.cxx eggNurbsCurve.h eggNurbsSurface.I \

5
panda/src/egg/eggMorph.h
View File

@ -53,11 +53,6 @@ INLINE ostream &operator << (ostream &out, const EggMorphColor &m);
// operator again. // operator again.
//INLINE ostream &operator << (ostream &out, const EggMorphNormal &m); //INLINE ostream &operator << (ostream &out, const EggMorphNormal &m);
typedef set<EggMorphVertex> EggMorphVertices;
typedef set<EggMorphNormal> EggMorphNormals;
typedef set<EggMorphTexCoord> EggMorphTexCoords;
typedef set<EggMorphColor> EggMorphColors;
#include "eggMorph.I" #include "eggMorph.I"
#endif #endif

31
panda/src/egg/eggMorphList.I
View File

@ -5,6 +5,37 @@
#include <indent.h> #include <indent.h>
////////////////////////////////////////////////////////////////////
// Function: EggMorphList::insert
// Access: Public
// Description: This is similar to the insert() interface for sets,
// except it does not guarantee that the resulting list
// is sorted.
//
// We have this member function so the EggMorphList
// resembles a set. It used to *be* a set, but we
// cannot export STL sets from a Windows DLL.
////////////////////////////////////////////////////////////////////
template<class MorphType>
pair<EggMorphList<MorphType>::iterator, bool> EggMorphList<MorphType>::
insert(const MorphType &value) {
pair<iterator, bool> result;
iterator i;
for (i = begin(); i != end(); ++i) {
if ((*i) == value) {
// This value is already present.
result.first = i;
result.second = false;
return result;
}
}
// This value is not already present; add it to the list.
push_back(value);
result.first = begin() + size() - 1;
result.second = true;
return result;
}
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: EggMorphList::write // Function: EggMorphList::write

16
panda/src/egg/eggMorphList.h
View File

@ -10,18 +10,30 @@
#include "eggMorph.h" #include "eggMorph.h"
#include <set> #include <vector>
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : EggMorphList // Class : EggMorphList
// Description : A collection of <Dxyz>'s or <Duv>'s or some such. // Description : A collection of <Dxyz>'s or <Duv>'s or some such.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
template<class MorphType> template<class MorphType>
class EggMorphList : public set<MorphType> { class EggMorphList : public vector<MorphType> {
public: public:
pair<iterator, bool> insert(const MorphType &value);
void write(ostream &out, int indent_level) const; void write(ostream &out, int indent_level) const;
}; };
EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, std::vector<EggMorphVertex>)
EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, std::vector<EggMorphNormal>)
EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, std::vector<EggMorphTexCoord>)
EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, std::vector<EggMorphColor>)
EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, EggMorphList<EggMorphVertex>)
EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, EggMorphList<EggMorphNormal>)
EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, EggMorphList<EggMorphTexCoord>)
EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, EggMorphList<EggMorphColor>)
typedef EggMorphList<EggMorphVertex> EggMorphVertexList; typedef EggMorphList<EggMorphVertex> EggMorphVertexList;
typedef EggMorphList<EggMorphNormal> EggMorphNormalList; typedef EggMorphList<EggMorphNormal> EggMorphNormalList;
typedef EggMorphList<EggMorphTexCoord> EggMorphTexCoordList; typedef EggMorphList<EggMorphTexCoord> EggMorphTexCoordList;