mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-08 04:20:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup lambda expressions and directly address Fadeable properties when adding properties

Browse Source
This commit is contained in:
Alexander Bock
2023-04-12 23:20:53 +02:00
parent 19642e8120
commit 7565a91196
67 changed files with 229 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gaia/rendering/renderablegaiastars.cpp
+5 -5
View File
@@ -487,7 +487,7 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
if (p.renderMode.has_value()) {
_renderMode = codegen::map<gaia::RenderMode>(*p.renderMode);
}
_renderMode.onChange([&]() { _buffersAreDirty = true; });
_renderMode.onChange([this]() { _buffersAreDirty = true; });
addProperty(_renderMode);
_shaderOption.addOptions({
@@ -511,7 +511,7 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
}
#endif // __APPLE__
}
_shaderOption.onChange([&]() {
_shaderOption.onChange([this]() {
_buffersAreDirty = true;
_shadersAreDirty = true;
});
@@ -547,7 +547,7 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
_lodPixelThreshold = p.lodPixelThreshold.value_or(_lodPixelThreshold);
_maxGpuMemoryPercent = p.maxGpuMemoryPercent.value_or(_maxGpuMemoryPercent);
_maxGpuMemoryPercent.onChange([&]() {
_maxGpuMemoryPercent.onChange([this]() {
if (_ssboData != 0) {
glDeleteBuffers(1, &_ssboData);
glGenBuffers(1, &_ssboData);
@@ -594,11 +594,11 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
// Only add properties correlated to fits files if we're reading from a fits file.
if (_fileReaderOption == gaia::FileReaderOption::Fits) {
_firstRow = p.firstRow.value_or(_firstRow);
_firstRow.onChange([&]() { _dataIsDirty = true; });
_firstRow.onChange([this]() { _dataIsDirty = true; });
addProperty(_firstRow);
_lastRow = p.lastRow.value_or(_lastRow);
_lastRow.onChange([&]() { _dataIsDirty = true; });
_lastRow.onChange([this]() { _dataIsDirty = true; });
addProperty(_lastRow);
if (p.columnNames.has_value()) {