mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2025-12-31 00:10:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clean include guards in OpenSpace core

Browse Source 
Remove unused files
This commit is contained in:
Alexander Bock
2016-12-09 13:54:22 +01:00
parent df543f0ec3
commit d139dd2d22
152 changed files with 681 additions and 1681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/openspace/documentation/core_registration.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __CORE_REGISTRATION_H__
#define __CORE_REGISTRATION_H__
#ifndef __OPENSPACE_CORE___REGISTRATION___H__
#define __OPENSPACE_CORE___REGISTRATION___H__
namespace openspace {
@@ -35,4 +35,4 @@ void registerCoreClasses(scripting::ScriptEngine& engine);
} // namespace openspace
#endif // __CORE_REGISTRATION_H__
#endif // __OPENSPACE_CORE___REGISTRATION___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DOCUMENTATION_H__
#define __DOCUMENTATION_H__
#ifndef __OPENSPACE_CORE___DOCUMENTATION___H__
#define __OPENSPACE_CORE___DOCUMENTATION___H__
#include <ghoul/misc/boolean.h>
#include <ghoul/misc/dictionary.h>
@@ -317,6 +317,6 @@ namespace std {
std::string to_string(openspace::documentation::TestResult::Offense::Reason reason);
} // namespace
} // namespace std
#endif // __DOCUMENTATION_H__
#endif // __OPENSPACE_CORE___DOCUMENTATION___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DOCUMENTATIONENGINE_H__
#define __DOCUMENTATIONENGINE_H__
#ifndef __OPENSPACE_CORE___DOCUMENTATIONENGINE___H__
#define __OPENSPACE_CORE___DOCUMENTATIONENGINE___H__
#include <openspace/documentation/documentation.h>
@@ -99,4 +99,4 @@ private:
#define DocEng (openspace::documentation::DocumentationEngine::ref())
#endif // __DOCUMENTATIONENGINE_H__
#endif // __OPENSPACE_CORE___DOCUMENTATIONENGINE___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __VERIFIER_H__
#define __VERIFIER_H__
#ifndef __OPENSPACE_CORE___VERIFIER___H__
#define __OPENSPACE_CORE___VERIFIER___H__
#include <openspace/documentation/documentation.h>
@@ -1141,4 +1141,4 @@ extern template struct DeprecatedVerifier<DoubleVector4Verifier>;
#include "verifier.inl"
#endif // __VERIFIER_H__
#endif // __OPENSPACE_CORE___VERIFIER___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __CONFIGURATIONMANAGER_H__
#define __CONFIGURATIONMANAGER_H__
#ifndef __OPENSPACE_CORE___CONFIGURATIONMANAGER___H__
#define __OPENSPACE_CORE___CONFIGURATIONMANAGER___H__
#include <openspace/documentation/documentation.h>
@@ -167,4 +167,4 @@ private:
} // namespace openspace
#endif // __CONFIGURATIONMANAGER_H__
#endif // __OPENSPACE_CORE___CONFIGURATIONMANAGER___H__

6
include/openspace/engine/downloadmanager.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DOWNLOADMANAGER_H__
#define __DOWNLOADMANAGER_H__
#ifndef __OPENSPACE_CORE___DOWNLOADMANAGER___H__
#define __OPENSPACE_CORE___DOWNLOADMANAGER___H__
#include <ghoul/filesystem/file.h>
#include <ghoul/filesystem/directory.h>
@@ -119,4 +119,4 @@ private:
} // namespace openspace
#endif // __DOWNLOADMANAGER_H__
#endif // __OPENSPACE_CORE___DOWNLOADMANAGER___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __LOGFACTORY_H__
#define __LOGFACTORY_H__
#ifndef __OPENSPACE_CORE___LOGFACTORY___H__
#define __OPENSPACE_CORE___LOGFACTORY___H__
#include <memory>
@@ -55,4 +55,4 @@ std::unique_ptr<ghoul::logging::Log> createLog(const ghoul::Dictionary& dictiona
} // namespace openspace
#endif // __LOGFACTORY_H__
#endif // __OPENSPACE_CORE___LOGFACTORY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MODULEENGINE_H__
#define __MODULEENGINE_H__
#ifndef __OPENSPACE_CORE___MODULEENGINE___H__
#define __OPENSPACE_CORE___MODULEENGINE___H__
#include <openspace/util/openspacemodule.h>
#include <openspace/scripting/scriptengine.h>
@@ -96,4 +96,4 @@ private:
} // namespace openspace
#endif // __MODULEENGINE_H__
#endif // __OPENSPACE_CORE___MODULEENGINE___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACEENGINE_H__
#define __OPENSPACEENGINE_H__
#ifndef __OPENSPACE_CORE___OPENSPACEENGINE___H__
#define __OPENSPACE_CORE___OPENSPACEENGINE___H__
#include <openspace/util/keys.h>
#include <openspace/util/mouse.h>
@@ -185,6 +185,6 @@ private:
#define OsEng (openspace::OpenSpaceEngine::ref())
} // namespace openspace
} // namespace openspace
#endif // __OPENSPACEENGINE_H__
#endif // __OPENSPACE_CORE___OPENSPACEENGINE___H__

6
include/openspace/engine/settingsengine.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __SETTINGSENGINE_H__
#define __SETTINGSENGINE_H__
#ifndef __OPENSPACE_CORE___SETTINGSENGINE___H__
#define __OPENSPACE_CORE___SETTINGSENGINE___H__
#include <openspace/properties/propertyowner.h>
@@ -69,4 +69,4 @@ private:
} // namespace openspace
#endif //#ifndef __SETTINGSENGINE_H__
#endif // __OPENSPACE_CORE___SETTINGSENGINE___H__

8
include/openspace/engine/syncengine.h
View File

@@ -22,14 +22,12 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __SYNCENGINE_H__
#define __SYNCENGINE_H__
#ifndef __OPENSPACE_CORE___SYNCENGINE___H__
#define __OPENSPACE_CORE___SYNCENGINE___H__
#include <vector>
#include <memory>
namespace openspace {
class Syncable;
@@ -103,4 +101,4 @@ private:
} // namespace openspace
#endif //#ifndef __SYNCENGINE_H__
#endif // __OPENSPACE_CORE___SYNCENGINE___H__

6
include/openspace/engine/wrapper/sgctwindowwrapper.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __SGCTWINDOWWRAPPER_H__
#define __SGCTWINDOWWRAPPER_H__
#ifndef __OPENSPACE_CORE___SGCTWINDOWWRAPPER___H__
#define __OPENSPACE_CORE___SGCTWINDOWWRAPPER___H__
#include <openspace/engine/wrapper/windowwrapper.h>
@@ -75,4 +75,4 @@ public:
} // namespace openspace
#endif // __SGCTWINDOWWRAPPER_H__
#endif // __OPENSPACE_CORE___SGCTWINDOWWRAPPER___H__

6
include/openspace/engine/wrapper/windowwrapper.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __WINDOWWRAPPER_H__
#define __WINDOWWRAPPER_H__
#ifndef __OPENSPACE_CORE___WINDOWWRAPPER___H__
#define __OPENSPACE_CORE___WINDOWWRAPPER___H__
#include <ghoul/glm.h>
#include <ghoul/misc/exception.h>
@@ -258,4 +258,4 @@ public:
} // namespace openspace
#endif // _WINDOW_H__
#endif // __OPENSPACE_CORE___WINDOWWRAPPER___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __CONTROLLER_H__
#define __CONTROLLER_H__
#ifndef __OPENSPACE_CORE___CONTROLLER___H__
#define __OPENSPACE_CORE___CONTROLLER___H__
#include <openspace/scene/scenegraphnode.h>
@@ -50,4 +50,4 @@ protected:
} // namespace interaction
} // namespace openspace
#endif // __CONTROLLER_H__
#endif // __OPENSPACE_CORE___CONTROLLER___H__

30
include/openspace/interaction/deviceidentifier.h
View File

@@ -1,5 +1,29 @@
#ifndef DEVICEIDENTIFIER_H
#define DEVICEIDENTIFIER_H
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___DEVICEIDENTIFIER___H__
#define __OPENSPACE_CORE___DEVICEIDENTIFIER___H__
// std includes
#include <array>
@@ -52,4 +76,4 @@ private:
} // namespace openspace
#endif
#endif // __OPENSPACE_CORE___DEVICEIDENTIFIER___H__

24
include/openspace/interaction/externalcontrol/externalconnectioncontroller.h
View File

@@ -1,24 +0,0 @@
#ifndef EXTERNALCONNECTIONCONTROLLER_H
#define EXTERNALCONNECTIONCONTROLLER_H
#include <openspace/interaction/externalcontrol/externalcontrol.h>
#include <vector>
namespace openspace {
class ExternalConnectionController: public ExternalControl {
public:
// constructors & destructor
ExternalConnectionController();
~ExternalConnectionController();
private:
std::vector<ExternalControl*> controllers;
};
} // namespace openspace
#endif

29
include/openspace/interaction/externalcontrol/externalcontrol.h
View File

@@ -1,29 +0,0 @@
#ifndef EXTERNALCONTROL_H
#define EXTERNALCONTROL_H
#include <openspace/util/powerscaledscalar.h>
#include <ghoul/glm.h>
#include <glm/gtc/quaternion.hpp>
namespace openspace {
class ExternalControl {
public:
// constructors & destructor
ExternalControl();
virtual ~ExternalControl();
virtual void update();
void rotate(const glm::quat &rotation);
void orbit(const glm::quat &rotation);
void distance(const PowerScaledScalar &distance);
protected:
};
} // namespace openspace
#endif

28
include/openspace/interaction/externalcontrol/joystickexternalcontrol.h
View File

@@ -1,28 +0,0 @@
//#ifndef JOYSTICKEXTERNALCONTROL_H
//#define JOYSTICKEXTERNALCONTROL_H
//
//#include "externalcontrol/pythonexternalcontrol.h"
//
//namespace openspace {
//
//class JoystickExternalControl: public PythonExternalControl {
//public:
//
// // constructors & destructor
// JoystickExternalControl(const char *filename);
// ~JoystickExternalControl();
//
// void setInputDevice(const int device);
// void update();
//
//private:
//
// // joystick
// int inputDevice_;
// int numberOfButtons_;
// int numberOfAxes_;
//};
//
//} // namespace openspace
//
//#endif

25
include/openspace/interaction/externalcontrol/keyboardexternalcontrol.h
View File

@@ -1,25 +0,0 @@
//#ifndef KEYBOARDEXTERNALCONTROL_H
//#define KEYBOARDEXTERNALCONTROL_H
//
//#include "externalcontrol/pythonexternalcontrol.h"
//
//namespace openspace {
//
//class KeyboardExternalControl: public PythonExternalControl {
//public:
//
// // constructors & destructor
// KeyboardExternalControl(const char *filename);
// ~KeyboardExternalControl();
//
// void update();
//
// void keyboardCallback(int key, int action);
//private:
// int *keys_;
//
//};
//
//} // namespace openspace
//
//#endif

28
include/openspace/interaction/externalcontrol/mouseexternalcontrol.h
View File

@@ -1,28 +0,0 @@
//#ifndef MOUSEEXTERNALCONTROL_H
//#define MOUSEEXTERNALCONTROL_H
//
//#include "externalcontrol/pythonexternalcontrol.h"
//
//namespace openspace {
//
//class MouseExternalControl: public PythonExternalControl {
//public:
//
// // constructors & destructor
// MouseExternalControl(const char *filename);
// ~MouseExternalControl();
//
// void update();
//
// void mouseButtonCallback(int key, int action);
// void mousePosCallback(int x, int y);
// void mouseScrollCallback(int pos);
//private:
//
// int x_, y_, pos_, button1_, button2_, button3_;
//
//};
//
//} // namespace openspace
//
//#endif

35
include/openspace/interaction/externalcontrol/pythonexternalcontrol.h
View File

@@ -1,35 +0,0 @@
//#ifndef PYTHONEXTERNALCONTROL_H
//#define PYTHONEXTERNALCONTROL_H
//
//#include <thread>
//#include <mutex>
//
//#include "externalcontrol/externalcontrol.h"
//#include "python/pythonscript.h"
//
//namespace openspace {
//
//class PythonExternalControl: public ExternalControl {
//public:
//
// // constructors & destructor
// PythonExternalControl(const char *filename);
// ~PythonExternalControl();
//
// static PyMethodDef* getMethodDef();
//
// void message(const char *text);
// virtual void update();
// void clear();
//private:
// PythonScript ps_;
//
//protected:
// void run();
// int pyarrSize_;
// PyObject **pyarr_;
//};
//
//} // namespace openspace
//
//#endif

26
include/openspace/interaction/externalcontrol/randomexternalcontrol.h
View File

@@ -1,26 +0,0 @@
#ifndef RANDOMEXTERNALCONTROL_H
#define RANDOMEXTERNALCONTROL_H
#include <thread>
#include <mutex>
#include <openspace/interaction/externalcontrol/externalcontrol.h>
namespace openspace {
class RandomExternalControl: public ExternalControl {
public:
// constructors & destructor
RandomExternalControl();
~RandomExternalControl();
private:
std::mutex inputGuard;
bool *keepGoing_;
// std::thread *backgroundThread;
};
} // namespace openspace
#endif

7
include/openspace/interaction/interactionhandler.h
View File

@@ -22,11 +22,10 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __INTERACTIONHANDLER_H__
#define __INTERACTIONHANDLER_H__
#ifndef __OPENSPACE_CORE___INTERACTIONHANDLER___H__
#define __OPENSPACE_CORE___INTERACTIONHANDLER___H__
#include <openspace/interaction/keyboardcontroller.h>
#include <openspace/interaction/mousecontroller.h>
#include <openspace/interaction/interactionmode.h>
#include <openspace/network/parallelconnection.h>
#include <openspace/properties/propertyowner.h>
@@ -158,4 +157,4 @@ private:
} // namespace interaction
} // namespace openspace
#endif // __INTERACTIONHANDLER_H__
#endif // __OPENSPACE_CORE___INTERACTIONHANDLER___H__

7
include/openspace/interaction/interactionmode.h
View File

@@ -22,11 +22,10 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __INTERACTION_MODE_H__
#define __INTERACTION_MODE_H__
#ifndef __OPENSPACE_CORE___INTERACTIONMODE___H__
#define __OPENSPACE_CORE___INTERACTIONMODE___H__
#include <openspace/interaction/keyboardcontroller.h>
#include <openspace/interaction/mousecontroller.h>
#include <openspace/network/parallelconnection.h>
#include <openspace/util/mouse.h>
#include <openspace/util/keys.h>
@@ -281,4 +280,4 @@ private:
} // namespace interaction
} // namespace openspace
#endif // __INTERACTION_MODE_H__
#endif // __OPENSPACE_CORE___INTERACTIONMODE___H__

6
include/openspace/interaction/keyboardcontroller.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __KEYBOARDCONTROLLER_H__
#define __KEYBOARDCONTROLLER_H__
#ifndef __OPENSPACE_CORE___KEYBOARDCONTROLLER___H__
#define __OPENSPACE_CORE___KEYBOARDCONTROLLER___H__
#include <openspace/interaction/controller.h>
@@ -54,4 +54,4 @@ protected:
} // namespace interaction
} // namespace openspace
#endif // __KEYBOARDCONTROLLER_H__
#endif // __OPENSPACE_CORE___KEYBOARDCONTROLLER___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef LUACONSOLE_H
#define LUACONSOLE_H
#ifndef __OPENSPACE_CORE___LUACONSOLE___H__
#define __OPENSPACE_CORE___LUACONSOLE___H__
#include <openspace/scripting/scriptengine.h>
#include <openspace/network/parallelconnection.h>
@@ -83,4 +83,4 @@ private:
} // namespace openspace
#endif
#endif // __OPENSPACE_CORE___LUACONSOLE___H__

111
include/openspace/interaction/mousecontroller.h
View File

@@ -1,111 +0,0 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
//#define USE_OLD_INTERACTIONHANDLER
#ifdef USE_OLD_INTERACTIONHANDLER
#ifndef __MOUSECONTROLLER_H__
#define __MOUSECONTROLLER_H__
#include <openspace/interaction/controller.h>
#include <openspace/util/mouse.h>
#include <ghoul/glm.h>
namespace openspace {
namespace interaction {
class MouseController : public Controller {
public:
MouseController();
virtual ~MouseController() {}
virtual void button(MouseButton button, MouseAction action) = 0;
virtual void move(float x, float y) = 0;
virtual void scrollWheel(int pos) = 0;
virtual void update(const double& dt) = 0;
protected:
glm::vec3 _lastTrackballPos;
bool _isMouseBeingPressedAndHeld;
glm::vec3 mapToTrackball(glm::vec2 mousePos);
glm::vec3 mapToCamera(glm::vec3 trackballPos);
void trackballRotate(int x, int y);
};
class TrackballMouseController : public MouseController {
public:
TrackballMouseController();
void button(MouseButton button, MouseAction action) override;
void move(float x, float y) override;
void scrollWheel(int pos) override;
void update(const double& dt) override;
protected:
bool _leftMouseButtonDown;
glm::vec3 _previousTrackballPos;
};
class OrbitalMouseController : public MouseController {
public:
OrbitalMouseController();
void button(MouseButton button, MouseAction action) override;
void move(float x, float y) override;
void scrollWheel(int pos) override;
void update(const double& dt) override;
protected:
bool _leftMouseButtonDown;
bool _rightMouseButtonDown;
bool _middleMouseButtonDown;
glm::vec2 _previousCursorPos[3];
glm::vec2 _currentCursorPos;
glm::vec2 _currentCursorDiff[3];
float _rotationSpeed;
float _navigationSpeed;
private:
enum MouseButtons{ ButtonLeft = 0, ButtonRight, ButtonMiddle };
};
} // namespace interaction
} // namespace openspace
#endif // __MOUSECONTROLLER_H__
#endif // USE_OLD_INTERACTIONHANDLER

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MISSION_H__
#define __MISSION_H__
#ifndef __OPENSPACE_CORE___MISSION___H__
#define __OPENSPACE_CORE___MISSION___H__
#include <openspace/documentation/documentation.h>
#include <openspace/util/timerange.h>
@@ -143,4 +143,4 @@ Mission missionFromFile(std::string filename);
} // namespace openspace
#endif // __MISSION_H__
#endif // __OPENSPACE_CORE___MISSION___H__

6
include/openspace/mission/missionmanager.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MISSIONMANAGER_H__
#define __MISSIONMANAGER_H__
#ifndef __OPENSPACE_CORE___MISSIONMANAGER___H__
#define __OPENSPACE_CORE___MISSIONMANAGER___H__
#include <openspace/mission/mission.h>
@@ -96,4 +96,4 @@ private:
} // namespace openspace
#endif // __MISSIONMANAGER_H__
#endif // __OPENSPACE_CORE___MISSIONMANAGER___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MESSAGESTRUCTURES_H__
#define __MESSAGESTRUCTURES_H__
#ifndef __OPENSPACE_CORE___MESSAGESTRUCTURES___H__
#define __OPENSPACE_CORE___MESSAGESTRUCTURES___H__
//std includes
#include <string>
@@ -164,4 +164,4 @@ struct ScriptMessage {
} //namespace messagestructures
} // namespace openspace
#endif // __MESSAGESTRUCTURES_H__
#endif // __OPENSPACE_CORE___MESSAGESTRUCTURES___H__

6
include/openspace/network/networkengine.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __NETWORKENGINE_H__
#define __NETWORKENGINE_H__
#ifndef __OPENSPACE_CORE___NETWORKENGINE___H__
#define PARALLELCONNECTION__OPENSPACE_CORE___NETWORKENGINE___H__
#include <cstdint>
#include <map>
@@ -75,4 +75,4 @@ private:
} // namespace openspace
#endif // __NETWORKENGINE_H__
#endif // __OPENSPACE_CORE___NETWORKENGINE___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __PARALLELCONNECTION_H__
#define __PARALLELCONNECTION_H__
#ifndef __OPENSPACE_CORE___PARALLELCONNECTION___H__
#define __OPENSPACE_CORE___PARALLELCONNECTION___H__
//openspace includes
#include <openspace/network/messagestructures.h>
@@ -200,4 +200,4 @@ private:
} // namespace openspace
#endif // __OSPARALLELCONNECTION_H__
#endif // __OPENSPACE_CORE___PARALLELCONNECTION___H__

6
include/openspace/openspace.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_H__
#define __OPENSPACE_H__
#ifndef __OPENSPACE_CORE___OPENSPACE___H__
#define __OPENSPACE_CORE___OPENSPACE___H__
#include <string>
@@ -39,4 +39,4 @@ const std::string OPENSPACE_VERSION_STRING = "prerelease-11 (AGU)";
} // namespace openspace
#endif // __OPENSPACE_H__
#endif // __OPENSPACE_CORE___OPENSPACE___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __PERFORMANCELAYOUT_H__
#define __PERFORMANCELAYOUT_H__
#ifndef __OPENSPACE_CORE___PERFORMANCELAYOUT___H__
#define __OPENSPACE_CORE___PERFORMANCELAYOUT___H__
#include <cstdint>
@@ -60,4 +60,4 @@ struct PerformanceLayout {
} // namespace performance
} // namespace openspace
#endif // __PERFORMANCELAYOUT_H__
#endif // __OPENSPACE_CORE___PERFORMANCELAYOUT___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __PERFORMANCEMANAGER_H__
#define __PERFORMANCEMANAGER_H__
#ifndef __OPENSPACE_CORE___PERFORMANCEMANAGER___H__
#define __OPENSPACE_CORE___PERFORMANCEMANAGER___H__
#include <openspace/performance/performancelayout.h>
@@ -71,4 +71,4 @@ private:
} // namespace performance
} // namespace openspace
#endif // __PERFORMANCEMANAGER_H__
#endif // __OPENSPACE_CORE___PERFORMANCEMANAGER___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __PERFORMANCEMEASUREMENT_H__
#define __PERFORMANCEMEASUREMENT_H__
#ifndef __OPENSPACE_CORE___PERFORMANCEMEASUREMENT___H__
#define __OPENSPACE_CORE___PERFORMANCEMEASUREMENT___H__
#include <openspace/engine/openspaceengine.h>
#include <openspace/rendering/renderengine.h>
@@ -62,4 +62,4 @@ private:
} // namespace performance
} // namespace openspace
#endif // __PERFORMANCEMEASUREMENTHELPER_H__
#endif // __OPENSPACE_CORE___PERFORMANCEMEASUREMENT___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DMAT2PROPERTY_H__
#define __DMAT2PROPERTY_H__
#ifndef __OPENSPACE_CORE___DMAT2PROPERTY___H__
#define __OPENSPACE_CORE___DMAT2PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DMat2Property, glm::dmat2x2);
} // namespace properties
} // namespace openspace
#endif // __DMAT2PROPERTY_H__
#endif // __OPENSPACE_CORE___DMAT2PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DMAT2x3PROPERTY_H__
#define __DMAT2x3PROPERTY_H__
#ifndef __OPENSPACE_CORE___DMAT2x3PROPERTY___H__
#define __OPENSPACE_CORE___DMAT2x3PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DMat2x3Property, glm::dmat2x3);
} // namespace properties
} // namespace openspace
#endif // __DMAT2x3PROPERTY_H__
#endif // __OPENSPACE_CORE___DMAT2x3PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DMAT2x4PROPERTY_H__
#define __DMAT2x4PROPERTY_H__
#ifndef __OPENSPACE_CORE___DMAT2x4PROPERTY___H__
#define __OPENSPACE_CORE___DMAT2x4PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DMat2x4Property, glm::dmat2x4);
} // namespace properties
} // namespace openspace
#endif // __DMAT2x4PROPERTY_H__
#endif // __OPENSPACE_CORE___DMAT2x4PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DMAT3PROPERTY_H__
#define __DMAT3PROPERTY_H__
#ifndef __OPENSPACE_CORE___DMAT3PROPERTY___H__
#define __OPENSPACE_CORE___DMAT3PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DMat3Property, glm::dmat3x3);
} // namespace properties
} // namespace openspace
#endif // __DMAT3PROPERTY_H__
#endif // __OPENSPACE_CORE___DMAT3PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DMAT3x2PROPERTY_H__
#define __DMAT3x2PROPERTY_H__
#ifndef __OPENSPACE_CORE___DMAT3x2PROPERTY___H__
#define __OPENSPACE_CORE___DMAT3x2PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DMat3x2Property, glm::dmat3x2);
} // namespace properties
} // namespace openspace
#endif // __DMAT3x2PROPERTY_H__
#endif // __OPENSPACE_CORE___DMAT3x2PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DMAT3x4PROPERTY_H__
#define __DMAT3x4PROPERTY_H__
#ifndef __OPENSPACE_CORE___DMAT3x4PROPERTY___H__
#define __OPENSPACE_CORE___DMAT3x4PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DMat3x4Property, glm::dmat3x4);
} // namespace properties
} // namespace openspace
#endif // __DMAT3x4PROPERTY_H__
#endif // __OPENSPACE_CORE___DMAT3x4PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DMAT4PROPERTY_H__
#define __DMAT4PROPERTY_H__
#ifndef __OPENSPACE_CORE___DMAT4PROPERTY___H__
#define __OPENSPACE_CORE___DMAT4PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DMat4Property, glm::dmat4x4);
} // namespace properties
} // namespace openspace
#endif // __DMAT4PROPERTY_H__
#endif // __OPENSPACE_CORE___DMAT4PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DMAT4x2PROPERTY_H__
#define __DMAT4x2PROPERTY_H__
#ifndef __OPENSPACE_CORE___DMAT4x2PROPERTY___H__
#define __OPENSPACE_CORE___DMAT4x2PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DMat4x2Property, glm::dmat4x2);
} // namespace properties
} // namespace openspace
#endif // __DMAT4x2PROPERTY_H__
#endif // __OPENSPACE_CORE___DMAT4x2PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DMAT4x3PROPERTY_H__
#define __DMAT4x3PROPERTY_H__
#ifndef __OPENSPACE_CORE___DMAT4x3PROPERTY___H__
#define __OPENSPACE_CORE___DMAT4x3PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DMat4x3Property, glm::dmat4x3);
} // namespace properties
} // namespace openspace
#endif // __DMAT4x3PROPERTY_H__
#endif // __OPENSPACE_CORE___DMAT4x3PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MAT2PROPERTY_H__
#define __MAT2PROPERTY_H__
#ifndef __OPENSPACE_CORE___MAT2PROPERTY___H__
#define __OPENSPACE_CORE___MAT2PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Mat2Property, glm::mat2x2);
} // namespace properties
} // namespace openspace
#endif // __MAT2PROPERTY_H__
#endif // __OPENSPACE_CORE___MAT2PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MAT2x3PROPERTY_H__
#define __MAT2x3PROPERTY_H__
#ifndef __OPENSPACE_CORE___MAT2x3PROPERTY___H__
#define __OPENSPACE_CORE___MAT2x3PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Mat2x3Property, glm::mat2x3);
} // namespace properties
} // namespace openspace
#endif // __MAT2x3PROPERTY_H__
#endif // __OPENSPACE_CORE___MAT2x3PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MAT2x4PROPERTY_H__
#define __MAT2x4PROPERTY_H__
#ifndef __OPENSPACE_CORE___MAT2x4PROPERTY___H__
#define __OPENSPACE_CORE___MAT2x4PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Mat2x4Property, glm::mat2x4);
} // namespace properties
} // namespace openspace
#endif // __MAT2x4PROPERTY_H__
#endif // __OPENSPACE_CORE___MAT2x4PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MAT3PROPERTY_H__
#define __MAT3PROPERTY_H__
#ifndef __OPENSPACE_CORE___MAT3PROPERTY___H__
#define __OPENSPACE_CORE___MAT3PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Mat3Property, glm::mat3x3);
} // namespace properties
} // namespace openspace
#endif // __MAT3PROPERTY_H__
#endif // __OPENSPACE_CORE___MAT3PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MAT3x2PROPERTY_H__
#define __MAT3x2PROPERTY_H__
#ifndef __OPENSPACE_CORE___MAT3x2PROPERTY___H__
#define __OPENSPACE_CORE___MAT3x2PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Mat3x2Property, glm::mat3x2);
} // namespace properties
} // namespace openspace
#endif // __MAT3x2PROPERTY_H__
#endif // __OPENSPACE_CORE___MAT3x2PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MAT3x4PROPERTY_H__
#define __MAT3x4PROPERTY_H__
#ifndef __OPENSPACE_CORE___MAT3x4PROPERTY___H__
#define __OPENSPACE_CORE___MAT3x4PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Mat3x4Property, glm::mat3x4);
} // namespace properties
} // namespace openspace
#endif // __MAT3x4PROPERTY_H__
#endif // __OPENSPACE_CORE___MAT3x4PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MAT4PROPERTY_H__
#define __MAT4PROPERTY_H__
#ifndef __OPENSPACE_CORE___MAT4PROPERTY___H__
#define __OPENSPACE_CORE___MAT4PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Mat4Property, glm::mat4x4);
} // namespace properties
} // namespace openspace
#endif // __MAT4PROPERTY_H__
#endif // __OPENSPACE_CORE___MAT4PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MAT4x2PROPERTY_H__
#define __MAT4x2PROPERTY_H__
#ifndef __OPENSPACE_CORE___MAT4x2PROPERTY___H__
#define __OPENSPACE_CORE___MAT4x2PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Mat4x2Property, glm::mat4x2);
} // namespace properties
} // namespace openspace
#endif // __MAT4x2PROPERTY_H__
#endif // __OPENSPACE_CORE___MAT4x2PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MAT4x3PROPERTY_H__
#define __MAT4x3PROPERTY_H__
#ifndef __OPENSPACE_CORE___MAT4x3PROPERTY___H__
#define __OPENSPACE_CORE___MAT4x3PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Mat4x3Property, glm::mat4x3);
} // namespace properties
} // namespace openspace
#endif // __MAT4x3PROPERTY_H__
#endif // __OPENSPACE_CORE___MAT4x3PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MATRIXPROPERTY_H__
#define __MATRIXPROPERTY_H__
#ifndef __OPENSPACE_CORE___MATRIXPROPERTY___H__
#define __OPENSPACE_CORE___MATRIXPROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -47,4 +47,4 @@
#include <openspace/properties/matrix/dmat4x3property.h>
#include <openspace/properties/matrix/dmat4property.h>
#endif // __MATRIXPROPERTY_H__
#endif // __OPENSPACE_CORE___MATRIXPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __NUMERICALPROPERTY_H__
#define __NUMERICALPROPERTY_H__
#ifndef __OPENSPACE_CORE___NUMERICALPROPERTY___H__
#define __OPENSPACE_CORE___NUMERICALPROPERTY___H__
#include <openspace/properties/templateproperty.h>
@@ -78,4 +78,4 @@ protected:
#include "openspace/properties/numericalproperty.inl"
#endif // __NUMERICALPROPERTY_H__
#endif // __OPENSPACE_CORE___NUMERICALPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPTIONPROPERTY_H__
#define __OPTIONPROPERTY_H__
#ifndef __OPENSPACE_CORE___OPTIONPROPERTY___H__
#define __OPENSPACE_CORE___OPTIONPROPERTY___H__
#include <openspace/properties/scalar/intproperty.h>
@@ -134,4 +134,4 @@ private:
} // namespace properties
} // namespace openspace
#endif // __STRINGPROPERTY_H__
#endif // __OPENSPACE_CORE___OPTIONPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __PROPERTY_H__
#define __PROPERTY_H__
#ifndef __OPENSPACE_CORE___PROPERTY___H__
#define __OPENSPACE_CORE___PROPERTY___H__
#include <openspace/properties/propertydelegate.h>
@@ -388,4 +388,4 @@ protected:
} // namespace properties
} // namespace openspace
#endif // __PROPERTY_H__
#endif // __OPENSPACE_CORE___PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __PROPERTYDELEGATE_H__
#define __PROPERTYDELEGATE_H__
#ifndef __OPENSPACE_CORE___PROPERTYDELEGATE___H__
#define __OPENSPACE_CORE___PROPERTYDELEGATE___H__
#include <string>
@@ -163,4 +163,4 @@ public:
#include <openspace/properties/propertydelegate.inl>
#endif // __PROPERTYDELEGATE_H__
#endif // __OPENSPACE_CORE___PROPERTYDELEGATE___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __PROPERTYOWNER_H__
#define __PROPERTYOWNER_H__
#ifndef __OPENSPACE_CORE___PROPERTYOWNER___H__
#define __OPENSPACE_CORE___PROPERTYOWNER___H__
#include <openspace/properties/property.h>
#include <map>
@@ -222,4 +222,4 @@ private:
} // namespace properties
} // namespace openspace
#endif // __PROPERTYOWNER_H__
#endif // __OPENSPACE_CORE___PROPERTYOWNER___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __BOOLPROPERTY_H__
#define __BOOLPROPERTY_H__
#ifndef __OPENSPACE_CORE___BOOLPROPERTY___H__
#define __OPENSPACE_CORE___BOOLPROPERTY___H__
/**
* \file boolproperty.h
@@ -50,4 +50,4 @@ REGISTER_TEMPLATEPROPERTY_HEADER(BoolProperty, bool);
} // namespace properties
} // namespace openspace
#endif // __BOOLPROPERTY_H__
#endif // __OPENSPACE_CORE___BOOLPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __CHARPROPERTY_H__
#define __CHARPROPERTY_H__
#ifndef __OPENSPACE_CORE___CHARPROPERTY___H__
#define __OPENSPACE_CORE___CHARPROPERTY___H__
/**
* \file charproperty.h
@@ -50,4 +50,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(CharProperty, char);
} // namespace properties
} // namespace openspace
#endif // __CHARPROPERTY_H__
#endif // __OPENSPACE_CORE___CHARPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DOUBLEPROPERTY_H__
#define __DOUBLEPROPERTY_H__
#ifndef __OPENSPACE_CORE___DOUBLEPROPERTY___H__
#define __OPENSPACE_CORE___DOUBLEPROPERTY___H__
/**
* \file doubleproperty.h
@@ -50,4 +50,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DoubleProperty, double);
} // namespace properties
} // namespace openspace
#endif // __DOUBLEPROPERTY_H__
#endif // __OPENSPACE_CORE___DOUBLEPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __FLOATPROPERTY_H__
#define __FLOATPROPERTY_H__
#ifndef __OPENSPACE_CORE___FLOATPROPERTY___H__
#define __OPENSPACE_CORE___FLOATPROPERTY___H__
/**
* \file floatproperty.h
@@ -50,4 +50,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(FloatProperty, float);
} // namespace properties
} // namespace openspace
#endif // __FLOATPROPERTY_H__
#endif // __OPENSPACE_CORE___FLOATPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __INTPROPERTY_H__
#define __INTPROPERTY_H__
#ifndef __OPENSPACE_CORE___INTPROPERTY___H__
#define __OPENSPACE_CORE___INTPROPERTY___H__
/**
* \file intproperty.h
@@ -50,4 +50,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(IntProperty, int);
} // namespace properties
} // namespace openspace
#endif // __INTPROPERTY_H__
#endif // __OPENSPACE_CORE___INTPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __LONGDOUBLEPROPERTY_H__
#define __LONGDOUBLEPROPERTY_H__
#ifndef __OPENSPACE_CORE___LONGDOUBLEPROPERTY___H__
#define __OPENSPACE_CORE___LONGDOUBLEPROPERTY___H__
/**
* \file longdoubleproperty.h
@@ -50,4 +50,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(LongDoubleProperty, long double);
} // namespace properties
} // namespace openspace
#endif // __LONGDOUBLEPROPERTY_H__
#endif // __OPENSPACE_CORE___LONGDOUBLEPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __LONGLONGPROPERTY_H__
#define __LONGLONGPROPERTY_H__
#ifndef __OPENSPACE_CORE___LONGLONGPROPERTY___H__
#define __OPENSPACE_CORE___LONGLONGPROPERTY___H__
/**
* \file longlongproperty.h
@@ -50,4 +50,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(LongLongProperty, long long);
} // namespace properties
} // namespace openspace
#endif // __LONGLONGPROPERTY_H__
#endif // __OPENSPACE_CORE___LONGLONGPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __LONGPROPERTY_H__
#define __LONGPROPERTY_H__
#ifndef __OPENSPACE_CORE___LONGPROPERTY___H__
#define __OPENSPACE_CORE___LONGPROPERTY___H__
/**
* \file longproperty.h
@@ -50,4 +50,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(LongProperty, long);
} // namespace properties
} // namespace openspace
#endif // __LONGPROPERTY_H__
#endif // __OPENSPACE_CORE___LONGPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __SHORTPROPERTY_H__
#define __SHORTPROPERTY_H__
#ifndef __OPENSPACE_CORE___SHORTPROPERTY___H__
#define __OPENSPACE_CORE___SHORTPROPERTY___H__
/**
* \file shortproperty.h
@@ -50,4 +50,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(ShortProperty, short);
} // namespace properties
} // namespace openspace
#endif // __SHORTPROPERTY_H__
#endif // __OPENSPACE_CORE___SHORTPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __SIGNEDCHARPROPERTY_H__
#define __SIGNEDCHARPROPERTY_H__
#ifndef __OPENSPACE_CORE___SIGNEDCHARPROPERTY___H__
#define __OPENSPACE_CORE___SIGNEDCHARPROPERTY___H__
/**
* \file signedcharproperty.h
@@ -50,4 +50,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(SignedCharProperty, signed char);
} // namespace properties
} // namespace openspace
#endif // __SIGNEDCHARPROPERTY_H__
#endif // __OPENSPACE_CORE___SIGNEDCHARPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __UCHARPROPERTY_H__
#define __UCHARPROPERTY_H__
#ifndef __OPENSPACE_CORE___UCHARPROPERTY___H__
#define __OPENSPACE_CORE___UCHARPROPERTY___H__
/**
* \file ucharproperty.h
@@ -50,4 +50,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(UCharProperty, unsigned char);
} // namespace properties
} // namespace openspace
#endif // __UCHARPROPERTY_H__
#endif // __OPENSPACE_CORE___UCHARPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __UINTPROPERTY_H__
#define __UINTPROPERTY_H__
#ifndef __OPENSPACE_CORE___UINTPROPERTY___H__
#define __OPENSPACE_CORE___UINTPROPERTY___H__
/**
* \file uintproperty.h
@@ -50,4 +50,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(UIntProperty, unsigned int);
} // namespace properties
} // namespace openspace
#endif // __UINTPROPERTY_H__
#endif // __OPENSPACE_CORE___UINTPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __ULONGLONGPROPERTY_H__
#define __ULONGLONGPROPERTY_H__
#ifndef __OPENSPACE_CORE___ULONGLONGPROPERTY___H__
#define __OPENSPACE_CORE___ULONGLONGPROPERTY___H__
/**
* \file ulonglongproperty.h
@@ -50,4 +50,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(ULongLongProperty, unsigned long long);
} // namespace properties
} // namespace openspace
#endif // __ULONGLONGPROPERTY_H__
#endif // __OPENSPACE_CORE___ULONGLONGPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __ULONGPROPERTY_H__
#define __ULONGPROPERTY_H__
#ifndef __OPENSPACE_CORE___ULONGPROPERTY___H__
#define __OPENSPACE_CORE___ULONGPROPERTY___H__
/**
* \file ulongproperty.h
@@ -50,4 +50,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(ULongProperty, unsigned long);
} // namespace properties
} // namespace openspace
#endif // __ULONGPROPERTY_H__
#endif // __OPENSPACE_CORE___ULONGPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __USHORTPROPERTY_H__
#define __USHORTPROPERTY_H__
#ifndef __OPENSPACE_CORE___USHORTPROPERTY___H__
#define __OPENSPACE_CORE___USHORTPROPERTY___H__
/**
* \file ushortproperty.h
@@ -50,4 +50,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(UShortProperty, unsigned short);
} // namespace properties
} // namespace openspace
#endif // __USHORTPROPERTY_H__
#endif // __OPENSPACE_CORE___USHORTPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __WCHARPROPERTY_H__
#define __WCHARPROPERTY_H__
#ifndef __OPENSPACE_CORE___WCHARPROPERTY___H__
#define __OPENSPACE_CORE___WCHARPROPERTY___H__
/**
* \file wcharproperty.h
@@ -50,4 +50,4 @@ namespace properties {
} // namespace properties
} // namespace openspace
#endif // __WCHARPROPERTY_H__
#endif // __OPENSPACE_CORE___WCHARPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __SCALARPROPERTY_H__
#define __SCALARPROPERTY_H__
#ifndef __OPENSPACE_CORE___SCALARPROPERTY___H__
#define __OPENSPACE_CORE___SCALARPROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -44,4 +44,4 @@
#include <openspace/properties/scalar/ushortproperty.h>
#include <openspace/properties/scalar/wcharproperty.h>
#endif // __SCALARPROPERTY_H__
#endif // __OPENSPACE_CORE___SCALARPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __SELECTIONPROPERTY_H__
#define __SELECTIONPROPERTY_H__
#ifndef __OPENSPACE_CORE___SELECTIONPROPERTY___H__
#define __OPENSPACE_CORE___SELECTIONPROPERTY___H__
#include <openspace/properties/templateproperty.h>
@@ -80,4 +80,4 @@ bool PropertyDelegate<TemplateProperty<std::vector<int>>>::toString(std::string&
} // namespace properties
} // namespace openspace
#endif // __SELECTIONPROPERTY_H__
#endif // __OPENSPACE_CORE___SELECTIONPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __STRINGPROPERTY_H__
#define __STRINGPROPERTY_H__
#ifndef __OPENSPACE_CORE___STRINGPROPERTY___H__
#define __OPENSPACE_CORE___STRINGPROPERTY___H__
#include <openspace/properties/templateproperty.h>
@@ -35,4 +35,4 @@ REGISTER_TEMPLATEPROPERTY_HEADER(StringProperty, std::string);
} // namespace properties
} // namespace openspace
#endif // __STRINGPROPERTY_H__
#endif // __OPENSPACE_CORE___STRINGPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __TEMPLATEPROPERTY_H__
#define __TEMPLATEPROPERTY_H__
#ifndef __OPENSPACE_CORE___TEMPLATEPROPERTY___H__
#define __OPENSPACE_CORE___TEMPLATEPROPERTY___H__
#include <openspace/properties/property.h>
@@ -191,4 +191,4 @@ protected:
#include "openspace/properties/templateproperty.inl"
#endif // __TEMPLATEPROPERTY_H__
#endif // __OPENSPACE_CORE___TEMPLATEPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __TRIGGERPROPERTY_H__
#define __TRIGGERPROPERTY_H__
#ifndef __OPENSPACE_CORE___TRIGGERPROPERTY___H__
#define __OPENSPACE_CORE___TRIGGERPROPERTY___H__
#include <openspace/properties/property.h>
@@ -70,4 +70,4 @@ public:
} // namespace properties
} // namespace openspace
#endif // __TRIGGERPROPERTY_H__
#endif // __OPENSPACE_CORE___TRIGGERPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __BVEC2PROPERTY_H__
#define __BVEC2PROPERTY_H__
#ifndef __OPENSPACE_CORE___BVEC2PROPERTY___H__
#define __OPENSPACE_CORE___BVEC2PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_TEMPLATEPROPERTY_HEADER(BVec2Property, glm::bvec2);
} // namespace properties
} // namespace openspace
#endif // __BVEC2PROPERTY_H__
#endif // __OPENSPACE_CORE___BVEC2PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __BVEC3PROPERTY_H__
#define __BVEC3PROPERTY_H__
#ifndef __OPENSPACE_CORE___BVEC3PROPERTY___H__
#define __OPENSPACE_CORE___BVEC3PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_TEMPLATEPROPERTY_HEADER(BVec3Property, glm::bvec3);
} // namespace properties
} // namespace openspace
#endif // __BVEC3PROPERTY_H__
#endif // __OPENSPACE_CORE___BVEC3PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __BVEC4PROPERTY_H__
#define __BVEC4PROPERTY_H__
#ifndef __OPENSPACE_CORE___BVEC4PROPERTY___H__
#define __OPENSPACE_CORE___BVEC4PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_TEMPLATEPROPERTY_HEADER(BVec4Property, glm::bvec4);
} // namespace properties
} // namespace openspace
#endif // __BVEC4PROPERTY_H__
#endif // __OPENSPACE_CORE___BVEC4PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DVEC2PROPERTY_H__
#define __DVEC2PROPERTY_H__
#ifndef __OPENSPACE_CORE___DVEC2PROPERTY___H__
#define __OPENSPACE_CORE___DVEC2PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DVec2Property, glm::dvec2);
} // namespace properties
} // namespace openspace
#endif // __DVEC2PROPERTY_H__
#endif // __OPENSPACE_CORE___DVEC2PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DVEC3PROPERTY_H__
#define __DVEC3PROPERTY_H__
#ifndef __OPENSPACE_CORE___DVEC3PROPERTY___H__
#define __OPENSPACE_CORE___DVEC3PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DVec3Property, glm::dvec3);
} // namespace properties
} // namespace openspace
#endif // __DVEC3PROPERTY_H__
#endif // __OPENSPACE_CORE___DVEC3PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DVEC4PROPERTY_H__
#define __DVEC4PROPERTY_H__
#ifndef __OPENSPACE_CORE___DVEC4PROPERTY___H__
#define __OPENSPACE_CORE___DVEC4PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DVec4Property, glm::dvec4);
} // namespace properties
} // namespace openspace
#endif // __DVEC4PROPERTY_H__
#endif // __OPENSPACE_CORE___DVEC4PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __IVEC2PROPERTY_H__
#define __IVEC2PROPERTY_H__
#ifndef __OPENSPACE_CORE___IVEC2PROPERTY___H__
#define __OPENSPACE_CORE___IVEC2PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(IVec2Property, glm::ivec2);
} // namespace properties
} // namespace openspace
#endif // __IVEC2PROPERTY_H__
#endif // __OPENSPACE_CORE___IVEC2PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __IVEC3PROPERTY_H__
#define __IVEC3PROPERTY_H__
#ifndef __OPENSPACE_CORE___IVEC3PROPERTY___H__
#define __OPENSPACE_CORE___IVEC3PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(IVec3Property, glm::ivec3);
} // namespace properties
} // namespace openspace
#endif // __IVEC3PROPERTY_H__
#endif // __OPENSPACE_CORE___IVEC3PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __IVEC4PROPERTY_H__
#define __IVEC4PROPERTY_H__
#ifndef __OPENSPACE_CORE___IVEC4PROPERTY___H__
#define __OPENSPACE_CORE___IVEC4PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(IVec4Property, glm::ivec4);
} // namespace properties
} // namespace openspace
#endif // __IVEC4PROPERTY_H__
#endif // __OPENSPACE_CORE___IVEC4PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __UVEC2PROPERTY_H__
#define __UVEC2PROPERTY_H__
#ifndef __OPENSPACE_CORE___UVEC2PROPERTY___H__
#define __OPENSPACE_CORE___UVEC2PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(UVec2Property, glm::uvec2);
} // namespace properties
} // namespace openspace
#endif // __UVEC2PROPERTY_H__
#endif // __OPENSPACE_CORE___UVEC2PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __UVEC3PROPERTY_H__
#define __UVEC3PROPERTY_H__
#ifndef __OPENSPACE_CORE___UVEC3PROPERTY___H__
#define __OPENSPACE_CORE___UVEC3PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(UVec3Property, glm::uvec3);
} // namespace properties
} // namespace openspace
#endif // __UVEC3PROPERTY_H__
#endif // __OPENSPACE_CORE___UVEC3PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __UVEC4PROPERTY_H__
#define __UVEC4PROPERTY_H__
#ifndef __OPENSPACE_CORE___UVEC4PROPERTY___H__
#define __OPENSPACE_CORE___UVEC4PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(UVec4Property, glm::uvec4);
} // namespace properties
} // namespace openspace
#endif // __UVEC4PROPERTY_H__
#endif // __OPENSPACE_CORE___UVEC4PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __VEC2PROPERTY_H__
#define __VEC2PROPERTY_H__
#ifndef __OPENSPACE_CORE___VEC2PROPERTY___H__
#define __OPENSPACE_CORE___VEC2PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Vec2Property, glm::vec2);
} // namespace properties
} // namespace openspace
#endif // __VEC2PROPERTY_H__
#endif // __OPENSPACE_CORE___VEC2PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __VEC3PROPERTY_H__
#define __VEC3PROPERTY_H__
#ifndef __OPENSPACE_CORE___VEC3PROPERTY___H__
#define __OPENSPACE_CORE___VEC3PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Vec3Property, glm::vec3);
} // namespace properties
} // namespace openspace
#endif // __VEC3PROPERTY_H__
#endif // __OPENSPACE_CORE___VEC3PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __VEC4PROPERTY_H__
#define __VEC4PROPERTY_H__
#ifndef __OPENSPACE_CORE___VEC4PROPERTY___H__
#define __OPENSPACE_CORE___VEC4PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Vec4Property, glm::vec4);
} // namespace properties
} // namespace openspace
#endif // __VEC4PROPERTY_H__
#endif // __OPENSPACE_CORE___VEC4PROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __VECTORPROPERTY_H__
#define __VECTORPROPERTY_H__
#ifndef __OPENSPACE_CORE___VECTORPROPERTY___H__
#define __OPENSPACE_CORE___VECTORPROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -47,4 +47,4 @@
#include <openspace/properties/vector/vec3property.h>
#include <openspace/properties/vector/vec4property.h>
#endif // __INTPROPERTY_H__
#endif // __OPENSPACE_CORE___VECTORPROPERTY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __QUERY_H__
#define __QUERY_H__
#ifndef __OPENSPACE_CORE___QUERY___H__
#define __OPENSPACE_CORE___QUERY___H__
#include <string>
#include <vector>
@@ -46,6 +46,6 @@ Renderable* renderable(const std::string& name);
properties::Property* property(const std::string& uri);
std::vector<properties::Property*> allProperties();
} // namespace
} // namespace openspace
#endif // __QUERY_H__
#endif // __OPENSPACE_CORE___QUERY___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __ABUFFERRENDERER_H__
#define __ABUFFERRENDERER_H__
#ifndef __OPENSPACE_CORE___ABUFFERRENDERER___H__
#define __OPENSPACE_CORE___ABUFFERRENDERER___H__
#include <ghoul/opengl/ghoul_gl.h>
#include <ghoul/glm.h>
@@ -136,7 +136,8 @@ private:
float _blackoutFactor;
ghoul::Dictionary _rendererData;
}; // ABufferRenderer
} // openspace
};
#endif // __RENDERER_H__
} // namespace openspace
#endif // __OPENSPACE_CORE___ABUFFERRENDERER___H__

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

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __FRAMEBUFFERRENDERER_H__
#define __FRAMEBUFFERRENDERER_H__
#ifndef __OPENSPACE_CORE___FRAMEBUFFERRENDERER___H__
#define __OPENSPACE_CORE___FRAMEBUFFERRENDERER___H__
#include <ghoul/opengl/ghoul_gl.h>
#include <ghoul/glm.h>
@@ -107,7 +107,8 @@ private:
int _nAaSamples;
ghoul::Dictionary _rendererData;
}; // FramebufferRenderer
} // openspace
};
#endif // __FRAMEBUFFERRENDERER_H__
} // namespace openspace
#endif // __OPENSPACE_CORE___FRAMEBUFFERRENDERER___H__

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