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

wrapping up thesis project 2019 space debris

Browse Source
This commit is contained in:
Elon
2019-07-22 16:16:21 -06:00
parent 3fbe042250
commit 46c22488d7
14 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/transferfunction.txt
+1 -1
View File
@@ -1,6 +1,6 @@
width 1024
lower 0.0
upper 1.0
mappingkey 0.01 40 160 40 0
mappingkey 0.02 40 160 40 0
mappingkey 0.14 40 40 240 50
mappingkey 0.3 200 80 0 250
data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
+1
View File
@@ -11,6 +11,7 @@ local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
--shared.registerSatelliteGroupObjects(asset, group, tle, true) -- if thesis project of 2019 is used
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, false)
data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset
+4 -6
View File
@@ -1,7 +1,5 @@
--asset.request('./debris/debris_asat')
asset.request('./debris/debris_breezem')
--asset.request('./debris/debris_fengyun')
--asset.request('./debris/debris_iridium33')
--asset.request('./debris/debris_kosmos2251')
asset.request('./satellites_debris_old')
asset.request('./debris/debris_asat')
asset.request('./debris/debris_fengyun')
asset.request('./debris/debris_iridium33')
asset.request('./debris/debris_kosmos2251')
data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris_old.asset
+4 -1
View File
@@ -1,2 +1,5 @@
asset.request('./debris/debris_breezem_old')
-- asset.request('./debris/debris_asat_old')
asset.request('./debris/debris_asat_old')
asset.request('./debris/debris_fengyum_old')
asset.request('./debris/debris_iridium33_old')
asset.request('./debris/debris_kosmos2251_old')
data/assets/spaceDebris.scene
+2 -1
View File
@@ -74,7 +74,8 @@ assetHelper.registerInterestingNodes(asset, {
})
asset.onInitialize(function ()
local now = openspace.time.currentWallTime()
--local now = openspace.time.currentWallTime()
local now = "2019-06-26T00:00:00"
-- Jump back one day to show a complete planet
openspace.time.setTime(openspace.time.advancedTime(now, "-1d"))
data/tasks/volume/debristasks/generate_cartesian_volume.task
+4 -4
View File
@@ -1,12 +1,12 @@
return {{
Type = "GenerateDebrisVolumeTask",
Dimensions = {32, 32, 32},
Dimensions = {48, 48, 48},
LowerDomainBound = {-0.5, -0.5, -0.5},
UpperDomainBound = {0.5, 0.5, 0.5},
InputPath = "${SYNC}/url/satellite_tle_data_DebrisAll/files/allDebrisInOneTLE.txt",
StartTime = "2018-05-04T00:00:00",
TimeStep = "25",
EndTime = "2018-05-04T00:01:00",
StartTime = "2019-07-27T10:00:00",
TimeStep = "2",
EndTime = "2019-07-27T12:00:00",
GridType = "Cartesian",
RawVolumeOutput = "${DATA}/assets/scene/solarsystem/planets/earth/satellites/debris/volume/generatedCartesian/singleDebris.rawvolume",
DictionaryOutput = "${DATA}/assets/scene/solarsystem/planets/earth/satellites/debris/volume/generatedCartesian/singleDebris.dictionary"
data/tasks/volume/debristasks/generate_spherical_volume.task
+4 -5
View File
@@ -1,13 +1,12 @@
return {{
Type = "GenerateDebrisVolumeTask",
Dimensions = {20, 28, 28},
Dimensions = {45, 30, 40},
LowerDomainBound = {0, 0, 0},
UpperDomainBound = {1, math.pi, 2 * math.pi},
InputPath = "${SYNC}/url/satellite_tle_data_DebrisAll/files/allDebrisInOneTLE.txt",
--InputPath = "${SYNC}/url/satellite_tle_data_BreezeMBreakup(18391204735368316775)/files/2012-044.txt",
StartTime = "2018-05-04T00:00:00",
TimeStep = "3",
EndTime = "2018-05-04T00:00:00",
StartTime = "2019-07-27T10:00:00",
TimeStep = "2",
EndTime = "2019-07-27T12:00:00",
GridType = "Spherical",
RawVolumeOutput = "${DATA}/assets/scene/solarsystem/planets/earth/satellites/debris/volume/generated/singleDebris.rawvolume",
DictionaryOutput = "${DATA}/assets/scene/solarsystem/planets/earth/satellites/debris/volume/generated/singleDebris.dictionary"
modules/base/dashboard/dashboarditemframerate.cpp
+9
View File
@@ -32,10 +32,18 @@
#include <ghoul/font/fontmanager.h>
#include <ghoul/font/fontrenderer.h>
// #include <cstring>
#include <string.h>
#include <stdio.h>
#include <fstream>
namespace {
constexpr const char* KeyFontMono = "Mono";
constexpr const float DefaultFontSize = 10.f;
constexpr openspace::properties::Property::PropertyInfo FontNameInfo = {
"FontName",
"Font Name",
@@ -105,6 +113,7 @@ namespace {
"Avg. FPS: {:3.2f}",
1.0 / openspace::global::windowDelegate.averageDeltaTime()
);
}
std::string format(openspace::DashboardItemFramerate::FrametimeType frametimeType) {
modules/space/rendering/renderablesatellites.cpp
+3 -3
View File
@@ -622,9 +622,9 @@ void RenderableSatellites::updateBuffers() {
glm::dvec3 position = _keplerTranslator.debrisPos(timeOffset + orbit.epoch);
double positionX = position.x; // 10 miljon
double positionY = position.y; // 10 miljon
double positionZ = position.z; // 10 miljon
double positionX = position.x;
double positionY = position.y;
double positionZ = position.z;
_vertexBufferData[index].x = static_cast<float>(positionX);
_vertexBufferData[index].y = static_cast<float>(positionY);
modules/space/rendering/renderablesatellites.h
+2
View File
@@ -103,6 +103,8 @@ namespace openspace {
KeplerTranslation _keplerTranslator;
std::vector<KeplerParameters> _TLEData;
/// The backend storage for the vertex buffer object containing all points for this
/// trail.
std::vector<TrailVBOLayout> _vertexBufferData;
modules/space/shaders/debrisViz_fs.glsl
+4 -4
View File
@@ -75,10 +75,10 @@ Fragment getFragment() {
// to debug using colors use this if-statment.
float ep = 0.01;
if( fract(vertexID_f) < ep ){ //periodFraction < ep
frag.color = vec4(1, 0, 0, 1);
}
// float ep = 0.01;
// if( fract(vertexID_f) < ep ){ //periodFraction < ep
// frag.color = vec4(1, 0, 0, 1);
// }
return frag;
}
modules/space/shaders/debrisViz_vs.glsl
+2 -2
View File
@@ -26,8 +26,8 @@
#include "PowerScaling/powerScalingMath.hglsl"
layout (location = 0) in vec4 vertex_data; // 1: x, 2: y, 3: z
layout (location = 1) in vec2 orbit_data; // 1: timeOffset, 2: epoch, 3: period
layout (location = 0) in vec4 vertex_data; // 1: x, 2: y, 3: z, 4: timeOffset,
layout (location = 1) in vec2 orbit_data; // 1: epoch, 2: period
uniform dmat4 modelViewTransform;
uniform mat4 projectionTransform;
openspace.cfg
+2 -2
View File
@@ -6,13 +6,13 @@
-- occurs in a single window, a fisheye projection, or a dome cluster system
-- A regular 1280x720 window
SGCTConfig = sgct.config.single{}
--SGCTConfig = sgct.config.single{}
-- A regular 1920x1080 window
-- SGCTConfig = sgct.config.single{1920, 1080}
-- A windowed 1920x1080 fullscreen
-- SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}, shared=true, name="WV_OBS_SPOUT1"}
SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}, shared=true, name="WV_OBS_SPOUT1"}
-- A 1k fisheye rendering
-- SGCTConfig = sgct.config.fisheye{1024, 1024}
src/performance/performancemanager.cpp
+3 -2
View File
@@ -173,6 +173,7 @@ void PerformanceManager::setEnabled(bool enabled) {
else {
if (loggingEnabled()) {
outputLogs();
debrisLog();
}
if (_performanceMemory) {
@@ -260,8 +261,8 @@ void PerformanceManager::debrisLog() {
PerformanceLayout* layout = performanceData();
const size_t writeStart = (PerformanceLayout::NumberValues - 1) - _currentTick;
//for (int16_t n = 0; n < layout->nScaleGraphEntries; n++) {
for (int16_t n = 7; n < 12; n++) {
for (int16_t n = 0; n < layout->nScaleGraphEntries; n++) {
//for (int16_t n = 7; n < 12; n++) {
//lol fult
const PerformanceLayout::SceneGraphPerformanceLayout node =
layout->sceneGraphEntries[n];