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

Starting to clean out constants.h file by moving constants into the relevant classes

Browse Source
This commit is contained in:
Alexander Bock
2015-05-20 16:32:28 +02:00
parent 2bb2b906ff
commit 4de4c015d7
17 changed files with 140 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/engine/configurationmanager.h
+20
View File
@@ -31,6 +31,26 @@ namespace openspace {
class ConfigurationManager : public ghoul::Dictionary {
public:
static const std::string KeyPaths;
static const std::string KeyCache;
static const std::string KeyCachePath;
static const std::string KeyFonts;
static const std::string KeyConfigSgct;
static const std::string KeyLuaDocumentationType;
static const std::string KeyLuaDocumentationFile;
static const std::string KeyPropertyDocumentationType;
static const std::string KeyPropertyDocumentationFile;
static const std::string KeyConfigScene;
static const std::string KeyEnableGui;
static const std::string KeyStartupScript;
static const std::string KeySettingsScript;
static const std::string KeySpiceTimeKernel;
static const std::string KeySpiceLeapsecondKernel;
static const std::string KeyLogLevel;
static const std::string KeyLogImmediateFlush;
static const std::string KeyLogs;
static const std::string KeyDisableMasterRendering;
bool loadFromFile(const std::string& filename);
private:
include/openspace/rendering/renderable.h
-2
View File
@@ -78,14 +78,12 @@ public:
void setBody(std::string& body);
protected:
std::string findPath(const std::string& path);
void setPscUniforms(ghoul::opengl::ProgramObject* program, const Camera* camera, const PowerScaledCoordinate& position);
private:
properties::BoolProperty _enabled;
PowerScaledScalar boundingSphere_;
std::string _relativePath;
std::string _startTime;
std::string _endTime;
std::string _targetBody;
include/openspace/scene/scenegraphnode.h
+4
View File
@@ -51,6 +51,10 @@ public:
};
static std::string RootNodeName;
static const std::string KeyName;
static const std::string KeyParentName;
static const std::string KeyDependencies;
SceneGraphNode();
~SceneGraphNode();
include/openspace/util/constants.h
+8 -30
View File
@@ -36,37 +36,15 @@ namespace fonts {
const std::string keyLight = "Light";
} // namespace fonts
namespace configurationmanager {
const std::string keyPaths = "Paths";
const std::string keyCache = "CACHE";
const std::string keyCachePath = keyPaths + "." + keyCache;
const std::string keyFonts = "Fonts";
const std::string keyConfigSgct = "SGCTConfig";
const std::string keyLuaDocumentationType = "LuaDocumentationFile.Type";
const std::string keyLuaDocumentationFile = "LuaDocumentationFile.File";
const std::string keyPropertyDocumentationType = "PropertyDocumentationFile.Type";
const std::string keyPropertyDocumentationFile = "PropertyDocumentationFile.File";
const std::string keyConfigScene = "Scene";
const std::string keyEnableGui = "EnableGUI";
const std::string keyStartupScript = "StartupScripts";
const std::string keySettingsScript = "SettingsScripts";
const std::string keySpiceTimeKernel = "SpiceKernel.Time";
const std::string keySpiceLeapsecondKernel = "SpiceKernel.LeapSecond";
const std::string keyLogLevel = "Logging.LogLevel";
const std::string keyLogImmediateFlush = "Logging.ImmediateFlush";
const std::string keyLogs = "Logging.Logs";
const std::string keyDisableMasterRendering = "DisableRenderingOnMaster";
} // namespace configurationmanager
namespace scenegraph {
const std::string keyPathScene = "ScenePath";
const std::string keyCommonFolder = "CommonFolder";
const std::string keyModules = "Modules";
const std::string keyCamera = "Camera";
const std::string keyFocusObject = "Focus";
const std::string keyPositionObject = "Position";
const std::string keyViewOffset = "Offset";
const std::string keyPathModule = "ModulePath";
// const std::string keyPathScene = "ScenePath";
//const std::string keyCommonFolder = "CommonFolder";
// const std::string keyModules = "Modules";
// const std::string keyCamera = "Camera";
// const std::string keyFocusObject = "Focus";
// const std::string keyPositionObject = "Position";
// const std::string keyViewOffset = "Offset";
// const std::string keyPathModule = "ModulePath";
} // namespace scenegraph
namespace scenegraphnode {