mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-28 23:09:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Feature/volume tools (#614)

Browse Source 
* Create volume generation task

* Change domain bounds into a non-optional parameter

* Work on volume generation and rendering

* Example generation of time varying volume

* Example generation of time varying volume

* Compile fix in RenderableKameleonVolume

* Fix copy and paste error

* Enable spherical raycasting again

* Uniform naming

* Add some documentation and remove dead code
This commit is contained in:
Emil Axelsson
2018-06-08 09:47:24 -04:00
committed by micahnyc
parent 0d870f7c9d
commit 5de728442d
29 changed files with 858 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/volume/rendering/basicvolumeraycaster.cpp
+8 -7
View File
@@ -45,10 +45,10 @@ namespace openspace::volume {
BasicVolumeRaycaster::BasicVolumeRaycaster(
std::shared_ptr<ghoul::opengl::Texture> volumeTexture,
std::shared_ptr<TransferFunctionHandler> transferFunctionHandler,
std::shared_ptr<openspace::TransferFunction> transferFunction,
std::shared_ptr<VolumeClipPlanes> clipPlanes)
: _volumeTexture(volumeTexture)
, _transferFunctionHandler(transferFunctionHandler)
, _transferFunction(transferFunction)
, _clipPlanes(clipPlanes)
, _boundingBox(glm::vec3(1.0))
, _opacity(20.0)
@@ -112,7 +112,7 @@ void BasicVolumeRaycaster::preRaycast(
const RaycastData& data,
ghoul::opengl::ProgramObject& program)
{
if (!_volumeTexture || !_transferFunctionHandler) {
if (!_volumeTexture || !_transferFunction) {
return;
}
@@ -121,9 +121,10 @@ void BasicVolumeRaycaster::preRaycast(
std::string id = std::to_string(data.id);
_transferFunction->update();
_tfUnit = std::make_unique<ghoul::opengl::TextureUnit>();
_tfUnit->activate();
_transferFunctionHandler->getTexture().bind();
_transferFunction->getTexture().bind();
program.setUniform("transferFunction_" + id, _tfUnit->unitNumber());
_textureUnit = std::make_unique<ghoul::opengl::TextureUnit>();
@@ -182,10 +183,10 @@ std::string BasicVolumeRaycaster::getHelperPath() const {
}
void BasicVolumeRaycaster::setTransferFunctionHandler(
std::shared_ptr<TransferFunctionHandler> transferFunctionHandler)
void BasicVolumeRaycaster::setTransferFunction(
std::shared_ptr<openspace::TransferFunction> transferFunction)
{
_transferFunctionHandler = transferFunctionHandler;
_transferFunction = transferFunction;
}
void BasicVolumeRaycaster::setVolumeTexture(