mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-25 13:58:55 -05:00
Fixed transformation from psc to dvec.
This commit is contained in:
@@ -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
@@ -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",
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user