Added GeometryTechinque to osgTerrain. Added usage of GeometryTechnique into osgterrain example

Added --width and --height command line options to osgdistortion to allow users
to control the window size.

src/osgTerrain/CMakeLists.txt

@@ -12,6 +12,7 @@ SET(LIB_PUBLIC_HEADERS
 	${HEADER_PATH}/Layer
 	${HEADER_PATH}/TerrainNode
 	${HEADER_PATH}/TerrainTechnique
+	${HEADER_PATH}/GeometryTechnique
 	${HEADER_PATH}/Version
 )
 
@@ -23,6 +24,7 @@ ADD_LIBRARY(${LIB_NAME}
 	Locator.cpp
 	TerrainNode.cpp
 	TerrainTechnique.cpp
+	GeometryTechnique.cpp
 	Version.cpp
 )
 

src/osgTerrain/GeometryTechnique.cpp

@@ -0,0 +1,56 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
+*/
+
+#include <osgTerrain/GeometryTechnique>
+
+using namespace osgTerrain;
+
+GeometryTechnique::GeometryTechnique()
+{
+}
+
+GeometryTechnique::GeometryTechnique(const GeometryTechnique& gt,const osg::CopyOp& copyop):
+    TerrainTechnique(gt,copyop)
+{
+}
+
+GeometryTechnique::~GeometryTechnique()
+{
+}
+
+void GeometryTechnique::initialize()
+{
+    osg::notify(osg::NOTICE)<<"Doing initalize"<<std::endl;
+    
+    _geode = new osg::Geode;
+    _geometry = new osg::Geometry;
+    _geode->addDrawable(_geometry.get());
+    
+}
+
+
+void GeometryTechnique::update(osgUtil::UpdateVisitor* nv)
+{
+    osg::notify(osg::NOTICE)<<"Doing update"<<std::endl;
+}
+
+
+void GeometryTechnique::cull(osgUtil::CullVisitor* nv)
+{
+    osg::notify(osg::NOTICE)<<"Doing cull"<<std::endl;
+    
+    if (_geode.valid())
+    {
+        _geode->accept(*nv);
+    }
+}

src/osgTerrain/TerrainNode.cpp

@@ -23,7 +23,9 @@ TerrainNode::TerrainNode()
 
 TerrainNode::TerrainNode(const TerrainNode& terrain,const osg::CopyOp& copyop):
     Group(terrain,copyop),
-    _heightLayer(terrain._heightLayer)
+    _elevationLayer(terrain._elevationLayer),
+    _colorLayer(terrain._colorLayer),
+    _colorTransferFunction(terrain._colorTransferFunction)
 {
     setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+1);
     
@@ -74,20 +76,17 @@ void TerrainNode::setTerrainTechnique(osgTerrain::TerrainTechnique* terrainTechn
 }
 
 
-void TerrainNode::setHeightLayer(osgTerrain::Layer* layer)
+void TerrainNode::setElevationLayer(osgTerrain::Layer* layer)
 {
-    _heightLayer = layer;
+    _elevationLayer = layer;
 }
 
-osgTerrain::Layer* TerrainNode::getHeightLayer()
+void TerrainNode::setColorLayer(osgTerrain::Layer* layer)
 {
-    return _heightLayer.get();
+    _colorLayer = layer;
 }
 
-void TerrainNode::addColorLayer(osgTerrain::Layer* layer)
-{
-}
-
-void TerrainNode::removeColorLayer(osgTerrain::Layer* layer)
+void TerrainNode::setColorTransferFunction(osg::TransferFunction* tf)
 {
+    _colorTransferFunction = tf;
 }

src/osgTerrain/TerrainTechnique.cpp

@@ -29,3 +29,23 @@ TerrainTechnique::TerrainTechnique(const TerrainTechnique& TerrainTechnique,cons
 TerrainTechnique::~TerrainTechnique()
 {
 }
+
+void TerrainTechnique::initialize()
+{
+}
+
+void TerrainTechnique::update(osgUtil::UpdateVisitor* nv)
+{
+}
+
+void TerrainTechnique::cull(osgUtil::CullVisitor* nv)
+{
+}
+
+void TerrainTechnique::cleanSceneGraph()
+{
+}
+
+void TerrainTechnique::dirty()
+{
+}