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

Added more accurate computation of local height above sea level in the plane intersections routines

Browse Source
This commit is contained in:
Robert Osfield 2006-12-05 12:58:29 +00:00
parent ba3fe2844f
commit afa96fff0e
5 changed files with 130 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/osgintersection/osgintersection.cpp
View File

@ -134,7 +134,7 @@ int main(int argc, char **argv)
es.setDatabaseCacheReadCallback(los.getDatabaseCacheReadCallback()); es.setDatabaseCacheReadCallback(los.getDatabaseCacheReadCallback());
es.setStartPoint(bs.center()+osg::Vec3d(bs.radius(),0.0,0.0) ); es.setStartPoint(bs.center()+osg::Vec3d(bs.radius(),0.0,0.0) );
es.setEndPoint(bs.center()+osg::Vec3d(0.0,0.0,bs.radius()) ); es.setEndPoint(bs.center()+osg::Vec3d(bs.radius(),bs.radius(),bs.radius()) );
es.computeIntersections(scene.get()); es.computeIntersections(scene.get());

4
include/osg/Plane
View File

@ -163,7 +163,7 @@ class OSG_EXPORT Plane
_fv[3]; _fv[3];
} }
inline float distance(const osg::Vec3d& v) const inline double distance(const osg::Vec3d& v) const
{ {
return _fv[0]*v.x()+ return _fv[0]*v.x()+
_fv[1]*v.y()+ _fv[1]*v.y()+
@ -180,7 +180,7 @@ class OSG_EXPORT Plane
} }
/** calculate the dot product of the plane normal and a point.*/ /** calculate the dot product of the plane normal and a point.*/
inline float dotProductNormal(const osg::Vec3d& v) const inline double dotProductNormal(const osg::Vec3d& v) const
{ {
return _fv[0]*v.x()+ return _fv[0]*v.x()+
_fv[1]*v.y()+ _fv[1]*v.y()+

26
include/osgUtil/PlaneIntersector
View File

@ -16,6 +16,8 @@
#include <osgUtil/IntersectionVisitor> #include <osgUtil/IntersectionVisitor>
#include <osg/CoordinateSystemNode>
namespace osgUtil namespace osgUtil
{ {
@ -47,11 +49,13 @@ class OSGUTIL_EXPORT PlaneIntersector : public Intersector
} }
typedef std::vector<osg::Vec3d> Polyline; typedef std::vector<osg::Vec3d> Polyline;
typedef std::vector<double> Attributes;
osg::NodePath nodePath; osg::NodePath nodePath;
osg::ref_ptr<osg::RefMatrix> matrix; osg::ref_ptr<osg::RefMatrix> matrix;
osg::ref_ptr<osg::Drawable> drawable; osg::ref_ptr<osg::Drawable> drawable;
Polyline polyline; Polyline polyline;
Attributes attributes;
}; };
@ -61,6 +65,15 @@ class OSGUTIL_EXPORT PlaneIntersector : public Intersector
inline Intersections& getIntersections() { return _parent ? _parent->_intersections : _intersections; } inline Intersections& getIntersections() { return _parent ? _parent->_intersections : _intersections; }
void setRecordHeightsAsAttributes(bool flag) { _recordHeightsAsAttributes = flag; }
bool getRecordHeightsAsAttributes() const { return _recordHeightsAsAttributes; }
void setEllipsoidModel(osg::EllipsoidModel* em) { _em = em; }
const osg::EllipsoidModel* getEllipsoidModel() const { return _em.get(); }
public: public:
virtual Intersector* clone(osgUtil::IntersectionVisitor& iv); virtual Intersector* clone(osgUtil::IntersectionVisitor& iv);
@ -77,12 +90,15 @@ class OSGUTIL_EXPORT PlaneIntersector : public Intersector
protected: protected:
PlaneIntersector* _parent; PlaneIntersector* _parent;
osg::Plane _plane;
osg::Polytope _polytope;
Intersections _intersections; bool _recordHeightsAsAttributes;
osg::ref_ptr<osg::EllipsoidModel> _em;
osg::Plane _plane;
osg::Polytope _polytope;
Intersections _intersections;
}; };

18
src/osgSim/ElevationSlice.cpp
View File

@ -245,6 +245,10 @@ void ElevationSlice::computeIntersections(osg::Node* scene)
osg::ref_ptr<osgUtil::PlaneIntersector> intersector = new osgUtil::PlaneIntersector(plane, boundingPolytope); osg::ref_ptr<osgUtil::PlaneIntersector> intersector = new osgUtil::PlaneIntersector(plane, boundingPolytope);
intersector->setRecordHeightsAsAttributes(true);
intersector->setEllipsoidModel(em);
_intersectionVisitor.reset(); _intersectionVisitor.reset();
_intersectionVisitor.setIntersector( intersector.get() ); _intersectionVisitor.setIntersector( intersector.get() );
@ -253,6 +257,7 @@ void ElevationSlice::computeIntersections(osg::Node* scene)
osgUtil::PlaneIntersector::Intersections& intersections = intersector->getIntersections(); osgUtil::PlaneIntersector::Intersections& intersections = intersector->getIntersections();
typedef osgUtil::PlaneIntersector::Intersection::Polyline Polyline; typedef osgUtil::PlaneIntersector::Intersection::Polyline Polyline;
typedef osgUtil::PlaneIntersector::Intersection::Attributes Attributes;
if (!intersections.empty()) if (!intersections.empty())
{ {
@ -300,14 +305,23 @@ void ElevationSlice::computeIntersections(osg::Node* scene)
++itr) ++itr)
{ {
osgUtil::PlaneIntersector::Intersection& intersection = *itr; osgUtil::PlaneIntersector::Intersection& intersection = *itr;
if (intersection.attributes.size()!=intersection.polyline.size()) continue;
Attributes::iterator aitr = intersection.attributes.begin();
for(Polyline::iterator pitr = intersection.polyline.begin(); for(Polyline::iterator pitr = intersection.polyline.begin();
pitr != intersection.polyline.end(); pitr != intersection.polyline.end();
++pitr) ++pitr, ++aitr)
{ {
const osg::Vec3d& v = *pitr; const osg::Vec3d& v = *pitr;
double distance, height; double distance, height;
dhc.computeDistanceHeight(v, distance, height); dhc.computeDistanceHeight(v, distance, height);
distanceHeightSet.insert(ElevationSliceUtils::DistanceHeightXYZ( distance, height, v));
double pi_height = *aitr;
osg::notify(osg::NOTICE)<<"computed height = "<<height<<" PI height = "<<pi_height<<std::endl;
distanceHeightSet.insert(ElevationSliceUtils::DistanceHeightXYZ( distance, pi_height, v));
} }
} }
} }

106
src/osgUtil/PlaneIntersector.cpp
View File

@ -26,7 +26,7 @@ namespace PlaneIntersectorUtils
struct RefPolyline : public osg::Referenced struct RefPolyline : public osg::Referenced
{ {
typedef std::vector<osg::Vec3d> Polyline; typedef std::vector<osg::Vec4d> Polyline;
Polyline _polyline; Polyline _polyline;
void reverse() void reverse()
@ -45,15 +45,21 @@ namespace PlaneIntersectorUtils
{ {
public: public:
typedef std::map<osg::Vec3d, osg::ref_ptr<RefPolyline> > PolylineMap; typedef std::map<osg::Vec4d, osg::ref_ptr<RefPolyline> > PolylineMap;
typedef std::vector< osg::ref_ptr<RefPolyline> > PolylineList; typedef std::vector< osg::ref_ptr<RefPolyline> > PolylineList;
PolylineList _polylines; PolylineList _polylines;
PolylineMap _startPolylineMap; PolylineMap _startPolylineMap;
PolylineMap _endPolylineMap; PolylineMap _endPolylineMap;
osg::ref_ptr<osg::EllipsoidModel> _em;
void add(const osg::Vec3d& v1, const osg::Vec3d& v2) void add(const osg::Vec3d& v1, const osg::Vec3d& v2)
{
add(osg::Vec4d(v1,0.0), osg::Vec4d(v2,0.0));
}
void add(const osg::Vec4d& v1, const osg::Vec4d& v2)
{ {
if (v1==v2) return; if (v1==v2) return;
@ -170,7 +176,7 @@ namespace PlaneIntersectorUtils
} }
} }
void newline(const osg::Vec3d& v1, const osg::Vec3d& v2) void newline(const osg::Vec4d& v1, const osg::Vec4d& v2)
{ {
RefPolyline* polyline = new RefPolyline; RefPolyline* polyline = new RefPolyline;
polyline->_polyline.push_back(v1); polyline->_polyline.push_back(v1);
@ -179,7 +185,7 @@ namespace PlaneIntersectorUtils
_endPolylineMap[v2] = polyline; _endPolylineMap[v2] = polyline;
} }
void insertAtStart(const osg::Vec3d& v, PolylineMap::iterator v_start_itr) void insertAtStart(const osg::Vec4d& v, PolylineMap::iterator v_start_itr)
{ {
// put v1 at the start of its poyline // put v1 at the start of its poyline
RefPolyline* polyline = v_start_itr->second.get(); RefPolyline* polyline = v_start_itr->second.get();
@ -193,7 +199,7 @@ namespace PlaneIntersectorUtils
} }
void insertAtEnd(const osg::Vec3d& v, PolylineMap::iterator v_end_itr) void insertAtEnd(const osg::Vec4d& v, PolylineMap::iterator v_end_itr)
{ {
// put v1 at the end of its poyline // put v1 at the end of its poyline
RefPolyline* polyline = v_end_itr->second.get(); RefPolyline* polyline = v_end_itr->second.get();
@ -350,7 +356,10 @@ namespace PlaneIntersectorUtils
osg::Plane _plane; osg::Plane _plane;
osg::Polytope _polytope; osg::Polytope _polytope;
bool _hit; bool _hit;
osg::ref_ptr<osg::RefMatrix> _matrix;
bool _recordHeightsAsAttributes;
osg::ref_ptr<osg::EllipsoidModel> _em;
PolylineConnector _polylineConnector; PolylineConnector _polylineConnector;
@ -359,14 +368,25 @@ namespace PlaneIntersectorUtils
_hit = false; _hit = false;
} }
void set(const osg::Plane& plane, const osg::Polytope& polytope) void set(const osg::Plane& plane, const osg::Polytope& polytope, osg::RefMatrix* matrix, bool recordHeightsAsAttributes, osg::EllipsoidModel* em)
{ {
_plane = plane; _plane = plane;
_polytope = polytope; _polytope = polytope;
_hit = false; _hit = false;
_matrix = matrix;
_recordHeightsAsAttributes = recordHeightsAsAttributes;
_em = em;
} }
inline void add(osg::Vec3d& vs, osg::Vec3d& ve) inline double distance(const osg::Plane& plane, const osg::Vec4d& v) const
{
return plane[0]*v.x()+
plane[1]*v.y()+
plane[2]*v.z()+
plane[3];
}
inline void add(osg::Vec4d& vs, osg::Vec4d& ve)
{ {
if (_polytope.getPlaneList().empty()) if (_polytope.getPlaneList().empty())
{ {
@ -379,8 +399,8 @@ namespace PlaneIntersectorUtils
++itr) ++itr)
{ {
osg::Plane& plane = *itr; osg::Plane& plane = *itr;
double ds = plane.distance(vs); double ds = distance(plane,vs);
double de = plane.distance(ve); double de = distance(plane,ve);
if (ds<0.0) if (ds<0.0)
{ {
@ -465,21 +485,57 @@ namespace PlaneIntersectorUtils
return; return;
} }
osg::Vec3d v[2]; osg::Vec4d v[2];
unsigned int numIntersects = 0; unsigned int numIntersects = 0;
osg::Vec4d p1(v1, v1.z());
osg::Vec4d p2(v2, v2.z());
osg::Vec4d p3(v3, v3.z());
if (_em.valid())
{
double latitude, longitude, height;
if (_matrix.valid())
{
osg::Vec3d tp = v1 * (*_matrix);
_em->convertXYZToLatLongHeight(tp.x(), tp.y(), tp.z(), latitude, longitude, height);
p1[3] = height;
tp = v2 * (*_matrix);
_em->convertXYZToLatLongHeight(tp.x(), tp.y(), tp.z(), latitude, longitude, height);
p2[3] = height;
tp = v3 * (*_matrix);
_em->convertXYZToLatLongHeight(tp.x(), tp.y(), tp.z(), latitude, longitude, height);
p3[3] = height;
}
else
{
_em->convertXYZToLatLongHeight(v1.x(), v1.y(), v1.z(), latitude, longitude, height);
p1[3] = height;
_em->convertXYZToLatLongHeight(v2.x(), v2.y(), v2.z(), latitude, longitude, height);
p2[3] = height;
_em->convertXYZToLatLongHeight(v3.x(), v3.y(), v3.z(), latitude, longitude, height);
p3[3] = height;
}
}
if (d1*d2 < 0.0) if (d1*d2 < 0.0)
{ {
// edge 12 itersects // edge 12 itersects
double div = 1.0 / (d2-d1); double div = 1.0 / (d2-d1);
v[numIntersects++] = v1* (d2*div) - v2 * (d1*div); v[numIntersects++] = p1* (d2*div) - p2 * (d1*div);
} }
if (d2*d3 < 0.0) if (d2*d3 < 0.0)
{ {
// edge 23 itersects // edge 23 itersects
double div = 1.0 / (d3-d2); double div = 1.0 / (d3-d2);
v[numIntersects++] = v2* (d3*div) - v3 * (d2*div); v[numIntersects++] = p2* (d3*div) - p3 * (d2*div);
} }
if (d1*d3 < 0.0) if (d1*d3 < 0.0)
@ -488,7 +544,7 @@ namespace PlaneIntersectorUtils
{ {
// edge 13 itersects // edge 13 itersects
double div = 1.0 / (d3-d1); double div = 1.0 / (d3-d1);
v[numIntersects++] = v1* (d3*div) - v3 * (d1*div); v[numIntersects++] = p1* (d3*div) - p3 * (d1*div);
} }
else else
{ {
@ -512,6 +568,7 @@ namespace PlaneIntersectorUtils
// //
PlaneIntersector::PlaneIntersector(const osg::Plane& plane, const osg::Polytope& boundingPolytope): PlaneIntersector::PlaneIntersector(const osg::Plane& plane, const osg::Polytope& boundingPolytope):
_parent(0), _parent(0),
_recordHeightsAsAttributes(false),
_plane(plane), _plane(plane),
_polytope(boundingPolytope) _polytope(boundingPolytope)
{ {
@ -520,6 +577,7 @@ PlaneIntersector::PlaneIntersector(const osg::Plane& plane, const osg::Polytope&
PlaneIntersector::PlaneIntersector(CoordinateFrame cf, const osg::Plane& plane, const osg::Polytope& boundingPolytope): PlaneIntersector::PlaneIntersector(CoordinateFrame cf, const osg::Plane& plane, const osg::Polytope& boundingPolytope):
Intersector(cf), Intersector(cf),
_parent(0), _parent(0),
_recordHeightsAsAttributes(false),
_plane(plane), _plane(plane),
_polytope(boundingPolytope) _polytope(boundingPolytope)
{ {
@ -532,6 +590,8 @@ Intersector* PlaneIntersector::clone(osgUtil::IntersectionVisitor& iv)
{ {
osg::ref_ptr<PlaneIntersector> pi = new PlaneIntersector(_plane, _polytope); osg::ref_ptr<PlaneIntersector> pi = new PlaneIntersector(_plane, _polytope);
pi->_parent = this; pi->_parent = this;
pi->_recordHeightsAsAttributes = _recordHeightsAsAttributes;
pi->_em = _em;
return pi.release(); return pi.release();
} }
@ -568,6 +628,8 @@ Intersector* PlaneIntersector::clone(osgUtil::IntersectionVisitor& iv)
osg::ref_ptr<PlaneIntersector> pi = new PlaneIntersector(plane, transformedPolytope); osg::ref_ptr<PlaneIntersector> pi = new PlaneIntersector(plane, transformedPolytope);
pi->_parent = this; pi->_parent = this;
pi->_recordHeightsAsAttributes = _recordHeightsAsAttributes;
pi->_em = _em;
return pi.release(); return pi.release();
} }
@ -594,7 +656,7 @@ void PlaneIntersector::intersect(osgUtil::IntersectionVisitor& iv, osg::Drawable
// osg::notify(osg::NOTICE)<<"Succed PlaneIntersector::intersect(osgUtil::IntersectionVisitor& iv, osg::Drawable* drawable)"<<std::endl; // osg::notify(osg::NOTICE)<<"Succed PlaneIntersector::intersect(osgUtil::IntersectionVisitor& iv, osg::Drawable* drawable)"<<std::endl;
osg::TriangleFunctor<PlaneIntersectorUtils::TriangleIntersector> ti; osg::TriangleFunctor<PlaneIntersectorUtils::TriangleIntersector> ti;
ti.set(_plane,_polytope); ti.set(_plane, _polytope, iv.getModelMatrix(), _recordHeightsAsAttributes, _em.get());
drawable->accept(ti); drawable->accept(ti);
ti._polylineConnector.consolidatePolylineLists(); ti._polylineConnector.consolidatePolylineLists();
@ -614,7 +676,19 @@ void PlaneIntersector::intersect(osgUtil::IntersectionVisitor& iv, osg::Drawable
Intersection& new_intersection = intersections[pos]; Intersection& new_intersection = intersections[pos];
new_intersection.matrix = iv.getModelMatrix(); new_intersection.matrix = iv.getModelMatrix();
new_intersection.polyline = (*pitr)->_polyline;
new_intersection.polyline.reserve((*pitr)->_polyline.size());
if (_recordHeightsAsAttributes) new_intersection.attributes.reserve((*pitr)->_polyline.size());
for(PlaneIntersectorUtils::RefPolyline::Polyline::iterator vitr = (*pitr)->_polyline.begin();
vitr != (*pitr)->_polyline.end();
++vitr)
{
const osg::Vec4d& v = *vitr;
new_intersection.polyline.push_back( osg::Vec3d(v.x(), v.y(), v.z()) );
if (_recordHeightsAsAttributes) new_intersection.attributes.push_back( v.w() );
}
new_intersection.nodePath = iv.getNodePath(); new_intersection.nodePath = iv.getNodePath();
new_intersection.drawable = drawable; new_intersection.drawable = drawable;
} }