diff --git a/examples/osgvolume/osgvolume.cpp b/examples/osgvolume/osgvolume.cpp index cf4343a87..d24fcfeb9 100644 --- a/examples/osgvolume/osgvolume.cpp +++ b/examples/osgvolume/osgvolume.cpp @@ -63,7 +63,7 @@ #include #include #include -#include +#include #include typedef std::vector< osg::ref_ptr > ImageList; @@ -1324,7 +1324,7 @@ int main( int argc, char **argv ) layer->addProperty(new osgVolume::TransferFunctionProperty(transferFunction.get())); } - tile->setVolumeTechnique(new osgVolume::ShaderTechnique); + tile->setVolumeTechnique(new osgVolume::RayTracedTechnique); } else { diff --git a/include/osgVolume/ShaderTechnique b/include/osgVolume/RayTracedTechnique similarity index 75% rename from include/osgVolume/ShaderTechnique rename to include/osgVolume/RayTracedTechnique index d9a2e3007..6d08818a5 100644 --- a/include/osgVolume/ShaderTechnique +++ b/include/osgVolume/RayTracedTechnique @@ -11,22 +11,22 @@ * OpenSceneGraph Public License for more details. */ -#ifndef OSGVOLUME_SHADERTECHNIQUE -#define OSGVOLUME_SHADERTECHNIQUE 1 +#ifndef OSGVOLUME_RAYTRACEDTECHNIQUE +#define OSGVOLUME_RAYTRACEDTECHNIQUE 1 #include namespace osgVolume { -class OSGVOLUME_EXPORT ShaderTechnique : public VolumeTechnique +class OSGVOLUME_EXPORT RayTracedTechnique : public VolumeTechnique { public: - ShaderTechnique(); + RayTracedTechnique(); - ShaderTechnique(const ShaderTechnique&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); + RayTracedTechnique(const RayTracedTechnique&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); - META_Object(osgVolume, ShaderTechnique); + META_Object(osgVolume, RayTracedTechnique); virtual void init(); @@ -42,7 +42,7 @@ class OSGVOLUME_EXPORT ShaderTechnique : public VolumeTechnique protected: - virtual ~ShaderTechnique(); + virtual ~RayTracedTechnique(); osg::ref_ptr _geode; }; diff --git a/src/osgPlugins/dicom/ReaderWriterDICOM.cpp b/src/osgPlugins/dicom/ReaderWriterDICOM.cpp index 279b5e2a2..402ba9af4 100644 --- a/src/osgPlugins/dicom/ReaderWriterDICOM.cpp +++ b/src/osgPlugins/dicom/ReaderWriterDICOM.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #ifdef USE_DCMTK #define HAVE_CONFIG_H @@ -122,7 +122,7 @@ class ReaderWriterDICOM : public osgDB::ReaderWriter osg::ref_ptr tile = new osgVolume::VolumeTile; tile->setVolume(volume.get()); - tile->setVolumeTechnique(new osgVolume::ShaderTechnique()); + tile->setVolumeTechnique(new osgVolume::RayTracedTechnique()); osg::ref_ptr layer= new osgVolume::ImageLayer(result.getImage()); layer->rescaleToZeroToOneRange(); diff --git a/src/osgPlugins/osgVolume/CMakeLists.txt b/src/osgPlugins/osgVolume/CMakeLists.txt index 6a37b5b62..c5699210f 100644 --- a/src/osgPlugins/osgVolume/CMakeLists.txt +++ b/src/osgPlugins/osgVolume/CMakeLists.txt @@ -4,7 +4,7 @@ SET(TARGET_SRC Layer.cpp Volume.cpp VolumeTile.cpp - ShaderTechnique.cpp + RayTracedTechnique.cpp FixedFunctionTechnique.cpp ) diff --git a/src/osgPlugins/osgVolume/RayTracedTechnique.cpp b/src/osgPlugins/osgVolume/RayTracedTechnique.cpp new file mode 100644 index 000000000..49dda53e0 --- /dev/null +++ b/src/osgPlugins/osgVolume/RayTracedTechnique.cpp @@ -0,0 +1,40 @@ +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include + +bool RayTracedTechnique_readLocalData(osg::Object &obj, osgDB::Input &fr); +bool RayTracedTechnique_writeLocalData(const osg::Object &obj, osgDB::Output &fw); + +osgDB::RegisterDotOsgWrapperProxy RayTracedTechnique_Proxy +( + new osgVolume::RayTracedTechnique, + "RayTracedTechnique", + "RayTracedTechnique Object", + RayTracedTechnique_readLocalData, + RayTracedTechnique_writeLocalData +); + + +bool RayTracedTechnique_readLocalData(osg::Object& obj, osgDB::Input &fr) +{ + //osgVolume::RayTracedTechnique& st = static_cast(obj); + bool itrAdvanced = false; + return itrAdvanced; +} + +bool RayTracedTechnique_writeLocalData(const osg::Object& obj, osgDB::Output& fw) +{ + //const osgVolume::RayTracedTechnique& st = static_cast(obj); + return true; +} diff --git a/src/osgPlugins/osgVolume/ShaderTechnique.cpp b/src/osgPlugins/osgVolume/ShaderTechnique.cpp deleted file mode 100644 index 9e8aba253..000000000 --- a/src/osgPlugins/osgVolume/ShaderTechnique.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include - -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include - -bool ShaderTechnique_readLocalData(osg::Object &obj, osgDB::Input &fr); -bool ShaderTechnique_writeLocalData(const osg::Object &obj, osgDB::Output &fw); - -osgDB::RegisterDotOsgWrapperProxy ShaderTechnique_Proxy -( - new osgVolume::ShaderTechnique, - "ShaderTechnique", - "ShaderTechnique Object", - ShaderTechnique_readLocalData, - ShaderTechnique_writeLocalData -); - - -bool ShaderTechnique_readLocalData(osg::Object& obj, osgDB::Input &fr) -{ - //osgVolume::ShaderTechnique& st = static_cast(obj); - bool itrAdvanced = false; - return itrAdvanced; -} - -bool ShaderTechnique_writeLocalData(const osg::Object& obj, osgDB::Output& fw) -{ - //const osgVolume::ShaderTechnique& st = static_cast(obj); - return true; -} diff --git a/src/osgVolume/CMakeLists.txt b/src/osgVolume/CMakeLists.txt index f65d02eba..e4f27a98e 100644 --- a/src/osgVolume/CMakeLists.txt +++ b/src/osgVolume/CMakeLists.txt @@ -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 diff --git a/src/osgVolume/ShaderTechnique.cpp b/src/osgVolume/RayTracedTechnique.cpp similarity index 94% rename from src/osgVolume/ShaderTechnique.cpp rename to src/osgVolume/RayTracedTechnique.cpp index 376e4e98b..a7a8e6943 100644 --- a/src/osgVolume/ShaderTechnique.cpp +++ b/src/osgVolume/RayTracedTechnique.cpp @@ -11,7 +11,7 @@ * OpenSceneGraph Public License for more details. */ -#include +#include #include #include @@ -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()"<accept(*cv); } } -void ShaderTechnique::cleanSceneGraph() +void RayTracedTechnique::cleanSceneGraph() { - osg::notify(osg::NOTICE)<<"ShaderTechnique::cleanSceneGraph()"< #include #include -#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -25,14 +25,14 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osgVolume::ShaderTechnique) - I_DeclaringFile("osgVolume/ShaderTechnique"); +BEGIN_OBJECT_REFLECTOR(osgVolume::RayTracedTechnique) + I_DeclaringFile("osgVolume/RayTracedTechnique"); I_BaseType(osgVolume::VolumeTechnique); - I_Constructor0(____ShaderTechnique, + I_Constructor0(____RayTracedTechnique, "", ""); - I_ConstructorWithDefaults2(IN, const osgVolume::ShaderTechnique &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, - ____ShaderTechnique__C5_ShaderTechnique_R1__C5_osg_CopyOp_R1, + I_ConstructorWithDefaults2(IN, const osgVolume::RayTracedTechnique &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____RayTracedTechnique__C5_RayTracedTechnique_R1__C5_osg_CopyOp_R1, "", ""); I_Method0(osg::Object *, cloneType,