diff --git a/include/osg/CoordinateSystemNode b/include/osg/CoordinateSystemNode index 04918d237..34cd69bd1 100644 --- a/include/osg/CoordinateSystemNode +++ b/include/osg/CoordinateSystemNode @@ -29,8 +29,7 @@ class EllipsoidModel : public Object { public: - /** WGS_84 is a common representation of the earth's spheroid - */ + /** WGS_84 is a common representation of the earth's spheroid */ EllipsoidModel(double radiusEquator = WGS_84_RADIUS_EQUATOR, double radiusPolar = WGS_84_RADIUS_POLAR): _radiusEquator(radiusEquator), diff --git a/src/osgPlugins/osgTerrain/CompositeLayer.cpp b/src/osgPlugins/osgTerrain/CompositeLayer.cpp index d5755f1be..a3fc129b1 100644 --- a/src/osgPlugins/osgTerrain/CompositeLayer.cpp +++ b/src/osgPlugins/osgTerrain/CompositeLayer.cpp @@ -1,3 +1,16 @@ +/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield + * + * This library is open source and may be redistributed and/or modified under + * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or + * (at your option) any later version. The full license is in LICENSE file + * included with this distribution, and on the openscenegraph.org website. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * OpenSceneGraph Public License for more details. +*/ + #include #include diff --git a/src/osgTerrain/GeometryTechnique.cpp b/src/osgTerrain/GeometryTechnique.cpp index e4253d04c..0b34439b5 100644 --- a/src/osgTerrain/GeometryTechnique.cpp +++ b/src/osgTerrain/GeometryTechnique.cpp @@ -229,8 +229,8 @@ void GeometryTechnique::generateGeometry(Locator* masterLocator, const osg::Vec3 buffer._geometry = new osg::Geometry; if (buffer._geometry.valid()) buffer._geode->addDrawable(buffer._geometry.get()); - unsigned int numRows = 100; - unsigned int numColumns = 100; + unsigned int numRows = 20; + unsigned int numColumns = 20; if (elevationLayer) { @@ -597,10 +597,11 @@ void GeometryTechnique::applyTransparency() if (colorLayer) { osgTerrain::ImageLayer* imageLayer = dynamic_cast(colorLayer); - if (imageLayer) { + if (imageLayer) + { osg::TransferFunction1D* tf = dynamic_cast(colorTF); if (tf) containsTransparency = tf->getImage()->isImageTranslucent(); - else containsTransparency = imageLayer->getImage()->isImageTranslucent(); + else containsTransparency = imageLayer->getImage() ? imageLayer->getImage()->isImageTranslucent() : false; } }