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

Code cleanup branch (#618)

Browse Source 
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
This commit is contained in:
Alexander Bock
2018-06-10 04:47:34 +00:00
committed by GitHub
parent 5de728442d
commit 4952f8f977
796 changed files with 22428 additions and 24063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,30 +33,29 @@
#include <openspace/util/powerscaledcoordinate.h>
#include <openspace/util/updatestructures.h>
#include <openspace/rendering/renderable.h>
#include <modules/volume/transferfunctionhandler.h>
#include <modules/volume/rendering/volumeclipplanes.h>
#include <ghoul/opengl/texture.h>
namespace {
const char* GlslRaycastPath = "${MODULE_VOLUME}/shaders/raycast.glsl";
const char* GlslHelperPath = "${MODULE_VOLUME}/shaders/helper.glsl";
const char* GlslBoundsVsPath = "${MODULE_VOLUME}/shaders/boundsvs.glsl";
const char* GlslBoundsFsPath = "${MODULE_VOLUME}/shaders/boundsfs.glsl";
constexpr const char* GlslRaycastPath = "${MODULE_VOLUME}/shaders/raycast.glsl";
constexpr const char* GlslHelperPath = "${MODULE_VOLUME}/shaders/helper.glsl";
constexpr const char* GlslBoundsVsPath = "${MODULE_VOLUME}/shaders/boundsvs.glsl";
constexpr const char* GlslBoundsFsPath = "${MODULE_VOLUME}/shaders/boundsfs.glsl";
} // namespace
namespace openspace::volume {
BasicVolumeRaycaster::BasicVolumeRaycaster(
std::shared_ptr<ghoul::opengl::Texture> volumeTexture,
std::shared_ptr<openspace::TransferFunction> transferFunction,
std::shared_ptr<VolumeClipPlanes> clipPlanes)
std::shared_ptr<ghoul::opengl::Texture> volumeTexture,
std::shared_ptr<openspace::TransferFunction> transferFunction,
std::shared_ptr<VolumeClipPlanes> clipPlanes)
: _volumeTexture(volumeTexture)
, _transferFunction(transferFunction)
, _clipPlanes(clipPlanes)
, _boundingBox(glm::vec3(1.0))
, _opacity(20.0)
, _rNormalization(0.0)
, _rUpperBound(1.0)
{}
BasicVolumeRaycaster::~BasicVolumeRaycaster() {}
void BasicVolumeRaycaster::initialize() {
@@ -65,9 +64,8 @@ void BasicVolumeRaycaster::initialize() {
void BasicVolumeRaycaster::deinitialize() {}
void BasicVolumeRaycaster::renderEntryPoints(
const RenderData& data,
ghoul::opengl::ProgramObject& program)
void BasicVolumeRaycaster::renderEntryPoints(const RenderData& data,
ghoul::opengl::ProgramObject& program)
{
program.setUniform("modelViewTransform", glm::mat4(modelViewTransform(data)));
program.setUniform("projectionTransform", data.camera.projectionMatrix());
@@ -90,9 +88,8 @@ glm::dmat4 BasicVolumeRaycaster::modelViewTransform(const RenderData& data) {
return data.camera.combinedViewMatrix() * modelTransform;
}
void BasicVolumeRaycaster::renderExitPoints(
const RenderData& data,
ghoul::opengl::ProgramObject& program)
void BasicVolumeRaycaster::renderExitPoints(const RenderData& data,
ghoul::opengl::ProgramObject& program)
{
program.setUniform("modelViewTransform", glm::mat4(modelViewTransform(data)));
program.setUniform("projectionTransform", data.camera.projectionMatrix());
@@ -108,9 +105,8 @@ void BasicVolumeRaycaster::renderExitPoints(
glCullFace(GL_BACK);
}
void BasicVolumeRaycaster::preRaycast(
const RaycastData& data,
ghoul::opengl::ProgramObject& program)
void BasicVolumeRaycaster::preRaycast(const RaycastData& data,
ghoul::opengl::ProgramObject& program)
{
if (!_volumeTexture || !_transferFunction) {
return;
@@ -124,7 +120,7 @@ void BasicVolumeRaycaster::preRaycast(
_transferFunction->update();
_tfUnit = std::make_unique<ghoul::opengl::TextureUnit>();
_tfUnit->activate();
_transferFunction->getTexture().bind();
_transferFunction->texture().bind();
program.setUniform("transferFunction_" + id, _tfUnit->unitNumber());
_textureUnit = std::make_unique<ghoul::opengl::TextureUnit>();
@@ -148,16 +144,15 @@ void BasicVolumeRaycaster::preRaycast(
void BasicVolumeRaycaster::postRaycast(const RaycastData&, ghoul::opengl::ProgramObject&)
{
// For example: release texture units
_textureUnit = nullptr;
_tfUnit = nullptr;
}
bool BasicVolumeRaycaster::cameraIsInside(const RenderData& data,
bool BasicVolumeRaycaster::isCameraInside(const RenderData& data,
glm::vec3& localPosition)
{
glm::vec4 modelPos =
glm::inverse(modelViewTransform(data)) * glm::vec4(0.0, 0.0, 0.0, 1.0);
glm::vec4 modelPos = glm::inverse(modelViewTransform(data)) *
glm::vec4(0.f, 0.f, 0.f, 1.f);
localPosition = (glm::vec3(modelPos) + glm::vec3(0.5));
@@ -166,33 +161,33 @@ bool BasicVolumeRaycaster::cameraIsInside(const RenderData& data,
localPosition.z > 0 && localPosition.z < 1);
}
std::string BasicVolumeRaycaster::getBoundsVsPath() const {
std::string BasicVolumeRaycaster::boundsVertexShaderPath() const {
return absPath(GlslBoundsVsPath);
}
std::string BasicVolumeRaycaster::getBoundsFsPath() const {
std::string BasicVolumeRaycaster::boundsFragmentShaderPath() const {
return absPath(GlslBoundsFsPath);
}
std::string BasicVolumeRaycaster::getRaycastPath() const {
std::string BasicVolumeRaycaster::raycasterPath() const {
return absPath(GlslRaycastPath);
}
std::string BasicVolumeRaycaster::getHelperPath() const {
std::string BasicVolumeRaycaster::helperPath() const {
return absPath(GlslHelperPath);
}
void BasicVolumeRaycaster::setTransferFunction(
std::shared_ptr<openspace::TransferFunction> transferFunction)
std::shared_ptr<openspace::TransferFunction> transferFunction)
{
_transferFunction = transferFunction;
_transferFunction = std::move(transferFunction);
}
void BasicVolumeRaycaster::setVolumeTexture(
std::shared_ptr<ghoul::opengl::Texture> volumeTexture)
std::shared_ptr<ghoul::opengl::Texture> volumeTexture)
{
_volumeTexture = volumeTexture;
_volumeTexture = std::move(volumeTexture);
}
std::shared_ptr<ghoul::opengl::Texture> BasicVolumeRaycaster::volumeTexture() const {
@@ -235,9 +230,8 @@ void BasicVolumeRaycaster::setGridType(VolumeGridType gridType) {
_gridType = gridType;
}
void BasicVolumeRaycaster::setModelTransform(const glm::mat4 & transform) {
_modelTransform = transform;
void BasicVolumeRaycaster::setModelTransform(glm::mat4 transform) {
_modelTransform = std::move(transform);
}
} // namespace openspace::volume