mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-22 21:09:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Started switching OpenSpace projects to nested namespaces

Browse Source 
Various cleanups
This commit is contained in:
Alexander Bock
2017-07-15 20:01:55 -04:00
parent 9d4215695d
commit 4dba552fd1
331 changed files with 1126 additions and 1917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/openspace/documentation/documentation.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -34,8 +34,7 @@
namespace ghoul { class Dictionary; }
namespace openspace {
namespace documentation {
namespace openspace::documentation {
using Optional = ghoul::Boolean;
using Exhaustive = ghoul::Boolean;
@@ -303,9 +302,7 @@ TestResult testSpecification(const Documentation& documentation,
void testSpecificationAndThrow(const Documentation& documentation,
const ghoul::Dictionary& dictionary, std::string component);
} // namespace documentation
} // namespace openspace
} // namespace openspace::documentation
// Make the overload for std::to_string available for the Offense::Reason for easier
// error logging

8
include/openspace/documentation/documentationengine.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -31,8 +31,7 @@
#include <ghoul/misc/exception.h>
namespace openspace {
namespace documentation {
namespace openspace::documentation {
/**
* The DocumentationEngine has the ability to collect all Documentation%s that are
@@ -92,8 +91,7 @@ private:
static DocumentationEngine* _instance;
};
} // namespace documentation
} // namespace openspace
} // namespace openspace::documentation
#define DocEng (openspace::documentation::DocumentationEngine::ref())

8
include/openspace/documentation/verifier.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -32,8 +32,7 @@
#include <functional>
#include <type_traits>
namespace openspace {
namespace documentation {
namespace openspace::documentation {
/**
* The base class of all Verifier%s. Each object must have an Verifier::operator()
@@ -1153,8 +1152,7 @@ extern template struct DeprecatedVerifier<BoolVector4Verifier>;
extern template struct DeprecatedVerifier<IntVector4Verifier>;
extern template struct DeprecatedVerifier<DoubleVector4Verifier>;
} // namespace documentation
} // namespace openspace
} // namespace openspace::documentation
#include "verifier.inl"

10
include/openspace/documentation/verifier.inl
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,10 +29,9 @@
namespace std {
std::string to_string(std::string value);
}
} // namespace std
namespace openspace {
namespace documentation {
namespace openspace::documentation {
template <typename T>
TestResult TemplateVerifier<T>::operator()(const ghoul::Dictionary& dict,
@@ -355,5 +354,4 @@ std::string DeprecatedVerifier<T>::documentation() const {
return T::documentation() + " (deprecated)";
}
} // namespace documentation
} // namespace openspace
} // namespace openspace::documentation

1
include/openspace/engine/configurationmanager.h
View File

@@ -28,6 +28,7 @@
#include <ghoul/misc/dictionary.h>
namespace openspace {
namespace documentation { struct Documentation; }
/**

10
include/openspace/engine/logfactory.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -27,12 +27,8 @@
#include <memory>
namespace ghoul {
class Dictionary;
namespace logging { class Log; }
} // namespace ghoul
namespace ghoul { class Dictionary; }
namespace ghoul::logging { class Log; }
namespace openspace {

10
include/openspace/engine/moduleengine.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -33,13 +33,7 @@
#include <ghoul/misc/assert.h>
#include <algorithm>
namespace ghoul {
namespace systemcapabilities {
struct Version;
} // namespace systemcapabilities
} // namespace ghoul
namespace ghoul::systemcapabilities { struct Version; }
namespace openspace {

13
include/openspace/engine/openspaceengine.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -35,14 +35,9 @@
#include <string>
#include <vector>
namespace ghoul {
class Dictionary;
namespace cmdparser { class CommandlineParser; }
namespace fontrendering { class FontManager; }
} // namespace ghoul
namespace ghoul { class Dictionary; }
namespace ghoul::cmdparser { class CommandlineParser; }
namespace ghoul::fontrendering { class FontManager; }
namespace openspace {

8
include/openspace/interaction/controller.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -30,8 +30,7 @@
#include <ghoul/glm.h>
#include <glm/gtx/vector_angle.hpp>
namespace openspace {
namespace interaction {
namespace openspace::interaction {
class NavigationHandler;
@@ -47,7 +46,6 @@ protected:
NavigationHandler* _handler;
};
} // namespace interaction
} // namespace openspace
} // namespace openspace::interaction
#endif // __OPENSPACE_CORE___CONTROLLER___H__

8
include/openspace/interaction/delayedvariable.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -25,8 +25,7 @@
#ifndef __OPENSPACE_CORE___DELAYEDVARIABLE___H__
#define __OPENSPACE_CORE___DELAYEDVARIABLE___H__
namespace openspace {
namespace interaction {
namespace openspace::interaction {
/**
* Class that acts as a smoothing filter to a variable. The filter has a step
@@ -51,8 +50,7 @@ private:
T _currentValue;
};
} // namespace interaction
} // namespace openspace
} // namespace openspace::interaction
#include "delayedvariable.inl"

8
include/openspace/interaction/delayedvariable.inl
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -25,8 +25,7 @@
#include <ghoul/misc/assert.h>
#include <ghoul/glm.h>
namespace openspace {
namespace interaction {
namespace openspace::interaction {
template <typename T, typename ScaleType>
DelayedVariable<T, ScaleType>::DelayedVariable(ScaleType scaleFactor, ScaleType friction)
@@ -72,5 +71,4 @@ T DelayedVariable<T, ScaleType>::get() const {
return _currentValue;
}
} // namespace interaction
} // namespace openspace
} // namespace openspace::interaction

8
include/openspace/interaction/inputstate.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -32,8 +32,7 @@
#include <list>
namespace openspace {
namespace interaction {
namespace openspace::interaction {
class InputState {
public:
@@ -64,7 +63,6 @@ private:
double _mouseScrollDelta;
};
} // namespace interaction
} // namespace openspace
} // namespace openspace::interaction
#endif // __OPENSPACE_CORE___INPUTSTATE___H__

10
include/openspace/interaction/interpolator.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -27,8 +27,7 @@
#include <functional>
namespace openspace {
namespace interaction {
namespace openspace::interaction {
/*
* Interpolates a typename T using a transfer function.
@@ -44,7 +43,7 @@ public:
void setDeltaTime(float deltaTime);
void setTransferFunction(std::function<T(float)> transferFunction);
void setInterpolationTime(float interpolationTime);
void step();
void step();
float deltaTimeScaled() const;
T value() const;
@@ -57,8 +56,7 @@ private:
float _scaledDeltaTime;
};
} // namespace interaction
} // namespace openspace
} // namespace openspace::interaction
#include "interpolator.inl"

8
include/openspace/interaction/interpolator.inl
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -26,8 +26,7 @@
#include <functional>
namespace openspace {
namespace interaction {
namespace openspace::interaction {
template <typename T>
Interpolator<T>::Interpolator()
@@ -81,5 +80,4 @@ bool Interpolator<T>::isInterpolating() const {
return _t < 1.0 && _t >= 0.0;
}
} // namespace interaction
} // namespace openspace
} // namespace openspace::interaction

16
include/openspace/interaction/keybindingmanager.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -32,14 +32,13 @@
#include <ghoul/misc/boolean.h>
namespace openspace {
class Camera;
class SceneGraphNode;
} // namespace
class Camera;
class SceneGraphNode;
namespace openspace::interaction {
namespace interaction {
class KeyBindingManager : public DocumentationGenerator
{
class KeyBindingManager : public DocumentationGenerator {
public:
KeyBindingManager();
~KeyBindingManager() = default;
@@ -81,7 +80,6 @@ private:
std::multimap<KeyWithModifier, KeyInformation> _keyLua;
};
} // namespace interaction
} // namespace openspace
} // namespace openspace::interaction
#endif // __OPENSPACE_CORE___KEYBINDINGMANAGER___H__

14
include/openspace/interaction/keyframenavigator.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -31,14 +31,11 @@
#include <glm/glm.hpp>
#include <glm/gtx/quaternion.hpp>
namespace openspace {
namespace openspace { class Camera; }
class Camera;
namespace openspace::interaction {
namespace interaction {
class KeyframeNavigator
{
class KeyframeNavigator {
public:
struct CameraPose {
glm::dvec3 position;
@@ -63,7 +60,6 @@ private:
Timeline<CameraPose> _cameraPoseTimeline;
};
} // namespace interaction
} // namespace openspace
} // namespace openspace::interaction
#endif // __OPENSPACE_CORE___KEYFRAMENAVIGATOR___H__

8
include/openspace/interaction/luaconsole.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -35,11 +35,7 @@
#include <string>
#include <vector>
namespace ghoul {
namespace opengl {
class ProgramObject;
} // namespace opengl
} // namespace ghoul
namespace ghoul::opengl { class ProgramObject; }
namespace openspace {

19
include/openspace/interaction/mousestate.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -30,8 +30,7 @@
#include <glm/glm.hpp>
namespace openspace {
namespace interaction {
namespace openspace::interaction {
struct MouseState {
MouseState(double scaleFactor);
@@ -42,14 +41,13 @@ struct MouseState {
DelayedVariable<glm::dvec2, double> velocity;
};
class MouseStates
{
class MouseStates {
public:
/**
\param sensitivity
\param velocityScaleFactor can be set to 60 to remove the inertia of the
interaction. Lower value will make it harder to move the camera.
*/
* \param sensitivity
* \param velocityScaleFactor can be set to 60 to remove the inertia of the
* interaction. Lower value will make it harder to move the camera.
*/
MouseStates(double sensitivity, double velocityScaleFactor);
void updateMouseStatesFromInput(const InputState& inputState, double deltaTime);
void setRotationalFriction(double friction);
@@ -74,7 +72,6 @@ private:
MouseState _globalRollMouseState;
};
} // namespace interaction
} // namespace openspace
} // namespace openspace::interaction
#endif // __OPENSPACE_CORE___MOUSESTATE___H__

14
include/openspace/interaction/navigationhandler.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -38,11 +38,11 @@
#include <ghoul/misc/boolean.h>
namespace openspace {
class Camera;
class SceneGraphNode;
} // namespace openspace
class Camera;
class SceneGraphNode;
namespace interaction {
namespace openspace::interaction {
class NavigationHandler : public properties::PropertyOwner {
public:
@@ -85,6 +85,7 @@ public:
* interaction
*/
static scripting::LuaLibrary luaLibrary();
private:
bool _cameraUpdatedFromScript = false;
@@ -99,7 +100,6 @@ private:
properties::BoolProperty _useKeyFrameInteraction;
};
} // namespace interaction
} // namespace openspace
} // namespace openspace::interaction
#endif // __OPENSPACE_CORE___NAVIGATIONHANDLER___H__

15
include/openspace/interaction/orbitalnavigator.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -38,12 +38,12 @@
#include <glm/gtx/quaternion.hpp>
namespace openspace {
class SceneGraphNode;
class Camera;
struct SurfacePositionHandle;
} // namespace
class SceneGraphNode;
class Camera;
struct SurfacePositionHandle;
namespace interaction {
namespace openspace::interaction {
class OrbitalNavigator : public properties::PropertyOwner {
public:
@@ -191,7 +191,6 @@ private:
const glm::dvec3 cameraPositionWorldSpace);
};
} // namespace interaction
} // namespace openspace
} // namespace openspace::interaction
#endif // __OPENSPACE_CORE___ORBITALNAVIGATOR___H__

3
include/openspace/mission/mission.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -34,6 +34,7 @@
namespace ghoul { class Dictionary; }
namespace openspace {
namespace documentation { struct Documentation; }
/**

11
include/openspace/network/messagestructures.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -25,18 +25,14 @@
#ifndef __OPENSPACE_CORE___MESSAGESTRUCTURES___H__
#define __OPENSPACE_CORE___MESSAGESTRUCTURES___H__
//std includes
#include <string>
#include <vector>
//glm includes
#include <glm/gtx/quaternion.hpp>
//openspace includes
#include <openspace/util/camera.h>
namespace openspace{
namespace datamessagestructures {
namespace openspace::datamessagestructures {
enum class Type : uint32_t {
CameraData = 0,
TimeData,
@@ -187,7 +183,6 @@ struct ScriptMessage {
};
};
} //namespace messagestructures
} // namespace openspace
} // namespace openspace::messagestructures
#endif // __OPENSPACE_CORE___MESSAGESTRUCTURES___H__

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

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -25,20 +25,16 @@
#ifndef __OPENSPACE_CORE___PARALLELCONNECTION___H__
#define __OPENSPACE_CORE___PARALLELCONNECTION___H__
//openspace includes
#include <openspace/network/messagestructures.h>
#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>
//ghoul includes
#include <ghoul/designpattern/event.h>
//std includes
#include <string>
#include <vector>
#include <deque>
@@ -48,8 +44,6 @@
#include <map>
#include <condition_variable>
#if defined(WIN32) || defined(__MING32__) || defined(__MING64__)
typedef size_t _SOCKET;
#else

8
include/openspace/performance/performancelayout.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -27,8 +27,7 @@
#include <cstdint>
namespace openspace {
namespace performance {
namespace openspace::performance {
struct PerformanceLayout {
static const int8_t Version = 0;
@@ -57,7 +56,6 @@ struct PerformanceLayout {
int16_t nFunctionEntries;
};
} // namespace performance
} // namespace openspace
} // namespace openspace::performance
#endif // __OPENSPACE_CORE___PERFORMANCELAYOUT___H__

15
include/openspace/performance/performancemanager.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -33,15 +33,11 @@
#include <memory>
#include <vector>
namespace ghoul {
class SharedMemory;
}
namespace ghoul { class SharedMemory; }
namespace openspace {
namespace openspace { class SceneGraphNode; }
class SceneGraphNode;
namespace performance {
namespace openspace::performance {
class PerformanceManager {
public:
@@ -95,7 +91,6 @@ private:
bool createLogDir();
};
} // namespace performance
} // namespace openspace
} // namespace openspace::performance
#endif // __OPENSPACE_CORE___PERFORMANCEMANAGER___H__

8
include/openspace/performance/performancemeasurement.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -31,8 +31,7 @@
#include <chrono>
#include <string>
namespace openspace {
namespace performance {
namespace openspace::performance {
class PerformanceManager;
@@ -59,7 +58,6 @@ private:
OsEng.renderEngine().performanceManager() \
)
} // namespace performance
} // namespace openspace
} // namespace openspace::performance
#endif // __OPENSPACE_CORE___PERFORMANCEMEASUREMENT___H__

8
include/openspace/properties/matrix/dmat2property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(DMat2Property, glm::dmat2x2);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___DMAT2PROPERTY___H__

8
include/openspace/properties/matrix/dmat2x3property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(DMat2x3Property, glm::dmat2x3);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___DMAT2X3PROPERTY___H__

8
include/openspace/properties/matrix/dmat2x4property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(DMat2x4Property, glm::dmat2x4);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___DMAT2X4PROPERTY___H__

8
include/openspace/properties/matrix/dmat3property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(DMat3Property, glm::dmat3x3);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___DMAT3PROPERTY___H__

8
include/openspace/properties/matrix/dmat3x2property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(DMat3x2Property, glm::dmat3x2);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___DMAT3X2PROPERTY___H__

8
include/openspace/properties/matrix/dmat3x4property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(DMat3x4Property, glm::dmat3x4);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___DMAT3X4PROPERTY___H__

8
include/openspace/properties/matrix/dmat4property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(DMat4Property, glm::dmat4x4);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___DMAT4PROPERTY___H__

8
include/openspace/properties/matrix/dmat4x2property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(DMat4x2Property, glm::dmat4x2);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___DMAT4X2PROPERTY___H__

8
include/openspace/properties/matrix/dmat4x3property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(DMat4x3Property, glm::dmat4x3);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___DMAT4X3PROPERTY___H__

8
include/openspace/properties/matrix/mat2property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(Mat2Property, glm::mat2x2);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___MAT2PROPERTY___H__

8
include/openspace/properties/matrix/mat2x3property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(Mat2x3Property, glm::mat2x3);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___MAT2X3PROPERTY___H__

8
include/openspace/properties/matrix/mat2x4property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(Mat2x4Property, glm::mat2x4);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___MAT2X4PROPERTY___H__

8
include/openspace/properties/matrix/mat3property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(Mat3Property, glm::mat3x3);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___MAT3PROPERTY___H__

8
include/openspace/properties/matrix/mat3x2property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(Mat3x2Property, glm::mat3x2);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___MAT3X2PROPERTY___H__

8
include/openspace/properties/matrix/mat3x4property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(Mat3x4Property, glm::mat3x4);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___MAT3X4PROPERTY___H__

8
include/openspace/properties/matrix/mat4property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(Mat4Property, glm::mat4x4);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___MAT4PROPERTY___H__

8
include/openspace/properties/matrix/mat4x2property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(Mat4x2Property, glm::mat4x2);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___MAT4X2PROPERTY___H__

8
include/openspace/properties/matrix/mat4x3property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(Mat4x3Property, glm::mat4x3);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___MAT4X3PROPERTY___H__

8
include/openspace/properties/numericalproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -27,8 +27,7 @@
#include <openspace/properties/templateproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
template <typename T>
class NumericalProperty : public TemplateProperty<T> {
@@ -73,8 +72,7 @@ protected:
T _stepping;
};
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#include "openspace/properties/numericalproperty.inl"

6
include/openspace/properties/numericalproperty.inl
View File

@@ -24,8 +24,7 @@
#include <ghoul/lua/ghoul_lua.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
#define REGISTER_NUMERICALPROPERTY_HEADER(CLASS_NAME, TYPE) \
typedef NumericalProperty<TYPE> CLASS_NAME; \
@@ -361,5 +360,4 @@ std::string NumericalProperty<T>::generateAdditionalDescription() const {
return result;
}
} // namespace properties
} // namespace openspace
} // namespace openspace::properties

8
include/openspace/properties/optionproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,8 +29,7 @@
#include <vector>
namespace openspace {
namespace properties {
namespace openspace::properties {
/**
* The OptionProperty is a property that provides a number of predefined (using the
@@ -131,7 +130,6 @@ private:
DisplayType _displayType;
};
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___OPTIONPROPERTY___H__

6
include/openspace/properties/property.h
View File

@@ -35,8 +35,7 @@
struct lua_State;
namespace openspace {
namespace properties {
namespace openspace::properties {
class PropertyOwner;
@@ -419,7 +418,6 @@ private:
OnChangeHandle _currentHandleValue;
};
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___PROPERTY___H__

8
include/openspace/properties/propertydelegate.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,8 +29,7 @@
struct lua_State;
namespace openspace {
namespace properties {
namespace openspace::properties {
/**
* The PropertyDelegate class is used by (among others) the TemplateProperty and the
@@ -158,8 +157,7 @@ public:
static bool toString(std::string& outValue, U inValue);
};
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#include <openspace/properties/propertydelegate.inl>

8
include/openspace/properties/propertydelegate.inl
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -24,8 +24,7 @@
#include <typeinfo>
namespace openspace {
namespace properties {
namespace openspace::properties {
template <typename T>
std::string PropertyDelegate<T>::className() {
@@ -95,5 +94,4 @@ U PropertyDelegate<T>::fromString(std::string value, bool& success) {
"Unimplemented PropertyDelegate::fromString specialization");
}
} // namespace properties
} // namespace openspace
} // namespace openspace::properties

8
include/openspace/properties/propertyowner.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,8 +29,7 @@
#include <string>
#include <vector>
namespace openspace {
namespace properties {
namespace openspace::properties {
class Property;
@@ -236,7 +235,6 @@ private:
std::vector<std::string> _tags;
};
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___PROPERTYOWNER___H__

8
include/openspace/properties/scalar/boolproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,12 +42,10 @@
#include <openspace/properties/numericalproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_TEMPLATEPROPERTY_HEADER(BoolProperty, bool);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___BOOLPROPERTY___H__

8
include/openspace/properties/scalar/charproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,12 +42,10 @@
#include <openspace/properties/numericalproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(CharProperty, char);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___CHARPROPERTY___H__

8
include/openspace/properties/scalar/doubleproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,12 +42,10 @@
#include <openspace/properties/numericalproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(DoubleProperty, double);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___DOUBLEPROPERTY___H__

8
include/openspace/properties/scalar/floatproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,12 +42,10 @@
#include <openspace/properties/numericalproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(FloatProperty, float);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___FLOATPROPERTY___H__

8
include/openspace/properties/scalar/intproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,12 +42,10 @@
#include <openspace/properties/numericalproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(IntProperty, int);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___INTPROPERTY___H__

8
include/openspace/properties/scalar/longdoubleproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,12 +42,10 @@
#include <openspace/properties/numericalproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(LongDoubleProperty, long double);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___LONGDOUBLEPROPERTY___H__

8
include/openspace/properties/scalar/longlongproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,12 +42,10 @@
#include <openspace/properties/numericalproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(LongLongProperty, long long);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___LONGLONGPROPERTY___H__

8
include/openspace/properties/scalar/longproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,12 +42,10 @@
#include <openspace/properties/numericalproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(LongProperty, long);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___LONGPROPERTY___H__

8
include/openspace/properties/scalar/shortproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,12 +42,10 @@
#include <openspace/properties/numericalproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(ShortProperty, short);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___SHORTPROPERTY___H__

8
include/openspace/properties/scalar/signedcharproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,12 +42,10 @@
#include <openspace/properties/numericalproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(SignedCharProperty, signed char);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___SIGNEDCHARPROPERTY___H__

8
include/openspace/properties/scalar/ucharproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,12 +42,10 @@
#include <openspace/properties/numericalproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(UCharProperty, unsigned char);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___UCHARPROPERTY___H__

8
include/openspace/properties/scalar/uintproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,12 +42,10 @@
#include <openspace/properties/numericalproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(UIntProperty, unsigned int);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___UINTPROPERTY___H__

8
include/openspace/properties/scalar/ulonglongproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,12 +42,10 @@
#include <openspace/properties/numericalproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(ULongLongProperty, unsigned long long);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___ULONGLONGPROPERTY___H__

8
include/openspace/properties/scalar/ulongproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,12 +42,10 @@
#include <openspace/properties/numericalproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(ULongProperty, unsigned long);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___ULONGPROPERTY___H__

8
include/openspace/properties/scalar/ushortproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,12 +42,10 @@
#include <openspace/properties/numericalproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(UShortProperty, unsigned short);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___USHORTPROPERTY___H__

8
include/openspace/properties/scalar/wcharproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,12 +42,10 @@
#include <openspace/properties/numericalproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
//REGISTER_NUMERICALPROPERTY_HEADER(WCharProperty, wchar_t);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___WCHARPROPERTY___H__

8
include/openspace/properties/selectionproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,8 +29,7 @@
#include <vector>
namespace openspace {
namespace properties {
namespace openspace::properties {
class SelectionProperty : public TemplateProperty<std::vector<int>> {
public:
@@ -77,7 +76,6 @@ template <>
template <>
bool PropertyDelegate<TemplateProperty<std::vector<int>>>::toString(std::string& outValue, std::vector<int> inValue);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___SELECTIONPROPERTY___H__

8
include/openspace/properties/stringproperty.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -27,12 +27,10 @@
#include <openspace/properties/templateproperty.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_TEMPLATEPROPERTY_HEADER(StringProperty, std::string);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___STRINGPROPERTY___H__

6
include/openspace/properties/templateproperty.h
View File

@@ -27,8 +27,7 @@
#include <openspace/properties/property.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
/**
* This concrete subclass of Property handles a single parameter value that is of type
@@ -186,8 +185,7 @@ protected:
T _value;
};
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#include "openspace/properties/templateproperty.inl"

6
include/openspace/properties/templateproperty.inl
View File

@@ -24,8 +24,7 @@
#include <ghoul/logging/logmanager.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
// The following macros can be used to quickly generate the necessary PropertyDelegate
// specializations required by the TemplateProperty class. Use the
@@ -287,5 +286,4 @@ bool TemplateProperty<T>::setStringValue(std::string value) {
return success;
}
} // namespace properties
} // namespace openspace
} // namespace openspace::properties

6
include/openspace/properties/triggerproperty.h
View File

@@ -27,8 +27,7 @@
#include <openspace/properties/property.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
/**
* TriggerProperty that can be used to fire events into your code using the callback
@@ -67,7 +66,6 @@ public:
void set(std::any value);
};
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___TRIGGERPROPERTY___H__

8
include/openspace/properties/vector/bvec2property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_TEMPLATEPROPERTY_HEADER(BVec2Property, glm::bvec2);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___BVEC2PROPERTY___H__

8
include/openspace/properties/vector/bvec3property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_TEMPLATEPROPERTY_HEADER(BVec3Property, glm::bvec3);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___BVEC3PROPERTY___H__

8
include/openspace/properties/vector/bvec4property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_TEMPLATEPROPERTY_HEADER(BVec4Property, glm::bvec4);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___BVEC4PROPERTY___H__

8
include/openspace/properties/vector/dvec2property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(DVec2Property, glm::dvec2);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___DVEC2PROPERTY___H__

8
include/openspace/properties/vector/dvec3property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(DVec3Property, glm::dvec3);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___DVEC3PROPERTY___H__

8
include/openspace/properties/vector/dvec4property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(DVec4Property, glm::dvec4);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___DVEC4PROPERTY___H__

8
include/openspace/properties/vector/ivec2property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(IVec2Property, glm::ivec2);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___IVEC2PROPERTY___H__

8
include/openspace/properties/vector/ivec3property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(IVec3Property, glm::ivec3);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___IVEC3PROPERTY___H__

8
include/openspace/properties/vector/ivec4property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(IVec4Property, glm::ivec4);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___IVEC4PROPERTY___H__

8
include/openspace/properties/vector/uvec2property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(UVec2Property, glm::uvec2);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___UVEC2PROPERTY___H__

8
include/openspace/properties/vector/uvec3property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(UVec3Property, glm::uvec3);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___UVEC3PROPERTY___H__

8
include/openspace/properties/vector/uvec4property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(UVec4Property, glm::uvec4);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___UVEC4PROPERTY___H__

8
include/openspace/properties/vector/vec2property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(Vec2Property, glm::vec2);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___VEC2PROPERTY___H__

8
include/openspace/properties/vector/vec3property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(Vec3Property, glm::vec3);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___VEC3PROPERTY___H__

8
include/openspace/properties/vector/vec4property.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,12 +29,10 @@
#include <ghoul/glm.h>
namespace openspace {
namespace properties {
namespace openspace::properties {
REGISTER_NUMERICALPROPERTY_HEADER(Vec4Property, glm::vec4);
} // namespace properties
} // namespace openspace
} // namespace openspace::properties
#endif // __OPENSPACE_CORE___VEC4PROPERTY___H__

6
include/openspace/query/query.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -30,9 +30,7 @@
namespace openspace {
namespace properties {
class Property;
}
namespace properties { class Property; }
class Renderable;
class Scene;

18
include/openspace/rendering/framebufferrenderer.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -36,16 +36,12 @@
#include <openspace/rendering/renderer.h>
#include <openspace/util/updatestructures.h>
namespace ghoul {
class Dictionary;
namespace filesystem {
class File;
}
namespace opengl {
class ProgramObject;
class Texture;
}
namespace ghoul { class Dictionary; }
namespace ghoul::filesystem { class File; }
namespace ghoul::opengl {
class ProgramObject;
class Texture;
}
namespace openspace {

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

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -32,8 +32,8 @@ class VolumeRaycaster;
class RaycasterListener {
public:
virtual void raycastersChanged(VolumeRaycaster& raycaster, bool attached) = 0;
}; // RaycasterListener
};
} // openspace
} // namespace openspace
#endif // __OPENSPACE_CORE___RAYCASTERLISTENER___H__

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

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,13 +29,11 @@
#include <openspace/properties/scalar/boolproperty.h>
namespace ghoul {
namespace opengl {
class ProgramObject;
class Texture;
}
class Dictionary;
} // namespace ghoul
namespace ghoul { class Dictionary; }
namespace ghoul::opengl {
class ProgramObject;
class Texture;
}
namespace openspace {

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

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -32,22 +32,18 @@
#include <openspace/properties/scalar/intproperty.h>
#include <openspace/properties/triggerproperty.h>
namespace ghoul {
namespace fontrendering {
class Font;
class Dictionary;
class SharedMemory;
}
namespace opengl {
class ProgramObject;
}
class Dictionary;
class SharedMemory;
} // namespace ghoul
namespace ghoul::fontrendering { class Font; }
namespace ghoul::opengl { class ProgramObject; }
namespace openspace {
namespace performance { class PerformanceManager; }
namespace scripting { struct LuaLibrary; }
class Camera;
class RaycasterManager;
class Renderer;

17
include/openspace/rendering/renderer.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -32,16 +32,11 @@
#include <vector>
#include <map>
namespace ghoul {
class Dictionary;
namespace filesystem {
class File;
}
namespace opengl {
class ProgramObject;
class Texture;
}
namespace ghoul { class Dictionary; }
namespace ghoul::filesystem { class File; }
namespace ghoul::opengl {
class ProgramObject;
class Texture;
}
namespace openspace {

11
include/openspace/rendering/volume.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -28,18 +28,15 @@
#include <string>
#include <vector>
namespace ghoul {
namespace opengl {
class Texture;
class ProgramObject;
}
namespace ghoul::opengl {
class Texture;
class ProgramObject;
}
namespace openspace {
class Volume {
public:
/**
* Constructor
*/

8
include/openspace/rendering/volumeraycaster.h
View File

@@ -29,11 +29,9 @@
#include <vector>
#include <openspace/util/updatestructures.h>
namespace ghoul {
namespace opengl {
class Texture;
class ProgramObject;
}
namespace ghoul::opengl {
class Texture;
class ProgramObject;
}
namespace openspace {

4
include/openspace/scene/scenemanager.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -43,6 +43,6 @@ private:
std::vector<std::unique_ptr<Scene>> _scenes;
};
} // namespace
} // namespace openspace
#endif // __OPENSPACE_CORE___SCENEMANAGER___H__

8
include/openspace/scripting/lualibrary.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -30,8 +30,7 @@
#include <string>
#include <vector>
namespace openspace {
namespace scripting {
namespace openspace::scripting {
/**
* This structure represents a Lua library, itself consisting of a unique #name and
@@ -78,7 +77,6 @@ struct LuaLibrary {
bool operator<(const LuaLibrary& rhs) const;
};
} // namespace scripting
} // namespace openspace
} // namespace openspace::scripting
#endif // __OPENSPACE_CORE___LUALIBRARY___H__

11
include/openspace/scripting/scriptengine.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -38,11 +38,9 @@
#include <memory>
#include <set>
namespace openspace {
namespace openspace { class SyncBuffer; }
class SyncBuffer;
namespace scripting {
namespace openspace::scripting {
/**
* The ScriptEngine is responsible for handling the execution of custom Lua functions and
@@ -132,7 +130,6 @@ private:
std::string _logFilename;
};
} // namespace scripting
} // namespace openspace
} // namespace openspace::scripting
#endif // __OPENSPACE_CORE___SCRIPTENGINE___H__

15
include/openspace/scripting/scriptscheduler.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -30,13 +30,11 @@
#include <queue>
#include <vector>
namespace ghoul {
class Dictionary;
} // namespace ghoul
namespace ghoul { class Dictionary; }
namespace openspace {
namespace documentation { struct Documentation; }
namespace scripting {
namespace openspace::documentation { struct Documentation; }
namespace openspace::scripting {
/**
* Maintains an ordered list of <code>ScheduledScript</code>s and provides a simple
@@ -123,7 +121,6 @@ private:
};
} // namespace scripting
} // namespace openspace
} // namespace openspace::scripting
#endif // __OPENSPACE_CORE___SCRIPTSCHEDULER___H__

8
include/openspace/scripting/systemcapabilitiesbinding.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -27,13 +27,11 @@
#include <openspace/scripting/lualibrary.h>
namespace openspace {
namespace scripting {
namespace openspace::scripting {
LuaLibrary generalSystemCapabilities();
LuaLibrary openglSystemCapabilities();
} // namespace scripting
} // namespace openspace
} // namespace openspace::scripting
#endif // __OPENSPACE_CORE___SYSTEMCAPABILITIESBINDING___H__

Some files were not shown because too many files have changed in this diff Show More