mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-02 01:30:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed include guards

Browse Source 
Removed unused writeToTexture file
This commit is contained in:
Alexander Bock
2017-02-09 19:12:21 -05:00
parent 9e4cf8196d
commit 6d9dc2bfeb
74 changed files with 77 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/DataConverter/conversiontask.h
View File

@@ -14,4 +14,4 @@ public:
}
}
#endif
#endif // __CONVERSIONTASK_H__

2
apps/DataConverter/milkywayconversiontask.h
View File

@@ -38,4 +38,4 @@ private:
}
}
#endif
#endif // __MILKYWAYCONVERSIONTASK_H__

2
apps/DataConverter/milkywaypointsconversiontask.h
View File

@@ -32,4 +32,4 @@ private:
}
}
#endif
#endif // __MILKYWAYPOINTSCONVERSIONTASK_H__

2
ext/ghoul

Submodule ext/ghoul updated: be0ffdb2f1...1e6400a9e6

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

@@ -167,4 +167,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_CORE___CONFIGURATIONMANAGER___H__
#endif // __OPENSPACE_CORE___CONFIGURATIONMANAGER___H__

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

@@ -187,4 +187,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_CORE___OPENSPACEENGINE___H__
#endif // __OPENSPACE_CORE___OPENSPACEENGINE___H__

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

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

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

@@ -140,4 +140,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_CORE___ABUFFERRENDERER___H__
#endif // __OPENSPACE_CORE___ABUFFERRENDERER___H__

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

@@ -36,4 +36,4 @@ public:
} // openspace
#endif // __OPENSPACE_CORE___RAYCASTERLISTENER___H__
#endif // __OPENSPACE_CORE___RAYCASTERLISTENER___H__

2
include/openspace/rendering/raycastermanager.h
View File

@@ -50,4 +50,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_CORE___RAYCASTERMANAGER___H__
#endif // __OPENSPACE_CORE___RAYCASTERMANAGER___H__

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

@@ -129,4 +129,4 @@ public:
} // namespace openspace
#endif // __OPENSPACE_CORE___VOLUME___H__
#endif // __OPENSPACE_CORE___VOLUME___H__

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

@@ -126,4 +126,4 @@ public:
} // namespace openspace
#endif // __OPENSPACE_CORE___VOLUMERAYCASTER___H__
#endif // __OPENSPACE_CORE___VOLUMERAYCASTER___H__

2
include/openspace/util/histogram.h
View File

@@ -90,4 +90,4 @@ private:
} // namespace openspace
#endif //__OPENSPACE_CORE___HISTOGRAM___H__
#endif // __OPENSPACE_CORE___HISTOGRAM___H__

2
include/openspace/util/timerange.h
View File

@@ -78,4 +78,4 @@ struct TimeRange {
} // namespace openspace
#endif //__OPENSPACE_CORE___TIMERANGE___H__
#endif // __OPENSPACE_CORE___TIMERANGE___H__

2
include/openspace/util/transformationmanager.h
View File

@@ -61,4 +61,4 @@ private:
} // namespace openspace
#endif //__OPENSPACE_CORE___TRANSFORMATIONMANAGER___H__
#endif // __OPENSPACE_CORE___TRANSFORMATIONMANAGER___H__

2
modules/base/rendering/modelgeometry.h
View File

@@ -81,4 +81,4 @@ protected:
} // namespace modelgeometry
} // namespace openspace
#endif // __OPENSPACE_MODULE_BASE___MODELGEOMETRY___H__
#endif // __OPENSPACE_MODULE_BASE___MODELGEOMETRY___H__

2
modules/base/rendering/renderablemodel.h
View File

@@ -87,4 +87,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_MODULE_BASE___RENDERABLEMODEL___H__
#endif // __OPENSPACE_MODULE_BASE___RENDERABLEMODEL___H__

2
modules/base/rendering/screenspaceframebuffer.h
View File

@@ -68,4 +68,4 @@ private:
} //namespace openspace
#endif //__OPENSPACE_MODULE_BASE___SCREENSPACEFRAMEBUFFER___H__
#endif // __OPENSPACE_MODULE_BASE___SCREENSPACEFRAMEBUFFER___H__

4
modules/base/rendering/screenspaceimage.h
View File

@@ -61,6 +61,6 @@ private:
properties::StringProperty _texturePath;
};
} //namespace openspace
} // namespace openspace
#endif //__OPENSPACE_MODULE_BASE___SCREENSPACEIMAGE___H__
#endif // __OPENSPACE_MODULE_BASE___SCREENSPACEIMAGE___H__

2
modules/base/rendering/wavefrontgeometry.h
View File

@@ -48,4 +48,4 @@ namespace modelgeometry {
} // namespace modelgeometry
} // namespace openspace
#endif // __WAVEFRONTOBJECT_H__
#endif // __WAVEFRONTGEOMETRY_H__

2
modules/galaxy/rendering/galaxyraycaster.h
View File

@@ -85,4 +85,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_MODULE_GALAXY___GALAXYRAYCASTER___H__
#endif // __OPENSPACE_MODULE_GALAXY___GALAXYRAYCASTER___H__

2
modules/globebrowsing/chunk/culling.h
View File

@@ -85,4 +85,4 @@ public:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CULLING___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CULLING___H__

2
modules/globebrowsing/geometry/aabb.h
View File

@@ -88,4 +88,4 @@ struct AABB3 {
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___AABB___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___AABB___H__

2
modules/globebrowsing/geometry/convexhull.h
View File

@@ -69,4 +69,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CONVEX_HULL___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CONVEX_HULL___H__

2
modules/globebrowsing/globes/chunkedlodglobe.h
View File

@@ -137,4 +137,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNKED_LOD_GLOBE___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNKED_LOD_GLOBE___H__

2
modules/globebrowsing/globes/pointglobe.h
View File

@@ -59,4 +59,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___POINTGLOBE___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___POINTGLOBE___H__

2
modules/globebrowsing/globes/renderableglobe.h
View File

@@ -128,4 +128,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___RENDERABLEGLOBE___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___RENDERABLEGLOBE___H__

2
modules/globebrowsing/other/distanceswitch.h
View File

@@ -67,4 +67,4 @@ private:
} // namespace globebrowsing
} // openspace
#endif //__OPENSPACE_MODULE_GLOBEBROWSING___DISTANCESWITCH___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___DISTANCESWITCH___H__

2
modules/globebrowsing/other/statscollector.h
View File

@@ -121,4 +121,4 @@ private:
#include "statscollector.inl"
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___STATS_TRACKER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___STATS_TRACKER___H__

2
modules/globebrowsing/rendering/chunkrenderer.h
View File

@@ -100,4 +100,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNK_RENDERER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNK_RENDERER___H__

2
modules/globebrowsing/rendering/gpulayermanager.h
View File

@@ -317,4 +317,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___GPU_LAYER_MANAGER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___GPU_LAYER_MANAGER___H__

2
modules/globebrowsing/rendering/layermanager.h
View File

@@ -129,4 +129,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___LAYERMANAGER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___LAYERMANAGER___H__

2
modules/globebrowsing/rendering/layershadermanager.h
View File

@@ -104,4 +104,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___LAYER_SHADER_MANAGER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___LAYER_SHADER_MANAGER___H__

2
modules/globebrowsing/tile/asynctilereader.h
View File

@@ -107,4 +107,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___ASYNC_TILE_DATA_PROVIDER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___ASYNC_TILE_DATA_PROVIDER___H__

2
modules/globebrowsing/tile/chunktile.h
View File

@@ -46,4 +46,4 @@ struct ChunkTilePile {
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNKTILE___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNKTILE___H__

2
modules/globebrowsing/tile/pixelregion.h
View File

@@ -103,4 +103,4 @@ struct PixelRegion {
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___PIXELREGION___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___PIXELREGION___H__

2
modules/globebrowsing/tile/tile.h
View File

@@ -140,4 +140,4 @@ struct Tile {
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE___H__

2
modules/globebrowsing/tile/tiledataset.h
View File

@@ -195,4 +195,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DATASET___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DATASET___H__

2
modules/globebrowsing/tile/tiledatatype.h
View File

@@ -51,4 +51,4 @@ struct TileDataType {
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DATA_TYPE___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DATA_TYPE___H__

2
modules/globebrowsing/tile/tilediskcache.h
View File

@@ -60,4 +60,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DISK_CACHE___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DISK_CACHE___H__

2
modules/globebrowsing/tile/tileprovider/cachingtileprovider.h
View File

@@ -95,4 +95,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CACHING_TILE_PROVIDER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CACHING_TILE_PROVIDER___H__

2
modules/globebrowsing/tile/tileprovider/singleimageprovider.h
View File

@@ -54,4 +54,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___SINGLE_IMAGE_PROVIDER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___SINGLE_IMAGE_PROVIDER___H__

2
modules/globebrowsing/tile/tileprovider/temporaltileprovider.h
View File

@@ -295,4 +295,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TEMPORAL_TILE_PROVIDER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TEMPORAL_TILE_PROVIDER___H__

2
modules/globebrowsing/tile/tileprovider/texttileprovider.h
View File

@@ -134,4 +134,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TEXT_TILE_PROVIDER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TEXT_TILE_PROVIDER___H__

2
modules/globebrowsing/tile/tileprovider/tileprovider.h
View File

@@ -146,4 +146,4 @@ using TileCache = LRUCache<TileHashKey, Tile>;
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER___H__

2
modules/globebrowsing/tile/tileprovider/tileproviderbyindex.h
View File

@@ -54,4 +54,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER_BY_INDEX___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER_BY_INDEX___H__

2
modules/globebrowsing/tile/tileprovider/tileproviderbylevel.h
View File

@@ -54,4 +54,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER_BY_LEVEL___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER_BY_LEVEL___H__

2
modules/globebrowsing/tile/tileselector.h
View File

@@ -49,4 +49,4 @@ public:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_SELECTOR___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_SELECTOR___H__

2
modules/iswa/rendering/datacygnet.h
View File

@@ -113,4 +113,4 @@ private:
} //namespace openspace
#endif //__OPENSPACE_MODULE_ISWA___DATACYGNET___H__
#endif // __OPENSPACE_MODULE_ISWA___DATACYGNET___H__

2
modules/iswa/rendering/dataplane.h
View File

@@ -59,4 +59,4 @@ private:
} // namespace openspace
#endif //__OPENSPACE_MODULE_ISWA___DATAPLANE___H__
#endif // __OPENSPACE_MODULE_ISWA___DATAPLANE___H__

2
modules/iswa/rendering/datasphere.h
View File

@@ -58,4 +58,4 @@ protected:
} // namespace openspace
#endif //__OPENSPACE_MODULE_ISWA___DATASPHERE___H__
#endif // __OPENSPACE_MODULE_ISWA___DATASPHERE___H__

2
modules/iswa/rendering/kameleonplane.h
View File

@@ -106,4 +106,4 @@ private:
} // namespace openspace
#endif //__OPENSPACE_MODULE_ISWA___KAMELEONPLANE___H__
#endif // __OPENSPACE_MODULE_ISWA___KAMELEONPLANE___H__

2
modules/iswa/rendering/screenspacecygnet.h
View File

@@ -56,4 +56,4 @@ private:
} // namespace openspace
#endif //__OPENSPACE_MODULE_ISWA___SCREENSPACECYGNET___H__
#endif // __OPENSPACE_MODULE_ISWA___SCREENSPACECYGNET___H__

2
modules/iswa/rendering/texturecygnet.h
View File

@@ -58,4 +58,4 @@ private:
};
} //namespace openspace
#endif //__OPENSPACE_MODULE_ISWA___TEXTURECYGNET___H__
#endif // __OPENSPACE_MODULE_ISWA___TEXTURECYGNET___H__

2
modules/iswa/util/dataprocessor.h
View File

@@ -78,4 +78,4 @@ protected:
} // namespace openspace
#endif //__OPENSPACE_MODULE_ISWA___DATAPROCESSOR___H__
#endif // __OPENSPACE_MODULE_ISWA___DATAPROCESSOR___H__

4
modules/iswa/util/dataprocessorjson.h
View File

@@ -39,6 +39,6 @@ public:
virtual std::vector<float*> processData(std::string data, properties::SelectionProperty& dataOptions, glm::size3_t& dimensions) override;
};
}// namespace openspace
} // namespace openspace
#endif __OPENSPACE_MODULE_ISWA___DATAPROCESSORJSON___H__
#endif // __OPENSPACE_MODULE_ISWA___DATAPROCESSORJSON___H__

2
modules/iswa/util/dataprocessorkameleon.h
View File

@@ -54,4 +54,4 @@ private:
} // namespace openspace
#endif __OPENSPACE_MODULE_ISWA___DATAPROCESSORKAMELEON___H__
#endif // __OPENSPACE_MODULE_ISWA___DATAPROCESSORKAMELEON___H__

2
modules/iswa/util/dataprocessortext.h
View File

@@ -46,4 +46,4 @@ private:
} // namespace openspace
#endif __OPENSPACE_MODULE_ISWA___DATAPROCESSORTEXT___H__
#endif // __OPENSPACE_MODULE_ISWA___DATAPROCESSORTEXT___H__

2
modules/iswa/util/iswamanager.h
View File

@@ -139,4 +139,4 @@ private:
} //namespace openspace
#endif //__OPENSPACE_MODULE_ISWA___ISWAMANAGER___H__
#endif // __OPENSPACE_MODULE_ISWA___ISWAMANAGER___H__

2
modules/multiresvolume/rendering/multiresvolumeraycaster.h
View File

@@ -95,4 +95,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___MULTIRESVOLUMERAYCASTER___H__
#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___MULTIRESVOLUMERAYCASTER___H__

2
modules/newhorizons/rendering/renderablemodelprojection.h
View File

@@ -110,4 +110,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEMODELPROJECTION___H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEMODELPROJECTION___H__

2
modules/newhorizons/rendering/renderableplanetprojection.h
View File

@@ -103,4 +103,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEPLANETPROJECTION___H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEPLANETPROJECTION___H__

71
modules/newhorizons/rendering/writeToTexture.h
View File

@@ -1,71 +0,0 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* *
* 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 __RENDERABLEPLANET_H__
#define __RENDERABLEPLANET_H__
// open space includes
#include <openspace/rendering/renderable.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/util/updatestructures.h>
// ghoul includes
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/texture.h>
namespace openspace {
namespace planetgeometry {
class PlanetGeometry;
}
class RenderablePlanet : public Renderable {
public:
RenderablePlanet(const ghoul::Dictionary& dictionary);
~RenderablePlanet();
bool initialize() override;
bool deinitialize() override;
void render(const RenderData& data) override;
void update(const UpdateData& data) override;
protected:
void loadTexture();
private:
properties::StringProperty _colorTexturePath;
ghoul::opengl::ProgramObject* _programObject;
ghoul::opengl::Texture* _texture;
planetgeometry::PlanetGeometry* _geometry;
glm::dmat3 _stateMatrix;
std::string _target;
};
} // namespace openspace
#endif // __RENDERABLEPLANET_H__

2
modules/newhorizons/util/hongkangparser.h
View File

@@ -58,4 +58,4 @@ private:
} // namespace openspace
#endif //__OPENSPACE_MODULE_NEWHORIZONS___HONGKANGPARSER___H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___HONGKANGPARSER___H__

2
modules/newhorizons/util/instrumenttimesparser.h
View File

@@ -59,4 +59,4 @@ private:
} // namespace openspace
#endif //__OPENSPACE_MODULE_NEWHORIZONS___INSTRUMENTTIMESPARSER___H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___INSTRUMENTTIMESPARSER___H__

2
modules/newhorizons/util/labelparser.h
View File

@@ -72,4 +72,4 @@ private:
} // namespace openspace
#endif //__OPENSPACE_MODULE_NEWHORIZONS___LABELPARSER___H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___LABELPARSER___H__

2
modules/newhorizons/util/sequenceparser.h
View File

@@ -74,4 +74,4 @@ protected:
} // namespace openspace
#endif //__OPENSPACE_MODULE_NEWHORIZONS___SEQUENCEPARSER___H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___SEQUENCEPARSER___H__

2
modules/onscreengui/include/renderproperties.h
View File

@@ -54,4 +54,4 @@ void renderTriggerProperty(properties::Property* prop, const std::string& ownerN
} // namespace openspace
#endif __OPENSPACE_MODULE_ONSCREENGUI___RENDERPROPERTIES___H__
#endif // __OPENSPACE_MODULE_ONSCREENGUI___RENDERPROPERTIES___H__

2
modules/space/rendering/planetgeometry.h
View File

@@ -53,4 +53,4 @@ protected:
} // namespace planetgeometry
} // namespace openspace
#endif // __OPENSPACE_MODULE_SPACE___PLANETGEOMETRY___H__
#endif // __OPENSPACE_MODULE_SPACE___PLANETGEOMETRY___H__

4
modules/space/rendering/renderableplanet.h
View File

@@ -111,6 +111,6 @@ private:
bool tempPic;
};
} // namespace openspace
} // namespace openspace
#endif // __OPENSPACE_MODULE_SPACE___RENDERABLEPLANET___H__
#endif // __OPENSPACE_MODULE_SPACE___RENDERABLEPLANET___H__

2
modules/space/rendering/renderablestars.h
View File

@@ -105,4 +105,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_MODULE_SPACE___RENDERABLESTARS___H__
#endif // __OPENSPACE_MODULE_SPACE___RENDERABLESTARS___H__

2
modules/toyvolume/rendering/toyvolumeraycaster.h
View File

@@ -77,4 +77,4 @@ private:
} // openspace
#endif // __OPENSPACE_MODULE_TOYVOLUME___TOYVOLUMERAYCASTER___H__
#endif // __OPENSPACE_MODULE_TOYVOLUME___TOYVOLUMERAYCASTER___H__

2
modules/volume/rendering/renderablevolume.h
View File

@@ -60,4 +60,4 @@ private:
} // namespace openspace
#endif
#endif // __RENDERABLEVOLUME_H__

2
modules/volume/rendering/renderablevolumegl.h
View File

@@ -83,4 +83,4 @@ private:
} // namespace openspace
#endif
#endif // __RENDERABLEVOLUMEGL_H__