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

Renamed the ConvexPlaner* classes to ConvexPlanar* and changed all the various

Browse Source 
classes that reference it.

Added MUST_READ_ME.txt to the VisualStudio directory.
This commit is contained in:
Robert Osfield
2002-08-29 11:02:01 +00:00
parent 4e45c82067
commit 79aaac4e0c
19 changed files with 107 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/osg/ConvexPlanerOccluder → include/osg/ConvexPlanarOccluder
View File

@@ -2,10 +2,10 @@
//Distributed under the terms of the GNU Library General Public License (LGPL)
//as published by the Free Software Foundation.
#ifndef OSG_CONVEXPLANEROCCLUDER
#define OSG_CONVEXPLANEROCCLUDER 1
#ifndef OSG_CONVEXPLANAROCCLUDER
#define OSG_CONVEXPLANAROCCLUDER 1
#include <osg/ConvexPlanerPolygon>
#include <osg/ConvexPlanarPolygon>
#include <osg/Object>
namespace osg {
@@ -14,30 +14,30 @@ class OccluderVolume;
/** A class for representing convex clipping volumes made up.
* When adding planes, their normals should point inwards (into the volume) */
class SG_EXPORT ConvexPlanerOccluder : public Object
class SG_EXPORT ConvexPlanarOccluder : public Object
{
public:
ConvexPlanerOccluder():Object() {}
ConvexPlanerOccluder(const ConvexPlanerOccluder& cpo,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
ConvexPlanarOccluder():Object() {}
ConvexPlanarOccluder(const ConvexPlanarOccluder& cpo,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
Object(cpo,copyop),
_occluder(cpo._occluder),
_holeList(cpo._holeList) {}
META_Object(osg,ConvexPlanerOccluder)
META_Object(osg,ConvexPlanarOccluder)
void setOccluder(const ConvexPlanerPolygon& cpp) { _occluder = cpp; }
void setOccluder(const ConvexPlanarPolygon& cpp) { _occluder = cpp; }
ConvexPlanerPolygon& getOccluder() { return _occluder; }
ConvexPlanarPolygon& getOccluder() { return _occluder; }
const ConvexPlanerPolygon& getOccluder() const { return _occluder; }
const ConvexPlanarPolygon& getOccluder() const { return _occluder; }
typedef std::vector<ConvexPlanerPolygon> HoleList;
typedef std::vector<ConvexPlanarPolygon> HoleList;
void addHole(const ConvexPlanerPolygon& cpp) { _holeList.push_back(cpp); }
void addHole(const ConvexPlanarPolygon& cpp) { _holeList.push_back(cpp); }
HoleList& getHoleList() { return _holeList; }
@@ -51,9 +51,9 @@ class SG_EXPORT ConvexPlanerOccluder : public Object
protected:
~ConvexPlanerOccluder() {}
~ConvexPlanarOccluder() {}
ConvexPlanerPolygon _occluder;
ConvexPlanarPolygon _occluder;
HoleList _holeList;
};

8
include/osg/ConvexPlanerPolygon → include/osg/ConvexPlanarPolygon
View File

@@ -2,8 +2,8 @@
//Distributed under the terms of the GNU Library General Public License (LGPL)
//as published by the Free Software Foundation.
#ifndef OSG_CONVEXPLANERPOLYGON
#define OSG_CONVEXPLANERPOLYGON 1
#ifndef OSG_CONVEXPLANARPOLYGON
#define OSG_CONVEXPLANARPOLYGON 1
#include <osg/Plane>
@@ -16,12 +16,12 @@ class BoundingSphere;
/** A class for representing convex clipping volumes made up.
* When adding planes, their normals should point inwards (into the volume) */
class SG_EXPORT ConvexPlanerPolygon
class SG_EXPORT ConvexPlanarPolygon
{
public:
ConvexPlanerPolygon();
ConvexPlanarPolygon();
typedef std::vector<osg::Vec3> VertexList;

16
include/osg/OccluderNode
View File

@@ -6,7 +6,7 @@
#define OSG_OCCLUDERNODE 1
#include <osg/Group>
#include <osg/ConvexPlanerOccluder>
#include <osg/ConvexPlanarOccluder>
namespace osg {
@@ -27,14 +27,14 @@ class SG_EXPORT OccluderNode : public Group
META_Node(osg, OccluderNode);
/** Attach a ConvexPlanerOccluder to an OccluderNode.*/
void setOccluder(ConvexPlanerOccluder* occluder) { _occluder = occluder; }
/** Attach a ConvexPlanarOccluder to an OccluderNode.*/
void setOccluder(ConvexPlanarOccluder* occluder) { _occluder = occluder; }
/** Get the ConvexPlanerOccluder* attached to a OccluderNode. */
ConvexPlanerOccluder* getOccluder() { return _occluder.get(); }
/** Get the ConvexPlanarOccluder* attached to a OccluderNode. */
ConvexPlanarOccluder* getOccluder() { return _occluder.get(); }
/** Get the const ConvexPlanerOccluder* attached to a OccluderNode.*/
const ConvexPlanerOccluder* getOccluder() const { return _occluder.get(); }
/** Get the const ConvexPlanarOccluder* attached to a OccluderNode.*/
const ConvexPlanarOccluder* getOccluder() const { return _occluder.get(); }
protected :
@@ -44,7 +44,7 @@ class SG_EXPORT OccluderNode : public Group
/** Override's Group's computeBound.*/
virtual const bool computeBound() const;
ref_ptr<ConvexPlanerOccluder> _occluder;
ref_ptr<ConvexPlanarOccluder> _occluder;
};
}

4
include/osg/ShadowVolumeOccluder
View File

@@ -6,7 +6,7 @@
#define OSG_SHADOWVOLUMEOCCLUDER 1
#include <osg/Polytope>
#include <osg/ConvexPlanerOccluder>
#include <osg/ConvexPlanarOccluder>
#include <osg/Node>
namespace osg {
@@ -36,7 +36,7 @@ class SG_EXPORT ShadowVolumeOccluder
bool operator < (const ShadowVolumeOccluder& svo) const { return getVolume()>svo.getVolume(); } // not greater volume first.
/** compute the shadow volume occluder. */
bool computeOccluder(const NodePath& nodePath,const ConvexPlanerOccluder& occluder,CullStack& cullStack,bool createDrawables=false);
bool computeOccluder(const NodePath& nodePath,const ConvexPlanarOccluder& occluder,CullStack& cullStack,bool createDrawables=false);
inline void disableResultMasks();