mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-05 10:59:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Issue/453 (#556)

Browse Source 
* Introduced guiName to PropertyOwner
  * Added requirement that PropertyOwner::identifier may not contain whitespaces
  * Changed Name to Identifier in asset and scene files
  * Added new PropertyOwner to RenderEngine that owns the ScreenSpaceRenderables
  * Moved Name and GuiPath into GUI group
  * Added user-facing names to layer groups
This commit is contained in:
Alexander Bock
2018-03-16 09:21:29 -04:00
committed by GitHub
parent 7a93a4fa37
commit db7ae7e384
234 changed files with 2921 additions and 1676 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/spacecraftinstruments/util/projectioncomponent.cpp
+8 -9
View File
@@ -247,7 +247,9 @@ ProjectionComponent::ProjectionComponent()
_applyTextureSize.onChange([this]() { _textureSizeDirty = true; });
}
void ProjectionComponent::initialize(const ghoul::Dictionary& dictionary) {
void ProjectionComponent::initialize(const std::string& identifier,
const ghoul::Dictionary& dictionary)
{
documentation::testSpecificationAndThrow(
Documentation(),
dictionary,
@@ -290,9 +292,6 @@ void ProjectionComponent::initialize(const ghoul::Dictionary& dictionary) {
static_cast<float>(dictionary.value<double>(keyTextureMapAspectRatio));
}
std::string name;
dictionary.getValue(SceneGraphNode::KeyName, name);
std::vector<SequenceParser*> parsers;
if (dictionary.hasKey(keySequenceDir)) {
@@ -324,7 +323,7 @@ void ProjectionComponent::initialize(const ghoul::Dictionary& dictionary) {
for (std::string& sequenceSource : sequenceSources) {
if (sequenceType == sequenceTypePlaybook) {
parsers.push_back(new HongKangParser(
name,
identifier,
std::move(sequenceSource),
_projectorID,
translationDictionary,
@@ -332,14 +331,14 @@ void ProjectionComponent::initialize(const ghoul::Dictionary& dictionary) {
}
else if (sequenceType == sequenceTypeImage) {
parsers.push_back(new LabelParser(
name,
identifier,
std::move(sequenceSource),
translationDictionary));
}
else if (sequenceType == sequenceTypeHybrid) {
//first read labels
parsers.push_back(new LabelParser(
name,
identifier,
std::move(sequenceSource),
translationDictionary));
@@ -349,7 +348,7 @@ void ProjectionComponent::initialize(const ghoul::Dictionary& dictionary) {
//then read playbook
_eventFile = absPath(_eventFile);
parsers.push_back(new HongKangParser(
name,
identifier,
_eventFile,
_projectorID,
translationDictionary,
@@ -361,7 +360,7 @@ void ProjectionComponent::initialize(const ghoul::Dictionary& dictionary) {
}
else if (sequenceType == sequenceTypeInstrumentTimes) {
parsers.push_back(new InstrumentTimesParser(
name,
identifier,
std::move(sequenceSource),
translationDictionary)
);