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

Changed ABSOLUTE and RELATIVE to ABSOLUTE_RF and RELATIVE_RF to avoid stooppid Win32 #define

Browse Source
This commit is contained in:
Robert Osfield
2004-10-24 20:04:00 +00:00
parent 1dd682f6b4
commit b70ff91eaf
35 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/osg/LightSource
View File

@@ -38,19 +38,19 @@ class SG_EXPORT LightSource : public Group
enum ReferenceFrame
{
RELATIVE,
ABSOLUTE
RELATIVE_RF,
ABSOLUTE_RF
#ifdef USE_DEPRECATED_API
,
RELATIVE_TO_PARENTS=RELATIVE,
RELATIVE_TO_ABSOLUTE=ABSOLUTE,
RELATIVE_TO_PARENTS=RELATIVE_RF,
RELATIVE_TO_ABSOLUTE=ABSOLUTE_RF,
#endif
};
/** Set the light sources's ReferenceFrame, either to be relative to its
* parent reference frame, or relative to an absolute coordinate
* frame. RELATIVE is the default.
* Note: setting the ReferenceFrame to be RELATIVE_TO_ABSOLUTE will
* frame. RELATIVE_RF is the default.
* Note: setting the ReferenceFrame to be ABSOLUTE_RF will
* also set the CullingActive flag on the light source, and hence all
* of its parents, to false, thereby disabling culling of it and
* all its parents. This is necessary to prevent inappropriate

16
include/osg/Transform
View File

@@ -89,19 +89,19 @@ class SG_EXPORT Transform : public Group
enum ReferenceFrame
{
RELATIVE,
ABSOLUTE
RELATIVE_RF,
ABSOLUTE_RF
#ifdef USE_DEPRECATED_API
,
RELATIVE_TO_PARENTS=RELATIVE,
RELATIVE_TO_ABSOLUTE=ABSOLUTE,
RELATIVE_TO_PARENTS=RELATIVE_RF,
RELATIVE_TO_ABSOLUTE=ABSOLUTE_RF,
#endif
};
/** Set the transform's ReferenceFrame, either to be relative to its
* parent reference frame, or relative to an absolute coordinate
* frame. RELATIVE is the default.
* Note: Setting the ReferenceFrame to be RELATIVE_TO_ABSOLUTE will
* frame. RELATIVE_RF is the default.
* Note: Setting the ReferenceFrame to be ABSOLUTE_RF will
* also set the CullingActive flag on the transform, and hence all
* of its parents, to false, thereby disabling culling of it and
* all its parents. This is neccessary to prevent inappropriate
@@ -116,7 +116,7 @@ class SG_EXPORT Transform : public Group
virtual bool computeLocalToWorldMatrix(Matrix& matrix,NodeVisitor*) const
{
if (_referenceFrame==RELATIVE)
if (_referenceFrame==RELATIVE_RF)
{
return false;
}
@@ -129,7 +129,7 @@ class SG_EXPORT Transform : public Group
virtual bool computeWorldToLocalMatrix(Matrix& matrix,NodeVisitor*) const
{
if (_referenceFrame==RELATIVE)
if (_referenceFrame==RELATIVE_RF)
{
return false;
}

2
include/osgParticle/AccelOperator
View File

@@ -95,7 +95,7 @@ namespace osgParticle
inline void AccelOperator::beginOperate(Program *prg)
{
if (prg->getReferenceFrame() == ModularProgram::RELATIVE) {
if (prg->getReferenceFrame() == ModularProgram::RELATIVE_RF) {
xf_accel_ = prg->rotateLocalToWorld(accel_);
} else {
xf_accel_ = accel_;

2
include/osgParticle/AngularAccelOperator
View File

@@ -86,7 +86,7 @@ namespace osgParticle
inline void AngularAccelOperator::beginOperate(Program *prg)
{
if (prg->getReferenceFrame() == ModularProgram::RELATIVE) {
if (prg->getReferenceFrame() == ModularProgram::RELATIVE_RF) {
xf_angular_accel_ = prg->rotateLocalToWorld(angular_accel_);
} else {
xf_angular_accel_ = angular_accel_;

2
include/osgParticle/ForceOperator
View File

@@ -87,7 +87,7 @@ namespace osgParticle
inline void ForceOperator::beginOperate(Program *prg)
{
if (prg->getReferenceFrame() == ModularProgram::RELATIVE) {
if (prg->getReferenceFrame() == ModularProgram::RELATIVE_RF) {
xf_force_ = prg->rotateLocalToWorld(force_);
} else {
xf_force_ = force_;

2
include/osgParticle/Operator
View File

@@ -57,7 +57,7 @@ namespace osgParticle
/** Do something before processing particles via the <CODE>operate()</CODE> method.
Overriding this method could be necessary to query the calling <CODE>Program</CODE> object
for the current reference frame. If the reference frame is RELATIVE, then your
for the current reference frame. If the reference frame is RELATIVE_RF, then your
class should prepare itself to do all operations in local coordinates.
*/
virtual void beginOperate(Program *) {}

8
include/osgParticle/ParticleProcessor
View File

@@ -39,12 +39,12 @@ namespace osgParticle
public:
enum ReferenceFrame {
RELATIVE,
ABSOLUTE
RELATIVE_RF,
ABSOLUTE_RF
#ifdef USE_DEPRECATED_API
,
RELATIVE_TO_PARENTS=RELATIVE,
RELATIVE_TO_ABSOLUTE=ABSOLUTE,
RELATIVE_RF_TO_PARENTS=RELATIVE_RF,
RELATIVE_RF_TO_ABSOLUTE=ABSOLUTE_RF,
#endif
};