mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-28 23:09:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed precision issues for stations, handled similar to spacecrafts

Browse Source
This commit is contained in:
Lovisa Hassler
2019-01-08 13:12:18 -05:00
parent fc56cf332b
commit a9bd05b5ef
2 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dsn/rendering/renderablesignals.cpp
+18 -21
View File
@@ -331,14 +331,11 @@ void RenderableSignals::updateVertexAttributes() {
void RenderableSignals::render(const RenderData& data, RendererTasks&) {
_programObject->activate();
//The stations are statically translated with respect to Earth
//glm::dmat4 modelTransformStation = global::renderEngine.scene()->sceneGraphNode("Earth")->modelTransform();
_programObject->setUniform(_uniformCache.modelViewStation,
data.camera.combinedViewMatrix() * _lineRenderInformation._localTransformStation);
data.camera.combinedViewMatrix() * _lineRenderInformation._localTransform);
_programObject->setUniform(_uniformCache.modelViewSpacecraft,
data.camera.combinedViewMatrix() * _lineRenderInformation._localTransformSpacecraft);
data.camera.combinedViewMatrix() * _lineRenderInformation._localTransform);
_programObject->setUniform(_uniformCache.projection, data.camera.sgctInternal.projectionMatrix());
@@ -405,12 +402,10 @@ void RenderableSignals::update(const UpdateData& data) {
// Make space for the vertex renderinformation
_vertexArray.clear();
//update focusnode information used to calculate spacecraft positions
// Update focusnode information, used to counter precision problems
_focusNode = global::navigationHandler.focusNode();
_lineRenderInformation._localTransformSpacecraft = glm::translate(glm::dmat4(1.0), _focusNode->worldPosition());
_lineRenderInformation._localTransformStation = glm::translate(glm::dmat4(1.0), global::renderEngine.scene()->sceneGraphNode("Earth")->worldPosition());
_lineRenderInformation._localTransform = glm::translate(glm::dmat4(1.0), _focusNode->worldPosition());
//Todo; keep track of active index for signalvector, or swap for loop for binary search
for (int i = 0; i < SignalManager::signalData.signals.size(); i++) {
SignalManager::Signal currentSignal = SignalManager::signalData.signals[i];
@@ -466,8 +461,8 @@ void RenderableSignals::extractData(std::unique_ptr<ghoul::Dictionary> &dictiona
void RenderableSignals::pushSignalDataToVertexArray(SignalManager::Signal signal) {
glm::vec4 color = getStationColor(signal.dishName);
glm::dvec3 posStation = getPositionForGeocentricSceneGraphNode(signal.dishName.c_str());
glm::dvec3 posSpacecraft = getSuitablePrecisionPositionForSceneGraphNode(signal.spacecraft.c_str());
glm::dvec3 posStation = getPrecisionPositionForStationNode(signal.dishName);
glm::dvec3 posSpacecraft = getPrecisionPositionForNode(signal.spacecraft);
double distance = getDistance(signal.dishName, signal.spacecraft);
double timeSinceStart = signal.timeSinceStart;
double lightTravelTime = signal.lightTravelTime;
@@ -516,25 +511,26 @@ void RenderableSignals::pushSignalDataToVertexArray(SignalManager::Signal signal
_vertexArray.push_back(lightTravelTime);
}
/* Returns a position that is relative to the current
focus node. This is a method to handle precision
problems that occur when placing our signal line endings. */
glm::dvec3 RenderableSignals::getCoordinatePosFromFocusNode(glm::dvec3 worldPos) {
glm::dvec3 RenderableSignals::getCoordinatePosFromFocusNode(SceneGraphNode* node) {
glm::dvec3 nodePos = node->worldPosition();
glm::dvec3 focusNodePos = _focusNode->worldPosition();
glm::dvec3 diff = glm::dvec3(nodePos.x - focusNodePos.x, nodePos.y - focusNodePos.y,
nodePos.z - focusNodePos.z);
glm::dvec3 diffPos = glm::dvec3(worldPos.x - focusNodePos.x, worldPos.y - focusNodePos.y,
worldPos.z - focusNodePos.z);
return diff;
return diffPos;
}
glm::dvec3 RenderableSignals::getSuitablePrecisionPositionForSceneGraphNode(std::string id) {
glm::dvec3 RenderableSignals::getPrecisionPositionForNode(std::string id) {
glm::dvec3 position;
if (global::renderEngine.scene()->sceneGraphNode(id)) {
SceneGraphNode* spacecraftNode = global::renderEngine.scene()->sceneGraphNode(id);
position = getCoordinatePosFromFocusNode(spacecraftNode);
position = getCoordinatePosFromFocusNode(spacecraftNode->worldPosition());
}
else {
LERROR(fmt::format("No scenegraphnode found for the spacecraft {}", id));
@@ -543,7 +539,7 @@ glm::dvec3 RenderableSignals::getSuitablePrecisionPositionForSceneGraphNode(std:
return position;
}
glm::dvec3 RenderableSignals::getPositionForGeocentricSceneGraphNode(const char* id) {
glm::dvec3 RenderableSignals::getPrecisionPositionForStationNode(std::string id) {
glm::dvec3 position;
@@ -557,7 +553,8 @@ glm::dvec3 RenderableSignals::getPositionForGeocentricSceneGraphNode(const char*
heightAboveSurfacePos.x = heightAboveSurfacePos.x * _stationToSize.at(id);
heightAboveSurfacePos.y = heightAboveSurfacePos.y * _stationToSize.at(id);
heightAboveSurfacePos.z = heightAboveSurfacePos.z * _stationToSize.at(id);
position = earthSurfacePos + heightAboveSurfacePos;
glm::dvec3 newWorldPos = earthPos + earthSurfacePos + heightAboveSurfacePos;
position = getCoordinatePosFromFocusNode(newWorldPos);
}
else {
modules/dsn/rendering/renderablesignals.h
+8 -10
View File
@@ -84,12 +84,12 @@ namespace openspace {
bool isReady() const override;
/* Adds the signaldata to _vertexArray*/
void pushSignalDataToVertexArray(SignalManager::Signal signal);
/* Returns a position relative the current focus node */
glm::dvec3 getCoordinatePosFromFocusNode(SceneGraphNode* node);
/*Returns a position for a spacecraft*/
glm::dvec3 getSuitablePrecisionPositionForSceneGraphNode(std::string id);
/* Returns a position for a station that has Earth as parent*/
glm::dvec3 getPositionForGeocentricSceneGraphNode(const char* id);
/* Returns position relative to the current focus node */
glm::dvec3 getCoordinatePosFromFocusNode(glm::dvec3 worldPos);
/*Returns a position for a spacecraft */
glm::dvec3 getPrecisionPositionForNode(std::string id);
/* Returns a position for a station placed on Earth with a set height*/
glm::dvec3 getPrecisionPositionForStationNode(std::string id);
/* Returns a color based on what site the station is located to */
glm::vec4 getStationColor(std::string dishidentifier);
/* Returns a distance between two scenegraphnodes */
@@ -123,10 +123,8 @@ namespace openspace {
GLint first = 0;
/// The number of values to be rendered
GLsizei countLines = 0;
/// Local model matrix, for spacecraft, dependant on focusnode, used for rendering in camera space
glm::dmat4 _localTransformSpacecraft = glm::dmat4(1.0);
/// Local model matrix, for station, dependant on earth position
glm::dmat4 _localTransformStation = glm::dmat4(1.0);
/// Local model matrix, dependant on focusnode, used for rendering in camera space
glm::dmat4 _localTransform = glm::dmat4(1.0);
/// The vertex array object for this RenderInformation
GLuint _vaoID = 0;
/// The main vertex buffer object