mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-08 04:20:14 -05:00
- Remove documentation.h include and replace with forward declaration
- Move Documentation struct into documentation namespace
This commit is contained in:
@@ -23,8 +23,10 @@
|
||||
****************************************************************************************/
|
||||
|
||||
#include <modules/space/rendering/planetgeometry.h>
|
||||
|
||||
#include <openspace/util/factorymanager.h>
|
||||
|
||||
#include <openspace/documentation/documentation.h>
|
||||
#include <openspace/documentation/verifier.h>
|
||||
|
||||
namespace {
|
||||
@@ -35,7 +37,7 @@ namespace {
|
||||
namespace openspace {
|
||||
namespace planetgeometry {
|
||||
|
||||
Documentation PlanetGeometry::Documentation() {
|
||||
documentation::Documentation PlanetGeometry::Documentation() {
|
||||
using namespace documentation;
|
||||
return {
|
||||
"Planet Geometry",
|
||||
|
||||
@@ -27,10 +27,10 @@
|
||||
|
||||
#include <openspace/properties/propertyowner.h>
|
||||
|
||||
#include <openspace/documentation/documentation.h>
|
||||
|
||||
namespace openspace {
|
||||
|
||||
class Renderable;
|
||||
namespace documentation { struct Documentation; }
|
||||
|
||||
namespace planetgeometry {
|
||||
|
||||
@@ -44,7 +44,7 @@ public:
|
||||
virtual void deinitialize();
|
||||
virtual void render() = 0;
|
||||
|
||||
static openspace::Documentation Documentation();
|
||||
static documentation::Documentation Documentation();
|
||||
|
||||
protected:
|
||||
Renderable* _parent;
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
#include <modules/space/rendering/renderablerings.h>
|
||||
|
||||
#include <openspace/documentation/documentation.h>
|
||||
#include <openspace/documentation/verifier.h>
|
||||
#include <openspace/engine/openspaceengine.h>
|
||||
#include <openspace/rendering/renderengine.h>
|
||||
@@ -43,7 +44,7 @@ namespace {
|
||||
|
||||
namespace openspace {
|
||||
|
||||
Documentation RenderableRings::Documentation() {
|
||||
documentation::Documentation RenderableRings::Documentation() {
|
||||
using namespace documentation;
|
||||
return {
|
||||
"Renderable Rings",
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
|
||||
#include <openspace/rendering/renderable.h>
|
||||
|
||||
#include <openspace/documentation/documentation.h>
|
||||
#include <openspace/properties/stringproperty.h>
|
||||
#include <openspace/properties/scalar/floatproperty.h>
|
||||
#include <openspace/properties/vector/vec2property.h>
|
||||
@@ -44,6 +43,7 @@ namespace ghoul {
|
||||
}
|
||||
|
||||
namespace openspace {
|
||||
namespace documentation { struct Documentation; }
|
||||
|
||||
class RenderableRings : public Renderable {
|
||||
public:
|
||||
@@ -57,7 +57,7 @@ public:
|
||||
void render(const RenderData& data) override;
|
||||
void update(const UpdateData& data) override;
|
||||
|
||||
static openspace::Documentation Documentation();
|
||||
static documentation::Documentation Documentation();
|
||||
|
||||
private:
|
||||
void loadTexture();
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
#include <modules/space/rendering/renderablestars.h>
|
||||
|
||||
#include <openspace/documentation/documentation.h>
|
||||
#include <openspace/documentation/verifier.h>
|
||||
#include <openspace/util/updatestructures.h>
|
||||
#include <openspace/engine/openspaceengine.h>
|
||||
@@ -82,7 +83,7 @@ namespace {
|
||||
|
||||
namespace openspace {
|
||||
|
||||
openspace::Documentation RenderableStars::Documentation() {
|
||||
documentation::Documentation RenderableStars::Documentation() {
|
||||
using namespace documentation;
|
||||
return {
|
||||
"RenderableStars",
|
||||
|
||||
@@ -27,23 +27,20 @@
|
||||
|
||||
#include <openspace/rendering/renderable.h>
|
||||
|
||||
#include <openspace/documentation/documentation.h>
|
||||
#include <openspace/properties/stringproperty.h>
|
||||
#include <openspace/properties/optionproperty.h>
|
||||
#include <openspace/properties/scalar/floatproperty.h>
|
||||
|
||||
namespace ghoul {
|
||||
namespace filesystem {
|
||||
class File;
|
||||
}
|
||||
}
|
||||
namespace filesystem { class File; }
|
||||
namespace opengl {
|
||||
class ProgramObject;
|
||||
class Texture;
|
||||
} // namespace opengl
|
||||
} // namespace ghoul
|
||||
|
||||
namespace openspace {
|
||||
|
||||
namespace opengl {
|
||||
class ProgramObject;
|
||||
class Texture;
|
||||
}
|
||||
namespace documentation { struct Documentation; }
|
||||
|
||||
class RenderableStars : public Renderable {
|
||||
public:
|
||||
@@ -58,7 +55,7 @@ public:
|
||||
void render(const RenderData& data) override;
|
||||
void update(const UpdateData& data) override;
|
||||
|
||||
static openspace::Documentation Documentation();
|
||||
static documentation::Documentation Documentation();
|
||||
|
||||
private:
|
||||
enum ColorOption {
|
||||
|
||||
Reference in New Issue
Block a user