Ran script to remove trailing spaces and tabs
This commit is contained in:
@@ -1,13 +1,13 @@
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 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
|
||||
* 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
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* OpenSceneGraph Public License for more details.
|
||||
*/
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
# endif
|
||||
#else
|
||||
# define OSGVOLUME_EXPORT
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 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
|
||||
* 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
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* OpenSceneGraph Public License for more details.
|
||||
*/
|
||||
|
||||
@@ -26,7 +26,7 @@ class OSGVOLUME_EXPORT FixedFunctionTechnique : public VolumeTechnique
|
||||
|
||||
/** Copy constructor using CopyOp to manage deep vs shallow copy.*/
|
||||
FixedFunctionTechnique(const FixedFunctionTechnique&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
|
||||
|
||||
|
||||
META_Object(osgVolume, FixedFunctionTechnique);
|
||||
|
||||
virtual void init();
|
||||
@@ -34,11 +34,11 @@ class OSGVOLUME_EXPORT FixedFunctionTechnique : public VolumeTechnique
|
||||
virtual void update(osgUtil::UpdateVisitor* nv);
|
||||
|
||||
virtual void cull(osgUtil::CullVisitor* nv);
|
||||
|
||||
|
||||
void setNumSlices(unsigned int numSlices);
|
||||
|
||||
unsigned int getNumSlices() const { return _numSlices; }
|
||||
|
||||
|
||||
|
||||
/** Clean scene graph from any terrain technique specific nodes.*/
|
||||
virtual void cleanSceneGraph();
|
||||
@@ -47,11 +47,11 @@ class OSGVOLUME_EXPORT FixedFunctionTechnique : public VolumeTechnique
|
||||
virtual void traverse(osg::NodeVisitor& nv);
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
virtual ~FixedFunctionTechnique();
|
||||
|
||||
|
||||
osg::ref_ptr<osg::Node> _node;
|
||||
|
||||
|
||||
unsigned int _numSlices;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 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
|
||||
* 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
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* OpenSceneGraph Public License for more details.
|
||||
*/
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 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
|
||||
* 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
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* OpenSceneGraph Public License for more details.
|
||||
*/
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace osgVolume {
|
||||
class OSGVOLUME_EXPORT Locator : public osg::Object
|
||||
{
|
||||
public:
|
||||
|
||||
|
||||
Locator() {}
|
||||
|
||||
Locator(const osg::Matrixd& transform) { setTransform(transform); }
|
||||
@@ -35,7 +35,7 @@ class OSGVOLUME_EXPORT Locator : public osg::Object
|
||||
Locator(const Locator& locator,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY):
|
||||
osg::Object(locator, copyop),
|
||||
_transform(locator._transform) {}
|
||||
|
||||
|
||||
META_Object(osgVolume, Locator);
|
||||
|
||||
/** Set the transformation from local coordinates to model coordinates.*/
|
||||
@@ -52,7 +52,7 @@ class OSGVOLUME_EXPORT Locator : public osg::Object
|
||||
|
||||
virtual bool convertModelToLocal(const osg::Vec3d& /*world*/, osg::Vec3d& /*local*/) const;
|
||||
|
||||
static bool convertLocalCoordBetween(const Locator& source, const osg::Vec3d& sourceNDC,
|
||||
static bool convertLocalCoordBetween(const Locator& source, const osg::Vec3d& sourceNDC,
|
||||
const Locator& destination, osg::Vec3d& destinationNDC)
|
||||
{
|
||||
osg::Vec3d model;
|
||||
@@ -60,7 +60,7 @@ class OSGVOLUME_EXPORT Locator : public osg::Object
|
||||
if (!destination.convertModelToLocal(model, destinationNDC)) return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
bool computeLocalBounds(osg::Vec3d& bottomLeft, osg::Vec3d& topRight) const;
|
||||
bool computeLocalBounds(Locator& source, osg::Vec3d& bottomLeft, osg::Vec3d& topRight) const;
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 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
|
||||
* 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
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* OpenSceneGraph Public License for more details.
|
||||
*/
|
||||
|
||||
@@ -26,7 +26,7 @@ class OSGVOLUME_EXPORT RayTracedTechnique : public VolumeTechnique
|
||||
RayTracedTechnique();
|
||||
|
||||
RayTracedTechnique(const RayTracedTechnique&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
|
||||
|
||||
|
||||
META_Object(osgVolume, RayTracedTechnique);
|
||||
|
||||
virtual void init();
|
||||
@@ -42,7 +42,7 @@ class OSGVOLUME_EXPORT RayTracedTechnique : public VolumeTechnique
|
||||
virtual void traverse(osg::NodeVisitor& nv);
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
virtual ~RayTracedTechnique();
|
||||
|
||||
osg::ref_ptr<osg::MatrixTransform> _transform;
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 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
|
||||
* 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
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* OpenSceneGraph Public License for more details.
|
||||
*/
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 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
|
||||
* 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
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* OpenSceneGraph Public License for more details.
|
||||
*/
|
||||
|
||||
@@ -28,27 +28,27 @@ class OSGVOLUME_EXPORT Volume : public osg::Group
|
||||
public:
|
||||
|
||||
Volume();
|
||||
|
||||
|
||||
/** Copy constructor using CopyOp to manage deep vs shallow copy.*/
|
||||
Volume(const Volume&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
|
||||
|
||||
META_Node(osgVolume, Volume);
|
||||
|
||||
virtual void traverse(osg::NodeVisitor& nv);
|
||||
|
||||
|
||||
/** Get the VolumeTile for a given VolumeTileID.*/
|
||||
VolumeTile* getVolumeTile(const TileID& tileID);
|
||||
|
||||
/** Get the const VolumeTile for a given VolumeTileID.*/
|
||||
const VolumeTile* getVolumeTile(const TileID& tileID) const;
|
||||
|
||||
|
||||
|
||||
/** Set the VolumeTechnique prototype that nested VolumeTile should clone if they haven't already been assigned a volume rendering technique. */
|
||||
void setVolumeTechniquePrototype(VolumeTechnique* volumeTechnique) { _volumeTechnique = volumeTechnique; }
|
||||
|
||||
/** Get the VolumeTechnique prototype. */
|
||||
VolumeTechnique* getVolumeTechniquePrototype() { return _volumeTechnique.get(); }
|
||||
|
||||
|
||||
/** Get the const VolumeTechnique prototype. */
|
||||
const VolumeTechnique* getVolumeTechniquePrototype() const { return _volumeTechnique.get(); }
|
||||
|
||||
@@ -56,9 +56,9 @@ class OSGVOLUME_EXPORT Volume : public osg::Group
|
||||
protected:
|
||||
|
||||
virtual ~Volume();
|
||||
|
||||
|
||||
friend class VolumeTile;
|
||||
|
||||
|
||||
void dirtyRegisteredVolumeTiles();
|
||||
|
||||
void registerVolumeTile(VolumeTile* tile);
|
||||
@@ -70,7 +70,7 @@ class OSGVOLUME_EXPORT Volume : public osg::Group
|
||||
mutable OpenThreads::Mutex _mutex;
|
||||
VolumeTileSet _volumeTileSet;
|
||||
VolumeTileMap _volumeTileMap;
|
||||
|
||||
|
||||
osg::ref_ptr<VolumeTechnique> _volumeTechnique;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 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
|
||||
* 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
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* OpenSceneGraph Public License for more details.
|
||||
*/
|
||||
|
||||
@@ -33,7 +33,7 @@ class OSGVOLUME_EXPORT VolumeTechnique : public osg::Object
|
||||
|
||||
/** Copy constructor using CopyOp to manage deep vs shallow copy.*/
|
||||
VolumeTechnique(const VolumeTechnique&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
|
||||
|
||||
|
||||
META_Object(osgVolume, VolumeTechnique);
|
||||
|
||||
VolumeTile* getVolumeTile() { return _volumeTile; }
|
||||
@@ -52,11 +52,11 @@ class OSGVOLUME_EXPORT VolumeTechnique : public osg::Object
|
||||
virtual void traverse(osg::NodeVisitor& nv);
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
void setDirty(bool dirty);
|
||||
|
||||
virtual ~VolumeTechnique();
|
||||
|
||||
|
||||
friend class osgVolume::VolumeTile;
|
||||
|
||||
VolumeTile* _volumeTile;
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 Robert Osfield
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2009 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
|
||||
* 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
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* OpenSceneGraph Public License for more details.
|
||||
*/
|
||||
|
||||
@@ -29,17 +29,17 @@ class Volume;
|
||||
class OSGVOLUME_EXPORT TileID
|
||||
{
|
||||
public:
|
||||
|
||||
|
||||
TileID();
|
||||
|
||||
TileID(int in_level, int in_x, int in_y, int in_z);
|
||||
|
||||
bool operator == (const TileID& rhs) const
|
||||
|
||||
bool operator == (const TileID& rhs) const
|
||||
{
|
||||
return (level==rhs.level) && (x==rhs.x) && (y==rhs.y) && (z==rhs.z);
|
||||
}
|
||||
|
||||
bool operator != (const TileID& rhs) const
|
||||
bool operator != (const TileID& rhs) const
|
||||
{
|
||||
return (level!=rhs.level) || (x!=rhs.x) || (y!=rhs.y) || (z!=rhs.z);
|
||||
}
|
||||
@@ -54,7 +54,7 @@ class OSGVOLUME_EXPORT TileID
|
||||
if (y>rhs.y) return false;
|
||||
return z<rhs.z;
|
||||
}
|
||||
|
||||
|
||||
bool valid() const { return level>=0; }
|
||||
|
||||
int level;
|
||||
@@ -71,7 +71,7 @@ class OSGVOLUME_EXPORT VolumeTile : public osg::Group
|
||||
public:
|
||||
|
||||
VolumeTile();
|
||||
|
||||
|
||||
/** Copy constructor using CopyOp to manage deep vs shallow copy.*/
|
||||
VolumeTile(const VolumeTile&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
|
||||
|
||||
@@ -92,16 +92,16 @@ class OSGVOLUME_EXPORT VolumeTile : public osg::Group
|
||||
/** Get the const Volume that this Volume tile is a member of.*/
|
||||
const Volume* getVolume() const { return _volume; }
|
||||
|
||||
|
||||
|
||||
/** Set the TileID (layer, x,y,z) of the VolumeTile.
|
||||
* The TileID is used so it can be located by its neighbours
|
||||
* The TileID is used so it can be located by its neighbours
|
||||
* via the enclosing Volume node that manages a map of TileID to VolumeTiles.*/
|
||||
void setTileID(const TileID& tileID);
|
||||
|
||||
|
||||
/** Get the TileID (layer, x,y,z) of the VolumeTile.*/
|
||||
const TileID& getTileID() const { return _tileID; }
|
||||
|
||||
|
||||
|
||||
|
||||
void setLocator(Locator* locator) { _locator = locator; }
|
||||
Locator* getLocator() { return _locator.get(); }
|
||||
const Locator* getLocator() const { return _locator.get(); }
|
||||
@@ -118,7 +118,7 @@ class OSGVOLUME_EXPORT VolumeTile : public osg::Group
|
||||
|
||||
/** Get the VolumeTechnique that will be used to render this tile. */
|
||||
VolumeTechnique* getVolumeTechnique() { return _volumeTechnique.get(); }
|
||||
|
||||
|
||||
/** Get the const VolumeTechnique that will be used to render this tile. */
|
||||
const VolumeTechnique* getVolumeTechnique() const { return _volumeTechnique.get(); }
|
||||
|
||||
@@ -139,15 +139,15 @@ class OSGVOLUME_EXPORT VolumeTile : public osg::Group
|
||||
friend class Volume;
|
||||
|
||||
Volume* _volume;
|
||||
|
||||
|
||||
bool _dirty;
|
||||
bool _hasBeenTraversal;
|
||||
|
||||
|
||||
TileID _tileID;
|
||||
|
||||
osg::ref_ptr<VolumeTechnique> _volumeTechnique;
|
||||
|
||||
osg::ref_ptr<Locator> _locator;
|
||||
osg::ref_ptr<Locator> _locator;
|
||||
|
||||
osg::ref_ptr<Layer> _layer;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user