Changeset 13041 for OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osg/StateSet.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/osgWrappers/deprecated-dotosg/osg/StateSet.cpp (modified) (20 diffs)

OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osg/StateSet.cpp

@@ -85 +85 @@
 
     if (!first_time) return;
-    
+
     ADD_NAME("GL_ALPHA_TEST",GL_ALPHA_TEST)
     ADD_NAME("GL_BLEND",GL_BLEND)
@@ -101 +101 @@
     ADD_NAME("GL_NORMALIZE",GL_NORMALIZE);
     ADD_NAME("GL_RESCALE_NORMAL",GL_RESCALE_NORMAL);
-    
+
     ADD_NAME("GL_TEXTURE_1D",GL_TEXTURE_1D)
     ADD_NAME("GL_TEXTURE_2D",GL_TEXTURE_2D)
     ADD_NAME("GL_TEXTURE_3D",GL_TEXTURE_3D)
-    
+
     ADD_NAME("GL_TEXTURE_CUBE_MAP",GL_TEXTURE_CUBE_MAP);
     ADD_NAME("GL_TEXTURE_RECTANGLE",GL_TEXTURE_RECTANGLE);
-    
+
     ADD_NAME("GL_TEXTURE_GEN_Q",GL_TEXTURE_GEN_Q)
     ADD_NAME("GL_TEXTURE_GEN_R",GL_TEXTURE_GEN_R)
     ADD_NAME("GL_TEXTURE_GEN_S",GL_TEXTURE_GEN_S)
     ADD_NAME("GL_TEXTURE_GEN_T",GL_TEXTURE_GEN_T)
-    
+
     ADD_NAME("GL_STENCIL_TEST",GL_STENCIL_TEST)
-    
+
     ADD_NAME("GL_CLIP_PLANE0",GL_CLIP_PLANE0);
     ADD_NAME("GL_CLIP_PLANE1",GL_CLIP_PLANE1);
@@ -138 +138 @@
     ADD_NAME("GL_VERTEX_PROGRAM_POINT_SIZE", GL_VERTEX_PROGRAM_POINT_SIZE)
     ADD_NAME("GL_VERTEX_PROGRAM_TWO_SIDE", GL_VERTEX_PROGRAM_TWO_SIDE)
-    
+
     s_TextureGLModeSet.insert(GL_TEXTURE_1D);
     s_TextureGLModeSet.insert(GL_TEXTURE_2D);
     s_TextureGLModeSet.insert(GL_TEXTURE_3D);
-    
+
     s_TextureGLModeSet.insert(GL_TEXTURE_CUBE_MAP);
     s_TextureGLModeSet.insert(GL_TEXTURE_RECTANGLE);
-    
+
     s_TextureGLModeSet.insert(GL_TEXTURE_GEN_Q);
     s_TextureGLModeSet.insert(GL_TEXTURE_GEN_R);
     s_TextureGLModeSet.insert(GL_TEXTURE_GEN_S);
     s_TextureGLModeSet.insert(GL_TEXTURE_GEN_T);
-    
+
 
 //     for(GLNameToGLModeMap::iterator itr=s_GLNameToGLModeMap.begin();
@@ -158 +158 @@
 //         cout << "Name ["<<itr->first<<","<<itr->second<<"]"<< std::endl;
 //     }
-    
+
     first_time = false;
 }
@@ -278 +278 @@
             statset.setAttribute(attribute);
         }
-        
-        if (attribute->getType()==StateAttribute::TEXGEN) 
+
+        if (attribute->getType()==StateAttribute::TEXGEN)
             statset.setAssociatedModes(attribute,texgening);
-            
+
         iteratorAdvanced = true;
     }
@@ -296 +296 @@
 
     initGLNames();
-    
-    // read the rendering hint value.    
+
+    // read the rendering hint value.
     if (fr[0].matchWord("rendering_hint"))
     {
@@ -350 +350 @@
         setRenderBinDetails=true;
         binName = fr[1].getStr();
-        
+
         fr+=2;
         iteratorAdvanced = true;
@@ -395 +395 @@
                 int mode;
                 fr[0].getInt(mode);
-                
+
                 if (s_TextureGLModeSet.find(mode)!=s_TextureGLModeSet.end())
                 {
@@ -433 +433 @@
                 }
             }
-        } 
+        }
     }
 
@@ -460 +460 @@
         iteratorAdvanced = true;
     }
-    
+
     while(fr.matchSequence("textureUnit %i {"))
     {
@@ -468 +468 @@
         fr[1].getUInt(unit);
         fr+=3;
-        
+
         while (!fr.eof() && fr[0].getNoNestedBrackets()>entry)
         {
             bool localIteratorAdvanced = false;
-            
+
             bool readingMode = true;
             StateAttribute::GLModeValue value;
@@ -505 +505 @@
                         }
                     }
-                } 
+                }
             }
-            
+
             StateAttribute* attribute = NULL;
             while((attribute=fr.readStateAttribute())!=NULL)
@@ -514 +514 @@
                 localIteratorAdvanced = true;
             }
-            
+
             if (!localIteratorAdvanced)
                 fr.advanceOverCurrentFieldOrBlock();
         }
-        
+
         // skip over trailing '}'
         ++fr;
-        
-        iteratorAdvanced = true;
-
-    }
-    
-    
-    
+
+        iteratorAdvanced = true;
+
+    }
+
+
+
 
     return iteratorAdvanced;
 }
 
-// visual studio 6.0 doesn't appear to define std::max?!? So do our own here.. 
+// visual studio 6.0 doesn't appear to define std::max?!? So do our own here..
 template<class T>
 T mymax(const T& a,const T& b)
@@ -546 +546 @@
     initGLNames();
 
-    // write the rendering hint value.    
+    // write the rendering hint value.
     fw.indent()<<"rendering_hint ";
     switch(stateset.getRenderingHint())
@@ -552 +552 @@
     case(StateSet::DEFAULT_BIN):
         fw<<"DEFAULT_BIN"<< std::endl;
-        break;    
+        break;
     case(StateSet::OPAQUE_BIN):
         fw<<"OPAQUE_BIN"<< std::endl;
-        break;    
+        break;
     case(StateSet::TRANSPARENT_BIN):
         fw<<"TRANSPARENT_BIN"<< std::endl;
-        break;    
+        break;
     default:
         fw<<stateset.getRenderingHint()<< std::endl;
-        break;    
+        break;
     }
 
@@ -588 +588 @@
          }
     }
-    
+
     const StateSet::UniformList& ul = stateset.getUniformList();
     for(StateSet::UniformList::const_iterator uitr=ul.begin();
@@ -605 +605 @@
     }
 
-    
-    const StateSet::TextureModeList& tml = stateset.getTextureModeList();    
+
+    const StateSet::TextureModeList& tml = stateset.getTextureModeList();
     const StateSet::TextureAttributeList& tal = stateset.getTextureAttributeList();
     unsigned int maxUnit = mymax(tml.size(),tal.size());
@@ -613 +613 @@
         fw.indent()<<"textureUnit "<<unit<<" {"<< std::endl;
         fw.moveIn();
-        
+
         if (unit<tml.size())
         {
@@ -633 +633 @@
             }
         }
-        
+
         if (unit<tal.size())
         {
@@ -644 +644 @@
             }
         }
-        
+
         fw.moveOut();
         fw.indent()<<"}"<< std::endl;
     }
-    
+
     if (stateset.getUpdateCallback())
     {