Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/txp/TXPParser.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/txp/TXPParser.cpp (modified) (49 diffs)

OpenSceneGraph/trunk/src/osgPlugins/txp/TXPParser.cpp

@@ -39 +39 @@
 public:
     LayerGroup() : osg::Group() {}
-    
+
     LayerGroup(const LayerGroup& gg,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY):
         osg::Group(gg, copyop)
     {};
-    
+
     META_Node(txp, LayerGroup);
 protected:
@@ -100 +100 @@
 
     _childRefCB = dynamic_cast<childRefRead *>(GetCallback(TRPG_CHILDREF));
-    
+
     if (getenv("OSG_TXP_DEFAULT_MAX_ANISOTROPY"))
     {
         _defaultMaxAnisotropy = osg::asciiToFloat(getenv("OSG_TXP_DEFAULT_MAX_ANISOTROPY"));
     }
-    
+
 }
 
@@ -113 +113 @@
 
 osg::Group *TXPParser::parseScene(
-    trpgReadBuffer &buf, 
+    trpgReadBuffer &buf,
     std::map<int,osg::ref_ptr<osg::StateSet> > &materials,
     std::map<int,osg::ref_ptr<osg::Node> > &models,
@@ -159 +159 @@
 
        //modified by Brad Anderegg May-27-08
-       //running the optimizer on the terrain fixes some major preformance issues, unfortunately the texture atlas builder seems to get messed up 
+       //running the optimizer on the terrain fixes some major preformance issues, unfortunately the texture atlas builder seems to get messed up
        //on some of the textures (usually around buildings) and the tri stripper seems to occasionally crash and also mess up the indices on certain buildings.
        osgUtil::Optimizer opt;
@@ -232 +232 @@
         _currentTop = _currentNode->asGroup();
     }
-    
+
     return true;
 }
@@ -275 +275 @@
 
 DeferredLightAttribute& TXPParser::getLightAttribute(int ix)
-{ 
-    return _archive->getLightAttribute(ix); 
+{
+    return _archive->getLightAttribute(ix);
 }
 
@@ -343 +343 @@
             hints
         );
-    
+
     if (lod==0)
     {
@@ -403 +403 @@
         {
             osg::StateSet* osg_state_set = new osg::StateSet;
-            
+
             trpgLocalMaterial locmat;
             tile_head->GetLocalMaterial(i,locmat);
-            
+
             const trpgMaterial* mat = 0;
             const trpgTexture *tex = 0;
@@ -440 +440 @@
                     break;
                 }
-            
+
                 osg_state_set->setTextureAttribute(texNo,osg_texenv);
 
                 image_helper.GetNthImageInfoForLocalMat(&locmat, texNo, &mat,&tex,size);
-            
+
                 trpgTexture::ImageMode mode;
                 tex->GetImageMode(mode);
                 osg::Texture2D* osg_texture = 0L;
-                if(mode == trpgTexture::Template) 
+                if(mode == trpgTexture::Template)
                     osg_texture = getTemplateTexture(image_helper,&locmat, tex, texNo);
-                else if(mode == trpgTexture::Local) 
+                else if(mode == trpgTexture::Local)
                     osg_texture = getLocalTexture(image_helper,tex);
                 else if(mode == trpgTexture::Global)
@@ -472 +472 @@
                     osg_state_set->setTextureAttributeAndModes(texNo,osg_texture, osg::StateAttribute::ON);
 
-                    int wrap_s, wrap_t;   
+                    int wrap_s, wrap_t;
                     texEnv.GetWrap(wrap_s, wrap_t);
                     osg_texture->setWrap(osg::Texture2D::WRAP_S, wrap_s == trpgTextureEnv::Repeat ? osg::Texture2D::REPEAT: osg::Texture2D::CLAMP_TO_EDGE );
                     osg_texture->setWrap(osg::Texture2D::WRAP_T, wrap_t == trpgTextureEnv::Repeat ? osg::Texture2D::REPEAT: osg::Texture2D::CLAMP_TO_EDGE );
-                    
+
                     // by default is anisotropic filtering.
                     osg_texture->setMaxAnisotropy(_defaultMaxAnisotropy);
@@ -487 +487 @@
 
             osg::Material     *osg_material     = new osg::Material;
-            
+
             float64 alpha;
             mat->GetAlpha(alpha);
-            
+
             trpgColor color;
             mat->GetAmbient(color);
-            osg_material->setAmbient( osg::Material::FRONT_AND_BACK , 
+            osg_material->setAmbient( osg::Material::FRONT_AND_BACK ,
                 osg::Vec4(color.red, color.green, color.blue, alpha));
             mat->GetDiffuse(color);
-            osg_material->setDiffuse(osg::Material::FRONT_AND_BACK , 
+            osg_material->setDiffuse(osg::Material::FRONT_AND_BACK ,
                 osg::Vec4(color.red, color.green, color.blue, alpha));
-            
+
             mat->GetSpecular(color);
-            osg_material->setSpecular(osg::Material::FRONT_AND_BACK , 
+            osg_material->setSpecular(osg::Material::FRONT_AND_BACK ,
                 osg::Vec4(color.red, color.green, color.blue, alpha));
             mat->GetEmission(color);
-            osg_material->setEmission(osg::Material::FRONT_AND_BACK , 
+            osg_material->setEmission(osg::Material::FRONT_AND_BACK ,
                 osg::Vec4(color.red, color.green, color.blue, alpha));
-            
+
             float64 shinines;
             mat->GetShininess(shinines);
             osg_material->setShininess(osg::Material::FRONT_AND_BACK , (float)shinines);
-            
+
             osg_material->setAlpha(osg::Material::FRONT_AND_BACK ,(float)alpha);
             osg_state_set->setAttributeAndModes(osg_material, osg::StateAttribute::ON);
@@ -520 +520 @@
                 osg_state_set->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
             }
-            
-            
+
+
         /* This controls what alpha values in a texture mean.  It can take the values:
            None,Always,Equal,GreaterThanOrEqual,GreaterThan,
@@ -539 +539 @@
             int cullMode;
             mat->GetCullMode(cullMode);
-            
+
             // Culling mode in txp means opposite from osg i.e. Front-> show front face
             if( cullMode != trpgMaterial::FrontAndBack)
@@ -560 +560 @@
 }
 
-bool TXPParser::requestModel(int ix) 
-{
-    return _archive->loadModel(ix); 
+bool TXPParser::requestModel(int ix)
+{
+    return _archive->loadModel(ix);
 }
 
@@ -601 +601 @@
     osgLod->setRange(
         0,
-        _parse->checkAndGetMinRange(minRange), 
+        _parse->checkAndGetMinRange(minRange),
         _parse->checkAndGetMaxRange(maxRange)
     );
 #endif
-    
+
     // Our LODs are binary so we need to add a group under this LOD and attach stuff
     // to that instead of the LOD
@@ -651 +651 @@
         (float)mat[12],(float)mat[13],(float)mat[14],(float)mat[15]
         );
-    
+
     // Note: Array check before you do this
     osg::Node *osg_Model = NULL;
@@ -750 +750 @@
 void* childRefRead::Parse(trpgToken /*tok*/,trpgReadBuffer &buf)
 {
-   
+
    // This object contribute nothing to the scenegraph, except
    // where the children tile should connect.
@@ -805 +805 @@
 
     lpNode->setMaxPixelSize(perfAttr.maxPixelSize);
-    lpNode->setMinPixelSize(perfAttr.minPixelSize);    
+    lpNode->setMinPixelSize(perfAttr.minPixelSize);
 
     trpg3dPoint norm;
@@ -818 +818 @@
         light.GetVertex(i, pt);
 
-        osgSim::LightPoint lp( 
-            true, 
-            osg::Vec3(pt.x,pt.y,pt.z), 
-            osg::Vec4(col.red, col.green,col.blue, 1.0), 
+        osgSim::LightPoint lp(
+            true,
+            osg::Vec3(pt.x,pt.y,pt.z),
+            osg::Vec4(col.red, col.green,col.blue, 1.0),
             inten
         );
@@ -834 +834 @@
                 ref->GetHLobeAngle(tmp);
                 lobeHorz = osg::DegreesToRadians( tmp );
-                
+
                 ref->GetVLobeAngle(tmp);
                 lobeVert = osg::DegreesToRadians( tmp );
-                
+
                 ref->GetLobeRollAngle(tmp);
                 lobeRoll = osg::DegreesToRadians( tmp );
@@ -852 +852 @@
                 ref->GetHLobeAngle(tmp);
                 lobeHorz = osg::DegreesToRadians( tmp );
-                
+
                 ref->GetVLobeAngle(tmp);
                 lobeVert = osg::DegreesToRadians( tmp );
-                
+
                 ref->GetLobeRollAngle(tmp);
                 lobeRoll = osg::DegreesToRadians( tmp );
@@ -865 +865 @@
                 ref->GetBackIntensity(inten);
 
-                osgSim::LightPoint lp2( 
-                    true, 
-                    osg::Vec3(pt.x,pt.y,pt.z), 
-                    osg::Vec4(col.red, col.green,col.blue, 1.0), 
+                osgSim::LightPoint lp2(
+                    true,
+                    osg::Vec3(pt.x,pt.y,pt.z),
+                    osg::Vec4(col.red, col.green,col.blue, 1.0),
                     inten
                 );
@@ -889 +889 @@
 #if 0
 
-    DefferedLightAttribute& dla = _parse->getLightAttribute(attr_index); 
+    DefferedLightAttribute& dla = _parse->getLightAttribute(attr_index);
     osgSim::LightPointNode* node = dla.lightPoint.get();
 
@@ -1001 +1001 @@
             break;
         }
-        
+
     }
     if (lb.length()) os << lb;
@@ -1024 +1024 @@
 
     const trpgLabelPropertyTable *labelPropertyTable = _parse->getArchive()->GetLabelPropertyTable();
-    const trpgLabelProperty *labelProperty = labelPropertyTable ? 
+    const trpgLabelProperty *labelProperty = labelPropertyTable ?
         labelPropertyTable->GetPropertyRef(label.GetProperty()) : 0;
-    
+
     bool addTextGeodeIntoSceneGraph = true;
     if (labelProperty)
@@ -1173 +1173 @@
                     }
                 }
-                
+
                  switch (supStyle->GetType())
                  {
@@ -1195 +1195 @@
                         linesGeom->setColorArray(colors);
                         linesGeom->setColorBinding(osg::Geometry::BIND_OVERALL);
-                        
+
                         osg::Vec3Array* normals = new osg::Vec3Array;
                         normals->push_back(osg::Vec3(0.0f,-1.0f,0.0f));
@@ -1216 +1216 @@
                         {
                             const trpg3dPoint& supPt = (*supports)[i];
-                            
+
                             osg::Vec3 supPos(supPt.x,supPt.y,supPt.z);
                             osg::Vec3 supCenter = (supPos+pos)/2.f;
@@ -1237 +1237 @@
 
                         }
-                        
+
                         _parse->getCurrTop()->addChild(supGeode.get());
                      }
@@ -1245 +1245 @@
                  }
 
-                 
+
              }
          }
@@ -1276 +1276 @@
         _im.invert(_m);
     }
-        
+
     virtual ~TransformFunctor() {}
 
@@ -1289 +1289 @@
             }
         }
-        else 
+        else
         if (type == osg::Drawable::NORMALS)
         {
@@ -1324 +1324 @@
     geom.GetNumVertex(numVert);
     geom.GetNumNormal(numNorm);
-    
+
     // Get vertices
     osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(numVert);
     geom.GetVertices((float *)&(vertices->front()));
-    
+
     // Turn the trpgGeometry into something osg can understand
     osg::ref_ptr<osg::Geometry> geometry;
-    
+
     // Get texture coordinates
     ;
@@ -1343 +1343 @@
         {
             tex_coords[texno] = new osg::Vec2Array(numVert);
-            const float* sourcePtr = &(td->floatData[0]); 
+            const float* sourcePtr = &(td->floatData[0]);
             float* destinationPtr = (float*)&((*tex_coords[texno])[0]);
             for (int i=0 ;i < numVert; ++i)
@@ -1352 +1352 @@
         }
     }
-   
+
     // The normals
     osg::ref_ptr<osg::Vec3Array> normals;
@@ -1360 +1360 @@
         geom.GetNormals((float*)&(normals->front()));
     }
-    
+
     // Set up the primitive type
     switch (primType)
@@ -1423 +1423 @@
         break;
     };
-    
-    
+
+
     // Add it to the current parent group
     osg::Group *top = _parse->getCurrTop();
@@ -1435 +1435 @@
 
        //modifed by Brad Anderegg on May-27-08
-       //using display lists actually increases our framerate by 
+       //using display lists actually increases our framerate by
        //a fair amount, on certain laptops it increased by as much as 1000%
        geometry->setUseDisplayList(true);
@@ -1462 +1462 @@
                 tmp_ss = (*_parse->getMaterials())[matId];
             }
-            if(sset.valid()) 
+            if(sset.valid())
             {
                 if(tmp_ss.valid())
                   {
                     osg::StateAttribute* texenv0 = tmp_ss->getTextureAttribute(0,osg::StateAttribute::TEXENV);
-                    if(texenv0) 
+                    if(texenv0)
                         sset->setTextureAttribute(n_mat,texenv0);
                     osg::StateAttribute* tex0 = tmp_ss->getTextureAttribute(0,osg::StateAttribute::TEXTURE);
-                    if(tex0) 
+                    if(tex0)
                         sset->setTextureAttributeAndModes(n_mat,tex0,osg::StateAttribute::ON);
                     // submitted by a. danklefsen
@@ -1479 +1479 @@
 //                sset->merge(*tmp_ss.get());
             }
-            else 
+            else
                 sset = tmp_ss;
         }
@@ -1501 +1501 @@
             billboard->setAxis(osg::Vec3(0.0f,0.0,1.0f) );
             billboard->setNormal(osg::Vec3(0.0f,-1.0,0.0f));
-            
+
             geometry->setUseDisplayList(true);
 
@@ -1605 +1605 @@
             }
         }
-#endif        
-        
+#endif
+
     }
     else
@@ -1612 +1612 @@
         OSG_WARN<<"Detected potential memory leak in TXPParser.cpp"<<std::endl;
     }
-    
+
     return (void *) 1;
 }
@@ -1701 +1701 @@
     trpgTexture::ImageType type;
     tex->GetImageType(type);
-    
+
     GLenum internalFormat = (GLenum)-1;
     GLenum pixelFormat = (GLenum)-1;
@@ -1707 +1707 @@
 
     check_format(type,depth,internalFormat , pixelFormat , dataType);
-    
+
     if(pixelFormat!=(GLenum)-1)
     {
         osg_texture = new osg::Texture2D();
 
-        // make sure the Texture unref's the Image after apply, when it is no longer needed.                
+        // make sure the Texture unref's the Image after apply, when it is no longer needed.
         osg_texture->setUnRefImageDataAfterApply(true);
 
@@ -1746 +1746 @@
             osg::Image::MipmapDataType mipmaps;
             // number of offsets in osg is one less than num_mipmaps
-            // because it's assumed that first offset iz 0 
+            // because it's assumed that first offset iz 0
             mipmaps.resize(num_mipmaps-1);
             for( int k = 1 ; k < num_mipmaps;k++ )
@@ -1774 +1774 @@
     trpgTexture::ImageType type;
     tex->GetImageType(type);
-    
+
     GLenum internalFormat = (GLenum)-1;
     GLenum pixelFormat = (GLenum)-1;
@@ -1780 +1780 @@
 
     check_format(type,depth,internalFormat , pixelFormat , dataType);
-    
+
     if(pixelFormat!=(GLenum)-1)
     {
         osg_texture = new osg::Texture2D();
 
-        // make sure the Texture unref's the Image after apply, when it is no longer needed.                
+        // make sure the Texture unref's the Image after apply, when it is no longer needed.
         osg_texture->setUnRefImageDataAfterApply(true);
 
@@ -1822 +1822 @@
             osg::Image::MipmapDataType mipmaps;
             // number of offsets in osg is one less than num_mipmaps
-            // because it's assumed that first offset iz 0 
+            // because it's assumed that first offset iz 0
             mipmaps.resize(num_mipmaps-1);
             for( int k = 1 ; k < num_mipmaps;k++ )