satellites_shared.asset added for debris

This commit is contained in:
Elon
2019-04-03 15:42:25 -06:00
parent 60085f65ef
commit 8003d9a9b7
4 changed files with 666 additions and 790 deletions
@@ -1,4 +1,5 @@
local transforms = asset.require('scene/solarsystem/planets/earth/transforms')
local assetHelper = asset.require('util/asset_helper')
local satImageFolder = asset.syncedResource({
Name = "Satellite Image Files",
@@ -42,161 +43,41 @@ local addSatelliteGroupObjects = function(group, tleFolder, shouldAddDuplicates)
end
return true
end
-- -------------------------------------------------------------------------------------
-- function getSat(title, file, lineNum, textureFile, group)
-- return {
-- Identifier = title,
-- Parent = transforms.EarthInertial.Identifier,
-- Renderable = {
-- Type = "RenderablePlaneImageLocal",
-- Enabled = true,
-- Size = 3e4,
-- Origin = "Center",
-- Body = "TLE",
-- Billboard = true,
-- Texture = textureFile
-- },
-- Transform = {
-- Translation = {
-- Type = "TLETranslation",
-- Body = title,
-- Observer = transforms.EarthInertial.Identifier,
-- File = file,
-- LineNumber = lineNum
-- },
-- Scale = {
-- Type = "StaticScale",
-- Scale = 1
-- }
-- },
-- Tag = { "earth_satellite_" .. group, "earth_satellite_" .. group .. "_marker" },
-- GUI = {
-- Path = "/Solar System/Planets/Earth/Satellites"
-- }
-- }
-- end
--
-- function getSatTrail(title, file, lineNum, per, color, group)
-- return {
-- Identifier = title .. "_trail",
-- Parent = transforms.EarthInertial.Identifier,
-- Renderable = {
-- Type = "RenderableTrailOrbit",
-- Translation = {
-- Type = "TLETranslation",
-- Body = title,
-- Observer = transforms.EarthInertial.Identifier,
-- File = file,
-- LineNumber = lineNum
-- },
-- Color = color,
-- Period = per,
-- Resolution = 160
-- },
-- Tag = { "earth_satellite_" .. group, "earth_satellite_" .. group .. "_trail"},
-- GUI = {
-- Path = "/Solar System/Planets/Earth/Satellites"
-- }
-- }
-- end
-- -------------------------------------------------------------------------------------
function test(title, file, per, color, group)
return {
return {
Identifier = title,
Parent = transforms.EarthInertial.Identifier,
Renderable = {
Type = "ElonsTest",
Color = color,
Period = per,
Resolution = 160,
Type = "ElonsTest",
PathInfo = "bubbis",
SegmentsInfo = 1,
EccentricityColumnInfo = "bubbis",
SemiMajorAxisColumnInfo = "bubbis",
SemiMajorAxisUnitInfo = 1,
InclinationColumnInfo = "bubbis",
AscendingNodeColumnInfo = "bubbis",
ArgumentOfPeriapsisColumnInfo = "bubbis",
MeanAnomalyAtEpochColumnInfo = "bubbis",
EpochColumnInfo = "bubbis",
Translation = {
Type = "TLETranslation",
Body = title,
Observer = transforms.EarthInertial.Identifier,
File = file
},
-- Size = 3e4,
-- Origin = "Center",
-- Body = "TLE",
-- Billboard = true,
-- Texture = textureFile
},
GUI = {
Path = "/Solar System/Planets/Earth/Satellites"
}
}
end
-- -------------------------------------------------------------------------------------
local filename = group.Url:match("([^/]+)$")
local filenameSansExt = filename:gsub(filename:match("(%.%w+)$"), "")
local path = tleFolder .. "/" .. filename
local texture = satImageFolder .. "/" .. "satB.png"
local file = io.open(path, "r")
assert(file, "File not found: " .. path)
local obj = {}
--now loop through the tle file and get each set of 3 lines
for n = 1, numLinesInFile(path), 3 do
local line = {
file:read('*l'), --title line
file:read('*l'),
file:read('*l')
}
assert(isValidTLEFileFormat(line), "TLE file syntax error on line " .. n .. ": " .. path)
-- Trim string
line[1] = line[1]:gsub("^%s*(.-)%s*$", "%1")
line[1] = line[1]:gsub("%s+", "_")
line[1] = line[1]:gsub("[%-()]", "")
local title = line[1]
-- Get period from correct location of the string
local per = tonumber(string.sub(line[3], 53, 63))
-- Trail for 2x a single revolution
per = 1.0 / per * 2.0
local satName = filenameSansExt .. "_" .. title
local shouldAddNotes = true
if openspace.hasSceneGraphNode(satName) then
if shouldAddDuplicates then
local originalSatName = satName
local i = 1
while openspace.hasSceneGraphNode(satName) do
satName = originalSatName .. "_" .. tostring(i)
i = i + 1
end
else
shouldAddNotes = false
end
end
if shouldAddNotes then
-- Register satellite object and trail
local test_var = test(satName, path, per, group.TrailColor, group.Title)
openspace.addSceneGraphNode(test_var)
table.insert(obj, test_var.Identifier)
-- local sat_var = getSat(satName, path, n, texture, group.Title)
-- openspace.addSceneGraphNode(sat_var)
-- table.insert(obj, sat_var.Identifier)
-- local satTrail_var = getSatTrail(satName, path, n, per, group.TrailColor, group.Title)
-- openspace.addSceneGraphNode(satTrail_var)
-- table.insert(obj, satTrail_var.Identifier)
end
end
return obj
end
asset.export("satImageFolder", satImageFolder)
assetHelper.registerSceneGraphNodesAndExport(asset, { Debris })
-- asset.export("satImageFolder", satImageFolder)
asset.export("downloadTLEFile", downloadTLEFile)
asset.export("addSatelliteGroupObjects", addSatelliteGroupObjects)
+3 -9
View File
@@ -41,7 +41,7 @@ namespace {
constexpr const char* ProgramName = "ElonsTest";
constexpr const char* _loggerCat = "SpaceDebris";
static const openspace::properties::Property::PropertyInfo PathInfo = {
"Path",
"Path",
@@ -417,13 +417,7 @@ namespace openspace {
addProperty(_nSegments);
// addProperty(_semiMajorAxisUnit);
// TLE
// documentation::testSpecificationAndThrow(
// Documentation(),
// dictionary,
// "TLETranslation"
// );
const std::string& file = dictionary.value<std::string>(KeyFile);
readTLEFile(file);
@@ -573,7 +567,7 @@ namespace openspace {
}
void ElonsTest::initialize(){
// note to self, se vad Gene skrev. Fyll _vertexArray i init och
//Fyll _vertexArray i init och
// rendera bara orbits, inga rörliga delar.
}
File diff suppressed because it is too large Load Diff
+102 -102
View File
@@ -1,128 +1,128 @@
// /****************************************************************************************
// * *
// * OpenSpace *
// * *
// * Copyright (c) 2014-2018 *
// * *
// * Permission is hereby granted, free of charge, to any person obtaining a copy of this *
// * software and associated documentation files (the "Software"), to deal in the Software *
// * without restriction, including without limitation the rights to use, copy, modify, *
// * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
// * permit persons to whom the Software is furnished to do so, subject to the following *
// * conditions: *
// * *
// * The above copyright notice and this permission notice shall be included in all copies *
// * or substantial portions of the Software. *
// * *
// * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
// * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
// * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
// * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
// * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
// * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
// ****************************************************************************************/
// // /****************************************************************************************
// // * *
// // * OpenSpace *
// // * *
// // * Copyright (c) 2014-2018 *
// // * *
// // * Permission is hereby granted, free of charge, to any person obtaining a copy of this *
// // * software and associated documentation files (the "Software"), to deal in the Software *
// // * without restriction, including without limitation the rights to use, copy, modify, *
// // * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
// // * permit persons to whom the Software is furnished to do so, subject to the following *
// // * conditions: *
// // * *
// // * The above copyright notice and this permission notice shall be included in all copies *
// // * or substantial portions of the Software. *
// // * *
// // * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
// // * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
// // * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
// // * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
// // * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
// // * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
// // ****************************************************************************************/
#include <openspace/rendering/renderable.h>
// #include <openspace/rendering/renderable.h>
#include <modules/base/rendering/renderabletrail.h>
#include <modules/space/translation/keplertranslation.h>
// #include <modules/base/rendering/renderabletrail.h>
// #include <modules/space/translation/keplertranslation.h>
// #include <openspace/util/circlegeometry.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/properties/scalar/uintproperty.h>
// // #include <openspace/util/circlegeometry.h>
// #include <openspace/properties/stringproperty.h>
// #include <openspace/properties/scalar/uintproperty.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/misc/objectmanager.h>
// #include <ghoul/opengl/programobject.h>
// #include <ghoul/misc/objectmanager.h>
#ifndef __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
#define __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
// #ifndef __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
// #define __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
namespace openspace {
// namespace openspace {
class RenderableSatellites : public Renderable {
public:
RenderableSatellites(const ghoul::Dictionary& dictionary);
virtual ~RenderableSatellites();
// class RenderableSatellites : public Renderable {
// public:
// RenderableSatellites(const ghoul::Dictionary& dictionary);
// virtual ~RenderableSatellites();
void initialize() override;
void deinitialize() override;
void initializeGL() override;
void deinitializeGL() override;
// void initialize() override;
// void deinitialize() override;
// void initializeGL() override;
// void deinitializeGL() override;
bool isReady() const override;
// bool isReady() const override;
void render(const RenderData& data, RendererTasks& rendererTask) override;
void update(const UpdateData& data) override;
// void render(const RenderData& data, RendererTasks& rendererTask) override;
// void update(const UpdateData& data) override;
/*
void setKeplerElements(double eccentricity, double semiMajorAxis, double inclination,
double ascendingNode, double argumentOfPeriapsis, double meanAnomalyAtEpoch,
double orbitalPeriod, double epoch);
*/
// /*
// void setKeplerElements(double eccentricity, double semiMajorAxis, double inclination,
// double ascendingNode, double argumentOfPeriapsis, double meanAnomalyAtEpoch,
// double orbitalPeriod, double epoch);
// */
static documentation::Documentation Documentation();
// static documentation::Documentation Documentation();
private:
/// The layout of the VBOs
struct TrailVBOLayout {
float x, y, z, time;
};
// private:
// /// The layout of the VBOs
// struct TrailVBOLayout {
// float x, y, z, time;
// };
/// The backend storage for the vertex buffer object containing all points for this
/// trail.
std::vector<TrailVBOLayout> _vertexBufferData;
// /// The backend storage for the vertex buffer object containing all points for this
// /// trail.
// std::vector<TrailVBOLayout> _vertexBufferData;
/// The index array that is potentially used in the draw call. If this is empty, no
/// element draw call is used.
std::vector<unsigned int> _indexBufferData;
// /// The index array that is potentially used in the draw call. If this is empty, no
// /// element draw call is used.
// std::vector<unsigned int> _indexBufferData;
GLuint _vertexArray;
GLuint _vertexBuffer;
GLuint _indexBuffer;
// GLuint _vertexArray;
// GLuint _vertexBuffer;
// GLuint _indexBuffer;
void readFromCsvFile();
void updateBuffers();
// void readFromCsvFile();
// void updateBuffers();
std::vector<KeplerTranslation::KeplerOrbit> _orbits;
ghoul::opengl::ProgramObject* _programObject;
//ghoul::ObjectManager* _objectManager;
// std::vector<KeplerTranslation::KeplerOrbit> _orbits;
// ghoul::opengl::ProgramObject* _programObject;
// //ghoul::ObjectManager* _objectManager;
properties::StringProperty _path;
properties::UIntProperty _nSegments;
// properties::StringProperty _path;
// properties::UIntProperty _nSegments;
properties::StringProperty _eccentricityColumnName;
properties::StringProperty _semiMajorAxisColumnName;
properties::DoubleProperty _semiMajorAxisUnit;
properties::StringProperty _inclinationColumnName;
properties::StringProperty _ascendingNodeColumnName;
properties::StringProperty _argumentOfPeriapsisColumnName;
properties::StringProperty _meanAnomalyAtEpochColumnName;
properties::StringProperty _epochColumnName;
// properties::StringProperty _eccentricityColumnName;
// properties::StringProperty _semiMajorAxisColumnName;
// properties::DoubleProperty _semiMajorAxisUnit;
// properties::StringProperty _inclinationColumnName;
// properties::StringProperty _ascendingNodeColumnName;
// properties::StringProperty _argumentOfPeriapsisColumnName;
// properties::StringProperty _meanAnomalyAtEpochColumnName;
// properties::StringProperty _epochColumnName;
RenderableTrail::Appearance _appearance;
// RenderableTrail::Appearance _appearance;
UniformCache(opacity, modelView, projection, color, useLineFade, lineFade)
_uniformCache;
// UniformCache(opacity, modelView, projection, color, useLineFade, lineFade)
// _uniformCache;
/**
* Reads the provided TLE file and calles the KeplerTranslation::setKeplerElments
* method with the correct values. If \p filename is a valid TLE file but contains
* disallowed values (see KeplerTranslation::setKeplerElements), a
* KeplerTranslation::RangeError is thrown.
*
* \param filename The path to the file that contains the TLE file.
* \param lineNum The line number in the file where the set of 3 TLE lines starts
*
* \throw std::system_error if the TLE file is malformed (does not contain at least
* two lines that start with \c 1 and \c 2.
* \throw KeplerTranslation::RangeError If the Keplerian elements are outside of
* the valid range supported by Kepler::setKeplerElements
* \pre The \p filename must exist
*/
void readTLEFile(const std::string& filename);
};
// /**
// * Reads the provided TLE file and calles the KeplerTranslation::setKeplerElments
// * method with the correct values. If \p filename is a valid TLE file but contains
// * disallowed values (see KeplerTranslation::setKeplerElements), a
// * KeplerTranslation::RangeError is thrown.
// *
// * \param filename The path to the file that contains the TLE file.
// * \param lineNum The line number in the file where the set of 3 TLE lines starts
// *
// * \throw std::system_error if the TLE file is malformed (does not contain at least
// * two lines that start with \c 1 and \c 2.
// * \throw KeplerTranslation::RangeError If the Keplerian elements are outside of
// * the valid range supported by Kepler::setKeplerElements
// * \pre The \p filename must exist
// */
// void readTLEFile(const std::string& filename);
// };
#endif // __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
// #endif // __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
}
// }