mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 02:48:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup of license headers

Browse Source 
Cleanup of include guards in modules
This commit is contained in:
Alexander Bock
2016-12-09 12:02:16 +01:00
parent 80d806d62c
commit df543f0ec3
136 changed files with 1621 additions and 1556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/onscreengui/include/gui.h
+5 -4
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __GUI_H__
#define __GUI_H__
#ifndef __OPENSPACE_MODULE_ONSCREENGUI___GUI___H__
#define __OPENSPACE_MODULE_ONSCREENGUI___GUI___H__
#include <modules/onscreengui/include/guicomponent.h>
#include <modules/onscreengui/include/guihelpcomponent.h>
@@ -57,7 +57,8 @@ public:
bool keyCallback(Key key, KeyModifier modifier, KeyAction action);
bool charCallback(unsigned int character, KeyModifier modifier);
void startFrame(float deltaTime, const glm::vec2& windowSize, const glm::vec2& dpiScaling, const glm::vec2& mousePos, uint32_t mouseButtons);
void startFrame(float deltaTime, const glm::vec2& windowSize,
const glm::vec2& dpiScaling, const glm::vec2& mousePos, uint32_t mouseButtons);
void endFrame();
void render();
@@ -82,4 +83,4 @@ private:
} // namespace gui
} // namespace openspace
#endif // __GUI_H__
#endif // __OPENSPACE_MODULE_ONSCREENGUI___GUI___H__
modules/onscreengui/include/guicomponent.h
+3 -3
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __GUICOMPONENT_H__
#define __GUICOMPONENT_H__
#ifndef __OPENSPACE_MODULE_ONSCREENGUI___GUICOMPONENT___H__
#define __OPENSPACE_MODULE_ONSCREENGUI___GUICOMPONENT___H__
#include <openspace/properties/propertyowner.h>
#include <openspace/properties/scalar/boolproperty.h>
@@ -78,4 +78,4 @@ protected:
} // namespace gui
} // namespace openspace
#endif // __GUICOMPONENT_H__
#endif // __OPENSPACE_MODULE_ONSCREENGUI___GUICOMPONENT___H__
modules/onscreengui/include/guihelpcomponent.h
+3 -3
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __GUIHELPCOMPONENT_H__
#define __GUIHELPCOMPONENT_H__
#ifndef __OPENSPACE_MODULE_ONSCREENGUI___GUIHELPCOMPONENT___H__
#define __OPENSPACE_MODULE_ONSCREENGUI___GUIHELPCOMPONENT___H__
#include <modules/onscreengui/include/guicomponent.h>
@@ -40,4 +40,4 @@ public:
} // namespace gui
} // namespace openspace
#endif // __GUIHELPCOMPONENT_H__
#endif // __OPENSPACE_MODULE_ONSCREENGUI___GUIHELPCOMPONENT___H__
modules/onscreengui/include/guiiswacomponent.h
+3 -3
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __GUIISWACOMPONENT_H__
#define __GUIISWACOMPONENT_H__
#ifndef __OPENSPACE_MODULE_ONSCREENGUI___GUIISWACOMPONENT___H__
#define __OPENSPACE_MODULE_ONSCREENGUI___GUIISWACOMPONENT___H__
#include <modules/onscreengui/include/guipropertycomponent.h>
@@ -49,4 +49,4 @@ private:
} // namespace gui
} // namespace openspace
#endif // __GUIISWACOMPONENT_H__
#endif // __OPENSPACE_MODULE_ONSCREENGUI___GUIISWACOMPONENT___H__
modules/onscreengui/include/guiorigincomponent.h
+3 -3
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __GUIORIGINCOMPONENT_H__
#define __GUIORIGINCOMPONENT_H__
#ifndef __OPENSPACE_MODULE_ONSCREENGUI___GUIORIGINCOMPONENT___H__
#define __OPENSPACE_MODULE_ONSCREENGUI___GUIORIGINCOMPONENT___H__
#include <modules/onscreengui/include/guicomponent.h>
@@ -40,4 +40,4 @@ public:
} // namespace gui
} // namespace openspace
#endif // __GUIORIGINCOMPONENT_H__
#endif // __OPENSPACE_MODULE_ONSCREENGUI___GUIORIGINCOMPONENT___H__
modules/onscreengui/include/guiperformancecomponent.h
+3 -3
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __GUIPERFORMANCECOMPONENT_H__
#define __GUIPERFORMANCECOMPONENT_H__
#ifndef __OPENSPACE_MODULE_ONSCREENGUI___GUIPERFORMANCECOMPONENT___H__
#define __OPENSPACE_MODULE_ONSCREENGUI___GUIPERFORMANCECOMPONENT___H__
#include <modules/onscreengui/include/guicomponent.h>
@@ -59,4 +59,4 @@ protected:
} // namespace gui
} // namespace openspace
#endif // __GUIPERFORMANCECOMPONENT_H__
#endif // __OPENSPACE_MODULE_ONSCREENGUI___GUIPERFORMANCECOMPONENT___H__
modules/onscreengui/include/guipropertycomponent.h
+3 -3
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __GUIPROPERTYCOMPONENT_H__
#define __GUIPROPERTYCOMPONENT_H__
#ifndef __OPENSPACE_MODULE_ONSCREENGUI___GUIPROPERTYCOMPONENT___H__
#define __OPENSPACE_MODULE_ONSCREENGUI___GUIPROPERTYCOMPONENT___H__
#include <modules/onscreengui/include/guicomponent.h>
@@ -68,4 +68,4 @@ protected:
} // namespace gui
} // namespace openspace
#endif // __GUIPROPERTYCOMPONENT_H__
#endif // __OPENSPACE_MODULE_ONSCREENGUI___GUIPROPERTYCOMPONENT___H__
modules/onscreengui/include/guitimecomponent.h
+3 -3
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __GUITIMECOMPONENT_H__
#define __GUITIMECOMPONENT_H__
#ifndef __OPENSPACE_MODULE_ONSCREENGUI___GUITIMECOMPONENT___H__
#define __OPENSPACE_MODULE_ONSCREENGUI___GUITIMECOMPONENT___H__
#include <modules/onscreengui/include/guicomponent.h>
@@ -40,4 +40,4 @@ public:
} // namespace gui
} // namespace openspace
#endif // __GUITIMECOMPONENT_H__
#endif // __OPENSPACE_MODULE_ONSCREENGUI___GUITIMECOMPONENT___H__
modules/onscreengui/include/renderproperties.h
+3 -3
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __RENDERPROPERTIES_H__
#define __RENDERPROPERTIES_H__
#ifndef __OPENSPACE_MODULE_ONSCREENGUI___RENDERPROPERTIES___H__
#define __OPENSPACE_MODULE_ONSCREENGUI___RENDERPROPERTIES___H__
#include <string>
@@ -54,4 +54,4 @@ void renderTriggerProperty(properties::Property* prop, const std::string& ownerN
} // namespace openspace
#endif __RENDERPROPERTIES_H__
#endif __OPENSPACE_MODULE_ONSCREENGUI___RENDERPROPERTIES___H__
modules/onscreengui/onscreenguimodule.h
+3 -3
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __ONSCREENGUIMODULE_H__
#define __ONSCREENGUIMODULE_H__
#ifndef __OPENSPACE_MODULE_ONSCREENGUI___ONSCREENGUIMODULE___H__
#define __OPENSPACE_MODULE_ONSCREENGUI___ONSCREENGUIMODULE___H__
#include <openspace/util/openspacemodule.h>
@@ -36,4 +36,4 @@ public:
} // namespace openspace
#endif // __ONSCREENGUIMODULE_H__
#endif // __OPENSPACE_MODULE_ONSCREENGUI___ONSCREENGUIMODULE___H__
modules/onscreengui/src/guiiswacomponent.cpp
+5 -1
View File
@@ -58,7 +58,11 @@ void GuiIswaComponent::render() {
bool oldGmImageValue = _gmImage;
bool oldIonDataValue = _ionData;
ImGui::Begin("ISWA", &_isEnabled, size, 0.5f);
bool e = _isEnabled;
ImGui::Begin("ISWA", &e, size, 0.5f);
_isEnabled = e;
ImGui::Text("Global Magnetosphere");
ImGui::Checkbox("Gm From Data", &_gmData); ImGui::SameLine();