- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/GeometryRecords.cpp
r12905 r13041 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 2 2 * 3 * This library is open source and may be redistributed and/or modified under 4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 3 * This library is open source and may be redistributed and/or modified under 4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 5 5 * (at your option) any later version. The full license is in LICENSE file 6 6 * included with this distribution, and on the openscenegraph.org website. 7 * 7 * 8 8 * This library is distributed in the hope that it will be useful, 9 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 11 * OpenSceneGraph Public License for more details. 12 12 */ … … 257 257 // Incorporate Face transparency per osg-users thread "Open Flight 258 258 // characteristic not reflected in the current OSG" (Sept/Oct 2011) 259 colors->push_back(osg::Vec4(_primaryColor.r(), _primaryColor.g(), 259 colors->push_back(osg::Vec4(_primaryColor.r(), _primaryColor.g(), 260 260 _primaryColor.b(), ( 1.0 - getTransparency() ) )); 261 261 } … … 645 645 billboard->getDrawable(i)->dirtyBound(); 646 646 } 647 647 648 648 billboard->dirtyBound(); 649 649 } … … 1141 1141 billboard->getDrawable(i)->dirtyBound(); 1142 1142 } 1143 1143 1144 1144 billboard->dirtyBound(); 1145 1145 } … … 1249 1249 osg::Vec2f uv = in.readVec2f(); 1250 1250 vertex.setUV(layer,uv); 1251 1251 1252 1252 if (!uv.valid()) 1253 1253 { … … 1341 1341 break; 1342 1342 } 1343 1343 1344 1344 if (index < vertexList->size()) 1345 1345 {
