Renamed ShaderTerrain to DisplacementMappingTechnique and moved it from the osgterrain example testbed into the osgTerrain NodeKit

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14534 16af8721-9629-0410-8352-f15c8da7e697

src/osgTerrain/CMakeLists.txt

@@ -7,6 +7,7 @@ ENDIF()
 SET(LIB_NAME osgTerrain)
 SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(TARGET_H
+    ${HEADER_PATH}/DisplacementMappingTechnique
     ${HEADER_PATH}/Export
     ${HEADER_PATH}/Locator
     ${HEADER_PATH}/Layer
@@ -21,6 +22,7 @@ SET(TARGET_H
 
 # FIXME: For OS X, need flag for Framework or dylib
 SET(TARGET_SRC
+    DisplacementMappingTechnique.cpp
     Layer.cpp
     Locator.cpp
     TerrainTile.cpp

src/osgTerrain/DisplacementMappingTechnique.cpp

@@ -0,0 +1,114 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2014 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/Layer>
+#include <osgTerrain/TerrainTile>
+#include <osgTerrain/DisplacementMappingTechnique>
+
+
+using namespace osgTerrain;
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  DisplacementMappingTechnique
+//
+DisplacementMappingTechnique::DisplacementMappingTechnique()
+{
+    // OSG_NOTICE<<"DisplacementMappingTechnique::DisplacementMappingTechnique()"<<std::endl;
+    _geometryPool = new GeometryPool;
+}
+
+DisplacementMappingTechnique::DisplacementMappingTechnique(const DisplacementMappingTechnique& st,const osg::CopyOp& copyop):
+    osgTerrain::TerrainTechnique(st, copyop),
+    _geometryPool(st._geometryPool)
+{
+    // OSG_NOTICE<<"DisplacementMappingTechnique::DisplacementMappingTechnique(DisplacementMappingTechnique&, CopyOp&) "<<_geometryPool.get()<<std::endl;
+}
+
+DisplacementMappingTechnique::~DisplacementMappingTechnique()
+{
+}
+
+void DisplacementMappingTechnique::init(int dirtyMask, bool assumeMultiThreaded)
+{
+    if (!_terrainTile) return;
+
+    //OSG_NOTICE<<"DisplacementMappingTechnique::init("<<dirtyMask<<", "<<assumeMultiThreaded<<")"<<std::endl;
+
+    _transform = _geometryPool->getTileSubgraph(_terrainTile);
+
+    // set tile as no longer dirty.
+    _terrainTile->setDirtyMask(0);
+}
+
+void DisplacementMappingTechnique::update(osgUtil::UpdateVisitor* uv)
+{
+    if (_terrainTile) _terrainTile->osg::Group::traverse(*uv);
+
+    if (_transform.valid()) _transform->accept(*uv);
+}
+
+
+void DisplacementMappingTechnique::cull(osgUtil::CullVisitor* cv)
+{
+    if (_transform.valid()) _transform->accept(*cv);
+}
+
+
+void DisplacementMappingTechnique::traverse(osg::NodeVisitor& nv)
+{
+    if (!_terrainTile) return;
+
+    // if app traversal update the frame count.
+    if (nv.getVisitorType()==osg::NodeVisitor::UPDATE_VISITOR)
+    {
+        // if (_terrainTile->getDirty()) _terrainTile->init(_terrainTile->getDirtyMask(), false);
+
+        osgUtil::UpdateVisitor* uv = dynamic_cast<osgUtil::UpdateVisitor*>(&nv);
+        if (uv)
+        {
+            update(uv);
+            return;
+        }
+    }
+    else if (nv.getVisitorType()==osg::NodeVisitor::CULL_VISITOR)
+    {
+        osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(&nv);
+        if (cv)
+        {
+            cull(cv);
+            return;
+        }
+    }
+
+    {
+        if (_transform.valid())
+        {
+            _transform->accept(nv);
+        }
+    }
+}
+
+
+void DisplacementMappingTechnique::cleanSceneGraph()
+{
+}
+
+void DisplacementMappingTechnique::releaseGLObjects(osg::State* state) const
+{
+    if (_transform.valid())
+    {
+//      OSG_NOTICE<<"DisplacementMappingTechnique::releaseGLObjects()"<<std::endl;
+        _transform->releaseGLObjects(state);
+    }
+}

src/osgTerrain/GeometryPool.cpp

@@ -1,4 +1,4 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2014 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