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

2
examples/osgdistortion/osgdistortion.cpp
View File

@@ -144,7 +144,7 @@ void DistortionNode::createHUDSubgraph()
// create the hud.
osg::MatrixTransform* modelview_abs = new osg::MatrixTransform;
modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE);
modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
modelview_abs->setMatrix(osg::Matrix::identity());
modelview_abs->addChild(geode);

2
examples/osgforest/osgforest.cpp
View File

@@ -744,7 +744,7 @@ osg::Node* ForestTechniqueManager::createHUDWithText(const std::string& str)
// create the hud.
osg::MatrixTransform* modelview_abs = new osg::MatrixTransform;
modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE);
modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
modelview_abs->setMatrix(osg::Matrix::identity());
modelview_abs->addChild(geode);

2
examples/osgfxbrowser/osgfxbrowser.cpp
View File

@@ -232,7 +232,7 @@ osg::Group *build_hud_base(osg::Group *root)
root->addChild(proj.get());
osg::ref_ptr<osg::MatrixTransform> xform = new osg::MatrixTransform(osg::Matrix::identity());
xform->setReferenceFrame(osg::Transform::ABSOLUTE);
xform->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
proj->addChild(xform.get());
osg::StateSet *ss = xform->getOrCreateStateSet();

4
examples/osghud/osghud.cpp
View File

@@ -102,7 +102,7 @@ osg::Node* createHUD()
text->setFont(timesFont);
text->setPosition(position);
text->setText("And add an osg::ModelViewMatrix set to ABSOLUTE to ensure\nit remains independent from any external model view matrices.");
text->setText("And add an osg::ModelViewMatrix set to ABSOLUTE_RF to ensure\nit remains independent from any external model view matrices.");
position += delta;
}
@@ -148,7 +148,7 @@ osg::Node* createHUD()
// create the hud.
osg::MatrixTransform* modelview_abs = new osg::MatrixTransform;
modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE);
modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
modelview_abs->setMatrix(osg::Matrix::identity());
modelview_abs->addChild(geode);

2
examples/osglauncher/osglauncher.cpp
View File

@@ -111,7 +111,7 @@ osg::Node* createHUD(osgText::Text* updateText)
// eg to be used as a menuing/help system!
// Can pick texts too!
osg::MatrixTransform* modelview_abs = new osg::MatrixTransform;
modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE);
modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
modelview_abs->setMatrix(osg::Matrix::identity());
osg::Projection* projection = new osg::Projection;

4
examples/osgparticle/osgparticle.cpp
View File

@@ -47,10 +47,10 @@ public:
// operators on the particle set via the operate() method.
void beginOperate(osgParticle::Program *prg)
{
// we have to check whether the reference frame is relative to parents
// we have to check whether the reference frame is RELATIVE_RF to parents
// or it's absolute; in the first case, we must transform the vectors
// from local to world space.
if (prg->getReferenceFrame() == osgParticle::Program::RELATIVE) {
if (prg->getReferenceFrame() == osgParticle::Program::RELATIVE_RF) {
// transform the center point (full transformation)
xf_center_ = prg->transformLocalToWorld(center_);
// transform the axis vector (only rotation and scale)

4
examples/osgphotoalbum/osgphotoalbum.cpp
View File

@@ -80,7 +80,7 @@ public:
virtual bool computeLocalToWorldMatrix(osg::Matrix& matrix,osg::NodeVisitor*) const
{
if (_referenceFrame==RELATIVE)
if (_referenceFrame==RELATIVE_RF)
{
matrix.preMult(getMatrix());
}
@@ -96,7 +96,7 @@ public:
{
const osg::Matrix& inverse = getInverseMatrix();
if (_referenceFrame==RELATIVE)
if (_referenceFrame==RELATIVE_RF)
{
matrix.postMult(inverse);
}

2
examples/osgpick/osgpick.cpp
View File

@@ -112,7 +112,7 @@ osg::Node* createHUD(osgText::Text* updateText)
// eg to be used as a menuing/help system!
// Can pick texts too!
osg::MatrixTransform* modelview_abs = new osg::MatrixTransform;
modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE);
modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
modelview_abs->setMatrix(osg::Matrix::identity());
osg::Projection* projection = new osg::Projection;

2
examples/osgscalarbar/osgscalarbar.cpp
View File

@@ -84,7 +84,7 @@ osg::Node * createScalarBar_HUD()
stateset->setRenderBinDetails(11, "RenderBin");
osg::MatrixTransform * modelview = new osg::MatrixTransform;
modelview->setReferenceFrame(osg::Transform::ABSOLUTE);
modelview->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
osg::Matrixd matrix(osg::Matrixd::scale(1000,1000,1000) * osg::Matrixd::translate(120,10,0)); // I've played with these values a lot and it seems to work, but I have no idea why
modelview->setMatrix(matrix);
modelview->addChild(geode);

2
examples/osgtesselate/osgtesselate.cpp
View File

@@ -525,7 +525,7 @@ osg::Node* createHUD()
// create the hud.
osg::MatrixTransform* modelview_abs = new osg::MatrixTransform;
modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE);
modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
modelview_abs->setMatrix(osg::Matrix::identity());
modelview_abs->addChild(geode);

2
examples/osgtext/osgtext.cpp
View File

@@ -501,7 +501,7 @@ int main( int argc, char **argv )
projection->setMatrix(osg::Matrix::ortho2D(0,1280,0,1024));
osg::MatrixTransform* modelview_abs = new osg::MatrixTransform;
modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE);
modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
modelview_abs->setMatrix(osg::Matrix::identity());
modelview_abs->addChild(createHUDText());

2
examples/osgtexturerectangle/osgtexturerectangle.cpp
View File

@@ -209,7 +209,7 @@ osg::Node* createHUD()
// create HUD
osg::MatrixTransform* modelview_abs = new osg::MatrixTransform;
modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE);
modelview_abs->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
modelview_abs->setMatrix(osg::Matrix::identity());
modelview_abs->addChild(group);