mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/profile-gui

Browse Source
This commit is contained in:
GPayne
2020-10-01 21:07:46 -06:00
parent c9772071fc 3310d954b3
commit fff9a32d97
34 changed files with 2597 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/openspace/util/distanceconstants.h
View File

@@ -27,6 +27,8 @@
namespace openspace::distanceconstants {
constexpr double EarthRadius = 6371;
constexpr double JupiterRadius = 7.1492E7;
constexpr double SolarRadius = 6.95700E8;
constexpr double LightYear = 9.4607304725808E15;
constexpr double LightMonth = LightYear / 12;
constexpr double LightDay = LightYear / 365;

1
include/openspace/util/memorymanager.h
View File

@@ -26,7 +26,6 @@
#define __OPENSPACE_CORE___MEMORYMANAGER___H__
#include <ghoul/misc/memorypool.h>
#include <memory_resource>
namespace openspace {