mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-08 04:20:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Feature/cleanup (#1608)

Browse Source 
* Revert screenlog back to showing Info and above messages
 * Various code cleanup
This commit is contained in:
Alexander Bock
2021-05-25 14:08:33 +02:00
committed by GitHub
parent 53d0b49f6b
commit c3ba532bdb
183 changed files with 4267 additions and 6072 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
+7 -15
View File
@@ -31,10 +31,8 @@
#include <openspace/rendering/renderengine.h>
#include <openspace/util/spicemanager.h>
#include <openspace/util/updatestructures.h>
#include <ghoul/glm.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/opengl/programobject.h>
#include <optional>
namespace {
struct VBOData {
@@ -120,7 +118,7 @@ void RenderableCrawlingLine::initializeGL() {
GL_FLOAT,
GL_FALSE,
sizeof(VBOData),
reinterpret_cast<void*>(offsetof(VBOData, color)) // NOLINT
reinterpret_cast<void*>(offsetof(VBOData, color))
);
glBindVertexArray(0);
@@ -147,8 +145,8 @@ void RenderableCrawlingLine::render(const RenderData& data, RendererTasks&) {
_frameCounter++;
glm::dmat4 modelTransform =
glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
glm::dmat4(data.modelTransform.rotation) * // Spice rotation
glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
glm::dmat4(data.modelTransform.rotation) *
glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
glm::dmat4 modelViewProjectionTransform = data.camera.projectionMatrix() *
@@ -162,10 +160,9 @@ void RenderableCrawlingLine::render(const RenderData& data, RendererTasks&) {
glLineWidth(2.f);
_program->setUniform("_alpha", alpha);
_program->setUniform("alpha", alpha);
glBindVertexArray(_vao);
glDrawArrays(GL_LINES, 0, 2);
glBindVertexArray(0);
@@ -204,20 +201,15 @@ void RenderableCrawlingLine::update(const UpdateData& data) {
glBindBuffer(GL_ARRAY_BUFFER, _vbo);
glBufferSubData(
GL_ARRAY_BUFFER,
0,
2 * sizeof(VBOData),
vboData
);
glBufferSubData(GL_ARRAY_BUFFER, 0, 2 * sizeof(VBOData), vboData);
if (ImageSequencer::ref().isReady()) {
_imageSequenceTime = ImageSequencer::ref().instrumentActiveTime(
float imageSequenceTime = ImageSequencer::ref().instrumentActiveTime(
data.time.j2000Seconds(),
_instrumentName
);
_drawLine = _imageSequenceTime != -1.f;
_drawLine = (imageSequenceTime != -1.f);
}
}