Changeset 6362

Show
Ignore:
Timestamp:
03/14/07 13:59:06
Author:
robert
Message:

Name fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenSceneGraph/trunk/src/osgTerrain/TerrainNode.cpp

    r6357 r6362  
    1212*/ 
    1313 
    14 #include <osgTerrain/HeightFieldNode> 
     14#include <osgTerrain/TerrainNode> 
    1515 
    1616using namespace osg; 
    1717using namespace osgTerrain; 
    1818 
    19 HeightFieldNode::HeightFieldNode() 
     19TerrainNode::TerrainNode() 
    2020{ 
    2121    setNumChildrenRequiringUpdateTraversal(1); 
    2222} 
    2323 
    24 HeightFieldNode::HeightFieldNode(const HeightFieldNode& terrain,const osg::CopyOp& copyop): 
     24TerrainNode::TerrainNode(const TerrainNode& terrain,const osg::CopyOp& copyop): 
    2525    Group(terrain,copyop), 
    2626    _heightField(terrain._heightField) 
    2727{ 
    2828    setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+1); 
    29     if (terrain.getRenderer()) setRenderer(dynamic_cast<HeightFieldRenderer*>(terrain.getRenderer()->cloneType())); 
     29    if (terrain.getRenderer()) setRenderer(dynamic_cast<TerrainTechnique*>(terrain.getRenderer()->cloneType())); 
    3030} 
    3131 
    32 HeightFieldNode::~HeightFieldNode() 
     32TerrainNode::~TerrainNode() 
    3333{ 
    3434} 
    3535 
    36 void HeightFieldNode::traverse(osg::NodeVisitor& nv) 
     36void TerrainNode::traverse(osg::NodeVisitor& nv) 
    3737{ 
    3838    // if app traversal update the frame count. 
    …… 
    6161} 
    6262 
    63 void HeightFieldNode::setHeightField(osg::HeightField* heightField) 
     63void TerrainNode::setHeightField(osg::HeightField* heightField) 
    6464{ 
    6565    _heightField = heightField; 
    …… 
    6767} 
    6868 
    69 void HeightFieldNode::heightFieldHasBeenModified() 
     69void TerrainNode::heightFieldHasBeenModified() 
    7070{ 
    7171    if (_renderer.valid()) _renderer->heightFieldHasBeenModified(); 
    7272} 
    7373 
    74 void HeightFieldNode::setRenderer(osgTerrain::HeightFieldRenderer* renderer) 
     74void TerrainNode::setRenderer(osgTerrain::TerrainTechnique* renderer) 
    7575{ 
    7676    // need to figure out how to ensure that only one renderer is 
    …… 
    8080    if (_renderer.valid()) 
    8181    { 
    82         _renderer->_heightFieldNode = this; 
     82        _renderer->_terrainNode = this; 
    8383        _renderer->initialize(); 
    8484    } 
    8585} 
    8686 
    87 void HeightFieldNode::computeNormalMap() 
     87void TerrainNode::computeNormalMap() 
    8888{ 
    8989    if (_heightField.valid()) 

  • OpenSceneGraph/trunk/src/osgTerrain/TerrainTechnique.cpp

    r6357 r6362  
    1212*/ 
    1313 
    14 #include <osgTerrain/HeightFieldRenderer> 
     14#include <osgTerrain/TerrainTechnique> 
    1515 
    1616using namespace osgTerrain; 
    1717 
    18 HeightFieldRenderer::HeightFieldRenderer(): 
    19     _heightFieldNode(0) 
     18TerrainTechnique::TerrainTechnique(): 
     19    _terrainNode(0) 
    2020{ 
    2121} 
    2222 
    23 HeightFieldRenderer::HeightFieldRenderer(const HeightFieldRenderer& HeightFieldRenderer,const osg::CopyOp& copyop): 
    24     osg::Object(HeightFieldRenderer,copyop), 
    25     _heightFieldNode(0) 
     23TerrainTechnique::TerrainTechnique(const TerrainTechnique& TerrainTechnique,const osg::CopyOp& copyop): 
     24    osg::Object(TerrainTechnique,copyop), 
     25    _terrainNode(0) 
    2626{ 
    2727} 
    2828 
    29 HeightFieldRenderer::~HeightFieldRenderer() 
     29TerrainTechnique::~TerrainTechnique() 
    3030{ 
    3131}