mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-26 14:58:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/jwst-update

Browse Source
This commit is contained in:
Malin E
2022-04-06 13:37:17 +02:00
parent e747af5003 36265bf2c4
commit df46bcfcc1
44 changed files with 130 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/base/rendering/grids/renderableboxgrid.cpp
View File

@@ -154,7 +154,7 @@ void RenderableBoxGrid::render(const RenderData& data, RendererTasks&){
"MVPTransform",
glm::dmat4(data.camera.projectionMatrix()) * modelViewTransform
);
_gridProgram->setUniform("opacity", _opacity);
_gridProgram->setUniform("opacity", opacity());
_gridProgram->setUniform("gridColor", _color);
// Change GL state:

2
modules/base/rendering/grids/renderablegrid.cpp
View File

@@ -170,7 +170,7 @@ void RenderableGrid::render(const RenderData& data, RendererTasks&){
"MVPTransform",
glm::dmat4(data.camera.projectionMatrix()) * modelViewTransform
);
_gridProgram->setUniform("opacity", _opacity);
_gridProgram->setUniform("opacity", opacity());
_gridProgram->setUniform("gridColor", _color);
// Change GL state:

2
modules/base/rendering/grids/renderableradialgrid.cpp
View File

@@ -181,7 +181,7 @@ void RenderableRadialGrid::render(const RenderData& data, RendererTasks&) {
"MVPTransform",
glm::dmat4(data.camera.projectionMatrix()) * modelViewTransform
);
_gridProgram->setUniform("opacity", _opacity);
_gridProgram->setUniform("opacity", opacity());
_gridProgram->setUniform("gridColor", _color);
// Change GL state:

2
modules/base/rendering/grids/renderablesphericalgrid.cpp
View File

@@ -172,7 +172,7 @@ void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&){
"MVPTransform",
glm::dmat4(data.camera.projectionMatrix()) * modelViewTransform
);
_gridProgram->setUniform("opacity", _opacity);
_gridProgram->setUniform("opacity", opacity());
_gridProgram->setUniform("gridColor", _color);
// Change GL state:

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

@@ -155,7 +155,7 @@ void RenderableDisc::render(const RenderData& data, RendererTasks&) {
data.camera.projectionMatrix() * glm::mat4(modelViewTransform)
);
_shader->setUniform(_uniformCache.width, _width);
_shader->setUniform(_uniformCache.opacity, _opacity);
_shader->setUniform(_uniformCache.opacity, opacity());
ghoul::opengl::TextureUnit unit;
unit.activate();

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

@@ -434,7 +434,7 @@ void RenderableLabels::renderLabels(const RenderData& data,
glm::vec4 textColor = glm::vec4(glm::vec3(_color), 1.f);
textColor.a *= fadeInVariable;
textColor.a *= _opacity;
textColor.a *= opacity();
ghoul::fontrendering::FontRenderer::ProjectedLabelsInformation labelInfo;

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

@@ -579,7 +579,7 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
if (distanceToCamera < maxDistance) {
_program->activate();
_program->setUniform(_uniformCache.opacity, _opacity);
_program->setUniform(_uniformCache.opacity, opacity());
// Model transform and view transform needs to be in double precision
const glm::dmat4 modelTransform =

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

@@ -270,7 +270,7 @@ void RenderableNodeLine::render(const RenderData& data, RendererTasks&) {
_program->setUniform("modelViewTransform", glm::mat4(modelViewTransform));
_program->setUniform("projectionTransform", data.camera.projectionMatrix());
_program->setUniform("color", glm::vec4(_lineColor.value(), _opacity));
_program->setUniform("color", glm::vec4(_lineColor.value(), opacity()));
// Change GL state:
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

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

@@ -217,7 +217,7 @@ void RenderablePlane::render(const RenderData& data, RendererTasks&) {
ZoneScoped
_shader->activate();
_shader->setUniform("opacity", _opacity);
_shader->setUniform("opacity", opacity());
_shader->setUniform("mirrorBackside", _mirrorBackside);

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

@@ -318,7 +318,7 @@ void RenderablePrism::render(const RenderData& data, RendererTasks&) {
// Uniforms
_shader->setUniform(_uniformCache.modelViewProjection, modelViewProjectionTransform);
_shader->setUniform(_uniformCache.color, glm::vec4(_lineColor.value(), _opacity));
_shader->setUniform(_uniformCache.color, glm::vec4(_lineColor.value(), opacity()));
// Render
glEnable(GL_PRIMITIVE_RESTART);

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

@@ -280,7 +280,7 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
);
_shader->setUniform(_uniformCache.modelViewRotation, modelViewRotation);
float adjustedOpacity = _opacity;
float adjustedOpacity = opacity();
if (!_disableFadeInDistance) {
if (_fadeInThreshold > -1.0) {

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

@@ -275,7 +275,7 @@ void RenderableTimeVaryingSphere::render(const RenderData& data, RendererTasks&)
);
_shader->setUniform(_uniformCache.modelViewRotation, modelViewRotation);
float adjustedOpacity = _opacity;
float adjustedOpacity = opacity();
if (!_disableFadeInDistance) {
if (_fadeInThreshold > -1.0) {

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

@@ -384,7 +384,7 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
ZoneScoped
_programObject->activate();
_programObject->setUniform(_uniformCache.opacity, _opacity);
_programObject->setUniform(_uniformCache.opacity, opacity());
glm::dmat4 modelTransform =
glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *

2
modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
View File

@@ -683,7 +683,7 @@ void RenderableBillboardsCloud::renderBillboards(const RenderData& data,
_program->setUniform(_uniformCache.minBillboardSize, minBillboardSize);
_program->setUniform(_uniformCache.maxBillboardSize, maxBillboardSize);
_program->setUniform(_uniformCache.color, _pointColor);
_program->setUniform(_uniformCache.alphaValue, _opacity);
_program->setUniform(_uniformCache.alphaValue, opacity());
_program->setUniform(_uniformCache.scaleFactor, _scaleFactor);
_program->setUniform(_uniformCache.up, glm::vec3(orthoUp));
_program->setUniform(_uniformCache.right, glm::vec3(orthoRight));

2
modules/digitaluniverse/rendering/renderabledumeshes.cpp
View File

@@ -320,7 +320,7 @@ void RenderableDUMeshes::renderMeshes(const RenderData&,
_program->setUniform(_uniformCache.modelViewTransform, modelViewMatrix);
_program->setUniform(_uniformCache.projectionTransform, projectionMatrix);
_program->setUniform(_uniformCache.alphaValue, _opacity);
_program->setUniform(_uniformCache.alphaValue, opacity());
for (const std::pair<const int, RenderingMesh>& pair : _renderingMeshesMap) {
_program->setUniform(_uniformCache.color, _meshColorMap[pair.second.colorIndex]);

2
modules/digitaluniverse/rendering/renderableplanescloud.cpp
View File

@@ -455,7 +455,7 @@ void RenderablePlanesCloud::renderPlanes(const RenderData&,
_uniformCache.modelViewProjectionTransform,
modelViewProjectionMatrix
);
_program->setUniform(_uniformCache.alphaValue, _opacity);
_program->setUniform(_uniformCache.alphaValue, opacity());
_program->setUniform(_uniformCache.fadeInValue, fadeInVariable);
glDisable(GL_CULL_FACE);

2
modules/digitaluniverse/rendering/renderablepoints.cpp
View File

@@ -242,7 +242,7 @@ void RenderablePoints::render(const RenderData& data, RendererTasks&) {
_program->setUniform(_uniformCache.color, _pointColor);
_program->setUniform(_uniformCache.sides, 4);
_program->setUniform(_uniformCache.alphaValue, _opacity);
_program->setUniform(_uniformCache.alphaValue, opacity());
_program->setUniform(_uniformCache.scaleFactor, _scaleFactor);
if (_hasSpriteTexture) {

2
modules/exoplanets/rendering/renderableorbitdisc.cpp
View File

@@ -176,7 +176,7 @@ void RenderableOrbitDisc::render(const RenderData& data, RendererTasks&) {
data.camera.projectionMatrix() * glm::mat4(modelViewTransform)
);
_shader->setUniform(_uniformCache.offset, _offset);
_shader->setUniform(_uniformCache.opacity, _opacity);
_shader->setUniform(_uniformCache.opacity, opacity());
_shader->setUniform(_uniformCache.eccentricity, _eccentricity);
_shader->setUniform(_uniformCache.semiMajorAxis, _size);

4
modules/globebrowsing/src/renderableglobe.cpp
View File

@@ -967,8 +967,8 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
_globalRenderer.program->setUniform("orenNayarRoughness", onr);
}
_localRenderer.program->setUniform("opacity", _opacity);
_globalRenderer.program->setUniform("opacity", _opacity);
_localRenderer.program->setUniform("opacity", opacity());
_globalRenderer.program->setUniform("opacity", opacity());
if (_globalRenderer.updatedSinceLastCall) {

2
modules/space/rendering/renderablehabitablezone.cpp
View File

@@ -150,7 +150,7 @@ void RenderableHabitableZone::render(const RenderData& data, RendererTasks&) {
data.camera.projectionMatrix() * glm::mat4(modelViewTransform)
);
_shader->setUniform(_uniformCache.width, _width);
_shader->setUniform(_uniformCache.opacity, _opacity);
_shader->setUniform(_uniformCache.opacity, opacity());
_shader->setUniform(_uniformCache.conservativeBounds, _conservativeBounds);
_shader->setUniform(_uniformCache.showOptimistic, _showOptimistic);

2
modules/space/rendering/renderableorbitalkepler.cpp
View File

@@ -451,7 +451,7 @@ void RenderableOrbitalKepler::render(const RenderData& data, RendererTasks&) {
}
_programObject->activate();
_programObject->setUniform(_uniformCache.opacity, _opacity);
_programObject->setUniform(_uniformCache.opacity, opacity());
_programObject->setUniform(_uniformCache.inGameTime, data.time.j2000Seconds());
glm::dmat4 modelTransform =

4
modules/space/rendering/renderablestars.cpp
View File

@@ -1034,10 +1034,10 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
const double funcValue = a * distCamera + b;
fadeInVariable *= static_cast<float>(funcValue > 1.f ? 1.f : funcValue);
_program->setUniform(_uniformCache.alphaValue, _opacity * fadeInVariable);
_program->setUniform(_uniformCache.alphaValue, opacity() * fadeInVariable);
}
else {
_program->setUniform(_uniformCache.alphaValue, _opacity);
_program->setUniform(_uniformCache.alphaValue, opacity());
}
ghoul::opengl::TextureUnit psfUnit;

2
modules/space/rendering/renderabletravelspeed.cpp
View File

@@ -290,7 +290,7 @@ void RenderableTravelSpeed::update(const UpdateData& data) {
}
_shaderProgram->setUniform("lineColor", _lineColor);
_shaderProgram->setUniform("opacity", _opacity);
_shaderProgram->setUniform("opacity", opacity());
}
void RenderableTravelSpeed::render(const RenderData& data, RendererTasks& ) {

2
modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
View File

@@ -265,7 +265,7 @@ void RenderableShadowCylinder::render(const RenderData& data, RendererTasks&) {
);
_shader->setUniform(_uniformCache.shadowColor, _shadowColor);
_shader->setUniform(_uniformCache.opacity, _opacity);
_shader->setUniform(_uniformCache.opacity, opacity());
glBindVertexArray(_vao);
glDrawArrays(GL_TRIANGLE_STRIP, 0, static_cast<GLsizei>(_vertices.size()));

4
modules/toyvolume/rendering/renderabletoyvolume.cpp
View File

@@ -140,7 +140,7 @@ RenderableToyVolume::RenderableToyVolume(const ghoul::Dictionary& dictionary)
RenderableToyVolume::~RenderableToyVolume() {}
void RenderableToyVolume::initializeGL() {
glm::vec4 color(glm::vec3(_color), _opacity);
glm::vec4 color(glm::vec3(_color), opacity());
_raycaster = std::make_unique<ToyVolumeRaycaster>(color);
_raycaster->initialize();
@@ -197,7 +197,7 @@ void RenderableToyVolume::update(const UpdateData& data) {
std::pow(10.f, static_cast<float>(_scalingExponent))
);
glm::vec4 color(glm::vec3(_color), _opacity);
glm::vec4 color(glm::vec3(_color), opacity());
_raycaster->setColor(color);
_raycaster->setStepSize(_stepSize);

2
modules/volume/rendering/basicvolumeraycaster.cpp
View File

@@ -137,7 +137,7 @@ void BasicVolumeRaycaster::preRaycast(const RaycastData& data,
program.setUniform("nClips_" + id, nClips);
program.setUniform("clipNormals_" + id, clipNormals);
program.setUniform("clipOffsets_" + id, clipOffsets);
program.setUniform("opacity_" + id, _opacity);
program.setUniform("opacity_" + id, opacity());
program.setUniform("rNormalization_" + id, _rNormalization);
program.setUniform("rUpperBound_" + id, _rUpperBound);
}

2
modules/volume/rendering/renderabletimevaryingvolume.cpp
View File

@@ -452,7 +452,7 @@ void RenderableTimeVaryingVolume::update(const UpdateData&) {
_raycaster->setVolumeTexture(nullptr);
}
_raycaster->setStepSize(_stepSize);
_raycaster->setOpacity(_opacity);
_raycaster->setOpacity(opacity());
_raycaster->setRNormalization(_rNormalization);
_raycaster->setRUpperBound(_rUpperBound);
}