mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-25 06:19:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve GeodeticPatch interface by allowing getting min/max lat/lon

Browse Source
This commit is contained in:
Erik Broberg
2016-06-15 14:25:32 -04:00
parent bfd2441eaa
commit fa3671eb4a
4 changed files with 46 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/globebrowsing/chunk/chunkrenderer.cpp
View File

@@ -327,7 +327,7 @@ namespace openspace {
}
// Calculate other uniform variables needed for rendering
Geodetic2 swCorner = chunk.surfacePatch().southWestCorner();
Geodetic2 swCorner = chunk.surfacePatch().getCorner(Quad::SOUTH_WEST);
auto patchSize = chunk.surfacePatch().size();
// TODO : Model transform should be fetched as a matrix directly.
@@ -404,10 +404,10 @@ namespace openspace {
dmat4 viewTransform = data.camera.combinedViewMatrix();
dmat4 modelViewTransform = viewTransform * modelTransform;
Geodetic2 sw = chunk.surfacePatch().southWestCorner();
Geodetic2 se = chunk.surfacePatch().southEastCorner();
Geodetic2 nw = chunk.surfacePatch().northWestCorner();
Geodetic2 ne = chunk.surfacePatch().northEastCorner();
Geodetic2 sw = chunk.surfacePatch().getCorner(Quad::SOUTH_WEST);
Geodetic2 se = chunk.surfacePatch().getCorner(Quad::SOUTH_EAST);
Geodetic2 nw = chunk.surfacePatch().getCorner(Quad::NORTH_WEST);
Geodetic2 ne = chunk.surfacePatch().getCorner(Quad::NORTH_EAST);
// Get model space positions of the four control points
Vec3 patchSwModelSpace = ellipsoid.cartesianSurfacePosition(sw);

74
modules/globebrowsing/geometry/geodetic2.cpp
View File

@@ -134,22 +134,6 @@ namespace openspace {
_halfSize = halfSize;
}
Scalar GeodeticPatch::minimalBoundingRadius(const Ellipsoid& ellipsoid) const {
// TODO: THIS FUNCTION IS CURRENTLY ERROR PRONE SINCE THE PATCH IS NOW COVERING
// A PART OF AN ELLIPSOID AND NOT A SPHERE!MUST CHECK IF THIS FUNCTION IS STILL
// VALID.
const Geodetic2& cornerNearEquator = _center.lat > 0 ? southWestCorner() : northWestCorner();
return glm::length(ellipsoid.cartesianSurfacePosition(_center) - ellipsoid.cartesianSurfacePosition(cornerNearEquator));
}
/*
Scalar GeodeticPatch::unitArea() const {
Scalar deltaTheta = 2 * _halfSize.lon;
Scalar phiMin = _center.lat - _halfSize.lat;
Scalar phiMax = _center.lat + _halfSize.lat;
return deltaTheta * (sin(phiMax) - sin(phiMin));
}
*/
Scalar GeodeticPatch::maximumTileLevel() const {
// Numerator is just pi, not 2*pi, since we are dealing with HALF sizes
return log2(M_PI / glm::min(_halfSize.lat, _halfSize.lon));
@@ -174,27 +158,37 @@ namespace openspace {
Geodetic2 GeodeticPatch::getCorner(Quad q) const {
switch (q) {
case NORTH_WEST: return northWestCorner();
case NORTH_EAST: return northEastCorner();
case SOUTH_WEST: return southWestCorner();
case SOUTH_EAST: return southEastCorner();
case NORTH_WEST: return Geodetic2(maxLat(), minLon());// northWestCorner();
case NORTH_EAST: return Geodetic2(maxLat(), maxLon());// northEastCorner();
case SOUTH_WEST: return Geodetic2(minLat(), minLon());// southWestCorner();
case SOUTH_EAST: return Geodetic2(minLat(), maxLon());// southEastCorner();
}
}
Geodetic2 GeodeticPatch::northWestCorner() const{
return Geodetic2(_center.lat + _halfSize.lat, _center.lon - _halfSize.lon);
Scalar GeodeticPatch::minLat() const {
return _center.lat - _halfSize.lat;
}
Geodetic2 GeodeticPatch::northEastCorner() const{
return Geodetic2(_center.lat + _halfSize.lat, _center.lon + _halfSize.lon);
Scalar GeodeticPatch::maxLat() const {
return _center.lat + _halfSize.lat;
}
Geodetic2 GeodeticPatch::southWestCorner() const{
return Geodetic2(_center.lat - _halfSize.lat, _center.lon - _halfSize.lon);
Scalar GeodeticPatch::minLon() const {
return _center.lon - _halfSize.lon;
}
Geodetic2 GeodeticPatch::southEastCorner() const{
return Geodetic2(_center.lat - _halfSize.lat, _center.lon + _halfSize.lon);
Scalar GeodeticPatch::maxLon() const {
return _center.lon + _halfSize.lon;
}
Scalar GeodeticPatch::edgeLatitudeNearestEquator() const {
return _center.lat + _halfSize.lat * (isNorthern() ? -1 : 1);
}
Scalar GeodeticPatch::isNorthern() const {
return _center.lat > 0.0;
}
@@ -217,13 +211,9 @@ namespace openspace {
pointLat.normalizeAround(centerLat);
pointLon.normalizeAround(centerLon);
// get clamp bounds
Geodetic2 max = northEastCorner();
Geodetic2 min = southWestCorner();
return Geodetic2(
glm::clamp(pointLat.asRadians(), min.lat, max.lat),
glm::clamp(pointLon.asRadians(), min.lon, max.lon)
glm::clamp(pointLat.asRadians(), minLat(), maxLat()),
glm::clamp(pointLon.asRadians(), minLon(), maxLon())
);
}
@@ -303,19 +293,15 @@ namespace openspace {
// Calculate the longitudinal distance to the closest patch edge
Ang longitudeDistanceToClosestPatchEdge = centerToPointLon.abs() - Ang::fromRadians(_halfSize.lon);
// get clamp bounds
Geodetic2 max = northEastCorner();
Geodetic2 min = southWestCorner();
// If the longitude distance to the closest patch edge is larger than 90 deg
// the latitude will have to be clamped to its closest corner, as explained in
// the example above.
Scalar clampedLat = longitudeDistanceToClosestPatchEdge > Ang::QUARTER ?
clampedLat = glm::clamp((Ang::HALF - pointLat).normalizeAround(centerLat).asRadians(), min.lat, max.lat) :
clampedLat = glm::clamp(pointLat.asRadians(), min.lat, max.lat);
clampedLat = glm::clamp((Ang::HALF - pointLat).normalizeAround(centerLat).asRadians(), minLat(), maxLat()) :
clampedLat = glm::clamp(pointLat.asRadians(), minLat(), maxLat());
// Longitude is just clamped normally
Scalar clampedLon = glm::clamp(pointLon.asRadians(), min.lon, max.lon);
Scalar clampedLon = glm::clamp(pointLon.asRadians(), minLon(), maxLon());
return Geodetic2(clampedLat, clampedLon);
}

22
modules/globebrowsing/geometry/geodetic2.h
View File

@@ -111,26 +111,22 @@ public:
void setHalfSize(const Geodetic2&);
/**
Returns the minimal bounding radius that together with the LatLonPatch's
center point represents a sphere in which the patch is completely contained.
TODO : THIS FUNCTION IS CURRENTLY ERROR PRONE SINCE THE PATCH IS NOW COVERING
A PART OF AN ELLIPSOID AND NOT A SPHERE! MUST CHECK IF THIS FUNCTION IS STILL
VALID.
returns the latitude boundary which is closest to the equator
*/
Scalar minimalBoundingRadius(const Ellipsoid& ellipsoid) const;
Scalar edgeLatitudeNearestEquator() const;
/**
Returns the area of the patch with unit radius
Returns true if the center above the equator
*/
// Scalar unitArea() const;
Scalar isNorthern() const;
Geodetic2 getCorner(Quad q) const;
Geodetic2 northWestCorner() const;
Geodetic2 northEastCorner() const;
Geodetic2 southWestCorner() const;
Geodetic2 southEastCorner() const;
Scalar minLat() const;
Scalar maxLat() const;
Scalar minLon() const;
Scalar maxLon() const;
/**
* Clamps a point to the patch region

4
modules/globebrowsing/tile/tiledataset.cpp
View File

@@ -441,8 +441,8 @@ namespace openspace {
// at overview 0
GeodeticPatch patch = GeodeticPatch(chunkIndex);
glm::uvec2 pixelStart0 = geodeticToPixel(dataSet, patch.northWestCorner());
glm::uvec2 pixelEnd0 = geodeticToPixel(dataSet, patch.southEastCorner());
glm::uvec2 pixelStart0 = geodeticToPixel(dataSet, patch.getCorner(Quad::NORTH_WEST));
glm::uvec2 pixelEnd0 = geodeticToPixel(dataSet, patch.getCorner(Quad::SOUTH_EAST));
glm::uvec2 numPixels0 = pixelEnd0 - pixelStart0;
// Calculate a suitable overview to choose from the GDAL dataset