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

Fixed method signatures.

Browse Source
This commit is contained in:
Robert Osfield 2005-05-16 11:18:11 +00:00
parent bfa0ce0e10
commit 10232cf81a
3 changed files with 49 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/osg/ShapeDrawable
View File

@ -163,16 +163,16 @@ class OSG_EXPORT ShapeDrawable : public Drawable
virtual void drawImplementation(State& state) const;
/** Return false, osg::ShapeDrawable does not support accept(AttributeFunctor&).*/
virtual bool supports(AttributeFunctor&) const { return false; }
virtual bool supports(const AttributeFunctor&) const { return false; }
/** Return true, osg::ShapeDrawable does support accept(ConstAttributeFunctor&).*/
virtual bool supports(ConstAttributeFunctor&) const { return true; }
virtual bool supports(const ConstAttributeFunctor&) const { return true; }
/** Accept a ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has.*/
virtual void accept(ConstAttributeFunctor& af) const;
/** Return true, osg::ShapeDrawable does support accept(PrimitiveFunctor&) .*/
virtual bool supports(PrimitiveFunctor&) const { return true; }
virtual bool supports(const PrimitiveFunctor&) const { return true; }
/** Accept a PrimitiveFunctor and call its methods to tell it about the internal primitives that this Drawable has.*/
virtual void accept(PrimitiveFunctor& pf) const;

2
include/osgDB/Archive
View File

@ -34,7 +34,7 @@ class OSGDB_EXPORT Archive : public ReaderWriter
virtual const char* className() const { return "Archive"; }
virtual bool acceptsExtension(const std::string& /*extension*/) { return true; }
virtual bool acceptsExtension(const std::string& /*extension*/) const { return true; }
/** close the archive.*/
virtual void close() = 0;

10
src/osgTerrain/DataSet.cpp
View File

@ -844,15 +844,6 @@ void DataSet::SourceData::readHeightField(DestinationData& destination)
if (bandSelected)
{
bool xyInDegrees = false;
CoordinateSystemType cst = getCoordinateSystemType(_cs.get());
if (cst==GEOGRAPHIC)
{
xyInDegrees = true;
}
if (bandSelected->GetUnitType()) my_notify(osg::INFO) << "bandSelected->GetUnitType()=" << bandSelected->GetUnitType()<<std::endl;
else my_notify(osg::INFO) << "bandSelected->GetUnitType()= null" <<std::endl;
@ -889,7 +880,6 @@ void DataSet::SourceData::readHeightField(DestinationData& destination)
{
scale = destination._dataSet->getVerticalScale();
my_notify(osg::INFO)<<"We have no Scale from file so use DataSet vertical scale of "<<scale<<std::endl;
//scale = (xyInDegrees /*&& !destination._dataSet->getConvertFromGeographicToGeocentric()*/) ? 1.0f/111319.0f : 1.0f;
}