diff --git a/examples/osgshadow/osgshadow.cpp b/examples/osgshadow/osgshadow.cpp index a16a6f805..71c4edb2e 100644 --- a/examples/osgshadow/osgshadow.cpp +++ b/examples/osgshadow/osgshadow.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #include #include @@ -493,7 +492,7 @@ int main(int argc, char** argv) arguments.getApplicationUsage()->addCommandLineOption("--sv", "Select ShadowVolume implementation."); arguments.getApplicationUsage()->addCommandLineOption("--sm", "Select ShadowMap implementation."); arguments.getApplicationUsage()->addCommandLineOption("--sm", "Select ShadowMap implementation."); - arguments.getApplicationUsage()->addCommandLineOption("--pssm", "Select ParallelSplitShadowMap implementation."); +// arguments.getApplicationUsage()->addCommandLineOption("--pssm", "Select ParallelSplitShadowMap implementation."); arguments.getApplicationUsage()->addCommandLineOption("-1", "Use test model one."); arguments.getApplicationUsage()->addCommandLineOption("-2", "Use test model two."); arguments.getApplicationUsage()->addCommandLineOption("-3", "Use test model three."); @@ -613,11 +612,13 @@ int main(int argc, char** argv) osg::ref_ptr st = new osgShadow::ShadowTexture; shadowedScene->setShadowTechnique(st.get()); } +#if 0 else if (arguments.read("--pssm")) { osg::ref_ptr pssm = new osgShadow::ParallelSplitShadowMap; shadowedScene->setShadowTechnique(pssm.get()); } +#endif else /* if (arguments.read("--sm")) */ { osg::ref_ptr sm = new osgShadow::ShadowMap; diff --git a/include/osgShadow/ParallelSplitShadowMap b/include/osgShadow/ParallelSplitShadowMap deleted file mode 100644 index d20abf79a..000000000 --- a/include/osgShadow/ParallelSplitShadowMap +++ /dev/null @@ -1,41 +0,0 @@ -/* -*-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. -*/ - -#ifndef OSGSHADOW_PARALLELSPLITSHADOWMAP -#define OSGSHADOW_PARALLELSPLITSHADOWMAP 1 - -#include - -#include - -namespace osgShadow { - -/** ShadowedTexture provides an implementation of shadow textures.*/ -class OSGSHADOW_EXPORT ParallelSplitShadowMap : public ShadowTechnique -{ - public : - ParallelSplitShadowMap(); - - ParallelSplitShadowMap(const ParallelSplitShadowMap& es, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); - - META_Object(osgShadow, ParallelSplitShadowMap); - - protected : - - virtual ~ParallelSplitShadowMap() {} - -}; - -} - -#endif diff --git a/src/osgPlugins/osgShadow/CMakeLists.txt b/src/osgPlugins/osgShadow/CMakeLists.txt index d15fa32b3..6850ca3e6 100644 --- a/src/osgPlugins/osgShadow/CMakeLists.txt +++ b/src/osgPlugins/osgShadow/CMakeLists.txt @@ -1,6 +1,5 @@ SET(TARGET_SRC - ParallelSplitShadowMap.cpp ReaderWriterOsgShadow.cpp ShadowedScene.cpp ShadowMap.cpp diff --git a/src/osgPlugins/osgShadow/ParallelSplitShadowMap.cpp b/src/osgPlugins/osgShadow/ParallelSplitShadowMap.cpp deleted file mode 100644 index 9eb929cbd..000000000 --- a/src/osgPlugins/osgShadow/ParallelSplitShadowMap.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include - -#include -#include - -#include -#include -#include - -#include -#include -#include -#include - -bool ParallelSplitShadowMap_readLocalData(osg::Object &obj, osgDB::Input &fr); -bool ParallelSplitShadowMap_writeLocalData(const osg::Object &obj, osgDB::Output &fw); - -osgDB::RegisterDotOsgWrapperProxy ParallelSplitShadowMap_Proxy -( - new osgShadow::ParallelSplitShadowMap, - "ParallelSplitShadowMap", - "Object ShadowTechnique ParallelSplitShadowMap", - ParallelSplitShadowMap_readLocalData, - ParallelSplitShadowMap_writeLocalData -); - -bool ParallelSplitShadowMap_readLocalData(osg::Object& obj, osgDB::Input &fr) -{ - osgShadow::ParallelSplitShadowMap& ss = static_cast(obj); - bool itAdvanced = false; - - return itAdvanced; -} - -bool ParallelSplitShadowMap_writeLocalData(const osg::Object& obj, osgDB::Output& fw) -{ - const osgShadow::ParallelSplitShadowMap& ss = static_cast(obj); - - return true; -} diff --git a/src/osgPlugins/osgShadow/ReaderWriterOsgShadow.cpp b/src/osgPlugins/osgShadow/ReaderWriterOsgShadow.cpp index b7f210610..2efa36497 100644 --- a/src/osgPlugins/osgShadow/ReaderWriterOsgShadow.cpp +++ b/src/osgPlugins/osgShadow/ReaderWriterOsgShadow.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include @@ -115,7 +114,7 @@ public: if (params=="ShadowVolume" || params=="sv") technique = new osgShadow::ShadowVolume; else if (params=="ShadowTexture" || params=="st") technique = new osgShadow::ShadowTexture; else if (params=="ShadowMap" || params=="sm") technique = new osgShadow::ShadowMap; - else if (params=="ParallelSplitShadowMap" || params=="pssm") technique = new osgShadow::ParallelSplitShadowMap; +// else if (params=="ParallelSplitShadowMap" || params=="pssm") technique = new osgShadow::ParallelSplitShadowMap; else subFileName += std::string(".") + params; } diff --git a/src/osgShadow/CMakeLists.txt b/src/osgShadow/CMakeLists.txt index 6d5b8aae8..031315832 100644 --- a/src/osgShadow/CMakeLists.txt +++ b/src/osgShadow/CMakeLists.txt @@ -10,7 +10,6 @@ SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(LIB_PUBLIC_HEADERS ${HEADER_PATH}/Export ${HEADER_PATH}/OccluderGeometry - ${HEADER_PATH}/ParallelSplitShadowMap ${HEADER_PATH}/ShadowMap ${HEADER_PATH}/ShadowTechnique ${HEADER_PATH}/ShadowTexture @@ -24,7 +23,6 @@ ADD_LIBRARY(${LIB_NAME} ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} ${LIB_PUBLIC_HEADERS} OccluderGeometry.cpp - ParallelSplitShadowMap.cpp ShadowMap.cpp ShadowTechnique.cpp ShadowTexture.cpp diff --git a/src/osgShadow/ParallelSplitShadowMap.cpp b/src/osgShadow/ParallelSplitShadowMap.cpp deleted file mode 100644 index 0ec3b7acf..000000000 --- a/src/osgShadow/ParallelSplitShadowMap.cpp +++ /dev/null @@ -1,27 +0,0 @@ -/* -*-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 -#include - -using namespace osgShadow; - -ParallelSplitShadowMap::ParallelSplitShadowMap() -{ - osg::notify(osg::NOTICE)<<"Warning: osgShadow::ParallelSplitShadowMap technique not implemented yet."< -#include -#include -#include - -#include -#include -#include - -// Must undefine IN and OUT macros defined in Windows headers -#ifdef IN -#undef IN -#endif -#ifdef OUT -#undef OUT -#endif - -BEGIN_OBJECT_REFLECTOR(osgShadow::ParallelSplitShadowMap) - I_DeclaringFile("osgShadow/ParallelSplitShadowMap"); - I_BaseType(osgShadow::ShadowTechnique); - I_Constructor0(____ParallelSplitShadowMap, - "", - ""); - I_ConstructorWithDefaults2(IN, const osgShadow::ParallelSplitShadowMap &, es, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, - ____ParallelSplitShadowMap__C5_ParallelSplitShadowMap_R1__C5_osg_CopyOp_R1, - "", - ""); - I_Method0(osg::Object *, cloneType, - Properties::VIRTUAL, - __osg_Object_P1__cloneType, - "Clone the type of an object, with Object* return type. ", - "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, - Properties::VIRTUAL, - __osg_Object_P1__clone__C5_osg_CopyOp_R1, - "Clone an object, with Object* return type. ", - "Must be defined by derived classes. "); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, - Properties::VIRTUAL, - __bool__isSameKindAs__C5_osg_Object_P1, - "", - ""); - I_Method0(const char *, libraryName, - Properties::VIRTUAL, - __C5_char_P1__libraryName, - "return the name of the object's library. ", - "Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. "); - I_Method0(const char *, className, - Properties::VIRTUAL, - __C5_char_P1__className, - "return the name of the object's class type. ", - "Must be defined by derived classes. "); -END_REFLECTOR -