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

Removed ParallelSplitShadowMap as its currently a non op.

Browse Source
This commit is contained in:
Robert Osfield
2007-06-13 09:56:12 +00:00
parent 938ab8b59f
commit 7016db5f26
11 changed files with 5 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/osgshadow/osgshadow.cpp
View File

@@ -39,7 +39,6 @@
#include <osgShadow/ShadowVolume>
#include <osgShadow/ShadowTexture>
#include <osgShadow/ShadowMap>
#include <osgShadow/ParallelSplitShadowMap>
#include <osgDB/ReadFile>
#include <osgDB/WriteFile>
@@ -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<osgShadow::ShadowTexture> st = new osgShadow::ShadowTexture;
shadowedScene->setShadowTechnique(st.get());
}
#if 0
else if (arguments.read("--pssm"))
{
osg::ref_ptr<osgShadow::ParallelSplitShadowMap> pssm = new osgShadow::ParallelSplitShadowMap;
shadowedScene->setShadowTechnique(pssm.get());
}
#endif
else /* if (arguments.read("--sm")) */
{
osg::ref_ptr<osgShadow::ShadowMap> sm = new osgShadow::ShadowMap;

41
include/osgShadow/ParallelSplitShadowMap
View File

@@ -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 <osg/Camera>
#include <osgShadow/ShadowTechnique>
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

1
src/osgPlugins/osgShadow/CMakeLists.txt
View File

@@ -1,6 +1,5 @@
SET(TARGET_SRC
ParallelSplitShadowMap.cpp
ReaderWriterOsgShadow.cpp
ShadowedScene.cpp
ShadowMap.cpp

40
src/osgPlugins/osgShadow/ParallelSplitShadowMap.cpp
View File

@@ -1,40 +0,0 @@
#include <osgShadow/ParallelSplitShadowMap>
#include <iostream>
#include <string>
#include <osg/Vec3>
#include <osg/Vec4>
#include <osg/io_utils>
#include <osgDB/Registry>
#include <osgDB/Input>
#include <osgDB/Output>
#include <osgDB/ParameterOutput>
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<osgShadow::ParallelSplitShadowMap&>(obj);
bool itAdvanced = false;
return itAdvanced;
}
bool ParallelSplitShadowMap_writeLocalData(const osg::Object& obj, osgDB::Output& fw)
{
const osgShadow::ParallelSplitShadowMap& ss = static_cast<const osgShadow::ParallelSplitShadowMap &>(obj);
return true;
}

3
src/osgPlugins/osgShadow/ReaderWriterOsgShadow.cpp
View File

@@ -14,7 +14,6 @@
#include <osgShadow/ShadowVolume>
#include <osgShadow/ShadowTexture>
#include <osgShadow/ShadowMap>
#include <osgShadow/ParallelSplitShadowMap>
#include <osgDB/ReaderWriter>
#include <osgDB/FileNameUtils>
@@ -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;
}

2
src/osgShadow/CMakeLists.txt
View File

@@ -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

27
src/osgShadow/ParallelSplitShadowMap.cpp
View File

@@ -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 <osgShadow/ParallelSplitShadowMap>
#include <osg/Notify>
using namespace osgShadow;
ParallelSplitShadowMap::ParallelSplitShadowMap()
{
osg::notify(osg::NOTICE)<<"Warning: osgShadow::ParallelSplitShadowMap technique not implemented yet."<<std::endl;
}
ParallelSplitShadowMap::ParallelSplitShadowMap(const ParallelSplitShadowMap& copy, const osg::CopyOp& copyop):
ShadowTechnique(copy,copyop)
{
}

1
src/osgShadow/ShadowMap.cpp
View File

@@ -51,7 +51,6 @@ static const char fragmentShaderSource_withBaseTexture[] =
ShadowMap::ShadowMap():
_textureUnit(1)
{
osg::notify(osg::NOTICE)<<"Warning: osgShadow::ShadowMap technique is in development."<<std::endl;
}
ShadowMap::ShadowMap(const ShadowMap& copy, const osg::CopyOp& copyop):

1
src/osgShadow/ShadowTexture.cpp
View File

@@ -22,7 +22,6 @@ using namespace osgShadow;
ShadowTexture::ShadowTexture():
_textureUnit(1)
{
osg::notify(osg::NOTICE)<<"Warning: osgShadow::ShadowTexture technique is in development."<<std::endl;
}
ShadowTexture::ShadowTexture(const ShadowTexture& copy, const osg::CopyOp& copyop):

2
src/osgShadow/ShadowVolume.cpp
View File

@@ -39,7 +39,7 @@ ShadowVolume::ShadowVolume():
{
// _drawMode = osgShadow::ShadowVolumeGeometry::GEOMETRY;
osg::notify(osg::NOTICE)<<"Warning: osgShadow::ShadowVolume technique in development."<<std::endl;
osg::notify(osg::NOTICE)<<"Warning: osgShadow::ShadowVolume technique is still in development, with current limitations that make it unsuitable for deployment. Please contact the osg-users for an update of developements."<<std::endl;
}
ShadowVolume::ShadowVolume(const ShadowVolume& sv, const osg::CopyOp& copyop):

61
src/osgWrappers/osgShadow/ParallelSplitShadowMap.cpp
View File

@@ -1,61 +0,0 @@
// ***************************************************************************
//
// Generated automatically by genwrapper.
// Please DO NOT EDIT this file!
//
// ***************************************************************************
#include <osgIntrospection/ReflectionMacros>
#include <osgIntrospection/TypedMethodInfo>
#include <osgIntrospection/StaticMethodInfo>
#include <osgIntrospection/Attributes>
#include <osg/CopyOp>
#include <osg/Object>
#include <osgShadow/ParallelSplitShadowMap>
// 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