mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-25 21:48:57 -05:00
Remove binary property. Make volume modules part of default build (#878)
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
set(DEFAULT_MODULE ON)
|
||||
|
||||
set (OPENSPACE_DEPENDENCIES
|
||||
space
|
||||
)
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
set(DEFAULT_MODULE ON)
|
||||
|
||||
set (OPENSPACE_DEPENDENCIES
|
||||
space
|
||||
)
|
||||
|
||||
@@ -76,7 +76,6 @@ TransferFunctionHandler::TransferFunctionHandler(const properties::StringPropert
|
||||
, _maxValue(MaxValueInfo)
|
||||
, _saveTransferFunction(SaveTransferFunctionInfo)
|
||||
, _transferFunctionProperty(TransferFunctionInfo)
|
||||
, _histogramProperty(HistogramInfo)
|
||||
{
|
||||
_transferFunction = std::make_shared<openspace::TransferFunction>(
|
||||
_transferFunctionPath
|
||||
@@ -86,7 +85,6 @@ TransferFunctionHandler::TransferFunctionHandler(const properties::StringPropert
|
||||
void TransferFunctionHandler::initialize() {
|
||||
addProperty(_transferFunctionPath);
|
||||
addProperty(_transferFunctionProperty);
|
||||
addProperty(_histogramProperty);
|
||||
addProperty(_dataUnit);
|
||||
addProperty(_minValue);
|
||||
addProperty(_maxValue);
|
||||
@@ -111,10 +109,6 @@ void TransferFunctionHandler::initialize() {
|
||||
_saveTransferFunction.onChange([this]() { saveEnvelopes(); });
|
||||
}
|
||||
|
||||
void TransferFunctionHandler::setHistogramProperty(openspace::Histogram& histogram) {
|
||||
_histogramProperty.setValue(histogram.getBinaryData());
|
||||
}
|
||||
|
||||
void TransferFunctionHandler::setTexture() {
|
||||
if (_transferFunctionProperty.value().createTexture(*_texture)) {
|
||||
uploadTexture();
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
#include <openspace/properties/propertyowner.h>
|
||||
|
||||
#include <modules/volume/transferfunctionproperty.h>
|
||||
#include <openspace/properties/binaryproperty.h>
|
||||
#include <openspace/properties/stringproperty.h>
|
||||
#include <openspace/properties/triggerproperty.h>
|
||||
#include <memory>
|
||||
@@ -49,8 +48,6 @@ public:
|
||||
|
||||
void initialize();
|
||||
|
||||
void setHistogramProperty(openspace::Histogram& histogram);
|
||||
|
||||
void setTexture();
|
||||
void loadStoredEnvelopes();
|
||||
void saveEnvelopes();
|
||||
@@ -72,7 +69,6 @@ private:
|
||||
properties::TriggerProperty _saveTransferFunction;
|
||||
std::string _filePath;
|
||||
properties::TransferFunctionProperty _transferFunctionProperty;
|
||||
properties::BinaryProperty _histogramProperty;
|
||||
std::shared_ptr<openspace::TransferFunction> _transferFunction;
|
||||
std::shared_ptr<ghoul::opengl::Texture> _texture;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user