mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-05 11:09:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

some cleanup, changing long lines, making sure underscored variables are private

Browse Source
This commit is contained in:
Lovisa Hassler
2018-12-06 14:16:30 -05:00
parent 101b9e9e00
commit 06c0ac8104
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/dsn/rendering/renderablesignals.cpp
View File

@@ -39,7 +39,7 @@ namespace {
constexpr const char* _loggerCat = "RenderableSignals";
constexpr const char* KeyStationSites = "StationSites";
constexpr const std::array < const char*, openspace::RenderableSignals::_uniformCacheSize > UniformNames = {
constexpr const std::array <const char*, openspace::RenderableSignals::uniformCacheSize> UniformNames = {
"modelViewStation","modelViewSpacecraft", "projectionTransform", "baseOpacity"
};
@@ -120,7 +120,9 @@ RenderableSignals::RenderableSignals(const ghoul::Dictionary& dictionary)
};
std::string site = siteNames[siteIndex];
glm::vec3 siteColor = siteColorDictionary.value<glm::vec3>(siteNames.at(siteIndex));
_siteColors.push_back(std::make_unique<properties::Vec4Property>(SiteColorsInfo, glm::vec4(siteColor,1.0), glm::vec4(0.f), glm::vec4(1.f)));
_siteColors.push_back( std::make_unique<properties::Vec4Property>(
SiteColorsInfo,glm::vec4(siteColor,1.0), glm::vec4(0.f), glm::vec4(1.f))
);
_siteToIndex[siteNames.at(siteIndex)] = siteIndex;
addProperty(_siteColors.back().get());
}
@@ -148,7 +150,7 @@ RenderableSignals::RenderableSignals(const ghoul::Dictionary& dictionary)
if (dictionary.hasKeyAndValue<double>(BaseOpacityInfo.identifier)) {
_baseOpacity = static_cast<float>(dictionary.value<double>(
BaseOpacityInfo.identifier
));
));
}
addProperty(_baseOpacity);

6
modules/dsn/rendering/renderablesignals.h
View File

@@ -109,10 +109,12 @@ namespace openspace {
};
/// Number of variables in _uniformCache
static const GLuint _uniformCacheSize = 4;
static const GLuint uniformCacheSize = 4;
const char* _identifier = "Signals";
protected:
const char* _identifier = "Signals";
/// Returns the documentation entries
static documentation::Documentation Documentation();