mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added toggle visibility and opacity

Browse Source
This commit is contained in:
aniisaaden
2020-07-20 15:59:22 +02:00
parent 2ea9a62e12
commit d9b51926c6
4 changed files with 74 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
modules/softwareintegration/rendering/renderablepointscloud.cpp
View File

@@ -52,11 +52,23 @@ namespace {
"TODO"
};
constexpr openspace::properties::Property::PropertyInfo OpacityInfo = {
"Opacity",
"Opacity",
"TODO"
};
constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
"Size",
"Size",
"TODO"
};
constexpr openspace::properties::Property::PropertyInfo ToggleVisibilityInfo = {
"ToggleVisibility",
"Toggle Visibility",
"Enables/Disables the drawing of points."
};
} // namespace
namespace openspace {
@@ -67,6 +79,12 @@ namespace openspace {
"RenderablePointsCloud",
"softwareintegration_renderable_pointscloud",
{
{
ColorInfo.identifier,
new DoubleVector3Verifier,
Optional::Yes,
ColorInfo.description
},
{
KeyFile,
new StringVerifier,
@@ -74,10 +92,10 @@ namespace openspace {
"TODO"
},
{
ColorInfo.identifier,
new DoubleVector3Verifier,
OpacityInfo.identifier,
new DoubleVerifier,
Optional::Yes,
ColorInfo.description
OpacityInfo.description
},
{
SizeInfo.identifier,
@@ -97,7 +115,9 @@ namespace openspace {
glm::vec3(0.f),
glm::vec3(1.f)
)
, _opacity(OpacityInfo, 1.f, 0.f, 1.f)
, _size(SizeInfo, 1.f, 0.f, 600.f)
, _toggleVisibility(ToggleVisibilityInfo, true)
{
documentation::testSpecificationAndThrow(
Documentation(),
@@ -105,23 +125,35 @@ namespace openspace {
"RenderablePointsCloud"
);
if (dictionary.hasKey(KeyFile)) {
_speckFile = absPath(dictionary.value<std::string>(KeyFile));
_hasSpeckFile = true;
}
if (dictionary.hasKey(ColorInfo.identifier)) {
_color = dictionary.value<glm::vec3>(ColorInfo.identifier);
}
_color.setViewOption(properties::Property::ViewOptions::Color);
addProperty(_color);
if (dictionary.hasKey(KeyFile)) {
_speckFile = absPath(dictionary.value<std::string>(KeyFile));
_hasSpeckFile = 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));
//dictionary.value<float>(SizeInfo.identifier);
}
addProperty(_size);
if (dictionary.hasKey(ToggleVisibilityInfo.identifier)) {
_toggleVisibility = dictionary.value<bool>(ToggleVisibilityInfo.identifier);
}
_toggleVisibility.onChange([&]() { _hasSpeckFile = !_hasSpeckFile; });
addProperty(_toggleVisibility);
}
bool RenderablePointsCloud::isReady() const {
@@ -160,36 +192,39 @@ namespace openspace {
if (_fullData.empty()) {
return;
}
_shaderProgram->activate();
if (_hasSpeckFile && _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 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;
glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
_shaderProgram->setUniform("modelViewTransform", modelViewTransform);
_shaderProgram->setUniform(
"MVPTransform",
glm::dmat4(data.camera.projectionMatrix()) * modelViewTransform
);
_shaderProgram->setUniform("modelViewTransform", modelViewTransform);
_shaderProgram->setUniform(
"MVPTransform",
glm::dmat4(data.camera.projectionMatrix()) * modelViewTransform
);
_shaderProgram->setUniform("color", _color);
_shaderProgram->setUniform("size", _size);
_shaderProgram->setUniform("color", _color);
_shaderProgram->setUniform("opacity", _opacity);
_shaderProgram->setUniform("size", _size);
// Changes GL state:
glEnablei(GL_BLEND, 0);
glBlendEquation(GL_FUNC_ADD);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_PROGRAM_POINT_SIZE); // Enable gl_PointSize in vertex
// Changes GL state:
glEnablei(GL_BLEND, 0);
glBlendEquation(GL_FUNC_ADD);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_PROGRAM_POINT_SIZE); // Enable gl_PointSize in vertex
glBindVertexArray(_vaoID);
const GLsizei nPoints = static_cast<GLsizei>(_fullData.size() / _nValuesPerPoints);
glDrawArrays(GL_POINTS, 0, nPoints);
glBindVertexArray(_vaoID);
const GLsizei nPoints = static_cast<GLsizei>(_fullData.size() / _nValuesPerPoints);
glDrawArrays(GL_POINTS, 0, nPoints);
glBindVertexArray(0);
_shaderProgram->deactivate();
glBindVertexArray(0);
_shaderProgram->deactivate();
}
}
void RenderablePointsCloud::update(const UpdateData&) {

4
modules/softwareintegration/rendering/renderablepointscloud.h
View File

@@ -69,8 +69,10 @@ namespace openspace {
std::unique_ptr<ghoul::opengl::ProgramObject> _shaderProgram = nullptr;
properties::Vec3Property _color;
properties::BoolProperty _toggleVisibility;
properties::FloatProperty _opacity;
properties::FloatProperty _size;
properties::Vec3Property _color;
std::string _speckFile;
std::vector<float> _fullData;