1.1 --- a/gds23ds/gdsobject_3ds.cpp Mon Jun 29 21:39:56 2009 +0100
1.2 +++ b/gds23ds/gdsobject_3ds.cpp Mon Jun 29 21:46:31 2009 +0100
1.3 @@ -172,7 +172,7 @@
1.4 }
1.5 }
1.6
1.7 -void GDSObject::Output3DSFaces(FILE *fptr, unsigned long *facecount, struct ProcessLayer *firstlayer)
1.8 +void GDSObject::Output3DSFaces(FILE *fptr, unsigned long *facecount, class ProcessLayer *firstlayer)
1.9 {
1.10 unsigned short chunk;
1.11 unsigned long chunklen;
1.12 @@ -321,7 +321,7 @@
1.13 }
1.14 }
1.15
1.16 -void GDSObject::Output3DSFaceMaterials(FILE *fptr, unsigned long facecount, struct ProcessLayer *firstlayer)
1.17 +void GDSObject::Output3DSFaceMaterials(FILE *fptr, unsigned long facecount, class ProcessLayer *firstlayer)
1.18 {
1.19 unsigned short chunk;
1.20 unsigned long chunklen;
1.21 @@ -330,8 +330,8 @@
1.22 unsigned long i;
1.23 unsigned char tempbyte;
1.24
1.25 - struct ProcessLayer dummylayer;
1.26 - struct ProcessLayer *thislayer;
1.27 + class ProcessLayer dummylayer;
1.28 + class ProcessLayer *thislayer;
1.29 dummylayer.Next = firstlayer;
1.30 thislayer = &dummylayer;
1.31
1.32 @@ -381,7 +381,7 @@
1.33 }
1.34 }
1.35
1.36 -void GDSObject::Output3DSSRefs(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer)
1.37 +void GDSObject::Output3DSSRefs(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer)
1.38 {
1.39 GDSObject *obj;
1.40
1.41 @@ -415,7 +415,7 @@
1.42 }
1.43 }
1.44
1.45 -void GDSObject::Output3DSARefs(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer)
1.46 +void GDSObject::Output3DSARefs(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer)
1.47 {
1.48 GDSObject *obj;
1.49 int i, j;
1.50 @@ -514,7 +514,7 @@
1.51 }
1.52 }
1.53
1.54 -void GDSObject::OutputTo3DS(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer)
1.55 +void GDSObject::OutputTo3DS(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer)
1.56 {
1.57 unsigned short chunk;
1.58 unsigned long chunklen;
2.1 --- a/gds23ds/gdsparse_3ds.cpp Mon Jun 29 21:39:56 2009 +0100
2.2 +++ b/gds23ds/gdsparse_3ds.cpp Mon Jun 29 21:46:31 2009 +0100
2.3 @@ -193,8 +193,8 @@
2.4 unsigned long chunklen;
2.5 unsigned char tempbyte;
2.6
2.7 - struct ProcessLayer *firstlayer;
2.8 - struct ProcessLayer dummylayer;
2.9 + class ProcessLayer *firstlayer;
2.10 + class ProcessLayer dummylayer;
2.11 dummylayer.Next = process->GetLayer();
2.12 //firstlayer = process->GetLayer();
2.13 firstlayer = &dummylayer;
3.1 --- a/gds2info/gdsobject_info.cpp Mon Jun 29 21:39:56 2009 +0100
3.2 +++ b/gds2info/gdsobject_info.cpp Mon Jun 29 21:46:31 2009 +0100
3.3 @@ -34,7 +34,7 @@
3.4 {
3.5 }
3.6
3.7 -void GDSObject_info::OutputPathToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer)
3.8 +void GDSObject_info::OutputPathToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer)
3.9 {
3.10 if(!PathItems.empty()){
3.11 float angleX, angleY;
3.12 @@ -171,7 +171,7 @@
3.13 }
3.14 }
3.15
3.16 -void GDSObject_info::OutputPolygonToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer)
3.17 +void GDSObject_info::OutputPolygonToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer)
3.18 {
3.19 if(!PolygonItems.empty()){
3.20 class GDSPolygon *polygon;
3.21 @@ -191,7 +191,7 @@
3.22 }
3.23 }
3.24
3.25 -void GDSObject_info::OutputTextToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer)
3.26 +void GDSObject_info::OutputTextToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer)
3.27 {
3.28 if(!TextItems.empty()){
3.29 class GDSText *text;
3.30 @@ -252,7 +252,7 @@
3.31 }
3.32 }
3.33
3.34 -void GDSObject_info::OutputSRefToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer)
3.35 +void GDSObject_info::OutputSRefToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer)
3.36 {
3.37 if(FirstSRef){
3.38 SRefElement dummysref;
3.39 @@ -279,7 +279,7 @@
3.40 }
3.41 }
3.42
3.43 -void GDSObject_info::OutputARefToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer)
3.44 +void GDSObject_info::OutputARefToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer)
3.45 {
3.46 if(FirstARef){
3.47 ARefElement dummyaref;
3.48 @@ -357,7 +357,7 @@
3.49 }
3.50
3.51
3.52 -void GDSObject_info::OutputToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer)
3.53 +void GDSObject_info::OutputToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer)
3.54 {
3.55 if(fptr && !IsOutput){
3.56 fprintf(fptr, "#declare str_%s = union {\n", Name);
4.1 --- a/gds2info/gdsobject_info.h Mon Jun 29 21:39:56 2009 +0100
4.2 +++ b/gds2info/gdsobject_info.h Mon Jun 29 21:46:31 2009 +0100
4.3 @@ -29,12 +29,12 @@
4.4 GDSObject_info(char *Name);
4.5 ~GDSObject_info();
4.6
4.7 - virtual void OutputToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer);
4.8 - void OutputPathToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer);
4.9 - void OutputPolygonToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer);
4.10 - void OutputTextToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer);
4.11 - void OutputSRefToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer);
4.12 - void OutputARefToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer);
4.13 + virtual void OutputToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer);
4.14 + void OutputPathToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer);
4.15 + void OutputPolygonToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer);
4.16 + void OutputTextToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer);
4.17 + void OutputSRefToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer);
4.18 + void OutputARefToFile(FILE *fptr, class GDSObjects *Objects, char *Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer);
4.19
4.20 };
4.21
5.1 --- a/gds2info/gdsparse_info.cpp Mon Jun 29 21:39:56 2009 +0100
5.2 +++ b/gds2info/gdsparse_info.cpp Mon Jun 29 21:46:31 2009 +0100
5.3 @@ -181,7 +181,7 @@
5.4 fprintf(_optr, "global_settings { ambient_light rgb <%.2f,%.2f,%.2f> }\n", _config->GetAmbient(), _config->GetAmbient(), _config->GetAmbient());
5.5
5.6 /* Output layer texture information */
5.7 - struct ProcessLayer *firstlayer;
5.8 + class ProcessLayer *firstlayer;
5.9 while(firstlayer && firstlayer->Next){
5.10 if(firstlayer->Show){
5.11 if(!firstlayer->Metal){
6.1 --- a/gds2ogl/gdsobject_ogl.cpp Mon Jun 29 21:39:56 2009 +0100
6.2 +++ b/gds2ogl/gdsobject_ogl.cpp Mon Jun 29 21:46:31 2009 +0100
6.3 @@ -25,7 +25,7 @@
6.4 float extn_x;
6.5 float extn_y;
6.6 Point3D points[8];
6.7 - struct ProcessLayer *layer;
6.8 + class ProcessLayer *layer;
6.9 class GDSPath *path;
6.10
6.11 if(!PathItems.empty() || !PolygonItems.empty()){
7.1 --- a/gdsoglviewer/gdsobject_ogl.cpp Mon Jun 29 21:39:56 2009 +0100
7.2 +++ b/gdsoglviewer/gdsobject_ogl.cpp Mon Jun 29 21:46:31 2009 +0100
7.3 @@ -62,7 +62,7 @@
7.4 float extn_x;
7.5 float extn_y;
7.6 Point3D points[8];
7.7 - struct ProcessLayer *layer;
7.8 + class ProcessLayer *layer;
7.9 class GDSPath *path;
7.10
7.11 if(!m_paths.empty()){
7.12 @@ -270,7 +270,7 @@
7.13 }
7.14 }
7.15
7.16 -void GDSObject_ogl::OutputOGLSRefs(std::string Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer)
7.17 +void GDSObject_ogl::OutputOGLSRefs(std::string Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer)
7.18 {
7.19 for(unsigned int i = 0; i < m_srefs.size(); i++){
7.20 ASRefElement *sref = m_srefs[i];
7.21 @@ -294,7 +294,7 @@
7.22 }
7.23 }
7.24
7.25 -void GDSObject_ogl::OutputOGLARefs(std::string Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer)
7.26 +void GDSObject_ogl::OutputOGLARefs(std::string Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer)
7.27 {
7.28 float dx, dy;
7.29
7.30 @@ -362,7 +362,7 @@
7.31 }
7.32 }
7.33
7.34 -void GDSObject_ogl::OutputToFile(FILE *fptr, std::string Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer)
7.35 +void GDSObject_ogl::OutputToFile(FILE *fptr, std::string Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer)
7.36 {
7.37 OutputOGLVertices(offx, offy);
7.38
8.1 --- a/gdsoglviewer/gdsobject_ogl.h Mon Jun 29 21:39:56 2009 +0100
8.2 +++ b/gdsoglviewer/gdsobject_ogl.h Mon Jun 29 21:46:31 2009 +0100
8.3 @@ -31,10 +31,10 @@
8.4 GDSObject_ogl(std::string Name);
8.5 ~GDSObject_ogl();
8.6
8.7 - virtual void OutputToFile(FILE *fptr, std::string Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer);
8.8 + virtual void OutputToFile(FILE *fptr, std::string Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer);
8.9 void OutputOGLVertices(float offx, float offy);
8.10 - void OutputOGLSRefs(std::string Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer);
8.11 - void OutputOGLARefs(std::string Font, float offx, float offy, long *objectid, struct ProcessLayer *firstlayer);
8.12 + void OutputOGLSRefs(std::string Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer);
8.13 + void OutputOGLARefs(std::string Font, float offx, float offy, long *objectid, class ProcessLayer *firstlayer);
8.14
8.15 };
8.16