summaryrefslogtreecommitdiff
path: root/Build/source/utils/asymptote/prc/oPRCFile.h
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/utils/asymptote/prc/oPRCFile.h')
-rw-r--r--Build/source/utils/asymptote/prc/oPRCFile.h120
1 files changed, 80 insertions, 40 deletions
diff --git a/Build/source/utils/asymptote/prc/oPRCFile.h b/Build/source/utils/asymptote/prc/oPRCFile.h
index 647f57c7d52..48683bf36da 100644
--- a/Build/source/utils/asymptote/prc/oPRCFile.h
+++ b/Build/source/utils/asymptote/prc/oPRCFile.h
@@ -115,30 +115,30 @@ typedef std::list<PRCtessline> PRCtesslineList;
struct PRCface
{
+ PRCface() : transform(NULL), face(NULL) {}
uint32_t style;
bool transparent;
- PRCpGeneralTransformation3d transform;
- PRCpFace face;
+ PRCGeneralTransformation3d* transform;
+ PRCFace* face;
};
-typedef std::tr1::shared_ptr <PRCface> PRCpface;
typedef std::vector <PRCface> PRCfaceList;
struct PRCcompface
{
+ PRCcompface() : face(NULL) {}
uint32_t style;
bool transparent;
- PRCpCompressedFace face;
+ PRCCompressedFace* face;
};
-typedef std::tr1::shared_ptr <PRCcompface> PRCpcompface;
typedef std::vector <PRCcompface> PRCcompfaceList;
struct PRCwire
{
+ PRCwire() : style(m1), transform(NULL), curve(NULL) {}
uint32_t style;
- PRCpGeneralTransformation3d transform;
- PRCpCurve curve;
+ PRCGeneralTransformation3d* transform;
+ PRCCurve* curve;
};
-typedef std::tr1::shared_ptr <PRCwire> PRCpwire;
typedef std::vector <PRCwire> PRCwireList;
typedef std::map <uint32_t,std::vector<PRCVector3d> > PRCpointsetMap;
@@ -163,8 +163,8 @@ public:
class PRCgroup
{
public:
- PRCgroup() {}
- PRCgroup(const std::string &name) : name(name) {}
+ PRCgroup() : transform(NULL) {}
+ PRCgroup(const std::string &name) : name(name), transform(NULL) {}
PRCfaceList faces;
PRCcompfaceList compfaces;
PRCtessrectangleList rectangles;
@@ -173,7 +173,7 @@ class PRCgroup
PRCpointsetMap points;
std::string name;
std::list<PRCgroup> groupList;
- PRCpGeneralTransformation3d transform;
+ PRCGeneralTransformation3d* transform;
PRCoptions options;
};
typedef std::list<PRCgroup> PRCgroupList;
@@ -216,6 +216,21 @@ class PRCGlobalsSection : public PRCCompressedSection
defaultFontFamilyName(""),
numberOfFillPatterns(0),
userData(0,0),index(i) {}
+ virtual ~PRCGlobalsSection() {
+ for(PRCTextureDefinitionList::iterator i = texture_definitions.begin();
+ i != texture_definitions.end(); i++)
+ delete *i;
+ for(PRCMaterialList::iterator i = materials.begin();
+ i != materials.end(); i++)
+ delete *i;
+ for(PRCStyleList::iterator i = styles.begin();
+ i != styles.end(); i++)
+ delete *i;
+ for(PRCCoordinateSystemList::iterator i =
+ reference_coordinate_systems.begin();
+ i != reference_coordinate_systems.end(); i++)
+ delete *i;
+ }
uint32_t numberOfReferencedFileStructures;
double tessellationChordHeightRatio;
double tessellationAngleDegrees;
@@ -239,6 +254,12 @@ class PRCTreeSection : public PRCCompressedSection
public:
PRCTreeSection(PRCFileStructure *fs, uint32_t i) :
PRCCompressedSection(fs),unit(1),index(i) {}
+ virtual ~PRCTreeSection()
+ {
+ for(PRCPartDefinitionList::iterator it=part_definitions.begin(); it!=part_definitions.end(); ++it) delete *it;
+ for(PRCProductOccurrenceList::iterator it=product_occurrences.begin(); it!=product_occurrences.end(); ++it) delete *it;
+ }
+
PRCPartDefinitionList part_definitions;
PRCProductOccurrenceList product_occurrences;
/*
@@ -256,6 +277,11 @@ class PRCTessellationSection : public PRCCompressedSection
public:
PRCTessellationSection(PRCFileStructure *fs, uint32_t i) :
PRCCompressedSection(fs),index(i) {}
+ virtual ~PRCTessellationSection() {
+ for(PRCTessList::iterator it=tessellations.begin();
+ it!=tessellations.end(); ++it)
+ delete *it;
+ }
PRCTessList tessellations;
private:
uint32_t index;
@@ -267,6 +293,7 @@ class PRCGeometrySection : public PRCCompressedSection
public:
PRCGeometrySection(PRCFileStructure *fs, uint32_t i) :
PRCCompressedSection(fs),index(i) {}
+ virtual ~PRCGeometrySection() {}
private:
uint32_t index;
virtual void writeData();
@@ -277,6 +304,7 @@ class PRCExtraGeometrySection : public PRCCompressedSection
public:
PRCExtraGeometrySection(PRCFileStructure *fs, uint32_t i) :
PRCCompressedSection(fs),index(i) {}
+ virtual ~PRCExtraGeometrySection() {}
private:
uint32_t index;
virtual void writeData();
@@ -287,6 +315,7 @@ class PRCModelFile : public PRCCompressedSection
public:
PRCModelFile(oPRCFile *p) : PRCCompressedSection(p), unit(1) {}
double unit;
+ virtual ~PRCModelFile() {}
private:
virtual void writeData();
};
@@ -333,6 +362,12 @@ class PRCFileStructure
std::list<PRCUncompressedFile> uncompressedFiles;
PRCTopoContextList contexts;
+ ~PRCFileStructure () {
+ for(PRCTopoContextList::iterator i = contexts.begin();
+ i != contexts.end(); i++)
+ delete *i;
+ }
+
PRCGlobalsSection globals;
PRCTreeSection tree;
PRCTessellationSection tessellations;
@@ -349,21 +384,22 @@ class PRCFileStructure
uint32_t addTextureDefinition(PRCTextureDefinition *pTextureDefinition);
uint32_t addRgbColor(const PRCRgbColor &color);
uint32_t addRgbColorUnique(const PRCRgbColor &color);
- uint32_t addMaterialGeneric(PRCMaterialGeneric *pMaterialGeneric);
- uint32_t addTextureApplication(PRCTextureApplication *pTextureApplication);
- uint32_t addStyle(PRCStyle *pStyle);
- uint32_t addPartDefinition(PRCPartDefinition *pPartDefinition);
- uint32_t addProductOccurrence(PRCProductOccurrence *pProductOccurrence);
- uint32_t addTopoContext(PRCTopoContext *pTopoContext);
- uint32_t add3DTess(PRC3DTess *p3DTess);
- uint32_t add3DWireTess(PRC3DWireTess *p3DWireTess);
+ uint32_t addMaterialGeneric(PRCMaterialGeneric*& pMaterialGeneric);
+ uint32_t addTextureApplication(PRCTextureApplication*& pTextureApplication);
+ uint32_t addStyle(PRCStyle*& pStyle);
+ uint32_t addPartDefinition(PRCPartDefinition*& pPartDefinition);
+ uint32_t addProductOccurrence(PRCProductOccurrence*& pProductOccurrence);
+ uint32_t addTopoContext(PRCTopoContext*& pTopoContext);
+ uint32_t getTopoContext(PRCTopoContext*& pTopoContext);
+ uint32_t add3DTess(PRC3DTess*& p3DTess);
+ uint32_t add3DWireTess(PRC3DWireTess*& p3DWireTess);
/*
- uint32_t addMarkupTess(PRCMarkupTess *pMarkupTess);
- uint32_t addMarkup(PRCMarkup *pMarkup);
- uint32_t addAnnotationItem(PRCAnnotationItem *pAnnotationItem);
+ uint32_t addMarkupTess(PRCMarkupTess*& pMarkupTess);
+ uint32_t addMarkup(PRCMarkup*& pMarkup);
+ uint32_t addAnnotationItem(PRCAnnotationItem*& pAnnotationItem);
*/
- uint32_t addCoordinateSystem(PRCCoordinateSystem *pCoordinateSystem);
- uint32_t addCoordinateSystemUnique(PRCCoordinateSystem *pCoordinateSystem);
+ uint32_t addCoordinateSystem(PRCCoordinateSystem*& pCoordinateSystem);
+ uint32_t addCoordinateSystemUnique(PRCCoordinateSystem*& pCoordinateSystem);
};
class PRCFileStructureInformation
@@ -461,11 +497,11 @@ class oPRCFile
PRCtransformMap transformMap;
std::stack<PRCgroupList::iterator> currentGroups;
PRCgroup& findGroup();
- void doGroup(const PRCgroup& group, PRCPartDefinition *parent_part_definition, PRCProductOccurrence *parent_product_occurrence);
+ void doGroup(PRCgroup& group, PRCPartDefinition *parent_part_definition, PRCProductOccurrence *parent_product_occurrence);
uint32_t addColor(const PRCRgbColor &color);
uint32_t addColour(const RGBAColour &colour);
uint32_t addMaterial(const PRCmaterial &material);
- uint32_t addTransform(const PRCpGeneralTransformation3d &transform);
+ uint32_t addTransform(PRCGeneralTransformation3d*& transform);
void addPoint(const double P[3], const RGBAColour &c);
void addLine(uint32_t n, const double P[][3], const RGBAColour &c);
void addBezierCurve(uint32_t n, const double cP[][3], const RGBAColour &c);
@@ -488,11 +524,11 @@ class oPRCFile
uint32_t addPicture(EPRCPictureDataFormat format, uint32_t size, const uint8_t *picture, uint32_t width=0, uint32_t height=0,
std::string name="", uint32_t fileStructure=0)
{ return fileStructures[fileStructure]->addPicture(format, size, picture, width, height, name); }
- uint32_t addTextureDefinition(PRCTextureDefinition *pTextureDefinition, uint32_t fileStructure=0)
+ uint32_t addTextureDefinition(PRCTextureDefinition*& pTextureDefinition, uint32_t fileStructure=0)
{
return fileStructures[fileStructure]->addTextureDefinition(pTextureDefinition);
}
- uint32_t addTextureApplication(PRCTextureApplication *pTextureApplication, uint32_t fileStructure=0)
+ uint32_t addTextureApplication(PRCTextureApplication*& pTextureApplication, uint32_t fileStructure=0)
{
return fileStructures[fileStructure]->addTextureApplication(pTextureApplication);
}
@@ -506,54 +542,58 @@ class oPRCFile
{
return fileStructures[fileStructure]->addRgbColorUnique(color);
}
- uint32_t addMaterialGeneric(PRCMaterialGeneric *pMaterialGeneric,
+ uint32_t addMaterialGeneric(PRCMaterialGeneric*& pMaterialGeneric,
uint32_t fileStructure=0)
{
return fileStructures[fileStructure]->addMaterialGeneric(pMaterialGeneric);
}
- uint32_t addStyle(PRCStyle *pStyle, uint32_t fileStructure=0)
+ uint32_t addStyle(PRCStyle*& pStyle, uint32_t fileStructure=0)
{
return fileStructures[fileStructure]->addStyle(pStyle);
}
- uint32_t addPartDefinition(PRCPartDefinition *pPartDefinition, uint32_t fileStructure=0)
+ uint32_t addPartDefinition(PRCPartDefinition*& pPartDefinition, uint32_t fileStructure=0)
{
return fileStructures[fileStructure]->addPartDefinition(pPartDefinition);
}
- uint32_t addProductOccurrence(PRCProductOccurrence *pProductOccurrence, uint32_t fileStructure=0)
+ uint32_t addProductOccurrence(PRCProductOccurrence*& pProductOccurrence, uint32_t fileStructure=0)
{
return fileStructures[fileStructure]->addProductOccurrence(pProductOccurrence);
}
- uint32_t addTopoContext(PRCTopoContext *pTopoContext, uint32_t fileStructure=0)
+ uint32_t addTopoContext(PRCTopoContext*& pTopoContext, uint32_t fileStructure=0)
{
return fileStructures[fileStructure]->addTopoContext(pTopoContext);
}
- uint32_t add3DTess(PRC3DTess *p3DTess, uint32_t fileStructure=0)
+ uint32_t getTopoContext(PRCTopoContext*& pTopoContext, uint32_t fileStructure=0)
+ {
+ return fileStructures[fileStructure]->getTopoContext(pTopoContext);
+ }
+ uint32_t add3DTess(PRC3DTess*& p3DTess, uint32_t fileStructure=0)
{
return fileStructures[fileStructure]->add3DTess(p3DTess);
}
- uint32_t add3DWireTess(PRC3DWireTess *p3DWireTess, uint32_t fileStructure=0)
+ uint32_t add3DWireTess(PRC3DWireTess*& p3DWireTess, uint32_t fileStructure=0)
{
return fileStructures[fileStructure]->add3DWireTess(p3DWireTess);
}
/*
- uint32_t addMarkupTess(PRCMarkupTess *pMarkupTess, uint32_t fileStructure=0)
+ uint32_t addMarkupTess(PRCMarkupTess*& pMarkupTess, uint32_t fileStructure=0)
{
return fileStructures[fileStructure]->addMarkupTess(pMarkupTess);
}
- uint32_t addMarkup(PRCMarkup *pMarkup, uint32_t fileStructure=0)
+ uint32_t addMarkup(PRCMarkup*& pMarkup, uint32_t fileStructure=0)
{
return fileStructures[fileStructure]->addMarkup(pMarkup);
}
- uint32_t addAnnotationItem(PRCAnnotationItem *pAnnotationItem, uint32_t fileStructure=0)
+ uint32_t addAnnotationItem(PRCAnnotationItem*& pAnnotationItem, uint32_t fileStructure=0)
{
return fileStructures[fileStructure]->addAnnotationItem(pAnnotationItem);
}
*/
- uint32_t addCoordinateSystem(PRCCoordinateSystem *pCoordinateSystem, uint32_t fileStructure=0)
+ uint32_t addCoordinateSystem(PRCCoordinateSystem*& pCoordinateSystem, uint32_t fileStructure=0)
{
return fileStructures[fileStructure]->addCoordinateSystem(pCoordinateSystem);
}
- uint32_t addCoordinateSystemUnique(PRCCoordinateSystem *pCoordinateSystem, uint32_t fileStructure=0)
+ uint32_t addCoordinateSystemUnique(PRCCoordinateSystem*& pCoordinateSystem, uint32_t fileStructure=0)
{
return fileStructures[fileStructure]->addCoordinateSystemUnique(pCoordinateSystem);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 19:26:34 +0000