mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 11:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Coding style adaptations

Browse Source
This commit is contained in:
Alexander Bock
2022-04-10 23:25:37 +02:00
parent dc9ffaa0e7
commit c206da4a98
64 changed files with 944 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/base/rendering/renderablenodeline.cpp
View File

@@ -212,7 +212,7 @@ void RenderableNodeLine::updateVertexData() {
_start.value(), _end.value()
)
);
return;
}

6
modules/base/rendering/renderableplane.h
View File

@@ -68,15 +68,15 @@ protected:
virtual void bindTexture();
virtual void unbindTexture();
void createPlane();
properties::OptionProperty _blendMode;
properties::BoolProperty _mirrorBackside;
properties::BoolProperty _billboard;
properties::FloatProperty _size;
properties::Vec3Property _multiplyColor;
ghoul::opengl::ProgramObject* _shader = nullptr;
GLuint _quad = 0;
GLuint _vertexPositionBuffer = 0;

12
modules/base/rendering/renderableplanetimevaryingimage.cpp
View File

@@ -88,9 +88,9 @@ RenderablePlaneTimeVaryingImage::RenderablePlaneTimeVaryingImage(
, _sourceFolder(SourceFolderInfo)
{
const Parameters p = codegen::bake<Parameters>(dictionary);
addProperty(_blendMode);
_sourceFolder = p.sourceFolder;
if (!std::filesystem::is_directory(absPath(_sourceFolder))) {
LERROR(fmt::format(
@@ -133,7 +133,7 @@ void RenderablePlaneTimeVaryingImage::initialize() {
return;
}
extractTriggerTimesFromFileNames();
computeSequenceEndTime();
computeSequenceEndTime();
}
void RenderablePlaneTimeVaryingImage::initializeGL() {
@@ -197,7 +197,7 @@ void RenderablePlaneTimeVaryingImage::bindTexture() {
void RenderablePlaneTimeVaryingImage::update(const UpdateData& data) {
ZoneScoped
RenderablePlane::update(data);
if (!_enabled || _startTimes.empty()) {
return;
}
@@ -231,8 +231,8 @@ void RenderablePlaneTimeVaryingImage::update(const UpdateData& data) {
void RenderablePlaneTimeVaryingImage::render(const RenderData& data, RendererTasks& t) {
if (!_startTimes.empty() &&
data.time.j2000Seconds() < _sequenceEndTime &&
data.time.j2000Seconds() > _startTimes[0])
data.time.j2000Seconds() < _sequenceEndTime &&
data.time.j2000Seconds() > _startTimes[0])
{
glDisable(GL_CULL_FACE);
RenderablePlane::render(data, t);

10
modules/base/rendering/renderabletimevaryingsphere.cpp
View File

@@ -44,7 +44,7 @@
namespace {
constexpr const char* ProgramName = "Timevarying Sphere";
constexpr const std::array<const char*, 5> UniformNames = {
"opacity", "modelViewProjection", "modelViewRotation", "colorTexture",
"mirrorTexture"
@@ -308,7 +308,7 @@ void RenderableTimeVaryingSphere::render(const RenderData& data, RendererTasks&)
const float startLogFadeDistance = glm::log(_size * _fadeOutThreshold);
const float stopLogFadeDistance = startLogFadeDistance + 1.f;
if (logDistCamera > startLogFadeDistance &&
if (logDistCamera > startLogFadeDistance &&
logDistCamera < stopLogFadeDistance)
{
const float fadeFactor = glm::clamp(
@@ -404,7 +404,7 @@ void RenderableTimeVaryingSphere::extractMandatoryInfoFromSourceFolder() {
}
std::sort(
_files.begin(), _files.end(),
_files.begin(), _files.end(),
[](const FileData& a, const FileData& b) {
return a.time < b.time;
}
@@ -436,7 +436,7 @@ void RenderableTimeVaryingSphere::update(const UpdateData& data) {
// true => We stepped forward to a time represented by another state
(nextIdx < _files.size() && currentTime >= _files[nextIdx].time))
{
updateActiveTriggerTimeIndex(currentTime);
updateActiveTriggerTimeIndex(currentTime);
_sphereIsDirty = true;
} // else {we're still in same state as previous frame (no changes needed)}
}
@@ -500,7 +500,7 @@ void RenderableTimeVaryingSphere::computeSequenceEndTime() {
}
void RenderableTimeVaryingSphere::loadTexture() {
if (_activeTriggerTimeIndex != -1) {
if (_activeTriggerTimeIndex != -1) {
_texture = _files[_activeTriggerTimeIndex].texture.get();
}
}