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

WS30 Improve LineFeature Mesh

Browse Source 
- Rely on the Slicer for path vertices
- Remove redundant vertices (<1m distance)
This commit is contained in:
Stuart Buchanan 2021-03-07 22:26:25 +00:00
parent c86b6fe96c
commit 7b336d2018
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
simgear/scene/tgdb/VPBTechnique.cxx
View File

@ -1848,27 +1848,17 @@ void VPBTechnique::generateLineFeature(BufferData& buffer, Locator* masterLocato
osg::Vec3d ma, mb; osg::Vec3d ma, mb;
std::list<osg::Vec3d> roadPoints; std::list<osg::Vec3d> roadPoints;
auto road_iter = road._nodes.begin(); auto road_iter = road._nodes.begin();
ma = *road_iter - modelCenter;
// We're in Earth-centered coordinates, so "up" is simply directly away from (0,0,0) // We're in Earth-centered coordinates, so "up" is simply directly away from (0,0,0)
osg::Vec3d up = modelCenter; osg::Vec3d up = modelCenter;
up.normalize(); up.normalize();
osg::Vec3d intersect = getMeshIntersection(buffer, masterLocator, ma, up); ma = getMeshIntersection(buffer, masterLocator, *road_iter - modelCenter, up);
// If we've got an intersection, add it to the list
if (intersect != ma) roadPoints.push_back(intersect);
road_iter++; road_iter++;
for (; road_iter != road._nodes.end(); road_iter++) { for (; road_iter != road._nodes.end(); road_iter++) {
mb = *road_iter - modelCenter; mb = getMeshIntersection(buffer, masterLocator, *road_iter - modelCenter, up);
intersect = getMeshIntersection(buffer, masterLocator, mb, up);
if (intersect != mb) roadPoints.push_back(intersect);
auto esl = VPBElevationSlice::computeVPBElevationSlice(buffer._geometry, ma, mb, up); auto esl = VPBElevationSlice::computeVPBElevationSlice(buffer._geometry, ma, mb, up);
for(auto eslitr = esl.begin(); eslitr != esl.end(); ++eslitr) { for(auto eslitr = esl.begin(); eslitr != esl.end(); ++eslitr) {
@ -1876,7 +1866,7 @@ void VPBTechnique::generateLineFeature(BufferData& buffer, Locator* masterLocato
} }
// Now traverse the next segment // Now traverse the next segment
ma = intersect; ma = mb;
} }
// We now have a series of points following the topography of the elevation mesh. // We now have a series of points following the topography of the elevation mesh.
@ -1890,8 +1880,14 @@ void VPBTechnique::generateLineFeature(BufferData& buffer, Locator* masterLocato
float ytex_base = 0.0f; float ytex_base = 0.0f;
for (; iter != roadPoints.end(); iter++) { for (; iter != roadPoints.end(); iter++) {
end = *iter + up; end = *iter + up;
if ((end-start).length2() < 1.0) {
// Pass over any points less than 1m from the last
continue;
}
// Find a spanwise vector // Find a spanwise vector
osg::Vec3d spanwise = ((end-start) ^ up); osg::Vec3d spanwise = ((end-start) ^ up);
spanwise.normalize(); spanwise.normalize();