mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 19:29:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Elon
2019-04-10 14:10:18 -06:00
parent 98790eddec 1a3467418b
commit 1d08e58cd6
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/space/rendering/elonstest.cpp
+1 -1
View File
@@ -636,7 +636,7 @@ namespace openspace {
// positionAtTime.time = Time(orbit.epoch + timeOffset);
// glm::vec3 position = calculatePosition(Time(orbit.epoch + timeOffset), orbit.epoch);
glm::vec3 position = _keplerTranslator.position(Time(orbit.epoch + timeOffset));
_vertexBufferData[index].x = position.x;
_vertexBufferData[index].y = position.y;
modules/space/rendering/renderablesatellites.cpp
-4
View File
@@ -439,10 +439,6 @@ RenderableSatellites::RenderableSatellites(const ghoul::Dictionary& dictionary)
addProperty(_nSegments);
addProperty(_semiMajorAxisUnit);
<<<<<<< HEAD
=======
>>>>>>> General code cleanup
LINFO(fmt::format("KeyFile: {} ", KeyFile));
const std::string& file = dictionary.value<std::string>(KeyFile);
LINFO(fmt::format("file: {} ", file));