mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-07 12:10:52 -06:00
Clean include guards in OpenSpace core
Remove unused files
This commit is contained in:
Alexander Bock
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __BLOCKPLANEINTERSECTIONGEOMETRY_H__
|
||||
#define __BLOCKPLANEINTERSECTIONGEOMETRY_H__
|
||||
#ifndef __OPENSPACE_CORE___BLOCKPLANEINTERSECTIONGEOMETRY___H__
|
||||
#define __OPENSPACE_CORE___BLOCKPLANEINTERSECTIONGEOMETRY___H__
|
||||
|
||||
#include <ghoul/opengl/ghoul_gl.h>
|
||||
#include <glm/glm.hpp>
|
||||
@@ -55,6 +55,6 @@ private:
|
||||
float _planeDistance;
|
||||
};
|
||||
|
||||
}
|
||||
} // namespace openspace
|
||||
|
||||
#endif // __BLOCKPLANEINTERSECTIONGEOMETRY_H__
|
||||
#endif // __OPENSPACE_CORE___BLOCKPLANEINTERSECTIONGEOMETRY___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __BOXGEOMETRY_H__
|
||||
#define __BOXGEOMETRY_H__
|
||||
#ifndef __OPENSPACE_CORE___BOXGEOMETRY___H__
|
||||
#define __OPENSPACE_CORE___BOXGEOMETRY___H__
|
||||
|
||||
#include <ghoul/opengl/ghoul_gl.h>
|
||||
#include <glm/glm.hpp>
|
||||
@@ -46,4 +46,4 @@ public:
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif // __BOXGEOMETRY_H__
|
||||
#endif // __OPENSPACE_CORE___BOXGEOMETRY___H__
|
||||
|
||||
@@ -22,182 +22,181 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __CAMERA_H__
|
||||
#define __CAMERA_H__
|
||||
#ifndef __OPENSPACE_CORE___CAMERA___H__
|
||||
#define __OPENSPACE_CORE___CAMERA___H__
|
||||
|
||||
#include <mutex>
|
||||
|
||||
// open space includes
|
||||
#include <openspace/util/powerscaledcoordinate.h>
|
||||
#include <openspace/rendering/renderengine.h>
|
||||
|
||||
#include <openspace/util/syncdata.h>
|
||||
|
||||
// glm includes
|
||||
#include <ghoul/glm.h>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
#include <glm/gtc/type_ptr.hpp>
|
||||
#include <glm/gtc/quaternion.hpp>
|
||||
|
||||
namespace openspace {
|
||||
class SyncBuffer;
|
||||
class SyncBuffer;
|
||||
|
||||
/**
|
||||
This class still needs some more love. Suggested improvements:
|
||||
- Remove psc from the camera class interface.
|
||||
- Accessors should return constant references to double precision class members.
|
||||
- Remove the scaling variable (What is it used for?)
|
||||
- Remove the maxFov and sinMaxfov variables. Redundant since the fov is embedded
|
||||
within the perspective projection matrix.
|
||||
- Remove focusposition, part of the integration with the scale graph. The
|
||||
"focus position" should not be needed since we assume the camera is always
|
||||
positioned relative to its origin. When orbiting another object (not in origin),
|
||||
the focus position should probably be handled outside the camera class
|
||||
(interaction handler) since it does not affect the state of the camera
|
||||
(only how it interacts).
|
||||
- The class might need some more reasonable accessors depending on use cases.
|
||||
(up vector world space?)
|
||||
- Make clear which function returns a combined view matrix (things that are
|
||||
dependent on the separate sgct nodes).
|
||||
/**
|
||||
* This class still needs some more love. Suggested improvements:
|
||||
* - Remove psc from the camera class interface.
|
||||
* - Accessors should return constant references to double precision class members.
|
||||
* - Remove the scaling variable (What is it used for?)
|
||||
* - Remove the maxFov and sinMaxfov variables. Redundant since the fov is embedded
|
||||
* within the perspective projection matrix.
|
||||
* - Remove focusposition, part of the integration with the scale graph. The
|
||||
* "focus position" should not be needed since we assume the camera is always
|
||||
* positioned relative to its origin. When orbiting another object (not in origin),
|
||||
* the focus position should probably be handled outside the camera class
|
||||
* (interaction handler) since it does not affect the state of the camera
|
||||
* (only how it interacts).
|
||||
* - The class might need some more reasonable accessors depending on use cases.
|
||||
* (up vector world space?)
|
||||
* - Make clear which function returns a combined view matrix (things that are
|
||||
* dependent on the separate sgct nodes).
|
||||
*/
|
||||
class Camera {
|
||||
/**
|
||||
Used to explicitly show which variables within the Camera class that are used
|
||||
for caching.
|
||||
class Camera {
|
||||
/**
|
||||
* Used to explicitly show which variables within the Camera class that are used
|
||||
* for caching.
|
||||
*/
|
||||
template<typename T>
|
||||
struct Cached
|
||||
{
|
||||
Cached() { isDirty = true; }
|
||||
T datum;
|
||||
bool isDirty;
|
||||
};
|
||||
|
||||
// now working with float precision. To be changed to double later.
|
||||
// The reason double does not work yet is because of the setUniform function
|
||||
// in ghoul::opengl
|
||||
typedef glm::dquat Quat;
|
||||
typedef glm::dmat4 Mat4;
|
||||
typedef glm::dvec3 Vec3;
|
||||
|
||||
// Static constants
|
||||
static const Vec3 _VIEW_DIRECTION_CAMERA_SPACE;
|
||||
static const Vec3 _LOOKUP_VECTOR_CAMERA_SPACE;
|
||||
public:
|
||||
Camera();
|
||||
Camera(const Camera& o);
|
||||
~Camera();
|
||||
|
||||
// Mutators
|
||||
void setPositionVec3(Vec3 pos);
|
||||
void setFocusPositionVec3(Vec3 pos);
|
||||
void setRotation(Quat rotation);
|
||||
void setScaling(glm::vec2 scaling);
|
||||
void setMaxFov(float fov);
|
||||
|
||||
// Relative mutators
|
||||
void rotate(Quat rotation);
|
||||
|
||||
// Accessors
|
||||
// Remove Vec3 from the name when psc is gone
|
||||
const Vec3& positionVec3() const;
|
||||
const Vec3& unsynchedPositionVec3() const;
|
||||
const Vec3& focusPositionVec3() const;
|
||||
const Vec3& viewDirectionWorldSpace() const;
|
||||
const Vec3& lookUpVectorCameraSpace() const;
|
||||
const Vec3& lookUpVectorWorldSpace() const;
|
||||
const glm::vec2& scaling() const;
|
||||
const Mat4& viewRotationMatrix() const;
|
||||
const Quat& rotationQuaternion() const;
|
||||
float maxFov() const;
|
||||
float sinMaxFov() const;
|
||||
|
||||
// @TODO this should simply be called viewMatrix!
|
||||
// Or it needs to be changed so that it actually is combined. Right now it is
|
||||
// only the view matrix that is the same for all SGCT cameras.
|
||||
// Right now this function returns the actual combined matrix which makes some
|
||||
// of the old calls to the function wrong..
|
||||
const Mat4& combinedViewMatrix() const;
|
||||
|
||||
void invalidateCache();
|
||||
|
||||
void serialize(std::ostream& os) const;
|
||||
void deserialize(std::istream& is);
|
||||
|
||||
/**
|
||||
Handles SGCT's internal matrices. Also caches a calculated viewProjection
|
||||
matrix. This is the data that is different for different cameras within
|
||||
SGCT.
|
||||
*/
|
||||
class SgctInternal {
|
||||
friend class Camera;
|
||||
public:
|
||||
void setViewMatrix(glm::mat4 viewMatrix);
|
||||
void setProjectionMatrix(glm::mat4 projectionMatrix);
|
||||
|
||||
const glm::mat4& viewMatrix() const;
|
||||
const glm::mat4& projectionMatrix() const;
|
||||
const glm::mat4& viewProjectionMatrix() const;
|
||||
private:
|
||||
SgctInternal();
|
||||
SgctInternal(const SgctInternal& o)
|
||||
: _viewMatrix(o._viewMatrix)
|
||||
, _projectionMatrix(o._projectionMatrix)
|
||||
, _cachedViewProjectionMatrix(o._cachedViewProjectionMatrix)
|
||||
{}
|
||||
|
||||
// State
|
||||
glm::mat4 _viewMatrix;
|
||||
glm::mat4 _projectionMatrix;
|
||||
|
||||
// Cache
|
||||
mutable Cached<glm::mat4> _cachedViewProjectionMatrix;
|
||||
mutable std::mutex _mutex;
|
||||
} sgctInternal;
|
||||
|
||||
// Deprecated
|
||||
[[deprecated("Replaced by Camera::setPositionVec3()")]]
|
||||
void setPosition(psc pos);
|
||||
[[deprecated("Replaced by Camera::setFocusPositionVec3()")]]
|
||||
void setFocusPosition(psc pos);
|
||||
[[deprecated("Replaced by Camera::positionVec3()")]]
|
||||
psc position() const;
|
||||
[[deprecated("Replaced by Camera::unsynchedPositionVec3()")]]
|
||||
psc unsynchedPosition() const;
|
||||
[[deprecated("Replaced by Camera::focusPositionVec3()")]]
|
||||
psc focusPosition() const;
|
||||
// @TODO use Camera::SgctInternal interface instead
|
||||
[[deprecated("Replaced by Camera::SgctInternal::viewMatrix()")]]
|
||||
const glm::mat4& viewMatrix() const;
|
||||
[[deprecated("Replaced by Camera::SgctInternal::projectionMatrix()")]]
|
||||
const glm::mat4& projectionMatrix() const;
|
||||
[[deprecated("Replaced by Camera::SgctInternal::viewProjectionMatrix()")]]
|
||||
const glm::mat4& viewProjectionMatrix() const;
|
||||
|
||||
|
||||
std::vector<Syncable*> getSyncables();
|
||||
|
||||
|
||||
private:
|
||||
|
||||
SyncData<Vec3> _position;
|
||||
SyncData<Quat> _rotation;
|
||||
SyncData<glm::vec2> _scaling;
|
||||
|
||||
|
||||
// _focusPosition to be removed
|
||||
Vec3 _focusPosition;
|
||||
float _maxFov;
|
||||
|
||||
// Cached data
|
||||
mutable Cached<Vec3> _cachedViewDirection;
|
||||
mutable Cached<Vec3> _cachedLookupVector;
|
||||
mutable Cached<Mat4> _cachedViewRotationMatrix;
|
||||
mutable Cached<Mat4> _cachedCombinedViewMatrix;
|
||||
mutable Cached<float> _cachedSinMaxFov;
|
||||
|
||||
mutable std::mutex _mutex;
|
||||
template<typename T>
|
||||
struct Cached
|
||||
{
|
||||
Cached() { isDirty = true; }
|
||||
T datum;
|
||||
bool isDirty;
|
||||
};
|
||||
|
||||
// now working with float precision. To be changed to double later.
|
||||
// The reason double does not work yet is because of the setUniform function
|
||||
// in ghoul::opengl
|
||||
typedef glm::dquat Quat;
|
||||
typedef glm::dmat4 Mat4;
|
||||
typedef glm::dvec3 Vec3;
|
||||
|
||||
// Static constants
|
||||
static const Vec3 _VIEW_DIRECTION_CAMERA_SPACE;
|
||||
static const Vec3 _LOOKUP_VECTOR_CAMERA_SPACE;
|
||||
public:
|
||||
Camera();
|
||||
Camera(const Camera& o);
|
||||
~Camera();
|
||||
|
||||
// Mutators
|
||||
void setPositionVec3(Vec3 pos);
|
||||
void setFocusPositionVec3(Vec3 pos);
|
||||
void setRotation(Quat rotation);
|
||||
void setScaling(glm::vec2 scaling);
|
||||
void setMaxFov(float fov);
|
||||
|
||||
// Relative mutators
|
||||
void rotate(Quat rotation);
|
||||
|
||||
// Accessors
|
||||
// Remove Vec3 from the name when psc is gone
|
||||
const Vec3& positionVec3() const;
|
||||
const Vec3& unsynchedPositionVec3() const;
|
||||
const Vec3& focusPositionVec3() const;
|
||||
const Vec3& viewDirectionWorldSpace() const;
|
||||
const Vec3& lookUpVectorCameraSpace() const;
|
||||
const Vec3& lookUpVectorWorldSpace() const;
|
||||
const glm::vec2& scaling() const;
|
||||
const Mat4& viewRotationMatrix() const;
|
||||
const Quat& rotationQuaternion() const;
|
||||
float maxFov() const;
|
||||
float sinMaxFov() const;
|
||||
|
||||
// @TODO this should simply be called viewMatrix!
|
||||
// Or it needs to be changed so that it actually is combined. Right now it is
|
||||
// only the view matrix that is the same for all SGCT cameras.
|
||||
// Right now this function returns the actual combined matrix which makes some
|
||||
// of the old calls to the function wrong..
|
||||
const Mat4& combinedViewMatrix() const;
|
||||
|
||||
void invalidateCache();
|
||||
|
||||
void serialize(std::ostream& os) const;
|
||||
void deserialize(std::istream& is);
|
||||
|
||||
/**
|
||||
Handles SGCT's internal matrices. Also caches a calculated viewProjection
|
||||
matrix. This is the data that is different for different cameras within
|
||||
SGCT.
|
||||
*/
|
||||
class SgctInternal {
|
||||
friend class Camera;
|
||||
public:
|
||||
void setViewMatrix(glm::mat4 viewMatrix);
|
||||
void setProjectionMatrix(glm::mat4 projectionMatrix);
|
||||
|
||||
const glm::mat4& viewMatrix() const;
|
||||
const glm::mat4& projectionMatrix() const;
|
||||
const glm::mat4& viewProjectionMatrix() const;
|
||||
private:
|
||||
SgctInternal();
|
||||
SgctInternal(const SgctInternal& o)
|
||||
: _viewMatrix(o._viewMatrix)
|
||||
, _projectionMatrix(o._projectionMatrix)
|
||||
, _cachedViewProjectionMatrix(o._cachedViewProjectionMatrix)
|
||||
{}
|
||||
|
||||
// State
|
||||
glm::mat4 _viewMatrix;
|
||||
glm::mat4 _projectionMatrix;
|
||||
|
||||
// Cache
|
||||
mutable Cached<glm::mat4> _cachedViewProjectionMatrix;
|
||||
mutable std::mutex _mutex;
|
||||
} sgctInternal;
|
||||
|
||||
// Deprecated
|
||||
[[deprecated("Replaced by Camera::setPositionVec3()")]]
|
||||
void setPosition(psc pos);
|
||||
[[deprecated("Replaced by Camera::setFocusPositionVec3()")]]
|
||||
void setFocusPosition(psc pos);
|
||||
[[deprecated("Replaced by Camera::positionVec3()")]]
|
||||
psc position() const;
|
||||
[[deprecated("Replaced by Camera::unsynchedPositionVec3()")]]
|
||||
psc unsynchedPosition() const;
|
||||
[[deprecated("Replaced by Camera::focusPositionVec3()")]]
|
||||
psc focusPosition() const;
|
||||
// @TODO use Camera::SgctInternal interface instead
|
||||
[[deprecated("Replaced by Camera::SgctInternal::viewMatrix()")]]
|
||||
const glm::mat4& viewMatrix() const;
|
||||
[[deprecated("Replaced by Camera::SgctInternal::projectionMatrix()")]]
|
||||
const glm::mat4& projectionMatrix() const;
|
||||
[[deprecated("Replaced by Camera::SgctInternal::viewProjectionMatrix()")]]
|
||||
const glm::mat4& viewProjectionMatrix() const;
|
||||
|
||||
|
||||
std::vector<Syncable*> getSyncables();
|
||||
|
||||
|
||||
private:
|
||||
|
||||
SyncData<Vec3> _position;
|
||||
SyncData<Quat> _rotation;
|
||||
SyncData<glm::vec2> _scaling;
|
||||
|
||||
|
||||
// _focusPosition to be removed
|
||||
Vec3 _focusPosition;
|
||||
float _maxFov;
|
||||
|
||||
// Cached data
|
||||
mutable Cached<Vec3> _cachedViewDirection;
|
||||
mutable Cached<Vec3> _cachedLookupVector;
|
||||
mutable Cached<Mat4> _cachedViewRotationMatrix;
|
||||
mutable Cached<Mat4> _cachedCombinedViewMatrix;
|
||||
mutable Cached<float> _cachedSinMaxFov;
|
||||
|
||||
mutable std::mutex _mutex;
|
||||
};
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif // __CAMERA_H__
|
||||
#endif // __OPENSPACE_CORE___CAMERA___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __FACTORYMANAGER_H__
|
||||
#define __FACTORYMANAGER_H__
|
||||
#ifndef __OPENSPACE_CORE___FACTORYMANAGER___H__
|
||||
#define __OPENSPACE_CORE___FACTORYMANAGER___H__
|
||||
|
||||
#include <ghoul/misc/exception.h>
|
||||
#include <ghoul/misc/templatefactory.h>
|
||||
@@ -129,4 +129,4 @@ private:
|
||||
|
||||
#include <openspace/util/factorymanager.inl>
|
||||
|
||||
#endif // __FACTORYMANAGER_H__
|
||||
#endif // __OPENSPACE_CORE___FACTORYMANAGER___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __GPUDATA_H__
|
||||
#define __GPUDATA_H__
|
||||
#ifndef __OPENSPACE_CORE___GPUDATA___H__
|
||||
#define __OPENSPACE_CORE___GPUDATA___H__
|
||||
|
||||
#include <ghoul/opengl/programobject.h>
|
||||
#include <ghoul/opengl/texture.h>
|
||||
@@ -105,4 +105,4 @@ private:
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif // __GPUDATA_H__
|
||||
#endif // __OPENSPACE_CORE___GPUDATA___H__
|
||||
|
||||
@@ -22,15 +22,15 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __HISTOGRAM_H__
|
||||
#define __HISTOGRAM_H__
|
||||
#ifndef __OPENSPACE_CORE___HISTOGRAM___H__
|
||||
#define __OPENSPACE_CORE___HISTOGRAM___H__
|
||||
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
|
||||
namespace openspace {
|
||||
class Histogram {
|
||||
|
||||
class Histogram {
|
||||
public:
|
||||
Histogram();
|
||||
Histogram(float minValue, float maxValue, int numBins);
|
||||
@@ -86,7 +86,8 @@ private:
|
||||
std::vector<float> _equalizer;
|
||||
int _numValues;
|
||||
|
||||
}; // class Histogram
|
||||
};
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif //__HISTOGRAM_H__
|
||||
#endif //__OPENSPACE_CORE___HISTOGRAM___H__
|
||||
|
||||
@@ -51,8 +51,8 @@
|
||||
*
|
||||
*************************************************************************/
|
||||
|
||||
#ifndef __KEYS_H__
|
||||
#define __KEYS_H__
|
||||
#ifndef __OPENSPACE_CORE___KEYS___H__
|
||||
#define __OPENSPACE_CORE___KEYS___H__
|
||||
|
||||
// All values that are defined here are compatible with (and are based on) the
|
||||
// definitions GLFW v3.1
|
||||
@@ -369,4 +369,4 @@ std::string to_string(openspace::KeyWithModifier key);
|
||||
|
||||
} // namespace std
|
||||
|
||||
#endif // __KEYS_H__
|
||||
#endif // __OPENSPACE_CORE___KEYS___H__
|
||||
|
||||
@@ -54,8 +54,8 @@
|
||||
// All values that are defined here are compatible with (and are based on) the
|
||||
// definitions GLFW v3.1
|
||||
|
||||
#ifndef __MOUSE_H__
|
||||
#define __MOUSE_H__
|
||||
#ifndef __OPENSPACE_CORE___MOUSE___H__
|
||||
#define __OPENSPACE_CORE___MOUSE___H__
|
||||
|
||||
namespace openspace {
|
||||
|
||||
@@ -92,4 +92,4 @@ enum class MouseButton {
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif // __MOUSE_H__
|
||||
#endif // __OPENSPACE_CORE___MOUSE___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __OPENSPACEMODULE_H__
|
||||
#define __OPENSPACEMODULE_H__
|
||||
#ifndef __OPENSPACE_CORE___OPENSPACEMODULE___H__
|
||||
#define __OPENSPACE_CORE___OPENSPACEMODULE___H__
|
||||
|
||||
#include <openspace/properties/propertyowner.h>
|
||||
|
||||
@@ -104,4 +104,4 @@ protected:
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif // __OPENSPACEMODULE_H__
|
||||
#endif // __OPENSPACE_CORE___OPENSPACEMODULE___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __POWERSCALEDCOORDINATE_H__
|
||||
#define __POWERSCALEDCOORDINATE_H__
|
||||
#ifndef __OPENSPACE_CORE___POWERSCALEDCOORDINATE___H__
|
||||
#define __OPENSPACE_CORE___POWERSCALEDCOORDINATE___H__
|
||||
|
||||
// open space includes
|
||||
// glm includes
|
||||
@@ -119,4 +119,4 @@ typedef PowerScaledCoordinate psc;
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif // __POWERSCALEDCOORDINATE_H__
|
||||
#endif // __OPENSPACE_CORE___POWERSCALEDCOORDINATE___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __POWERSCALEDSCALAR_H__
|
||||
#define __POWERSCALEDSCALAR_H__
|
||||
#ifndef __OPENSPACE_CORE___POWERSCALEDSCALAR___H__
|
||||
#define __OPENSPACE_CORE___POWERSCALEDSCALAR___H__
|
||||
|
||||
// glm includes
|
||||
#include <ghoul/glm.h>
|
||||
@@ -92,4 +92,4 @@ typedef PowerScaledScalar pss;
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif // __POWERSCALEDSCALAR_H__
|
||||
#endif // __OPENSPACE_CORE___POWERSCALEDSCALAR___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __POWERSCALEDSPHERE_H__
|
||||
#define __POWERSCALEDSPHERE_H__
|
||||
#ifndef __OPENSPACE_CORE___POWERSCALEDSPHERE___H__
|
||||
#define __OPENSPACE_CORE___POWERSCALEDSPHERE___H__
|
||||
|
||||
// open space includes
|
||||
#include <ghoul/opengl/ghoul_gl.h>
|
||||
@@ -69,4 +69,4 @@ public:
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif // __POWERSCALEDSPHERE_H__
|
||||
#endif // __OPENSPACE_CORE___POWERSCALEDSPHERE___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __PROGRESSBAR_H__
|
||||
#define __PROGRESSBAR_H__
|
||||
#ifndef __OPENSPACE_CORE___PROGRESSBAR___H__
|
||||
#define __OPENSPACE_CORE___PROGRESSBAR___H__
|
||||
|
||||
#include <iostream>
|
||||
|
||||
@@ -43,9 +43,8 @@ private:
|
||||
int _previous;
|
||||
int _end;
|
||||
std::ostream& _stream;
|
||||
|
||||
};
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif // __PROGRESSBAR_H__
|
||||
#endif // __OPENSPACE_CORE___PROGRESSBAR___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __SCREENLOG_H__
|
||||
#define __SCREENLOG_H__
|
||||
#ifndef __OPENSPACE_CORE___SCREENLOG___H__
|
||||
#define __OPENSPACE_CORE___SCREENLOG___H__
|
||||
|
||||
#include <ghoul/logging/log.h>
|
||||
|
||||
@@ -115,4 +115,4 @@ private:
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif // __SCREENLOG_H__
|
||||
#endif // __OPENSPACE_CORE___SCREENLOG___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __SPICEMANAGER_H__
|
||||
#define __SPICEMANAGER_H__
|
||||
#ifndef __OPENSPACE_CORE___SPICEMANAGER___H__
|
||||
#define __OPENSPACE_CORE___SPICEMANAGER___H__
|
||||
|
||||
#include <ghoul/designpattern/singleton.h>
|
||||
|
||||
@@ -931,4 +931,4 @@ private:
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif // __SPICEMANAGER_H__
|
||||
#endif // __OPENSPACE_CORE___SPICEMANAGER___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef SYNCBUFFER_H
|
||||
#define SYNCBUFFER_H
|
||||
#ifndef __OPENSPACE_CORE___SYNCBUFFER___H__
|
||||
#define __OPENSPACE_CORE___SYNCBUFFER___H__
|
||||
|
||||
#include <ghoul/opengl/ghoul_gl.h>
|
||||
#include <ghoul/misc/assert.h>
|
||||
@@ -116,4 +116,4 @@ private:
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif // SYNCBUFFER_H
|
||||
#endif // __OPENSPACE_CORE___SYNCBUFFER___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __SYNC_DATA_H__
|
||||
#define __SYNC_DATA_H__
|
||||
#ifndef __OPENSPACE_CORE___SYNCDATA___H__
|
||||
#define __OPENSPACE_CORE___SYNCDATA___H__
|
||||
|
||||
#include <memory>
|
||||
#include <mutex>
|
||||
@@ -31,15 +31,13 @@
|
||||
#include <ghoul/misc/assert.h>
|
||||
#include <openspace/util/syncbuffer.h>
|
||||
|
||||
|
||||
namespace openspace {
|
||||
|
||||
|
||||
/**
|
||||
* Interface for synchronizable data
|
||||
*
|
||||
* Used by <code>SyncEngine</code>
|
||||
*/
|
||||
* Interface for synchronizable data
|
||||
*
|
||||
* Used by <code>SyncEngine</code>
|
||||
*/
|
||||
class Syncable {
|
||||
public:
|
||||
virtual ~Syncable() {};
|
||||
@@ -55,17 +53,17 @@ protected:
|
||||
};
|
||||
|
||||
/**
|
||||
* A double buffered implementation of the Syncable interface.
|
||||
* Users are encouraged to used this class as a default way to synchronize different
|
||||
* C++ data types using the <code>SyncEngine</code>
|
||||
*
|
||||
* This class aims to handle the synchronization parts and yet act like a regular
|
||||
* instance of T. Implicit casts are supported, however, when accessing member functions or
|
||||
* or variables, user may have to do explicit casts.
|
||||
*
|
||||
* ((T&) t).method();
|
||||
*
|
||||
*/
|
||||
* A double buffered implementation of the Syncable interface.
|
||||
* Users are encouraged to used this class as a default way to synchronize different
|
||||
* C++ data types using the <code>SyncEngine</code>
|
||||
*
|
||||
* This class aims to handle the synchronization parts and yet act like a regular
|
||||
* instance of T. Implicit casts are supported, however, when accessing member functions or
|
||||
* or variables, user may have to do explicit casts.
|
||||
*
|
||||
* ((T&) t).method();
|
||||
*
|
||||
*/
|
||||
template<class T>
|
||||
class SyncData : public Syncable {
|
||||
public:
|
||||
@@ -77,29 +75,28 @@ public:
|
||||
};
|
||||
|
||||
/**
|
||||
* Allowing assignment of data as if
|
||||
*/
|
||||
* Allowing assignment of data as if
|
||||
*/
|
||||
SyncData& operator=(const T& rhs) {
|
||||
data = rhs;
|
||||
return *this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Allow implicit cast to referenced T
|
||||
*/
|
||||
* Allow implicit cast to referenced T
|
||||
*/
|
||||
operator T&() {
|
||||
return data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Allow implicit cast to const referenced T
|
||||
*/
|
||||
* Allow implicit cast to const referenced T
|
||||
*/
|
||||
operator const T&() const {
|
||||
return data;
|
||||
}
|
||||
|
||||
protected:
|
||||
|
||||
virtual void encode(SyncBuffer* syncBuffer) {
|
||||
_mutex.lock();
|
||||
syncBuffer->encode(data);
|
||||
@@ -121,14 +118,12 @@ protected:
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
T data;
|
||||
T doubleBufferedData;
|
||||
std::mutex _mutex;
|
||||
|
||||
};
|
||||
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif //#ifndef __SYNC_DATA_H__
|
||||
#endif // __OPENSPACE_CORE___SYNCDATA___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __TIME_H__
|
||||
#define __TIME_H__
|
||||
#ifndef __OPENSPACE_CORE___TIME___H__
|
||||
#define __OPENSPACE_CORE___TIME___H__
|
||||
|
||||
#include <openspace/scripting/scriptengine.h>
|
||||
#include <openspace/util/syncdata.h>
|
||||
@@ -224,4 +224,4 @@ private:
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif // __TIME_H__
|
||||
#endif // __OPENSPACE_CORE___TIME___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __TIMEMANAGER_H__
|
||||
#define __TIMEMANAGER_H__
|
||||
#ifndef __OPENSPACE_CORE___TIMEMANAGER___H__
|
||||
#define __OPENSPACE_CORE___TIMEMANAGER___H__
|
||||
|
||||
#include <deque>
|
||||
#include <openspace/network/messagestructures.h>
|
||||
@@ -45,7 +45,6 @@ private:
|
||||
double _latestConsumedTimestamp;
|
||||
};
|
||||
|
||||
}
|
||||
} // namespace openspace
|
||||
|
||||
|
||||
#endif // __TIMEMANAGER_H__
|
||||
#endif // __OPENSPACE_CORE___TIMEMANAGER___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __TIMERANGE_H__
|
||||
#define __TIMERANGE_H__
|
||||
#ifndef __OPENSPACE_CORE___TIMERANGE___H__
|
||||
#define __OPENSPACE_CORE___TIMERANGE___H__
|
||||
|
||||
#include <openspace/documentation/documentation.h>
|
||||
|
||||
@@ -78,4 +78,4 @@ struct TimeRange {
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif //__TIMERANGE_H__
|
||||
#endif //__OPENSPACE_CORE___TIMERANGE___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __TRANSFORMATIONMANAGER__
|
||||
#define __TRANSFORMATIONMANAGER__
|
||||
#ifndef __OPENSPACE_CORE___TRANSFORMATIONMANAGER___H__
|
||||
#define __OPENSPACE_CORE___TRANSFORMATIONMANAGER___H__
|
||||
|
||||
#include <ghoul/designpattern/singleton.h>
|
||||
#include <ghoul/glm.h>
|
||||
@@ -59,6 +59,6 @@ private:
|
||||
std::set<std::string> _dipoleFrames;
|
||||
};
|
||||
|
||||
}
|
||||
} // namespace openspace
|
||||
|
||||
#endif //__TRANSFORMATIONMANAGER__
|
||||
#endif //__OPENSPACE_CORE___TRANSFORMATIONMANAGER___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __UPDATESTRUCTURES_H__
|
||||
#define __UPDATESTRUCTURES_H__
|
||||
#ifndef __OPENSPACE_CORE___UPDATESTRUCTURES___H__
|
||||
#define __OPENSPACE_CORE___UPDATESTRUCTURES___H__
|
||||
|
||||
#include <openspace/util/camera.h>
|
||||
#include <openspace/util/powerscaledcoordinate.h>
|
||||
@@ -76,7 +76,6 @@ struct RaycastData {
|
||||
std::string namespaceName;
|
||||
};
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
}
|
||||
|
||||
#endif // __UPDATESTRUCTURES_H__
|
||||
#endif // __OPENSPACE_CORE___UPDATESTRUCTURES___H__
|
||||
|
||||
Reference in New Issue
Block a user