mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 12:10:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

updateBuffer changes

Browse Source
This commit is contained in:
Jonathan Fransson
2019-04-03 17:08:37 -06:00
committed by ElonOlsson
parent d3219d5b2e
commit 99bddfe8a2
2 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modules/space/rendering/renderablesatellites.cpp
View File

@@ -598,7 +598,6 @@ RenderableSatellites::~RenderableSatellites() {
}
void RenderableSatellites::initialize() {
/*
readFromCsvFile();
updateBuffers();
@@ -615,7 +614,6 @@ void RenderableSatellites::initialize() {
_nSegments.onChange([this]() {
updateBuffers();
});
*/
}
void RenderableSatellites::deinitialize() {
@@ -623,7 +621,6 @@ void RenderableSatellites::deinitialize() {
}
void RenderableSatellites::initializeGL() {
/*
glGenVertexArrays(1, &_vertexArray);
glGenBuffers(1, &_vertexBuffer);
glGenBuffers(1, &_indexBuffer);
@@ -647,17 +644,14 @@ void RenderableSatellites::initializeGL() {
_uniformCache.lineFade = _programObject->uniformLocation("lineFade");
setRenderBin(Renderable::RenderBin::Overlay);
*/
}
void RenderableSatellites::deinitializeGL() {
/*
SpaceModule::ProgramObjectManager.release(ProgramName);
glDeleteBuffers(1, &_vertexBuffer);
glDeleteBuffers(1, &_indexBuffer);
glDeleteVertexArrays(1, &_vertexArray);
*/
}
@@ -668,7 +662,6 @@ bool RenderableSatellites::isReady() const {
void RenderableSatellites::update(const UpdateData&) {}
void RenderableSatellites::render(const RenderData& data, RendererTasks&) {
/*
_programObject->activate();
_programObject->setUniform(_uniformCache.opacity, _opacity);
@@ -689,7 +682,6 @@ void RenderableSatellites::render(const RenderData& data, RendererTasks&) {
/*if (_appearance.useLineFade) {
_programObject->setUniform(_uniformCache.lineFade, _appearance.lineFade);
}*/
/*
glDepthMask(false);
//glBlendFunc(GL_SRC_ALPHA, GL_ONE);
@@ -701,17 +693,16 @@ void RenderableSatellites::render(const RenderData& data, RendererTasks&) {
0);
glBindVertexArray(0);
_programObject->deactivate();
*/
}
void RenderableSatellites::updateBuffers() {
/*
const size_t nVerticesPerOrbit = _nSegments + 1;
_vertexBufferData.resize(TLEData.size() * nVerticesPerOrbit);
_indexBufferData.resize(TLEData.size() * _nSegments * 2);
size_t orbitIndex = 0;
size_t elementIndex = 0;
for (const auto& orbit : TLEData) {
// KeplerTranslation setKeplerElements(orbit);
_keplerTranslator.setKeplerElements(
@@ -731,10 +722,16 @@ void RenderableSatellites::updateBuffers() {
double timeOffset = period *
static_cast<float>(i) / static_cast<float>(_nSegments);
glm::vec3 position =
_keplerTranslator.position(Time(orbit.epoch + timeOffset));
//keplerTranslation.position(orbit.epoch + timeOffset);
// _updateData.time.setTime(orbit.epoch + timeOffset);
// UpdateData::time(Time(orbit.epoch + timeOffset));
UpdateData updateTime;
updateTime.time = Time(orbit.epoch + timeOffset);
glm::vec3 position = _keplerTranslator.position(updateTime);
// _keplerTranslator.position(_updateData.time);
_vertexBufferData[index].x = position.x;
_vertexBufferData[index].y = position.y;
@@ -766,7 +763,7 @@ void RenderableSatellites::updateBuffers() {
);
glBindVertexArray(0);
*/
}
void RenderableSatellites::readFromCsvFile() {

7
modules/space/rendering/renderablesatellites.h
View File

@@ -54,12 +54,6 @@ namespace openspace {
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);
*/
static documentation::Documentation Documentation();
private:
@@ -71,7 +65,6 @@ namespace openspace {
KeplerTranslation _keplerTranslator;
std::vector<KeplerTranslation::KeplerOrbit> TLEData;
/// The backend storage for the vertex buffer object containing all points for this
/// trail.
std::vector<TrailVBOLayout> _vertexBufferData;