mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-03 01:09:34 -05:00
More coding style conformance
This commit is contained in:
@@ -41,7 +41,8 @@ namespace documentation { struct Documentation; }
|
||||
|
||||
class Rotation : public properties::PropertyOwner {
|
||||
public:
|
||||
static std::unique_ptr<Rotation> createFromDictionary(const ghoul::Dictionary& dictionary);
|
||||
static std::unique_ptr<Rotation> createFromDictionary(
|
||||
const ghoul::Dictionary& dictionary);
|
||||
|
||||
Rotation(const ghoul::Dictionary& dictionary);
|
||||
virtual ~Rotation() = default;
|
||||
|
||||
@@ -41,7 +41,8 @@ namespace documentation { struct Documentation; }
|
||||
|
||||
class Scale : public properties::PropertyOwner {
|
||||
public:
|
||||
static std::unique_ptr<Scale> createFromDictionary(const ghoul::Dictionary& dictionary);
|
||||
static std::unique_ptr<Scale> createFromDictionary(
|
||||
const ghoul::Dictionary& dictionary);
|
||||
|
||||
Scale();
|
||||
virtual ~Scale() = default;
|
||||
|
||||
@@ -61,7 +61,8 @@ public:
|
||||
* \param component The optional compoment that caused this exception to be thrown
|
||||
* \pre message may not be empty
|
||||
*/
|
||||
explicit InvalidSceneError(const std::string& message, const std::string& component = "");
|
||||
explicit InvalidSceneError(const std::string& message,
|
||||
const std::string& component = "");
|
||||
};
|
||||
|
||||
// constructors & destructor
|
||||
@@ -118,12 +119,14 @@ public:
|
||||
/**
|
||||
* Add a node and all its children to the scene.
|
||||
*/
|
||||
void addNode(SceneGraphNode* node, UpdateDependencies updateDeps = UpdateDependencies::Yes);
|
||||
void addNode(SceneGraphNode* node,
|
||||
UpdateDependencies updateDeps = UpdateDependencies::Yes);
|
||||
|
||||
/**
|
||||
* Remove a node and all its children from the scene.
|
||||
*/
|
||||
void removeNode(SceneGraphNode* node, UpdateDependencies updateDeps = UpdateDependencies::Yes);
|
||||
void removeNode(SceneGraphNode* node,
|
||||
UpdateDependencies updateDeps = UpdateDependencies::Yes);
|
||||
|
||||
void addSceneLicense(SceneLicense license);
|
||||
|
||||
|
||||
@@ -73,7 +73,8 @@ public:
|
||||
SceneGraphNode();
|
||||
~SceneGraphNode();
|
||||
|
||||
static std::unique_ptr<SceneGraphNode> createFromDictionary(const ghoul::Dictionary& dictionary);
|
||||
static std::unique_ptr<SceneGraphNode> createFromDictionary(
|
||||
const ghoul::Dictionary& dictionary);
|
||||
|
||||
void initialize();
|
||||
void deinitialize();
|
||||
@@ -84,16 +85,21 @@ public:
|
||||
void render(const RenderData& data, RendererTasks& tasks);
|
||||
void updateCamera(Camera* camera) const;
|
||||
|
||||
void attachChild(std::unique_ptr<SceneGraphNode> child, UpdateScene updateScene = UpdateScene::Yes);
|
||||
std::unique_ptr<SceneGraphNode> detachChild(SceneGraphNode& child, UpdateScene updateScene = UpdateScene::Yes);
|
||||
void attachChild(std::unique_ptr<SceneGraphNode> child,
|
||||
UpdateScene updateScene = UpdateScene::Yes);
|
||||
std::unique_ptr<SceneGraphNode> detachChild(SceneGraphNode& child,
|
||||
UpdateScene updateScene = UpdateScene::Yes);
|
||||
void setParent(SceneGraphNode& parent, UpdateScene updateScene = UpdateScene::Yes);
|
||||
|
||||
void addDependency(SceneGraphNode& dependency, UpdateScene updateScene = UpdateScene::Yes);
|
||||
void removeDependency(SceneGraphNode& dependency, UpdateScene updateScene = UpdateScene::Yes);
|
||||
void addDependency(SceneGraphNode& dependency,
|
||||
UpdateScene updateScene = UpdateScene::Yes);
|
||||
void removeDependency(SceneGraphNode& dependency,
|
||||
UpdateScene updateScene = UpdateScene::Yes);
|
||||
void clearDependencies(UpdateScene updateScene = UpdateScene::Yes);
|
||||
void setDependencies(const std::vector<SceneGraphNode*>& dependencies, UpdateScene updateScene = UpdateScene::Yes);
|
||||
void setDependencies(const std::vector<SceneGraphNode*>& dependencies,
|
||||
UpdateScene updateScene = UpdateScene::Yes);
|
||||
SurfacePositionHandle calculateSurfacePositionHandle(
|
||||
const glm::dvec3& targetModelSpace);
|
||||
const glm::dvec3& targetModelSpace);
|
||||
|
||||
const std::vector<SceneGraphNode*>& dependencies() const;
|
||||
const std::vector<SceneGraphNode*>& dependentNodes() const;
|
||||
|
||||
@@ -59,7 +59,8 @@ public:
|
||||
/**
|
||||
* Import a scene graph node from a dictionary into an existing scene.
|
||||
*/
|
||||
SceneGraphNode* importNodeDictionary(Scene& scene, const ghoul::Dictionary& dictionary);
|
||||
SceneGraphNode* importNodeDictionary(Scene& scene,
|
||||
const ghoul::Dictionary& dictionary);
|
||||
|
||||
private:
|
||||
struct LoadedNode {
|
||||
@@ -99,7 +100,8 @@ private:
|
||||
/**
|
||||
* Load a mod file.
|
||||
*/
|
||||
std::vector<SceneLoader::LoadedNode> loadModule(const std::string& path, lua_State* luaState);
|
||||
std::vector<SceneLoader::LoadedNode> loadModule(const std::string& path,
|
||||
lua_State* luaState);
|
||||
|
||||
/**
|
||||
* Loads an existing license file
|
||||
@@ -120,7 +122,8 @@ private:
|
||||
/**
|
||||
* Add loaded nodes to an existing scene
|
||||
*/
|
||||
std::vector<SceneGraphNode*> addLoadedNodes(Scene& scene, std::vector<SceneLoader::LoadedNode>&& nodes);
|
||||
std::vector<SceneGraphNode*> addLoadedNodes(Scene& scene,
|
||||
std::vector<SceneLoader::LoadedNode>&& nodes);
|
||||
};
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
@@ -42,7 +42,8 @@ namespace documentation { struct Documentation; }
|
||||
|
||||
class Translation : public properties::PropertyOwner {
|
||||
public:
|
||||
static std::unique_ptr<Translation> createFromDictionary(const ghoul::Dictionary& dictionary);
|
||||
static std::unique_ptr<Translation> createFromDictionary(
|
||||
const ghoul::Dictionary& dictionary);
|
||||
|
||||
Translation();
|
||||
virtual ~Translation() = default;
|
||||
|
||||
Reference in New Issue
Block a user