Changeset 12885 for OpenSceneGraph/trunk/examples/osgforest/osgforest.cpp

Timestamp:

11/18/11 09:15:36 (19 months ago)

Author:

robert

Message:

Fixed indentation

Files:

• OpenSceneGraph/trunk/examples/osgforest/osgforest.cpp (modified) (54 diffs)

OpenSceneGraph/trunk/examples/osgforest/osgforest.cpp

@@ -86 +86 @@
         unsigned int    _type;
     };
-    
+
     typedef std::vector< osg::ref_ptr<Tree> > TreeList;
-    
+
     class Cell : public osg::Referenced
     {
@@ -96 +96 @@
         Cell():_parent(0) {}
         Cell(osg::BoundingBox& bb):_parent(0), _bb(bb) {}
-        
+
         void addCell(Cell* cell) { cell->_parent=this; _cells.push_back(cell); }
 
         void addTree(Tree* tree) { _trees.push_back(tree); }
-        
+
         void addTrees(const TreeList& trees) { _trees.insert(_trees.end(),trees.begin(),trees.end()); }
-        
+
         void computeBound();
-        
+
         bool contains(const osg::Vec3& position) const { return _bb.contains(position); }
-        
+
         bool divide(unsigned int maxNumTreesPerCell=10);
-        
+
         bool divide(bool xAxis, bool yAxis, bool zAxis);
-        
+
         void bin();
 
@@ -118 +118 @@
         CellList            _cells;
         TreeList            _trees;
-        
+
     };
 
@@ -140 +140 @@
 
     osg::Node* createShaderGraph(Cell* cell,osg::StateSet* stateset);
-    
+
     osg::Node* createHUDWithText(const std::string& text);
 
     osg::Node* createScene(unsigned int numTreesToCreates);
-    
+
     void advanceToNextTechnique(int delta=1)
     {
@@ -157 +157 @@
         }
     }
-    
+
     osg::ref_ptr<osg::Switch>   _techniqueSwitch;
     int                         _currentTechnique;
-    
+
 
 };
@@ -170 +170 @@
 
     TechniqueEventHandler(ForestTechniqueManager* ttm=0) { _ForestTechniqueManager = ttm; }
-    
+
     META_Object(osgforestApp,TechniqueEventHandler);
 
     virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter&, osg::Object*, osg::NodeVisitor*);
-    
+
     virtual void getUsage(osg::ApplicationUsage& usage) const;
 
@@ -180 +180 @@
 
     ~TechniqueEventHandler() {}
-    
+
     TechniqueEventHandler(const TechniqueEventHandler&,const osg::CopyOp&) {}
-    
+
     osg::ref_ptr<ForestTechniqueManager> _ForestTechniqueManager;
 
-        
+
 };
 
@@ -195 +195 @@
         {
             if (ea.getKey()=='n' ||
-                ea.getKey()==osgGA::GUIEventAdapter::KEY_Right || 
+                ea.getKey()==osgGA::GUIEventAdapter::KEY_Right ||
                 ea.getKey()==osgGA::GUIEventAdapter::KEY_KP_Right)
             {
@@ -202 +202 @@
             }
             else if (ea.getKey()=='p' ||
-                     ea.getKey()==osgGA::GUIEventAdapter::KEY_Left || 
-                     ea.getKey()==osgGA::GUIEventAdapter::KEY_KP_Left)
+                    ea.getKey()==osgGA::GUIEventAdapter::KEY_Left ||
+                    ea.getKey()==osgGA::GUIEventAdapter::KEY_KP_Left)
             {
                 _ForestTechniqueManager->advanceToNextTechnique(-1);
@@ -261 +261 @@
         }
         return true;
-   }
-   else
-   {
-        return false;
-   }
+    }
+    else
+    {
+            return false;
+    }
 }
 
@@ -330 +330 @@
 
 void ForestTechniqueManager::Cell::bin()
-{   
+{
     // put trees in appropriate cells.
     TreeList treesNotAssigned;
@@ -388 +388 @@
         stateset->setTextureAttributeAndModes(0,texture,osg::StateAttribute::ON);
     }
-    
+
     geode->setStateSet( stateset );
-    
+
     unsigned int numColumns = 38;
     unsigned int numRows = 39;
@@ -407 +407 @@
         }
     }
-    
+
     float scale_z = size.z()/(max_z-min_z);
 
@@ -428 +428 @@
             }
         }
-        
+
         geode->addDrawable(new osg::ShapeDrawable(grid));
     }
@@ -434 +434 @@
     {
         osg::Geometry* geometry = new osg::Geometry;
-        
+
         osg::Vec3Array& v = *(new osg::Vec3Array(numColumns*numRows));
         osg::Vec2Array& t = *(new osg::Vec2Array(numColumns*numRows));
         osg::Vec4ubArray& color = *(new osg::Vec4ubArray(1));
-        
+
         color[0].set(255,255,255,255);
 
         float rowCoordDelta = size.y()/(float)(numRows-1);
         float columnCoordDelta = size.x()/(float)(numColumns-1);
-        
+
         float rowTexDelta = 1.0f/(float)(numRows-1);
         float columnTexDelta = 1.0f/(float)(numColumns-1);
@@ -465 +465 @@
             tex.y() += rowTexDelta;
         }
-        
+
         geometry->setVertexArray(&v);
         geometry->setColorArray(&color);
         geometry->setColorBinding(osg::Geometry::BIND_OVERALL);
         geometry->setTexCoordArray(0,&t);
-        
+
         for(r=0;r<numRows-1;++r)
         {
@@ -482 +482 @@
             }
         }
-        
+
         geode->addDrawable(geometry);
-        
+
         osgUtil::SmoothingVisitor sv;
         sv.smooth(*geometry);
     }
-    
+
     return geode;
 }
@@ -497 +497 @@
     float max_TreeHeight = sqrtf(size.length2()/(float)numTreesToCreate);
     float max_TreeWidth = max_TreeHeight*0.5f;
-    
+
     float min_TreeHeight = max_TreeHeight*0.3f;
     float min_TreeWidth = min_TreeHeight*0.5f;
@@ -512 +512 @@
         tree->_height = random(min_TreeHeight,max_TreeHeight);
         tree->_type = 0;
-        
+
         if (terrain)
         {
-            osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector = 
+            osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector =
                 new osgUtil::LineSegmentIntersector(tree->_position,tree->_position+osg::Vec3(0.0f,0.0f,size.z()));
 
             osgUtil::IntersectionVisitor iv(intersector.get());
-            
+
             terrain->accept(iv);
 
@@ -534 +534 @@
             }
         }
-        
+
         trees.push_back(tree);
     }
@@ -578 +578 @@
     osg::Vec2Array& t = *(new osg::Vec2Array(8));
     osg::Vec4ubArray& c = *(new osg::Vec4ubArray(1));
-    
+
     float rotation = random(0.0f,osg::PI/2.0f);
     float sw = sinf(rotation)*w*0.5f;
@@ -623 +623 @@
     bool needGroup = !(cell->_cells.empty());
     bool needBillboard = !(cell->_trees.empty());
-    
+
     osg::Billboard* billboard = 0;
     osg::Group* group = 0;
-    
+
     if (needBillboard)
     {
@@ -636 +636 @@
         {
             Tree& tree = **itr;
-            billboard->addDrawable(createSprite(tree._width,tree._height,tree._color),tree._position);    
-        }
-    }
-    
+            billboard->addDrawable(createSprite(tree._width,tree._height,tree._color),tree._position);
+        }
+    }
+
     if (needGroup)
     {
@@ -649 +649 @@
             group->addChild(createBillboardGraph(itr->get(),stateset));
         }
-        
+
         if (billboard) group->addChild(billboard);
-        
+
     }
     if (group) return group;
@@ -661 +661 @@
     bool needGroup = !(cell->_cells.empty());
     bool needTrees = !(cell->_trees.empty());
-    
+
     osg::Geode* geode = 0;
     osg::Group* group = 0;
-    
+
     if (needTrees)
     {
         geode = new osg::Geode;
         geode->setStateSet(stateset);
-        
+
         for(TreeList::iterator itr=cell->_trees.begin();
             itr!=cell->_trees.end();
@@ -678 +678 @@
         }
     }
-    
+
     if (needGroup)
     {
@@ -688 +688 @@
             group->addChild(createXGraph(itr->get(),stateset));
         }
-        
+
         if (geode) group->addChild(geode);
-        
+
     }
     if (group) return group;
@@ -700 +700 @@
     bool needGroup = !(cell->_cells.empty());
     bool needTrees = !(cell->_trees.empty());
-    
+
     osg::Group* transform_group = 0;
     osg::Group* group = 0;
-    
+
     if (needTrees)
     {
         transform_group = new osg::Group;
-        
+
         osg::Geometry* geometry = createOrthogonalQuads(osg::Vec3(0.0f,0.0f,0.0f),1.0f,1.0f,osg::Vec4ub(255,255,255,255));
-        
+
         for(TreeList::iterator itr=cell->_trees.begin();
             itr!=cell->_trees.end();
@@ -717 +717 @@
             osg::MatrixTransform* transform = new osg::MatrixTransform;
             transform->setMatrix(osg::Matrix::scale(tree._width,tree._width,tree._height)*osg::Matrix::translate(tree._position));
-    
+
             osg::Geode* geode = new osg::Geode;
             geode->setStateSet(stateset);
@@ -725 +725 @@
         }
     }
-    
+
     if (needGroup)
     {
@@ -735 +735 @@
             group->addChild(createTransformGraph(itr->get(),stateset));
         }
-        
+
         if (transform_group) group->addChild(transform_group);
-        
+
     }
     if (group) return group;
@@ -748 +748 @@
     osg::Vec3Array& v = *(new osg::Vec3Array(8));
     osg::Vec2Array& t = *(new osg::Vec2Array(8));
-    
+
     float rotation = random(0.0f,osg::PI/2.0f);
     float sw = sinf(rotation)*w*0.5f;
@@ -796 +796 @@
 
         typedef std::vector<osg::Vec4> PositionSizeList;
-        
+
         virtual void drawImplementation(osg::RenderInfo& renderInfo) const
         {
@@ -823 +823 @@
             return bb;
         }
-        
+
         void setGeometry(osg::Geometry* geometry)
         {
             _geometry = geometry;
         }
-        
+
         void addTree(ForestTechniqueManager::Tree& tree)
         {
             _trees.push_back(osg::Vec4(tree._position.x(), tree._position.y(), tree._position.z(), tree._height));
         }
-        
+
         osg::ref_ptr<osg::Geometry> _geometry;
 
@@ -839 +839 @@
 
     protected:
-    
+
         virtual ~ShaderGeometry() {}
-        
+
 };
 
@@ -857 +857 @@
     bool needGroup = !(cell->_cells.empty());
     bool needTrees = !(cell->_trees.empty());
-    
+
     osg::Geode* geode = 0;
     osg::Group* group = 0;
-    
+
     if (needTrees)
     {
         geode = new osg::Geode;
-        
+
         ShaderGeometry* shader_geometry = new ShaderGeometry;
         shader_geometry->setGeometry(shared_geometry);
-        
-        
+
+
         for(TreeList::iterator itr=cell->_trees.begin();
             itr!=cell->_trees.end();
@@ -881 +881 @@
         geode->addDrawable(shader_geometry);
     }
-    
+
     if (needGroup)
     {
@@ -891 +891 @@
             group->addChild(createShaderGraph(itr->get(),stateset));
         }
-        
+
         if (geode) group->addChild(geode);
-        
+
     }
     if (group) return group;
@@ -902 +902 @@
 {
     osg::Geode* geode = new osg::Geode();
-    
+
     std::string timesFont("fonts/arial.ttf");
 
@@ -909 +909 @@
     stateset->setMode(GL_LIGHTING,osg::StateAttribute::OFF);
 
-    // or disable depth test, and make sure that the hud is drawn after everything 
+    // or disable depth test, and make sure that the hud is drawn after everything
     // else so that it always appears ontop.
     stateset->setMode(GL_DEPTH_TEST,osg::StateAttribute::OFF);
@@ -924 +924 @@
         text->setPosition(position);
         text->setText(str);
-        
+
         position += delta;
-    }    
-
-   
+    }
+
+
     // create the hud.
     osg::MatrixTransform* modelview_abs = new osg::MatrixTransform;
@@ -950 +950 @@
     osg::ref_ptr<osg::Node> terrain = createTerrain(origin,size);
     std::cout<<"done."<<std::endl;
-    
+
     std::cout<<"Creating tree locations...";std::cout.flush();
     TreeList trees;
     createTreeList(terrain.get(),origin,size,numTreesToCreates,trees);
     std::cout<<"done."<<std::endl;
-    
+
     std::cout<<"Creating cell subdivision...";
     osg::ref_ptr<Cell> cell = new Cell;
     cell->addTrees(trees);
     cell->divide();
-     std::cout<<"done."<<std::endl;
-   
-    
+    std::cout<<"done."<<std::endl;
+
+
     osg::Texture2D *tex = new osg::Texture2D;
     tex->setWrap( osg::Texture2D::WRAP_S, osg::Texture2D::CLAMP );
@@ -969 +969 @@
 
     osg::StateSet *dstate = new osg::StateSet;
-    {    
+    {
         dstate->setTextureAttributeAndModes(0, tex, osg::StateAttribute::ON );
 
@@ -984 +984 @@
         dstate->setRenderingHint( osg::StateSet::TRANSPARENT_BIN );
     }
-    
+
 
     _techniqueSwitch = new osg::Switch;
@@ -996 +996 @@
         std::cout<<"done."<<std::endl;
     }
-    
+
     {
         std::cout<<"Creating double quad based forest...";
@@ -1026 +1026 @@
             vp_oss <<
                 "!!ARBvp1.0\n"
-                
+
                 "ATTRIB vpos = vertex.position;\n"
                 "ATTRIB vcol = vertex.color;\n"
@@ -1035 +1035 @@
 
                 "TEMP position;\n"
-                
-                 // vec3 position = gl_Vertex.xyz * gl_Color.w + gl_Color.xyz;
+
+                // vec3 position = gl_Vertex.xyz * gl_Color.w + gl_Color.xyz;
                 "MAD position, vpos, vcol.w, vcol;\n"
 
@@ -1049 +1049 @@
                 "MOV result.color.front.primary, one;\n"
 
-                 // texcoord = gl_MultiTexCoord0.st;
+                // texcoord = gl_MultiTexCoord0.st;
                 "MOV result.texcoord, tc;\n"
                 "END\n";
@@ -1088 +1088 @@
 #if 1
             // use inline shaders
-            
+
             ///////////////////////////////////////////////////////////////////
             // vertex shader using just Vec4 coefficients
-            char vertexShaderSource[] = 
+            char vertexShaderSource[] =
                 "varying vec2 texcoord;\n"
                 "\n"
@@ -1105 +1105 @@
             // fragment shader
             //
-            char fragmentShaderSource[] = 
+            char fragmentShaderSource[] =
                 "uniform sampler2D baseTexture; \n"
                 "varying vec2 texcoord; \n"
@@ -1119 +1119 @@
             osg::Shader* fragment_shader = new osg::Shader(osg::Shader::FRAGMENT, fragmentShaderSource);
             program->addShader(fragment_shader);
-            
+
 #else
 
@@ -1140 +1140 @@
     _currentTechnique = 0;
     _techniqueSwitch->setSingleChildOn(_currentTechnique);
-    
+
 
     osg::Group* scene = new osg::Group;
-    
+
     scene->addChild(terrain.get());
     scene->addChild(_techniqueSwitch.get());
@@ -1155 +1155 @@
     // use an ArgumentParser object to manage the program arguments.
     osg::ArgumentParser arguments(&argc,argv);
-   
+
     // construct the viewer.
     osgViewer::Viewer viewer(arguments);
@@ -1161 +1161 @@
     float numTreesToCreates = 10000;
     arguments.read("--trees",numTreesToCreates);
-    
+
     osg::ref_ptr<ForestTechniqueManager> ttm = new ForestTechniqueManager;
-    
+
     // add the stats handler
     viewer.addEventHandler(new osgViewer::StatsHandler);