From 2391b42000bb6349e04c614fdf9316f02ff2e0b6 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 9 Jan 2013 16:29:28 +0000 Subject: [PATCH] Changed the named colours back to having a alpha value of 1.0 to avoid problems with text not appearing. --- src/osgPlugins/p3d/ReaderWriterP3D.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/osgPlugins/p3d/ReaderWriterP3D.cpp b/src/osgPlugins/p3d/ReaderWriterP3D.cpp index de4ef1b6c..60ccedd6e 100644 --- a/src/osgPlugins/p3d/ReaderWriterP3D.cpp +++ b/src/osgPlugins/p3d/ReaderWriterP3D.cpp @@ -41,15 +41,15 @@ class ReaderWriterP3DXML : public osgDB::ReaderWriter public: ReaderWriterP3DXML() { - _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); + _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); _layoutMap["LEFT_TO_RIGHT"] = osgText::Text::LEFT_TO_RIGHT; _layoutMap["RIGHT_TO_LEFT"] = osgText::Text::RIGHT_TO_LEFT;