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

Updates for fade text to work properly, but only in perspetive views at present.

Browse Source
This commit is contained in:
Robert Osfield 2006-09-20 10:36:21 +00:00
parent 5cab53941f
commit cc202c1b6d
3 changed files with 21 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/osgfadetext/osgfadetext.cpp
View File

@ -101,7 +101,7 @@ osg::Node* createFadeText(osg::EllipsoidModel* ellipsoid)
osg::Geode* geode = new osg::Geode; osg::Geode* geode = new osg::Geode;
osgText::FadeText* text = new osgText::FadeText; osgText::FadeText* text = new osgText::FadeText;
text->setText("This is a test"); text->setText("One");
text->setFont("fonts/arial.ttf"); text->setFont("fonts/arial.ttf");
text->setPosition(position); text->setPosition(position);
text->setCharacterSize(300000.0f); text->setCharacterSize(300000.0f);
@ -118,7 +118,7 @@ osg::Node* createFadeText(osg::EllipsoidModel* ellipsoid)
osg::Geode* geode = new osg::Geode; osg::Geode* geode = new osg::Geode;
osgText::FadeText* text = new osgText::FadeText; osgText::FadeText* text = new osgText::FadeText;
text->setText("This is a test"); text->setText("Two");
text->setFont("fonts/arial.ttf"); text->setFont("fonts/arial.ttf");
text->setPosition(position); text->setPosition(position);
text->setCharacterSize(300000.0f); text->setCharacterSize(300000.0f);

2
src/osg/View.cpp
View File

@ -199,7 +199,7 @@ bool View::addCamera(osg::CameraNode* camera, const osg::Matrix& projectionOffse
_cameras.push_back(CameraData(camera, projectionOffset, viewOffset)); _cameras.push_back(CameraData(camera, projectionOffset, viewOffset));
osg::notify(osg::NOTICE)<<"Added camera"<<std::endl; // osg::notify(osg::NOTICE)<<"Added camera"<<std::endl;
return true; return true;
} }

53
src/osgText/FadeText.cpp
View File

@ -31,17 +31,20 @@ struct FadeTextData : public osg::Referenced
return _fadeText < rhs._fadeText; return _fadeText < rhs._fadeText;
} }
float getNearestZ() const double getNearestZ() const
{ {
float nearestZ = _vertices[0].z(); double nearestZ = _vertices[0].z();
if (nearestZ < _vertices[1].z()) nearestZ = _vertices[1].z(); if (nearestZ < _vertices[1].z()) nearestZ = _vertices[1].z();
if (nearestZ < _vertices[2].z()) nearestZ = _vertices[2].z(); if (nearestZ < _vertices[2].z()) nearestZ = _vertices[2].z();
if (nearestZ < _vertices[3].z()) nearestZ = _vertices[3].z(); if (nearestZ < _vertices[3].z()) nearestZ = _vertices[3].z();
// osg::notify(osg::NOTICE)<<"getNearestZ()="<<_fadeText->getText().createUTF8EncodedString()<<" "<<nearestZ<<std::endl;
return nearestZ; return nearestZ;
} }
FadeText* _fadeText; FadeText* _fadeText;
osg::Vec3 _vertices[4]; osg::Vec3d _vertices[4];
bool _visible; bool _visible;
}; };
@ -77,12 +80,12 @@ struct FadeTextPolytopeData : public FadeTextData, public osg::Polytope
normalFrontFace.normalize(); normalFrontFace.normalize();
add(osg::Plane(normalFrontFace, _vertices[0])); add(osg::Plane(normalFrontFace, _vertices[0]));
addEdgePlane(_vertices[0], edge01); add(osg::Plane( osg::Vec3(0.0f,0.0f,0.0f), _vertices[0], _vertices[1]));
addEdgePlane(_vertices[1], edge12); add(osg::Plane( osg::Vec3(0.0f,0.0f,0.0f), _vertices[1], _vertices[2]));
addEdgePlane(_vertices[2], edge23); add(osg::Plane( osg::Vec3(0.0f,0.0f,0.0f), _vertices[2], _vertices[3]));
addEdgePlane(_vertices[3], edge30); add(osg::Plane( osg::Vec3(0.0f,0.0f,0.0f), _vertices[3], _vertices[0]));
#if 0
osg::notify(osg::NOTICE)<<" normalFrontFace = "<<normalFrontFace<<std::endl; osg::notify(osg::NOTICE)<<" normalFrontFace = "<<normalFrontFace<<std::endl;
osg::notify(osg::NOTICE)<<" edge01 = "<<edge01<<std::endl; osg::notify(osg::NOTICE)<<" edge01 = "<<edge01<<std::endl;
osg::notify(osg::NOTICE)<<" edge12 = "<<edge12<<std::endl; osg::notify(osg::NOTICE)<<" edge12 = "<<edge12<<std::endl;
@ -91,40 +94,30 @@ struct FadeTextPolytopeData : public FadeTextData, public osg::Polytope
osg::notify(osg::NOTICE)<<" _vertices[1]= "<<_vertices[1]<<std::endl; osg::notify(osg::NOTICE)<<" _vertices[1]= "<<_vertices[1]<<std::endl;
osg::notify(osg::NOTICE)<<" _vertices[2]= "<<_vertices[2]<<std::endl; osg::notify(osg::NOTICE)<<" _vertices[2]= "<<_vertices[2]<<std::endl;
osg::notify(osg::NOTICE)<<" _vertices[3]= "<<_vertices[3]<<std::endl; osg::notify(osg::NOTICE)<<" _vertices[3]= "<<_vertices[3]<<std::endl;
#endif
if (needToFlip) flip(); if (needToFlip) flip();
#if 0
osg::notify(osg::NOTICE)<<" plane 0 "<< _planeList[0]<<std::endl; osg::notify(osg::NOTICE)<<" plane 0 "<< _planeList[0]<<std::endl;
osg::notify(osg::NOTICE)<<" plane 1 "<< _planeList[1]<<std::endl; osg::notify(osg::NOTICE)<<" plane 1 "<< _planeList[1]<<std::endl;
osg::notify(osg::NOTICE)<<" plane 2 "<< _planeList[2]<<std::endl; osg::notify(osg::NOTICE)<<" plane 2 "<< _planeList[2]<<std::endl;
osg::notify(osg::NOTICE)<<" plane 3 "<< _planeList[3]<<std::endl; osg::notify(osg::NOTICE)<<" plane 3 "<< _planeList[3]<<std::endl;
osg::notify(osg::NOTICE)<<" plane 4 "<< _planeList[4]<<std::endl; osg::notify(osg::NOTICE)<<" plane 4 "<< _planeList[4]<<std::endl;
#endif
} }
inline bool contains(const std::vector<osg::Vec3>& vertices) inline bool contains(const std::vector<osg::Vec3>& vertices)
{ {
for(std::vector<osg::Vec3>::const_iterator itr = vertices.begin();
itr != vertices.end();
++itr)
{
osg::notify(osg::NOTICE)<<"testing "<<*itr<<std::endl;
}
for(std::vector<osg::Vec3>::const_iterator itr = vertices.begin(); for(std::vector<osg::Vec3>::const_iterator itr = vertices.begin();
itr != vertices.end(); itr != vertices.end();
++itr) ++itr)
{ {
if (osg::Polytope::contains(*itr)) if (osg::Polytope::contains(*itr))
{ {
osg::notify(osg::NOTICE)<<"Does contain "<<*itr<<std::endl;
return true; return true;
} }
else
{
osg::notify(osg::NOTICE)<<"Doesn't contain "<<*itr<<std::endl;
}
} }
return false; return false;
} }
@ -145,7 +138,7 @@ struct GlobalFadeText : public osg::Referenced
{ {
typedef std::set< osg::ref_ptr<FadeTextUserData> > UserDataSet; typedef std::set< osg::ref_ptr<FadeTextUserData> > UserDataSet;
typedef std::set<FadeText*> FadeTextSet; typedef std::set<FadeText*> FadeTextSet;
typedef std::multimap<float, osg::ref_ptr<FadeTextPolytopeData> > FadeTextPolytopeMap; typedef std::multimap<double, osg::ref_ptr<FadeTextPolytopeData> > FadeTextPolytopeMap;
typedef std::map<osg::View*, UserDataSet> ViewUserDataMap; typedef std::map<osg::View*, UserDataSet> ViewUserDataMap;
typedef std::map<osg::View*, FadeTextSet > ViewFadeTextMap; typedef std::map<osg::View*, FadeTextSet > ViewFadeTextMap;
@ -175,8 +168,6 @@ struct GlobalFadeText : public osg::Referenced
void update(unsigned int frameNumber) void update(unsigned int frameNumber)
{ {
osg::notify(osg::NOTICE)<<std::endl<<"update**********************"<<std::endl;
_frameNumber = frameNumber; _frameNumber = frameNumber;
for(GlobalFadeText::ViewUserDataMap::iterator vitr = _viewMap.begin(); for(GlobalFadeText::ViewUserDataMap::iterator vitr = _viewMap.begin();
@ -232,13 +223,13 @@ struct GlobalFadeText : public osg::Referenced
FadeTextPolytopeData& outer_ftpm = *(outer_itr->second); FadeTextPolytopeData& outer_ftpm = *(outer_itr->second);
outer_ftpm.buildPolytope(); outer_ftpm.buildPolytope();
osg::notify(osg::NOTICE)<<"Outer z "<<outer_ftpm.getNearestZ()<<std::endl; // osg::notify(osg::NOTICE)<<"Outer z "<<outer_ftpm.getNearestZ()<<std::endl;
while(inner_itr != fadeTextPolytopeMap.end()) while(inner_itr != fadeTextPolytopeMap.end())
{ {
FadeTextPolytopeData& inner_ftpm = *(inner_itr->second); FadeTextPolytopeData& inner_ftpm = *(inner_itr->second);
osg::notify(osg::NOTICE)<<"Inner z "<<inner_ftpm.getNearestZ()<<std::endl; // osg::notify(osg::NOTICE)<<"Inner z "<<inner_ftpm.getNearestZ()<<std::endl;
if (outer_ftpm.contains(inner_ftpm.getReferenceVertexList())) if (outer_ftpm.contains(inner_ftpm.getReferenceVertexList()))
{ {
@ -262,9 +253,6 @@ struct GlobalFadeText : public osg::Referenced
++outer_itr; ++outer_itr;
} }
osg::notify(osg::NOTICE)<<"fadeTextPolytopeMap.size() = "<<fadeTextPolytopeMap.size()<<std::endl;
} }
} }
@ -417,17 +405,10 @@ void FadeText::drawImplementation(osg::RenderInfo& renderInfo) const
// move from camera into the view space. // move from camera into the view space.
lmv.postMult(state.getInitialInverseViewMatrix()); lmv.postMult(state.getInitialInverseViewMatrix());
lmv.postMult(renderInfo.getView()->getViewMatrix()); lmv.postMult(renderInfo.getView()->getViewMatrix());
lmv.postMult(renderInfo.getView()->getProjectionMatrix());
osg::notify(osg::NOTICE)<<"renderInfo.getView()->getProjectionMatrix())="<<renderInfo.getView()->getProjectionMatrix()<<std::endl;
osg::notify(osg::NOTICE)<<"lmv="<<lmv<<std::endl;
} }
FadeTextData ftd(const_cast<osgText::FadeText*>(this)); FadeTextData ftd(const_cast<osgText::FadeText*>(this));
osg::notify(osg::NOTICE)<<"osg::Vec3d(_textBB.xMin(),_textBB.yMin(),_textBB.zMin())*lmv="<<osg::Vec3d(_textBB.xMin(),_textBB.yMin(),_textBB.zMin())*lmv<<std::endl;
osg::notify(osg::NOTICE)<<"osg::Vec4d(_textBB.xMin(),_textBB.yMin(),_textBB.zMin(),1.0)*lmv="<<osg::Vec4d(_textBB.xMin(),_textBB.yMin(),_textBB.zMin(),1.0)*lmv<<std::endl;
ftd._vertices[0].set(osg::Vec3d(_textBB.xMin(),_textBB.yMin(),_textBB.zMin())*lmv); ftd._vertices[0].set(osg::Vec3d(_textBB.xMin(),_textBB.yMin(),_textBB.zMin())*lmv);
ftd._vertices[1].set(osg::Vec3d(_textBB.xMax(),_textBB.yMin(),_textBB.zMin())*lmv); ftd._vertices[1].set(osg::Vec3d(_textBB.xMax(),_textBB.yMin(),_textBB.zMin())*lmv);
ftd._vertices[2].set(osg::Vec3d(_textBB.xMax(),_textBB.yMax(),_textBB.zMin())*lmv); ftd._vertices[2].set(osg::Vec3d(_textBB.xMax(),_textBB.yMax(),_textBB.zMin())*lmv);