FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed ShaderTechnique to RayTracedTechnique

Browse Source
This commit is contained in:
Robert Osfield
2009-01-21 14:27:58 +00:00
parent 0897368fa6
commit a6284b0e03
9 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgVolume/CMakeLists.txt
View File

@@ -13,7 +13,7 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/Layer
${HEADER_PATH}/Locator
${HEADER_PATH}/Property
${HEADER_PATH}/ShaderTechnique
${HEADER_PATH}/RayTracedTechnique
${HEADER_PATH}/Version
${HEADER_PATH}/Volume
${HEADER_PATH}/VolumeTechnique
@@ -28,7 +28,7 @@ ADD_LIBRARY(${LIB_NAME}
Layer.cpp
Locator.cpp
Property.cpp
ShaderTechnique.cpp
RayTracedTechnique.cpp
Version.cpp
Volume.cpp
VolumeTechnique.cpp

28
src/osgVolume/ShaderTechnique.cpp → src/osgVolume/RayTracedTechnique.cpp
View File

@@ -11,7 +11,7 @@
* OpenSceneGraph Public License for more details.
*/
#include <osgVolume/ShaderTechnique>
#include <osgVolume/RayTracedTechnique>
#include <osgVolume/VolumeTile>
#include <osg/Geometry>
@@ -28,16 +28,16 @@
using namespace osgVolume;
ShaderTechnique::ShaderTechnique()
RayTracedTechnique::RayTracedTechnique()
{
}
ShaderTechnique::ShaderTechnique(const ShaderTechnique& fft,const osg::CopyOp& copyop):
RayTracedTechnique::RayTracedTechnique(const RayTracedTechnique& fft,const osg::CopyOp& copyop):
VolumeTechnique(fft,copyop)
{
}
ShaderTechnique::~ShaderTechnique()
RayTracedTechnique::~RayTracedTechnique()
{
}
@@ -49,9 +49,9 @@ enum ShadingModel
MaximumIntensityProjection
};
void ShaderTechnique::init()
void RayTracedTechnique::init()
{
osg::notify(osg::NOTICE)<<"ShaderTechnique::init()"<<std::endl;
osg::notify(osg::NOTICE)<<"RayTracedTechnique::init()"<<std::endl;
if (!_volumeTile) return;
@@ -432,28 +432,28 @@ void ShaderTechnique::init()
}
void ShaderTechnique::update(osgUtil::UpdateVisitor* uv)
void RayTracedTechnique::update(osgUtil::UpdateVisitor* uv)
{
// osg::notify(osg::NOTICE)<<"ShaderTechnique:update(osgUtil::UpdateVisitor* nv):"<<std::endl;
// osg::notify(osg::NOTICE)<<"RayTracedTechnique:update(osgUtil::UpdateVisitor* nv):"<<std::endl;
}
void ShaderTechnique::cull(osgUtil::CullVisitor* cv)
void RayTracedTechnique::cull(osgUtil::CullVisitor* cv)
{
//osg::notify(osg::NOTICE)<<"ShaderTechnique::cull(osgUtil::CullVisitor* nv)"<<std::endl;
//osg::notify(osg::NOTICE)<<"RayTracedTechnique::cull(osgUtil::CullVisitor* nv)"<<std::endl;
if (_geode.valid())
{
_geode->accept(*cv);
}
}
void ShaderTechnique::cleanSceneGraph()
void RayTracedTechnique::cleanSceneGraph()
{
osg::notify(osg::NOTICE)<<"ShaderTechnique::cleanSceneGraph()"<<std::endl;
osg::notify(osg::NOTICE)<<"RayTracedTechnique::cleanSceneGraph()"<<std::endl;
}
void ShaderTechnique::traverse(osg::NodeVisitor& nv)
void RayTracedTechnique::traverse(osg::NodeVisitor& nv)
{
// osg::notify(osg::NOTICE)<<"ShaderTechnique::traverse(osg::NodeVisitor& nv)"<<std::endl;
// osg::notify(osg::NOTICE)<<"RayTracedTechnique::traverse(osg::NodeVisitor& nv)"<<std::endl;
if (!_volumeTile) return;
// if app traversal update the frame count.