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

Rendering separate orbits

Browse Source
This commit is contained in:
Jonathan Fransson
2019-04-15 16:25:26 -06:00
committed by ElonOlsson
parent 92aded4e3f
commit bd7943b874
3 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset
View File

@@ -1,4 +1,4 @@
asset.request('./debris/debris_breezem')
asset.request('./debris/debris_fengyun')
asset.request('./debris/debris_iridium33')
asset.request('./debris/debris_kosmos2251')
--asset.request('./debris/debris_fengyun')
--asset.request('./debris/debris_iridium33')
--asset.request('./debris/debris_kosmos2251')

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

@@ -713,31 +713,16 @@ void RenderableSatellites::render(const RenderData& data, RendererTasks&) {
//glEnableVertexAttribArray(0); // We like submitting vertices on stream 0 for no special reason
//glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(TrailVBOLayout), 0);
const size_t orbits = static_cast<GLsizei>(_vertexBufferData.size()) / _nSegments;
size_t vertices = 0;
glBindVertexArray(_vertexArray);
//glBindBuffer(GL_ARRAY_BUFFER, _vertexBuffer);
//glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indexBuffer);
glDrawArrays(GL_LINE_LOOP, 0, static_cast<unsigned int>(_vertexBufferData.size()));
/*glDrawElements(GL_LINES,
static_cast<unsigned int>(_indexBufferData.size()),
//20,
GL_UNSIGNED_INT,
0);
*/
//&_indexBufferData.front());
//glDrawArrays(GL_LINES,
// 0,
// 20); //static_cast<unsigned int>(_indexBufferData.size()));
/*
glBegin (GL_LINES);
glVertex3f (_vertexBufferData[0].x, _vertexBufferData[0].y, _vertexBufferData[0].z);
glVertex3f (_vertexBufferData[1].x, _vertexBufferData[1].y, _vertexBufferData[1].z);
glVertex3f (_vertexBufferData[2].x, _vertexBufferData[2].y, _vertexBufferData[2].z);
glVertex3f (_vertexBufferData[3].x, _vertexBufferData[3].y, _vertexBufferData[3].z);
glEnd ();
*/
for (size_t i = 0; i <= orbits; ++i) {
//glDrawArrays(GL_LINE_STRIP, 0, static_cast<GLsizei>(_vertexBufferData.size()));
glDrawArrays(GL_LINE_LOOP, vertices, _nSegments);
vertices = vertices + _nSegments + 1;
}
glBindVertexArray(0);
_programObject->deactivate();

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

@@ -119,7 +119,7 @@ namespace openspace {
RenderableTrail::Appearance _appearance;
UniformCache(opacity, modelView, projection, color) //, useLineFade, lineFade)
UniformCache(opacity, modelView, projection, color, useLineFade, lineFade)
_uniformCache;
/**