diff --git a/data/assets/spaceDebris.scene b/data/assets/spaceDebris.scene index beaa95d6eb..fa86bf08d6 100644 --- a/data/assets/spaceDebris.scene +++ b/data/assets/spaceDebris.scene @@ -14,7 +14,7 @@ asset.require('util/default_dashboard') asset.require('util/webgui') -asset.request('customization/globebrowsing') +--asset.request('customization/globebrowsing') -- asset.request('scene/solarsystem/planets/earth/satellites/satellites_all') asset.request('scene/solarsystem/planets/earth/satellites/satellites_debris') diff --git a/modules/space/rendering/renderablesatellites.cpp b/modules/space/rendering/renderablesatellites.cpp index 0e361da511..4d12d7b8a9 100644 --- a/modules/space/rendering/renderablesatellites.cpp +++ b/modules/space/rendering/renderablesatellites.cpp @@ -447,7 +447,7 @@ RenderableSatellites::RenderableSatellites(const ghoul::Dictionary& dictionary) _epochColumnName = dictionary.value(EpochColumnInfo.identifier); - addPropertySubOwner(_appearance); + //addPropertySubOwner(_appearance); addProperty(_path); addProperty(_nSegments); // addProperty(_semiMajorAxisUnit); @@ -643,12 +643,12 @@ void RenderableSatellites::initializeGL() { } void RenderableSatellites::deinitializeGL() { - + SpaceModule::ProgramObjectManager.release(ProgramName); glDeleteBuffers(1, &_vertexBuffer); - glDeleteBuffers(1, &_indexBuffer); - //glDeleteVertexArrays(1, &_vertexArray); + //glDeleteBuffers(1, &_indexBuffer); + glDeleteVertexArrays(1, &_vertexArray); } @@ -680,7 +680,6 @@ void RenderableSatellites::render(const RenderData& data, RendererTasks&) { _programObject->setUniform(_uniformCache.projection, data.camera.projectionMatrix()); _programObject->setUniform(_uniformCache.color, _appearance.lineColor); //_programObject->setUniform(_uniformCache.useLineFade, _appearance.useLineFade); - //if (_appearance.useLineFade) { // _programObject->setUniform(_uniformCache.lineFade, _appearance.lineFade); //} @@ -699,8 +698,7 @@ void RenderableSatellites::updateBuffers() { const size_t nVerticesPerOrbit = _nSegments + 1; _vertexBufferData.resize(_TLEData.size() * nVerticesPerOrbit); - _indexBufferData.resize(_TLEData.size() * _nSegments * 2); - + //_indexBufferData.resize(_TLEData.size() * _nSegments * 2); size_t orbitindex = 0; size_t elementindex = 0; @@ -722,7 +720,7 @@ void RenderableSatellites::updateBuffers() { float timeOffset = orbit.period * static_cast(i) / static_cast(_nSegments); - glm::vec3 position = _keplerTranslator.debrisPos(Time(orbit.epoch + timeOffset)); + glm::vec3 position = _keplerTranslator.debrisPos(Time(orbit.epoch + timeOffset)); // LINFO(fmt::format("SegmentPosition: {} ", position)); @@ -730,10 +728,10 @@ void RenderableSatellites::updateBuffers() { _vertexBufferData[index].y = position.y; _vertexBufferData[index].z = position.z; _vertexBufferData[index].time = timeOffset; - if (i > 0) { - _indexBufferData[elementindex++] = static_cast(index) - 1; - _indexBufferData[elementindex++] = static_cast(index); - } + //if (i > 0) { + //_indexBufferData[elementindex++] = static_cast(index) - 1; + //_indexBufferData[elementindex++] = static_cast(index); + //} } ++orbitindex; } diff --git a/modules/space/shaders/renderablekeplerorbits_fs.glsl b/modules/space/shaders/renderablekeplerorbits_fs.glsl index c57d8b1bd6..02bd63357f 100644 --- a/modules/space/shaders/renderablekeplerorbits_fs.glsl +++ b/modules/space/shaders/renderablekeplerorbits_fs.glsl @@ -35,6 +35,7 @@ in vec4 viewSpacePosition; Fragment getFragment() { Fragment frag; frag.color = vec4(color, opacity); + // frag.color = vec4(0.0, 0.0, 1.0, 1.0); frag.depth = safeLength(viewSpacePosition); frag.blend = BLEND_MODE_ADDITIVE; frag.gPosition = viewSpacePosition; @@ -43,4 +44,6 @@ Fragment getFragment() { frag.gNormal = vec4(0.0, 0.0, -1.0, 1.0); return frag; -} \ No newline at end of file + +} + diff --git a/modules/space/shaders/renderablekeplerorbits_vs.glsl b/modules/space/shaders/renderablekeplerorbits_vs.glsl index 4f905b7196..e08980ab21 100644 --- a/modules/space/shaders/renderablekeplerorbits_vs.glsl +++ b/modules/space/shaders/renderablekeplerorbits_vs.glsl @@ -30,15 +30,16 @@ uniform dmat4 modelViewTransform; uniform mat4 projectionTransform; // uniform bool useLineFade; // uniform float lineFade; -uniform int vertexSortingMethod; +// uniform int vertexSortingMethod; uniform int pointSize; out vec4 viewSpacePosition; void main() { + dvec4 position = dvec4(vertexData.xyz, 1.0); float timeOffset = vertexData.w; viewSpacePosition = vec4(modelViewTransform * position); gl_Position = projectionTransform * viewSpacePosition; -} \ No newline at end of file +}