Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/dw/ReaderWriterDW.cpp

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgPlugins/dw/ReaderWriterDW.cpp (modified) (30 diffs)

OpenSceneGraph/trunk/src/osgPlugins/dw/ReaderWriterDW.cpp

@@ -9 +9 @@
 // DW Lite is completely free, produces textured 3D models
 // aimed mostly at the architectural world.  Flat polygons are generally produced
-// No ability to produce smooth shading, unfortunately.  
+// No ability to produce smooth shading, unfortunately.
 // But it is the best bangs per buck. (Anything/nothing = infinite value, and this is quite a lot/nothing)
 
@@ -34 +34 @@
 
 #ifndef WIN32
-    #define CALLBACK 
+    #define CALLBACK
 #endif
 
@@ -43 +43 @@
 public:
     typedef enum {Properties,TiledTexture,FullFace, SpotLight,PointLight} mttype;
-    dwmaterial() { type=Properties; 
+    dwmaterial() { type=Properties;
         opacity=1; specular=0; specexp=0; fname="";TextureWidth=1; TextureHeight=1;
         ctx=NULL; tx=NULL; id=0; dstate=NULL;colour[0]=colour[1]=colour[2]=colour[3]=1;
@@ -54 +54 @@
         if (isTextured()) { // shares common textures
             if (!ctx || !tx) { // new texture needed
-                if (fname.length()>0) { 
+                if (fname.length()>0) {
                     ctx=osgDB::readRefImageFile(fname.c_str(),options);
                     if (ctx.valid()) {
@@ -112 +112 @@
         TextureHeight=repy;
     }
-    inline float getRepWid() const { return TextureWidth;} 
+    inline float getRepWid() const { return TextureWidth;}
     inline float getRepHt() const { return TextureHeight;}
     inline int isFullFace() const { return  type==FullFace;}
@@ -121 +121 @@
     inline void setspecexp(float o) { specexp=o;}
     void setType(const char *buff) {
-        if (strncmp(buff,"Tiled_Texture",13)==0) 
+        if (strncmp(buff,"Tiled_Texture",13)==0)
             type=dwmaterial::TiledTexture;
-        else if (strncmp(buff,"Spot_Light",11)==0) 
+        else if (strncmp(buff,"Spot_Light",11)==0)
             type=dwmaterial::SpotLight;
-        else if (strncmp(buff,"Point_Light",11)==0) 
+        else if (strncmp(buff,"Point_Light",11)==0)
             type=dwmaterial::PointLight;
-        else if (strncmp(buff,"Properties",11)==0) 
+        else if (strncmp(buff,"Properties",11)==0)
             type=dwmaterial::Properties;
-        else if (strncmp(buff,"Full_Face_Texture",16)==0) 
+        else if (strncmp(buff,"Full_Face_Texture",16)==0)
             type=dwmaterial::FullFace;
     }
@@ -194 +194 @@
     ~_face() { delete [] idx;}
     void setnv(const int n){ nv=n; idx=new int[n];}
-    void addvtx(const int n){ 
+    void addvtx(const int n){
         if (nset < nv) {
             idx[nset]=n;
@@ -217 +217 @@
         while (i2==i1 && ic<nv-1) {
             ic++;
-            i2=idx[ic]; 
+            i2=idx[ic];
         }
         int i3=idx[ic]; // third, must be non-coincident
         while (ic<nv-1 && (i3==i2 || i3==i1)) {
             ic++;
-            i3=idx[ic]; 
+            i3=idx[ic];
         }
         if(ic>=nv) {
@@ -238 +238 @@
         norm(nrm, s2, side);
     }
-    void settrans(Matrix &mx, const Vec3 nrm, const std::vector<Vec3> verts, const dwmaterial *mat) const { 
+    void settrans(Matrix &mx, const Vec3 nrm, const std::vector<Vec3> verts, const dwmaterial *mat) const {
         // define the matrix perpendcular to normal for mapping textures
-        float wid=mat->getRepWid(); 
+        float wid=mat->getRepWid();
         float ht=mat->getRepHt();
         Vec3 r1, r2,r3; // 3 rows of rotation matrix
@@ -274 +274 @@
             mx(1,j)=r2[j];
             mx(2,j)=r3[j];
-        }        
+        }
         //        mx.postTrans(mx,0.5f,0.5f,0.0f);
         if (mat->isFullFace()) { // set offset such that mx*verts[idx[0]] -> uv=(0,0)
@@ -293 +293 @@
     }
     inline int setnvop(const unsigned short n) { // add a new hole in this face with n vertices
-        _face *oldop=opening; 
-        opening=new _face[nop+1]; 
+        _face *oldop=opening;
+        opening=new _face[nop+1];
         for (int i=0; i<nop; i++) opening[i].move(&oldop[i]);
         delete [] oldop;
@@ -328 +328 @@
         poses.idx=idx[j];
     }
-    void tessellate(const std::vector<Vec3>& verts, const dwmaterial *themat, 
+    void tessellate(const std::vector<Vec3>& verts, const dwmaterial *themat,
           GLUtesselator *ts, _dwobj *dwob, const RefMatrix *tmat) const;
-          
+
     void link(const int idop, const _face *f2, const int idop2,const std::vector<Vec3> verts, const dwmaterial *themat) const; // to join up opposed faces of a hole
     inline const int getidx(int i) const { return idx[i];}
@@ -372 +372 @@
     void End() { // tessellation is done
         int nverts=vertices->size()-nbegin;
-        osg::DrawArrays *drw=NULL;                                
+        osg::DrawArrays *drw=NULL;
             switch (primType) {
             case GL_TRIANGLES: //gset->setPrimType( osg::GeoSet::TRIANGLES );
                 //gset->setNumPrims( nload/3 );
-                drw=new osg::DrawArrays(osg::PrimitiveSet::TRIANGLES,nbegin,nverts);                                
+                drw=new osg::DrawArrays(osg::PrimitiveSet::TRIANGLES,nbegin,nverts);
                 gset->addPrimitiveSet(drw);
                 break;
             case GL_TRIANGLE_STRIP: //gset->setPrimType( osg::GeoSet::TRIANGLE_STRIP );
                 //gset->setPrimLengths( nuprimlengs );
-                drw=new osg::DrawArrays(osg::PrimitiveSet::TRIANGLE_STRIP,nbegin,nverts);                                
+                drw=new osg::DrawArrays(osg::PrimitiveSet::TRIANGLE_STRIP,nbegin,nverts);
                 gset->addPrimitiveSet(drw);
                 break;
             case GL_TRIANGLE_FAN: //gset->setPrimType( osg::GeoSet::TRIANGLE_FAN );
                 //gset->setPrimLengths( nuprimlengs );
-                drw=new osg::DrawArrays(osg::PrimitiveSet::TRIANGLE_FAN,nbegin,nverts);                                
+                drw=new osg::DrawArrays(osg::PrimitiveSet::TRIANGLE_FAN,nbegin,nverts);
                 gset->addPrimitiveSet(drw);
                 break;
             case GL_QUADS: //gset->setPrimType( osg::GeoSet::QUADS );
                 //gset->setNumPrims( nload/4 );
-                drw=new osg::DrawArrays(osg::PrimitiveSet::QUADS,nbegin,nverts);                                
+                drw=new osg::DrawArrays(osg::PrimitiveSet::QUADS,nbegin,nverts);
                 gset->addPrimitiveSet(drw);
                 break;
             case GL_QUAD_STRIP: //gset->setPrimType( osg::GeoSet::QUAD_STRIP );
-                drw=new osg::DrawArrays(osg::PrimitiveSet::QUAD_STRIP,nbegin,nverts);                                
+                drw=new osg::DrawArrays(osg::PrimitiveSet::QUAD_STRIP,nbegin,nverts);
                 gset->addPrimitiveSet(drw);
                 break;
             case GL_POLYGON: //gset->setPrimType( osg::GeoSet::POLYGON );
-                drw=new osg::DrawArrays(osg::PrimitiveSet::POLYGON,nbegin,nverts);                                
+                drw=new osg::DrawArrays(osg::PrimitiveSet::POLYGON,nbegin,nverts);
                 gset->addPrimitiveSet(drw);
                 break;
@@ -408 +408 @@
         nbegin=vertices->size();
     }
-    void combine( GLdouble coords[3], avertex *d[4], 
+    void combine( GLdouble coords[3], avertex *d[4],
         GLfloat w[4], avertex **dataOut , _dwobj *dwob);
-    void linkholes(const std::vector<Vec3> verts, const dwmaterial *themat, 
-        const _face *f1, const _face *f2, 
+    void linkholes(const std::vector<Vec3> verts, const dwmaterial *themat,
+        const _face *f1, const _face *f2,
         const int ipr[2], const int nv) {
         int gsidx[4];
@@ -418 +418 @@
         gsidx[2]=f2->getidx(nv-ipr[0]-1); // vertex position index
         gsidx[3]=f2->getidx(nv-ipr[1]-1); // vertex position index
-        
+
         Matrix mx; // texture matrix transform to plane
         Vec3 s1,s2;
@@ -435 +435 @@
             normals->push_back(nrm);
         }
-        osg::DrawArrays *drw=NULL;                                
+        osg::DrawArrays *drw=NULL;
         drw=new osg::DrawArrays(osg::PrimitiveSet::QUADS,n1,4);
         gset->addPrimitiveSet(drw);
     }
-    void tessellate(_face &fc, const std::vector<Vec3>& verts, const dwmaterial *themat,GLUtesselator* ts, _dwobj *dwob) 
+    void tessellate(_face &fc, const std::vector<Vec3>& verts, const dwmaterial *themat,GLUtesselator* ts, _dwobj *dwob)
     {    // generates a set of primitives all of one type (eg tris, qstrip trifan...)
         fc.setNBegin(vertices->size());
@@ -480 +480 @@
 }
 void CALLBACK myVertex(void *pv)
-{// tess vertex call back with texture coord == void *pv1, 
+{// tess vertex call back with texture coord == void *pv1,
         prd->addv((avertex *)pv);
 }
-void CALLBACK combineCallback( GLdouble coords[3], avertex *d[4], 
-                         GLfloat w[4], avertex **dataOut , _dwobj *dwob) 
-{ 
+void CALLBACK combineCallback( GLdouble coords[3], avertex *d[4],
+                         GLfloat w[4], avertex **dataOut , _dwobj *dwob)
+{
     // dwob needed if there is a combine callback to add the new vertex to group
     prd->combine(coords, d, w, dataOut,dwob);
@@ -523 +523 @@
     _dwobj() { nverts=nfaces=0; openings=NULL;faces=NULL; tmat=NULL; edges=NULL;
         nopens=nfaceverts=0; fc1=fc2=NULL; colour[0]=colour[1]=colour[2]=colour[3]=1;
-    } 
+    }
     ~_dwobj() {/*delete verts; delete faces;delete openings;*/
         delete [] fc1;delete [] fc2;
-    } 
+    }
     int readOpenings(FILE *fp, const int nexpected)
     { // read up to nexpected openings, each opening may have a number of vertices
@@ -668 +668 @@
 };
 
-void _face::tessellate(const std::vector<Vec3>& verts, const dwmaterial *themat, 
+void _face::tessellate(const std::vector<Vec3>& verts, const dwmaterial *themat,
                GLUtesselator *ts, _dwobj *dwob, const RefMatrix * /*tmat*/) const {
     int nvall=getallverts();
@@ -676 +676 @@
     settrans(mx, nrm, verts,themat);
     dwob->setmx(new RefMatrix(mx)); // may be used by combine callback to define txcoord
-    gluTessBeginPolygon(ts, dwob); 
+    gluTessBeginPolygon(ts, dwob);
     gluTessBeginContour(ts); /**/
     for (int j=0; j<nv; j++) {
@@ -687 +687 @@
         nused++;
     }
-    gluTessEndContour(ts); 
+    gluTessEndContour(ts);
     for (int k=0; k<nop; k++) { // now holes in the face
         gluTessBeginContour(ts);
@@ -706 +706 @@
     delete [] poses;
 }
-void prims::combine( GLdouble coords[3], avertex *d[4], 
+void prims::combine( GLdouble coords[3], avertex *d[4],
                     GLfloat w[4], avertex **dataOut , _dwobj *dwob) {
-    avertex *newv = new avertex(); // (avertex *)calloc(1, sizeof(avertex)); 
-    newv->pos[0] = coords[0]; 
-    newv->pos[1] = coords[1]; 
+    avertex *newv = new avertex(); // (avertex *)calloc(1, sizeof(avertex));
+    newv->pos[0] = coords[0];
+    newv->pos[1] = coords[1];
     newv->pos[2] = coords[2];
     newv->uv[0] = newv->uv[1] =0;
@@ -750 +750 @@
                 nfnvf+=faces[i].getallverts(); // get total vertices in object, defines dimensions of NEW arrays
             }
-            
-            
+
+
             GLUtesselator* ts=gluNewTess();
-            gluTessCallback(ts, GLU_TESS_BEGIN, (GLU_TESS_CALLBACK) myFaceBegin);  
-            gluTessCallback(ts, GLU_TESS_VERTEX, (GLU_TESS_CALLBACK) myVertex);  
-            gluTessCallback(ts, GLU_TESS_END, (GLU_TESS_CALLBACK) myFaceEnd);  
-            gluTessCallback(ts, GLU_TESS_ERROR, (GLU_TESS_CALLBACK) error);  
+            gluTessCallback(ts, GLU_TESS_BEGIN, (GLU_TESS_CALLBACK) myFaceBegin);
+            gluTessCallback(ts, GLU_TESS_VERTEX, (GLU_TESS_CALLBACK) myVertex);
+            gluTessCallback(ts, GLU_TESS_END, (GLU_TESS_CALLBACK) myFaceEnd);
+            gluTessCallback(ts, GLU_TESS_ERROR, (GLU_TESS_CALLBACK) error);
             gluTessCallback(ts, GLU_TESS_COMBINE_DATA, (GLU_TESS_CALLBACK) combineCallback);
             //  for (int nvf=0; nvf<6; nvf++) { // for each length of face
@@ -765 +765 @@
             osg::Geometry *gset = new osg::Geometry;
             prd->setGeometry(gset);
-            StateSet *dstate=themat->make(options);            
+            StateSet *dstate=themat->make(options);
             gset->setStateSet( dstate );
             grp->addChild( geode ); // add to the world outside
             geode->addDrawable(gset);
-            
+
             // each face adds a primitive to the geometry, after it is tessellated
             for (i=0; i<nfaces; i++) { // for each face, collect up
@@ -791 +791 @@
 {
     public:
-    
+
         ReaderWriterDW()
         {
             supportsExtension("dw","Designer Workbench model format");
         }
-    
+
         virtual const char* className() const { return "Design Workshop Database Reader"; }
 
@@ -833 +833 @@
             Group *grp = new Group;
 
-            // code for setting up the database path so that internally referenced file are searched for on relative paths. 
+            // code for setting up the database path so that internally referenced file are searched for on relative paths.
             osg::ref_ptr<Options> local_opt = options ? static_cast<Options*>(options->clone(osg::CopyOp::SHALLOW_COPY)) : new Options;
             local_opt->setDatabasePath(osgDB::getFilePath(fileName));
@@ -852 +852 @@
                         int id=atoi(buff);
                         matpalet[nmat].setid(id); // current material to be modified
-                        
+
                     } else if (strncmp(buff, "Phase:",6)==0) {
                     } else if (strncmp(buff, "CurrPhase:",10)==0) {
@@ -890 +890 @@
                         matpalet[nmat].setfname(buff);
                     } else if( strncmp(buff,"Extrusion:",10)==0 ||
-                        strncmp(buff,"Cube:",5)==0 || 
-                        strncmp(buff,"Polyline:",9)==0 || 
+                        strncmp(buff,"Cube:",5)==0 ||
+                        strncmp(buff,"Polyline:",9)==0 ||
                         strncmp(buff,"Polyhedron:",11)==0) {
                         rdg=OBJECT;
@@ -899 +899 @@
                         int mt=atoi(buff+4);
                         for (int j=0; j<nmn; j++) {
-                            if (matpalet[j].getid() == mt) 
+                            if (matpalet[j].getid() == mt)
                                 obj.setmat(&(matpalet[j]));
                         }
@@ -937 +937 @@
                             &mx[1][0], &mx[1][1], &mx[1][2],
                             &mx[2][0], &mx[2][1], &mx[2][2]);
-                        
+
                         obj.settmat(Matrix(mx[0][0],mx[0][1],mx[0][2],0.0,
                                            mx[1][0],mx[1][1],mx[1][2],0.0,