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

Indentation/bracket fixes and change of default size

Browse Source
This commit is contained in:
Robert Osfield
2008-01-09 21:17:10 +00:00
parent 2ea2872cfb
commit a46eb79311
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/osg/CoordinateSystemNode
View File

@@ -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),

13
src/osgPlugins/osgTerrain/CompositeLayer.cpp
View File

@@ -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 <osgTerrain/Layer>
#include <iostream>

9
src/osgTerrain/GeometryTechnique.cpp
View File

@@ -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<osgTerrain::ImageLayer*>(colorLayer);
if (imageLayer) {
if (imageLayer)
{
osg::TransferFunction1D* tf = dynamic_cast<osg::TransferFunction1D*>(colorTF);
if (tf) containsTransparency = tf->getImage()->isImageTranslucent();
else containsTransparency = imageLayer->getImage()->isImageTranslucent();
else containsTransparency = imageLayer->getImage() ? imageLayer->getImage()->isImageTranslucent() : false;
}
}