Commit 2ace13e9 authored by Michele Bosi's avatar Michele Bosi

Removed unused default VividVolume

parent 72632444
......@@ -73,20 +73,7 @@ VividRendering::VividRendering() {
// Depth Peeling Throttle
m_DepthPeelingAutoThrottleEnabled = true;
// Volume
mVividVolume = new VividVolume( this );
}
//------------------------------------------------------------------------------
void VividRendering::setupVolume( Image* img, const AABB& bounds, Image* transfer_func) {
// Add the Actor to the scene, once
mSceneManagerActorTree->tree()->eraseActor( vividVolume()->volumeActor() );
mSceneManagerActorTree->tree()->addActor( vividVolume()->volumeActor() );
// Initialize the volume
mVividVolume->setupVolume( img, bounds, transfer_func );
}
//-----------------------------------------------------------------------------
ref<Effect> VividRendering::makeVividEffect(Effect* effect) {
// Here we set only the uniforms that are not marked as <automatic> in vivid-uniforms.glsl
......
......@@ -37,7 +37,6 @@
#include <vlGraphics/Rendering.hpp>
#include <vlGraphics/CalibratedCamera.hpp>
#include <vlGraphics/SceneManagerActorTree.hpp>
#include <vlVivid/VividVolume.hpp>
namespace vl
{
......@@ -194,18 +193,6 @@ namespace vl
void setDepthPeelingAutoThrottleEnabled( bool enabled ) { m_DepthPeelingAutoThrottleEnabled = enabled; }
bool isDepthPeelingAutoThrottleEnabled() const { return m_DepthPeelingAutoThrottleEnabled; }
// Volumes
/** Initializes all the volume data, uniforms and textures using VividVolume::setupVolume() and adds the volume actor to the scene.
\param volume The 3D image representing the volume, typcally of IF_LUMINANCE format.
\param volume_bounds The AABB of the volume, can be a rectangle and defines the object space dimensions of the volume.
\param transfer_function A 1D image representing the RGBA values associated to a given `luminance` value (used by all modes).
*/
void setupVolume( Image* image, const AABB& bounds, Image* transfer_func = NULL );
VividVolume* vividVolume() { return mVividVolume.get(); }
const VividVolume* vividVolume() const { return mVividVolume.get(); }
// Utils
/** Returns an Effect that is compatible with the Vivid renderer and set to all its defaults.
......@@ -239,10 +226,6 @@ namespace vl
bool mBackgroundImageEnabled;
bool m_DepthPeelingAutoThrottleEnabled;
// Volume
ref<VividVolume> mVividVolume;
};
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment