Fixed transformation from psc to dvec.

This commit is contained in:
Jonathas Costa
2017-04-10 10:22:49 -04:00
parent 06e70d4946
commit f15ce8656a
3 changed files with 4 additions and 6 deletions
-3
View File
@@ -25,11 +25,9 @@
include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
set(HEADER_FILES
#${CMAKE_CURRENT_SOURCE_DIR}/atmosphere.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/atmosphereraycaster.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableatmosphere.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanetatmosphere.h
#${CMAKE_CURRENT_SOURCE_DIR}/rendering/globebrowsingatmosphere.h
)
source_group("Header Files" FILES ${HEADER_FILES})
@@ -37,7 +35,6 @@ set(SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/rendering/atmosphereraycaster.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableatmosphere.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanetatmosphere.cpp
#${CMAKE_CURRENT_SOURCE_DIR}/rendering/globebrowsingatmosphere.cpp
)
source_group("Source Files" FILES ${SOURCE_FILES})
+1 -1
View File
@@ -23,7 +23,7 @@ return {
-- Sets the scene that is to be loaded by OpenSpace. A scene file is a description
-- of all entities that will be visible during an instance of OpenSpace
-- Scene = "${SCENE}/default.scene",
-- Scene = "${SCENE}/default.scene",
-- Scene = "${SCENE}/globebrowsing.scene",
-- Scene = "${SCENE}/rosetta.scene",
-- Scene = "${SCENE}/dawn.scene",
+3 -2
View File
@@ -119,8 +119,9 @@ glm::dvec4 PowerScaledCoordinate::dvec4() const
glm::dvec3 PowerScaledCoordinate::dvec3() const
{
return glm::dvec3(_vec[0] * pow(k, _vec[3]), _vec[1] * pow(k, _vec[3]),
_vec[2] * pow(k, _vec[3]));
double p = pow(static_cast<double>(k), static_cast<double>(_vec[3]));
return glm::dvec3( static_cast<double>(_vec[0]) * p, static_cast<double>(_vec[1]) * p,
static_cast<double>(_vec[2]) * p);
}
PowerScaledScalar PowerScaledCoordinate::length() const