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

Added support for <image blending="ON" or blending="OFF"> to allow user definition of when to enable OpenGL blending for an image or not.

Browse Source
This commit is contained in:
Robert Osfield
2012-11-13 14:22:37 +00:00
parent 0c02ef358f
commit 057f8a8b3b
3 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/osgPresentation/SlideShowConstructor
View File

@@ -246,7 +246,8 @@ public:
duration(-1.0),
imageSequence(false),
imageSequencePagingMode(osg::ImageSequence::PAGE_AND_DISCARD_USED_IMAGES),
imageSequenceInteractionMode(PLAY_AUTOMATICALLY_LIKE_MOVIE)
imageSequenceInteractionMode(PLAY_AUTOMATICALLY_LIKE_MOVIE),
blendingHint(USE_IMAGE_ALPHA)
{}
std::string options;
@@ -271,7 +272,16 @@ public:
USE_MOUSE_Y_POSITION
};
ImageSequenceInteractionMode imageSequenceInteractionMode;
enum BlendingHint
{
USE_IMAGE_ALPHA,
OFF,
ON
};
BlendingHint blendingHint;
};
struct VolumeData

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

@@ -935,6 +935,16 @@ bool ReaderWriterP3DXML::getProperties(osgDB::XmlNode*cur, osgPresentation::Slid
OSG_NOTIFY(_notifyLevel)<<"read imageSequencePagingMode \""<<value.imageSequenceInteractionMode<<"\""<<std::endl;
}
if (getProperty(cur, "blending", str))
{
propertiesRead = true;
if (str=="ON" || str=="On" || str=="on" || str=="enable" ) value.blendingHint = osgPresentation::SlideShowConstructor::ImageData::ON;
else if (str=="OFF" || str=="Off" || str=="off" || str=="disable" ) value.blendingHint = osgPresentation::SlideShowConstructor::ImageData::OFF;
OSG_NOTIFY(_notifyLevel)<<"read blendingHint \""<<value.blendingHint<<"\""<<std::endl;
}
/*
if (getProperty(cur, "texcoord_offset", value.texcoord_offset))
{

19
src/osgPresentation/SlideShowConstructor.cpp
View File

@@ -1115,6 +1115,16 @@ void SlideShowConstructor::addImage(const std::string& filename, const PositionD
isImageTranslucent = image->isImageTranslucent();
}
if (imageData.blendingHint==ImageData::ON)
{
isImageTranslucent = true;
}
else if (imageData.blendingHint==ImageData::OFF)
{
isImageTranslucent = false;
}
float s = image->s();
float t = image->t();
@@ -1274,6 +1284,15 @@ void SlideShowConstructor::addStereoImagePair(const std::string& filenameLeft, c
isImageTranslucent = imageRight->isImageTranslucent();
}
if (imageDataLeft.blendingHint==ImageData::ON || imageDataRight.blendingHint==ImageData::ON)
{
isImageTranslucent = true;
}
else if (imageDataLeft.blendingHint==ImageData::OFF || imageDataRight.blendingHint==ImageData::OFF)
{
isImageTranslucent = false;
}
float s = imageLeft->s();
float t = imageLeft->t();