mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-06 11:39:49 -06:00
Opacity fix and some cleanup
This commit is contained in:
Emma Broman
@@ -2,7 +2,7 @@
|
||||
* *
|
||||
* OpenSpace *
|
||||
* *
|
||||
* Copyright (c) 2014-2020 *
|
||||
* Copyright (c) 2014-2021 *
|
||||
* *
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
|
||||
* software and associated documentation files (the "Software"), to deal in the Software *
|
||||
@@ -41,7 +41,7 @@ namespace {
|
||||
constexpr const char* KeyData = "Data";
|
||||
constexpr const char* KeyLuminosity = "Luminosity";
|
||||
constexpr const char* KeyVelocity = "Velocity";
|
||||
constexpr const char* ProgramName = "shaderProgram";
|
||||
|
||||
constexpr const char* _loggerCat = "PointsCloud";
|
||||
|
||||
constexpr int8_t CurrentCacheVersion = 1;
|
||||
@@ -52,13 +52,6 @@ namespace {
|
||||
"The color of the points."
|
||||
};
|
||||
|
||||
constexpr openspace::properties::Property::PropertyInfo OpacityInfo = {
|
||||
"Opacity",
|
||||
"Opacity",
|
||||
"Determines the transparency of the points, where 1 is completely opaque "
|
||||
"and 0 fully transparent."
|
||||
};
|
||||
|
||||
constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
|
||||
"Size",
|
||||
"Size",
|
||||
@@ -74,309 +67,282 @@ namespace {
|
||||
|
||||
namespace openspace {
|
||||
|
||||
documentation::Documentation RenderablePointsCloud::Documentation() {
|
||||
using namespace documentation;
|
||||
return {
|
||||
"RenderablePointsCloud",
|
||||
"softwareintegration_renderable_pointscloud",
|
||||
documentation::Documentation RenderablePointsCloud::Documentation() {
|
||||
using namespace documentation;
|
||||
return {
|
||||
"RenderablePointsCloud",
|
||||
"softwareintegration_renderable_pointscloud",
|
||||
{
|
||||
{
|
||||
{
|
||||
"Type",
|
||||
new StringEqualVerifier("RenderablePointsCloud"),
|
||||
Optional::No
|
||||
},
|
||||
{
|
||||
ColorInfo.identifier,
|
||||
new DoubleVector3Verifier,
|
||||
Optional::Yes,
|
||||
ColorInfo.description
|
||||
},
|
||||
{
|
||||
OpacityInfo.identifier,
|
||||
new DoubleVerifier,
|
||||
Optional::Yes,
|
||||
OpacityInfo.description
|
||||
},
|
||||
{
|
||||
SizeInfo.identifier,
|
||||
new DoubleVerifier,
|
||||
Optional::Yes,
|
||||
SizeInfo.description
|
||||
},
|
||||
{
|
||||
ToggleVisibilityInfo.identifier,
|
||||
new BoolVerifier,
|
||||
Optional::Yes,
|
||||
ToggleVisibilityInfo.description
|
||||
}
|
||||
ColorInfo.identifier,
|
||||
new DoubleVector3Verifier,
|
||||
Optional::Yes,
|
||||
ColorInfo.description
|
||||
},
|
||||
{
|
||||
SizeInfo.identifier,
|
||||
new DoubleVerifier,
|
||||
Optional::Yes,
|
||||
SizeInfo.description
|
||||
},
|
||||
{
|
||||
ToggleVisibilityInfo.identifier,
|
||||
new BoolVerifier,
|
||||
Optional::Yes,
|
||||
ToggleVisibilityInfo.description
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
RenderablePointsCloud::RenderablePointsCloud(const ghoul::Dictionary& dictionary)
|
||||
: Renderable(dictionary)
|
||||
, _color(ColorInfo, glm::vec3(0.5f), glm::vec3(0.f), glm::vec3(1.f))
|
||||
, _size(SizeInfo, 1.f, 0.f, 150.f)
|
||||
, _toggleVisibility(ToggleVisibilityInfo, true)
|
||||
{
|
||||
documentation::testSpecificationAndThrow(
|
||||
Documentation(),
|
||||
dictionary,
|
||||
"RenderablePointsCloud"
|
||||
);
|
||||
|
||||
if (dictionary.hasKey(ColorInfo.identifier)) {
|
||||
_color = dictionary.value<glm::dvec3>(ColorInfo.identifier);
|
||||
}
|
||||
_color.setViewOption(properties::Property::ViewOptions::Color);
|
||||
addProperty(_color);
|
||||
|
||||
if (dictionary.hasKey(KeyData)) {
|
||||
ghoul::Dictionary dataDict = dictionary.value<ghoul::Dictionary>(KeyData);
|
||||
for (int i = 0; i < static_cast<int>(dataDict.size()); ++i) {
|
||||
_pointData.push_back(dataDict.value<glm::dvec3>(std::to_string(i + 1)));
|
||||
}
|
||||
_hasPointData = true;
|
||||
}
|
||||
|
||||
RenderablePointsCloud::RenderablePointsCloud(const ghoul::Dictionary& dictionary)
|
||||
: Renderable(dictionary)
|
||||
, _color(
|
||||
ColorInfo,
|
||||
glm::vec3(0.5f, 0.5, 0.5f),
|
||||
glm::vec3(0.f),
|
||||
glm::vec3(1.f)
|
||||
)
|
||||
, _opacity(OpacityInfo, 0.5f, 0.f, 1.f)
|
||||
, _size(SizeInfo, 1.f, 0.f, 150.f)
|
||||
, _toggleVisibility(ToggleVisibilityInfo, true)
|
||||
{
|
||||
documentation::testSpecificationAndThrow(
|
||||
Documentation(),
|
||||
dictionary,
|
||||
"RenderablePointsCloud"
|
||||
if (dictionary.hasKey(KeyLuminosity)) {
|
||||
ghoul::Dictionary lumDict = dictionary.value<ghoul::Dictionary>(KeyLuminosity);
|
||||
for (int i = 0; i < static_cast<int>(lumDict.size()); ++i) {
|
||||
float luminosity = static_cast<float>(
|
||||
lumDict.value<double>(std::to_string(i + 1))
|
||||
);
|
||||
_luminosityData.push_back(luminosity);
|
||||
}
|
||||
_hasLuminosityData = true;
|
||||
}
|
||||
|
||||
if (dictionary.hasKey(KeyVelocity)) {
|
||||
ghoul::Dictionary velDict = dictionary.value<ghoul::Dictionary>(KeyVelocity);
|
||||
for (int i = 0; i < static_cast<int>(velDict.size()); ++i) {
|
||||
float velocity = static_cast<float>(
|
||||
velDict.value<double>(std::to_string(i + 1))
|
||||
);
|
||||
_velocityData.push_back(velocity);
|
||||
}
|
||||
_hasVelocityData = true;
|
||||
}
|
||||
|
||||
addProperty(_opacity);
|
||||
|
||||
if (dictionary.hasKey(SizeInfo.identifier)) {
|
||||
_size = static_cast<float>(dictionary.value<double>(SizeInfo.identifier));
|
||||
}
|
||||
addProperty(_size);
|
||||
|
||||
if (dictionary.hasKey(ToggleVisibilityInfo.identifier)) {
|
||||
_toggleVisibility = dictionary.value<bool>(ToggleVisibilityInfo.identifier);
|
||||
}
|
||||
_toggleVisibility.onChange([&]() { _hasPointData = !_hasPointData; });
|
||||
addProperty(_toggleVisibility);
|
||||
}
|
||||
|
||||
bool RenderablePointsCloud::isReady() const {
|
||||
return _shaderProgram && (!_fullData.empty());
|
||||
}
|
||||
|
||||
void RenderablePointsCloud::initialize() {
|
||||
bool isSuccessful = loadData();
|
||||
if (!isSuccessful) {
|
||||
throw ghoul::RuntimeError("Error loading data");
|
||||
}
|
||||
}
|
||||
|
||||
void RenderablePointsCloud::initializeGL() {
|
||||
_shaderProgram = global::renderEngine->buildRenderProgram(
|
||||
"PointsCloud",
|
||||
absPath("${MODULE_SOFTWAREINTEGRATION}/shaders/point_vs.glsl"),
|
||||
absPath("${MODULE_SOFTWAREINTEGRATION}/shaders/point_fs.glsl")
|
||||
);
|
||||
}
|
||||
|
||||
void RenderablePointsCloud::deinitializeGL() {
|
||||
glDeleteVertexArrays(1, &_vertexArrayObjectID);
|
||||
_vertexArrayObjectID = 0;
|
||||
|
||||
glDeleteBuffers(1, &_vertexBufferObjectID);
|
||||
_vertexBufferObjectID = 0;
|
||||
|
||||
if (_shaderProgram) {
|
||||
global::renderEngine->removeRenderProgram(_shaderProgram.get());
|
||||
_shaderProgram = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
void RenderablePointsCloud::render(const RenderData& data, RendererTasks&) {
|
||||
if (_fullData.empty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (_hasPointData && _toggleVisibility) {
|
||||
_shaderProgram->activate();
|
||||
|
||||
glm::dmat4 modelTransform =
|
||||
glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
|
||||
glm::dmat4(data.modelTransform.rotation) * // Spice rotation
|
||||
glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
|
||||
|
||||
glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
|
||||
|
||||
_shaderProgram->setUniform("modelViewTransform", modelViewTransform);
|
||||
_shaderProgram->setUniform(
|
||||
"MVPTransform",
|
||||
glm::dmat4(data.camera.projectionMatrix()) * modelViewTransform
|
||||
);
|
||||
|
||||
if (dictionary.hasKey(ColorInfo.identifier)) {
|
||||
_color = dictionary.value<glm::dvec3>(ColorInfo.identifier);
|
||||
}
|
||||
_color.setViewOption(properties::Property::ViewOptions::Color);
|
||||
addProperty(_color);
|
||||
_shaderProgram->setUniform("color", _color);
|
||||
_shaderProgram->setUniform("opacity", _opacity);
|
||||
_shaderProgram->setUniform("size", _size);
|
||||
|
||||
if (dictionary.hasKey(KeyData)) {
|
||||
ghoul::Dictionary pointDataDict = dictionary.value<ghoul::Dictionary>(
|
||||
KeyData
|
||||
);
|
||||
for (int i = 0; i < static_cast<int>(pointDataDict.size()); ++i) {
|
||||
_pointData.push_back(
|
||||
{ pointDataDict.value<glm::dvec3>(std::to_string(i + 1)) }
|
||||
);
|
||||
}
|
||||
_hasPointData = true;
|
||||
}
|
||||
// Changes GL state:
|
||||
glEnablei(GL_BLEND, 0);
|
||||
glDepthMask(false);
|
||||
glBlendEquation(GL_FUNC_ADD);
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
glEnable(GL_PROGRAM_POINT_SIZE); // Enable gl_PointSize in vertex
|
||||
|
||||
if (dictionary.hasKey(KeyLuminosity)) {
|
||||
ghoul::Dictionary lumDict = dictionary.value<ghoul::Dictionary>(KeyLuminosity);
|
||||
for (int i = 0; i < static_cast<int>(lumDict.size()); ++i) {
|
||||
float luminosity = static_cast<float>(
|
||||
lumDict.value<double>(std::to_string(i + 1))
|
||||
);
|
||||
_luminosityData.push_back(luminosity);
|
||||
}
|
||||
_hasLuminosityData = true;
|
||||
}
|
||||
|
||||
if (dictionary.hasKey(KeyVelocity)) {
|
||||
ghoul::Dictionary velDict = dictionary.value<ghoul::Dictionary>(KeyVelocity);
|
||||
for (int i = 0; i < static_cast<int>(velDict.size()); ++i) {
|
||||
float velocity = static_cast<float>(
|
||||
velDict.value<double>(std::to_string(i + 1))
|
||||
);
|
||||
_velocityData.push_back(velocity);
|
||||
}
|
||||
_hasVelocityData = true;
|
||||
}
|
||||
|
||||
if (dictionary.hasKey(OpacityInfo.identifier)) {
|
||||
_opacity = static_cast<float>(
|
||||
dictionary.value<double>(OpacityInfo.identifier));
|
||||
}
|
||||
addProperty(_opacity);
|
||||
|
||||
if (dictionary.hasKey(SizeInfo.identifier)) {
|
||||
_size = static_cast<float>(
|
||||
dictionary.value<double>(SizeInfo.identifier));
|
||||
}
|
||||
addProperty(_size);
|
||||
|
||||
if (dictionary.hasKey(ToggleVisibilityInfo.identifier)) {
|
||||
_toggleVisibility = dictionary.value<bool>(ToggleVisibilityInfo.identifier);
|
||||
}
|
||||
_toggleVisibility.onChange([&]() { _hasPointData = !_hasPointData; });
|
||||
addProperty(_toggleVisibility);
|
||||
}
|
||||
|
||||
bool RenderablePointsCloud::isReady() const {
|
||||
return ((_shaderProgram != nullptr) && (!_fullData.empty()));
|
||||
}
|
||||
|
||||
void RenderablePointsCloud::initialize() {
|
||||
bool isSuccessful = loadData();
|
||||
if (!isSuccessful) {
|
||||
throw ghoul::RuntimeError("Error loading data");
|
||||
}
|
||||
}
|
||||
|
||||
void RenderablePointsCloud::initializeGL() {
|
||||
_shaderProgram = global::renderEngine->buildRenderProgram(
|
||||
"PointsCloud",
|
||||
absPath("${MODULE_SOFTWAREINTEGRATION}/shaders/point_vs.glsl"),
|
||||
absPath("${MODULE_SOFTWAREINTEGRATION}/shaders/point_fs.glsl")
|
||||
);
|
||||
}
|
||||
|
||||
void RenderablePointsCloud::deinitializeGL() {
|
||||
glDeleteVertexArrays(1, &_vertexArrayObjectID);
|
||||
_vertexArrayObjectID = 0;
|
||||
|
||||
glDeleteBuffers(1, &_vertexBufferObjectID);
|
||||
_vertexBufferObjectID = 0;
|
||||
|
||||
if (_shaderProgram) {
|
||||
global::renderEngine->removeRenderProgram(_shaderProgram.get());
|
||||
_shaderProgram = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
void RenderablePointsCloud::render(const RenderData& data, RendererTasks&) {
|
||||
if (_fullData.empty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (_hasPointData && _toggleVisibility) {
|
||||
_shaderProgram->activate();
|
||||
|
||||
glm::dmat4 modelTransform =
|
||||
glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
|
||||
glm::dmat4(data.modelTransform.rotation) * // Spice rotation
|
||||
glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
|
||||
|
||||
glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
|
||||
|
||||
_shaderProgram->setUniform("modelViewTransform", modelViewTransform);
|
||||
_shaderProgram->setUniform(
|
||||
"MVPTransform",
|
||||
glm::dmat4(data.camera.projectionMatrix()) * modelViewTransform
|
||||
);
|
||||
|
||||
_shaderProgram->setUniform("color", _color);
|
||||
_shaderProgram->setUniform("opacity", _opacity);
|
||||
_shaderProgram->setUniform("size", _size);
|
||||
|
||||
// Changes GL state:
|
||||
glEnablei(GL_BLEND, 0);
|
||||
//glDepthMask(false);
|
||||
glBlendEquation(GL_FUNC_ADD);
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
glEnable(GL_PROGRAM_POINT_SIZE); // Enable gl_PointSize in vertex
|
||||
|
||||
glBindVertexArray(_vertexArrayObjectID);
|
||||
const GLsizei nPoints = static_cast<GLsizei>(_fullData.size() / _nValuesPerPoints);
|
||||
glDrawArrays(GL_POINTS, 0, nPoints);
|
||||
|
||||
glBindVertexArray(0);
|
||||
_shaderProgram->deactivate();
|
||||
|
||||
// Restores GL State
|
||||
global::renderEngine->openglStateCache().resetBlendState();
|
||||
//global::renderEngine->openglStateCache().resetDepthState();
|
||||
}
|
||||
}
|
||||
|
||||
void RenderablePointsCloud::update(const UpdateData&) {
|
||||
if (!_isDirty) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (_hasPointData) {
|
||||
LDEBUG("Regenerating data");
|
||||
|
||||
createDataSlice();
|
||||
|
||||
int size = static_cast<int>(_slicedData.size());
|
||||
|
||||
if (_vertexArrayObjectID == 0) {
|
||||
glGenVertexArrays(1, &_vertexArrayObjectID);
|
||||
LDEBUG(fmt::format("Generating Vertex Array id '{}'", _vertexArrayObjectID));
|
||||
}
|
||||
if (_vertexBufferObjectID == 0) {
|
||||
glGenBuffers(1, &_vertexBufferObjectID);
|
||||
LDEBUG(fmt::format("Generating Vertex Buffer Object id '{}'", _vertexBufferObjectID));
|
||||
}
|
||||
|
||||
glBindVertexArray(_vertexArrayObjectID);
|
||||
glBindBuffer(GL_ARRAY_BUFFER, _vertexBufferObjectID);
|
||||
glBufferData(
|
||||
GL_ARRAY_BUFFER,
|
||||
size * sizeof(float),
|
||||
_slicedData.data(),
|
||||
GL_STATIC_DRAW
|
||||
);
|
||||
|
||||
GLint positionAttribute = _shaderProgram->attributeLocation("in_position");
|
||||
|
||||
glEnableVertexAttribArray(positionAttribute);
|
||||
glVertexAttribPointer(
|
||||
positionAttribute,
|
||||
4,
|
||||
GL_FLOAT,
|
||||
GL_FALSE,
|
||||
0,
|
||||
nullptr
|
||||
);
|
||||
}
|
||||
glBindVertexArray(_vertexArrayObjectID);
|
||||
const GLsizei nPoints = static_cast<GLsizei>(_fullData.size() / _nValuesPerPoints);
|
||||
glDrawArrays(GL_POINTS, 0, nPoints);
|
||||
|
||||
glBindVertexArray(0);
|
||||
_shaderProgram->deactivate();
|
||||
|
||||
_isDirty = false;
|
||||
// Restores GL State
|
||||
global::renderEngine->openglStateCache().resetBlendState();
|
||||
global::renderEngine->openglStateCache().resetDepthState();
|
||||
}
|
||||
}
|
||||
|
||||
void RenderablePointsCloud::update(const UpdateData&) {
|
||||
if (!_isDirty) {
|
||||
return;
|
||||
}
|
||||
|
||||
void RenderablePointsCloud::createDataSlice() {
|
||||
_slicedData.clear();
|
||||
_slicedData.reserve(4 * (_fullData.size() / _nValuesPerPoints));
|
||||
if (_hasPointData) {
|
||||
LDEBUG("Regenerating data");
|
||||
|
||||
auto addPosition = [&](const glm::vec4& pos) {
|
||||
for (int j = 0; j < 4; ++j) {
|
||||
_slicedData.push_back(pos[j]);
|
||||
}
|
||||
};
|
||||
createDataSlice();
|
||||
|
||||
for (size_t i = 0; i < _fullData.size(); i += _nValuesPerPoints) {
|
||||
glm::dvec4 transformedPos = _transformationMatrix * glm::dvec4(
|
||||
_fullData[i + 0],
|
||||
_fullData[i + 1],
|
||||
_fullData[i + 2],
|
||||
1.0
|
||||
);
|
||||
// W-normalization
|
||||
transformedPos /= transformedPos.w;
|
||||
transformedPos *= openspace::distanceconstants::Parsec;
|
||||
addPosition(transformedPos);
|
||||
int size = static_cast<int>(_slicedData.size());
|
||||
|
||||
if (_vertexArrayObjectID == 0) {
|
||||
glGenVertexArrays(1, &_vertexArrayObjectID);
|
||||
LDEBUG(fmt::format("Generating Vertex Array id '{}'", _vertexArrayObjectID));
|
||||
}
|
||||
if (_vertexBufferObjectID == 0) {
|
||||
glGenBuffers(1, &_vertexBufferObjectID);
|
||||
LDEBUG(fmt::format("Generating Vertex Buffer Object id '{}'", _vertexBufferObjectID));
|
||||
}
|
||||
|
||||
glBindVertexArray(_vertexArrayObjectID);
|
||||
glBindBuffer(GL_ARRAY_BUFFER, _vertexBufferObjectID);
|
||||
glBufferData(
|
||||
GL_ARRAY_BUFFER,
|
||||
size * sizeof(float),
|
||||
_slicedData.data(),
|
||||
GL_STATIC_DRAW
|
||||
);
|
||||
|
||||
GLint positionAttribute = _shaderProgram->attributeLocation("in_position");
|
||||
|
||||
glEnableVertexAttribArray(positionAttribute);
|
||||
glVertexAttribPointer(
|
||||
positionAttribute,
|
||||
4,
|
||||
GL_FLOAT,
|
||||
GL_FALSE,
|
||||
0,
|
||||
nullptr
|
||||
);
|
||||
}
|
||||
|
||||
glBindVertexArray(0);
|
||||
|
||||
_isDirty = false;
|
||||
}
|
||||
|
||||
void RenderablePointsCloud::createDataSlice() {
|
||||
_slicedData.clear();
|
||||
_slicedData.reserve(4 * (_fullData.size() / _nValuesPerPoints));
|
||||
|
||||
auto addPosition = [&](const glm::vec4& pos) {
|
||||
for (int j = 0; j < 4; ++j) {
|
||||
_slicedData.push_back(pos[j]);
|
||||
}
|
||||
};
|
||||
|
||||
for (size_t i = 0; i < _fullData.size(); i += _nValuesPerPoints) {
|
||||
glm::dvec4 transformedPos = _transformationMatrix * glm::dvec4(
|
||||
_fullData[i + 0],
|
||||
_fullData[i + 1],
|
||||
_fullData[i + 2],
|
||||
1.0
|
||||
);
|
||||
// W-normalization
|
||||
transformedPos /= transformedPos.w;
|
||||
transformedPos *= openspace::distanceconstants::Parsec;
|
||||
addPosition(transformedPos);
|
||||
}
|
||||
}
|
||||
|
||||
bool RenderablePointsCloud::loadData() {
|
||||
bool isSuccessful = true;
|
||||
_slicedData.clear();
|
||||
_fullData.clear();
|
||||
|
||||
isSuccessful &= readPointData();
|
||||
if (!isSuccessful) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!_hasPointData) {
|
||||
isSuccessful = true;
|
||||
}
|
||||
|
||||
return isSuccessful;
|
||||
}
|
||||
|
||||
bool RenderablePointsCloud::readPointData() {
|
||||
if (!_hasPointData) {
|
||||
LERROR("No point data found");
|
||||
return false;
|
||||
}
|
||||
|
||||
_nValuesPerPoints = 3;
|
||||
|
||||
int dataSize = _pointData.size();
|
||||
std::vector<float> values(_nValuesPerPoints);
|
||||
|
||||
for (int i = 0; i < dataSize; i++) {
|
||||
for (int j = 0; j < _nValuesPerPoints; j++) {
|
||||
values.push_back(_pointData[i][j]);
|
||||
}
|
||||
}
|
||||
|
||||
bool RenderablePointsCloud::loadData() {
|
||||
bool isSuccessful = true;
|
||||
_slicedData.clear();
|
||||
_fullData.clear();
|
||||
_fullData.insert(_fullData.end(), values.begin(), values.end());
|
||||
|
||||
isSuccessful &= readPointData();
|
||||
if (!isSuccessful) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!_hasPointData) {
|
||||
isSuccessful = true;
|
||||
}
|
||||
|
||||
return isSuccessful;
|
||||
}
|
||||
|
||||
bool RenderablePointsCloud::readPointData() {
|
||||
if (!_hasPointData) {
|
||||
LERROR("No point data found");
|
||||
return false;
|
||||
}
|
||||
|
||||
_nValuesPerPoints = 3;
|
||||
|
||||
int dataSize = _pointData.size();
|
||||
std::vector<float> values(_nValuesPerPoints);
|
||||
|
||||
for (int i = 0; i < dataSize; i++) {
|
||||
|
||||
for (int j = 0; j < _nValuesPerPoints; j++) {
|
||||
values.push_back(_pointData[i][j]);
|
||||
}
|
||||
}
|
||||
|
||||
_fullData.insert(_fullData.end(), values.begin(), values.end());
|
||||
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* *
|
||||
* OpenSpace *
|
||||
* *
|
||||
* Copyright (c) 2014-2020 *
|
||||
* Copyright (c) 2014-2021 *
|
||||
* *
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
|
||||
* software and associated documentation files (the "Software"), to deal in the Software *
|
||||
@@ -68,7 +68,6 @@ protected:
|
||||
std::unique_ptr<ghoul::opengl::ProgramObject> _shaderProgram = nullptr;
|
||||
|
||||
properties::BoolProperty _toggleVisibility;
|
||||
properties::FloatProperty _opacity;
|
||||
properties::FloatProperty _size;
|
||||
properties::Vec3Property _color;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user