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

Added support for RGBA colour buffer in osgframerenderer using the --rgba command line option (--rgb selects the standard non colour frame buffer which is the default).

Browse Source
This commit is contained in:
Robert Osfield
2012-12-17 15:58:57 +00:00
parent f7bee82e99
commit c15d07caa1
6 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,15 +41,15 @@ class ReaderWriterP3DXML : public osgDB::ReaderWriter
public:
ReaderWriterP3DXML()
{
_colorMap["WHITE"] .set(1.0f,1.0f,1.0f,1.0f);
_colorMap["BLACK"] .set(0.0f,0.0f,0.0f,1.0f);
_colorMap["PURPLE"] .set(1.0f,0.0f,1.0f,1.0f);
_colorMap["BLUE"] .set(0.0f,0.0f,1.0f,1.0f);
_colorMap["RED"] .set(1.0f,0.0f,0.0f,1.0f);
_colorMap["CYAN"] .set(0.0f,1.0f,1.0f,1.0f);
_colorMap["YELLOW"] .set(1.0f,1.0f,0.0f,1.0f);
_colorMap["GREEN"] .set(0.0f,1.0f,0.0f,1.0f);
_colorMap["SKY"] .set(0.2f, 0.2f, 0.4f, 1.0f);
_colorMap["WHITE"] .set(1.0f,1.0f,1.0f,0.0f);
_colorMap["BLACK"] .set(0.0f,0.0f,0.0f,0.0f);
_colorMap["PURPLE"] .set(1.0f,0.0f,1.0f,0.0f);
_colorMap["BLUE"] .set(0.0f,0.0f,1.0f,0.0f);
_colorMap["RED"] .set(1.0f,0.0f,0.0f,0.0f);
_colorMap["CYAN"] .set(0.0f,1.0f,1.0f,0.0f);
_colorMap["YELLOW"] .set(1.0f,1.0f,0.0f,0.0f);
_colorMap["GREEN"] .set(0.0f,1.0f,0.0f,0.0f);
_colorMap["SKY"] .set(0.2f, 0.2f, 0.4f, 0.0f);
_layoutMap["LEFT_TO_RIGHT"] = osgText::Text::LEFT_TO_RIGHT;
_layoutMap["RIGHT_TO_LEFT"] = osgText::Text::RIGHT_TO_LEFT;

2
src/osgPresentation/SlideShowConstructor.cpp
View File

@@ -168,7 +168,7 @@ SlideShowConstructor::SlideShowConstructor(osgDB::Options* options):
_hudSettings = new HUDSettings(_slideDistance, ds->getEyeSeparation()*0.5, _leftEyeMask, _rightEyeMask);
_backgroundColor.set(0.0f,0.0f,0.0f,1.0f);
_backgroundColor.set(0.0f,0.0f,0.0f,0.0f);
_presentationDuration = -1.0;