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

More include file cleanup

Browse Source
This commit is contained in:
Alexander Bock
2017-05-15 15:27:38 -04:00
parent 302fa06067
commit f4ad2ce4c2
37 changed files with 92 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/openspace/network/parallelconnection.h
View File

@@ -30,6 +30,7 @@
#include <openspace/properties/propertyowner.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/properties/numericalproperty.h>
#include <openspace/properties/scalar/floatproperty.h>
//glm includes
#include <glm/gtx/quaternion.hpp>

6
include/openspace/rendering/renderable.h
View File

@@ -29,15 +29,13 @@
#include <openspace/properties/scalar/boolproperty.h>
#include <ghoul/opengl/programobject.h>
// Forward declare to minimize dependencies
namespace ghoul {
namespace opengl {
class ProgramObject;
class Texture;
}
class Dictionary;
}
} // namespace ghoul
namespace openspace {

21
include/openspace/rendering/renderengine.h
View File

@@ -25,20 +25,13 @@
#ifndef __OPENSPACE_CORE___RENDERENGINE___H__
#define __OPENSPACE_CORE___RENDERENGINE___H__
#include <openspace/performance/performancemanager.h>
#include <openspace/properties/optionproperty.h>
#include <openspace/properties/propertyowner.h>
#include <openspace/properties/optionproperty.h>
#include <openspace/properties/scalar/boolproperty.h>
#include <openspace/properties/scalar/intproperty.h>
#include <openspace/properties/triggerproperty.h>
#include <openspace/rendering/raycastermanager.h>
#include <openspace/rendering/renderer.h>
#include <openspace/rendering/screenspacerenderable.h>
#include <openspace/scripting/scriptengine.h>
#include <openspace/util/syncdata.h>
namespace ghoul {
namespace fontrendering {
@@ -49,17 +42,21 @@ namespace opengl {
}
class Dictionary;
class SharedMemory;
}
} // namespace ghoul
namespace openspace {
// Forward declare to minimize dependencies
namespace performance { class PerformanceManager; }
namespace scripting { struct LuaLibrary; }
class Camera;
class SyncBuffer;
class RaycasterManager;
class Renderer;
class Scene;
class SceneManager;
class ScreenLog;
class ScreenSpaceRenderable;
class Syncable;
class SyncBuffer;
class RenderEngine : public properties::PropertyOwner {
public:

20
include/openspace/scene/scenegraphnode.h
View File

@@ -25,16 +25,12 @@
#ifndef __OPENSPACE_CORE___SCENEGRAPHNODE___H__
#define __OPENSPACE_CORE___SCENEGRAPHNODE___H__
#include <openspace/rendering/renderable.h>
#include <openspace/scene/translation.h>
#include <openspace/scene/rotation.h>
#include <openspace/scene/scale.h>
#include <openspace/properties/propertyowner.h>
#include <openspace/scene/scene.h>
#include <openspace/util/updatestructures.h>
#include <ghoul/glm.h>
#include <ghoul/misc/boolean.h>
#include <iostream>
#include <functional>
#include <memory>
#include <string>
#include <vector>
@@ -43,6 +39,16 @@ namespace ghoul { class Dictionary; }
namespace openspace {
class Camera;
struct RenderData;
class Renderable;
struct RendererTasks;
class Rotation;
class Translation;
class Scale;
class Scene;
struct UpdateData;
namespace documentation { struct Documentation; }
class SceneGraphNode : public properties::PropertyOwner {