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

Added osg::ImageSequence support into osgPresentation::SlideShowConstructor and the associated <image> tag in .p3d.

Browse Source
This commit is contained in:
Robert Osfield 2012-06-08 04:18:28 +00:00
parent 4d86f8dc79
commit 5d3cb4f754
3 changed files with 139 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/osgPresentation/SlideShowConstructor
View File

@ -238,7 +238,9 @@ public:
texcoord_rotate(0.0f),
loopingMode(osg::ImageStream::NO_LOOPING),
page(-1),
backgroundColor(1.0f,1.0f,1.0f,1.0f) {}
backgroundColor(1.0f,1.0f,1.0f,1.0f),
fps(30.0),
duration(-1.0) {}
std::string options;
float width;
@ -249,6 +251,8 @@ public:
osg::ImageStream::LoopingMode loopingMode;
int page;
osg::Vec4 backgroundColor;
double fps;
double duration;
};
struct VolumeData

14
src/osgPlugins/p3d/ReaderWriterP3D.cpp
View File

@ -867,7 +867,19 @@ bool ReaderWriterP3DXML::getProperties(osgDB::XmlNode*cur, osgPresentation::Slid
OSG_NOTIFY(_notifyLevel)<<"looping \""<<str<<"\""<<std::endl;
}
/*
if (getProperty(cur, "fps", value.fps))
{
propertiesRead = true;
OSG_NOTIFY(osg::NOTICE)<<"read fps \""<<value.fps<<"\""<<std::endl;
}
if (getProperty(cur, "duration", value.duration))
{
propertiesRead = true;
OSG_NOTIFY(osg::NOTICE)<<"read duration \""<<value.duration<<"\""<<std::endl;
}
/*
if (getProperty(cur, "texcoord_offset", value.texcoord_offset))
{
propertiesRead = true;

128
src/osgPresentation/SlideShowConstructor.cpp
View File

@ -21,6 +21,7 @@
#include <osg/PositionAttitudeTransform>
#include <osg/TexMat>
#include <osg/ShapeDrawable>
#include <osg/ImageSequence>
#include <osg/ImageUtils>
#include <osg/Notify>
#include <osg/io_utils>
@ -775,12 +776,16 @@ osg::Geometry* SlideShowConstructor::createTexturedQuadGeometry(const osg::Vec3&
bool flipYAxis = image->getOrigin()==osg::Image::TOP_LEFT;
#ifdef __sgi
#if 1
bool useTextureRectangle = false;
#else
bool useTextureRectangle = true;
#ifdef __sgi
bool useTextureRectangle = false;
#else
bool useTextureRectangle = true;
#endif
#endif
// pass back info on wether texture 2D is used.
usedTextureRectangle = useTextureRectangle;
@ -814,6 +819,8 @@ osg::Geometry* SlideShowConstructor::createTexturedQuadGeometry(const osg::Vec3&
texture = new osg::Texture2D(image);
texture->setResizeNonPowerOfTwoHint(false);
stateset->setTextureAttributeAndModes(0,
texture,
osg::StateAttribute::ON);
@ -846,15 +853,122 @@ void SlideShowConstructor::addImage(const std::string& filename, const PositionD
options->setOptionString(imageData.options);
}
osg::Image* image = osgDB::readImageFile(filename, options.get());
if (image) recordOptionsFilePath(_options.get());
std::string foundFile = filename;
osg::ref_ptr<osg::Image> image;
osg::ref_ptr<osgVolume::Volume> volume;
osg::ref_ptr<osgVolume::VolumeTile> tile;
osg::ref_ptr<osgVolume::ImageLayer> layer;
osgDB::DirectoryContents filenames;
bool preLoad = true;
// check for wild cards
if (filename.find('*')!=std::string::npos)
{
OSG_INFO<<"Expanding wildcard "<<std::endl;
filenames = osgDB::expandWildcardsInFilename(filename);
}
else
{
std::string foundFile = filename;
osgDB::FileType fileType = osgDB::fileType(foundFile);
if (fileType == osgDB::FILE_NOT_FOUND)
{
foundFile = findFileAndRecordPath(foundFile);
fileType = osgDB::fileType(foundFile);
}
if (fileType == osgDB::DIRECTORY)
{
OSG_INFO<<"Reading directory "<<foundFile<<std::endl;
filenames = osgDB::getDirectoryContents(foundFile);
// need to insert the directory path in front of the filenames so it's relative to the appropriate directory.
for(osgDB::DirectoryContents::iterator itr = filenames.begin();
itr != filenames.end();
++itr)
{
*itr = foundFile + osgDB::getNativePathSeparator() + *itr;
}
// prune any directory entries from the list.
for(osgDB::DirectoryContents::iterator itr = filenames.begin();
itr != filenames.end();
)
{
if (osgDB::fileType(*itr)!=osgDB::REGULAR_FILE)
{
itr = filenames.erase(itr);
}
else
{
++itr;
}
}
}
else
{
filenames.push_back(foundFile);
}
}
if (filenames.empty()) return;
if (filenames.size()==1)
{
image = osgDB::readImageFile(filenames[0], options.get());
if (image.valid()) recordOptionsFilePath(options.get() );
}
else
{
// make sure images are in alphabetical order.
std::sort(filenames.begin(), filenames.end());
osg::ref_ptr<osg::ImageSequence> imageSequence = new osg::ImageSequence;
for(osgDB::DirectoryContents::iterator itr = filenames.begin();
itr != filenames.end();
++itr)
{
if (preLoad)
{
OSG_INFO<<"Attempting to read "<<*itr<<std::endl;
osg::ref_ptr<osg::Image> loadedImage = osgDB::readImageFile(*itr, options.get());
if (loadedImage.valid())
{
OSG_INFO<<"Loaded image "<<*itr<<std::endl;
imageSequence->addImage(loadedImage.get());
}
}
else
{
OSG_INFO<<"Adding filename for load image on demand "<<*itr<<std::endl;
imageSequence->addImageFile(*itr);
}
}
if (imageData.duration>0.0)
{
imageSequence->setLength(imageData.duration);
}
else
{
unsigned int maxNum = osg::maximum(imageSequence->getFileNames().size(),
imageSequence->getImages().size());
imageSequence->setLength(double(maxNum)*(1.0/imageData.fps));
}
image = imageSequence;
}
if (!image) return;
bool isImageTranslucent = false;
osg::ImageStream* imageStream = dynamic_cast<osg::ImageStream*>(image);
osg::ImageStream* imageStream = dynamic_cast<osg::ImageStream*>(image.get());
if (imageStream)
{
imageStream->setLoopingMode(imageData.loopingMode);
@ -1819,7 +1933,7 @@ void SlideShowConstructor::addVolume(const std::string& filename, const Position
}
else
{
// not found image, so fallback to plguins/callbacks to find the model.
// not found image, so fallback to plugins/callbacks to find the model.
image = osgDB::readImageFile( filename, options.get() );
if (image) recordOptionsFilePath(options.get() );
}