mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-29 23:39:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

More work on making use of nested namespaces

Browse Source
This commit is contained in:
Alexander Bock
2017-07-16 01:55:35 -04:00
parent 4dba552fd1
commit 26682669ff
160 changed files with 726 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/cache/memoryawaretilecache.cpp
Vendored
+5 -10
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -35,13 +35,11 @@
#include <numeric>
#include <algorithm>
namespace openspace {
namespace globebrowsing {
namespace cache {
namespace {
const char* _loggerCat = "MemoryAwareTileCache";
}
} // namespace
namespace openspace::globebrowsing::cache {
MemoryAwareTileCache::MemoryAwareTileCache()
: PropertyOwner("TileCache")
@@ -309,7 +307,4 @@ bool MemoryAwareTileCache::shouldUsePbo() const {
return _usePbo;
}
} // namespace cache
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::cache
modules/globebrowsing/cache/texturecontainer.cpp
Vendored
+3 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -25,9 +25,7 @@
#include <modules/globebrowsing/cache/texturecontainer.h>
#include <modules/globebrowsing/tile/tiletextureinitdata.h>
namespace openspace {
namespace globebrowsing {
namespace cache {
namespace openspace::globebrowsing::cache {
TextureContainer::TextureContainer(TileTextureInitData initData, size_t numTextures)
: _initData(initData)
@@ -86,6 +84,4 @@ size_t TextureContainer::size() const {
return _textures.size();
};
}
}
}
} // namespace openspace::globebrowsing::cache
modules/globebrowsing/chunk/chunk.cpp
+3 -6
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -32,9 +32,7 @@
#include <modules/globebrowsing/rendering/layer/layergroup.h>
#include <openspace/util/updatestructures.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
const float Chunk::DEFAULT_HEIGHT = 0.0f;
@@ -222,5 +220,4 @@ std::vector<glm::dvec4> Chunk::getBoundingPolyhedronCorners() const {
return corners;
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/chunk/chunklevelevaluator/distanceevaluator.cpp
+3 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -31,9 +31,7 @@
#include <modules/globebrowsing/tile/tileprovider/tileprovider.h>
#include <openspace/util/updatestructures.h>
namespace openspace {
namespace globebrowsing {
namespace chunklevelevaluator {
namespace openspace::globebrowsing::chunklevelevaluator {
int Distance::getDesiredLevel(const Chunk& chunk, const RenderData& data) const {
// Calculations are done in the reference frame of the globe
@@ -71,6 +69,4 @@ int Distance::getDesiredLevel(const Chunk& chunk, const RenderData& data) const
return desiredLevel;
}
} // namespace chunklevelevaluator
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::chunklevelevaluator
modules/globebrowsing/chunk/chunklevelevaluator/projectedareaevaluator.cpp
+3 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -31,9 +31,7 @@
#include <modules/globebrowsing/tile/tileprovider/tileprovider.h>
#include <openspace/util/updatestructures.h>
namespace openspace {
namespace globebrowsing {
namespace chunklevelevaluator {
namespace openspace::globebrowsing::chunklevelevaluator {
int ProjectedArea::getDesiredLevel(const Chunk& chunk, const RenderData& data) const {
// Calculations are done in the reference frame of the globe
@@ -125,6 +123,4 @@ int ProjectedArea::getDesiredLevel(const Chunk& chunk, const RenderData& data) c
return chunk.tileIndex().level + round(scaledArea - 1);
}
} // namespace chunklevelevaluator
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::chunklevelevaluator
modules/globebrowsing/chunk/chunknode.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,8 +29,7 @@
#include <stack>
#include <queue>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
ChunkNode::ChunkNode(const Chunk& chunk, ChunkNode* parent)
: _parent(parent)
@@ -186,5 +185,4 @@ const Chunk& ChunkNode::getChunk() const {
return _chunk;
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/chunk/culling/frustumculler.cpp
+3 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -28,9 +28,7 @@
#include <modules/globebrowsing/globes/renderableglobe.h>
#include <openspace/util/updatestructures.h>
namespace openspace {
namespace globebrowsing {
namespace culling {
namespace openspace::globebrowsing::culling {
FrustumCuller::FrustumCuller(AABB3 viewFrustum)
: _viewFrustum(std::move(viewFrustum))
@@ -59,6 +57,4 @@ bool FrustumCuller::isCullable(const Chunk& chunk, const RenderData& data) {
return !(_viewFrustum.intersects(bounds));
}
} // namespace culling
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::culling
modules/globebrowsing/chunk/culling/horizonculler.cpp
+11 -11
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -28,9 +28,7 @@
#include <modules/globebrowsing/globes/renderableglobe.h>
#include <openspace/util/updatestructures.h>
namespace openspace {
namespace globebrowsing {
namespace culling {
namespace openspace::globebrowsing::culling {
bool HorizonCuller::isCullable(const Chunk& chunk, const RenderData& data) {
// Calculations are done in the reference frame of the globe. Hence, the camera
@@ -58,13 +56,17 @@ bool HorizonCuller::isCullable(const Chunk& chunk, const RenderData& data) {
// real closest point,
glm::dvec3 corners[4];
corners[0] = ellipsoid.cartesianSurfacePosition(
chunk.surfacePatch().getCorner(NORTH_WEST));
chunk.surfacePatch().getCorner(NORTH_WEST)
);
corners[1] = ellipsoid.cartesianSurfacePosition(
chunk.surfacePatch().getCorner(NORTH_EAST));
chunk.surfacePatch().getCorner(NORTH_EAST)
);
corners[2] = ellipsoid.cartesianSurfacePosition(
chunk.surfacePatch().getCorner(SOUTH_WEST));
chunk.surfacePatch().getCorner(SOUTH_WEST)
);
corners[3] = ellipsoid.cartesianSurfacePosition(
chunk.surfacePatch().getCorner(SOUTH_EAST));
chunk.surfacePatch().getCorner(SOUTH_EAST)
);
for (int i = 0; i < 4; ++i) {
float distance = glm::length(cameraPosition - corners[i]);
@@ -100,6 +102,4 @@ bool HorizonCuller::isCullable(const glm::dvec3& cameraPosition,
return distanceToObjectSquared > minimumAllowedDistanceToObjectSquared;
}
} // namespace culling
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::culling
modules/globebrowsing/geometry/ellipsoid.cpp
+7 -12
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -27,8 +27,7 @@
#include <algorithm>
#include <vector>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
Ellipsoid::Ellipsoid(glm::dvec3 radii) : _radii(radii) {
updateInternalCache();
@@ -132,7 +131,7 @@ double Ellipsoid::longitudalDistance(double lat, double lon1, double lon2) const
return meanRadius * std::abs(lon2 - lon1);
}
double Ellipsoid::greatCircleDistance(const Geodetic2& p1, const Geodetic2& p2) const{
double Ellipsoid::greatCircleDistance(const Geodetic2& p1, const Geodetic2& p2) const {
// https://en.wikipedia.org/wiki/Meridian_arc
// https://en.wikipedia.org/wiki/Great-circle_distance#Vector_version
@@ -146,22 +145,19 @@ double Ellipsoid::greatCircleDistance(const Geodetic2& p1, const Geodetic2& p2)
return centralAngle * glm::length(centralNormal);
}
Geodetic2 Ellipsoid::cartesianToGeodetic2(const glm::dvec3& p) const
{
Geodetic2 Ellipsoid::cartesianToGeodetic2(const glm::dvec3& p) const {
glm::dvec3 normal = geodeticSurfaceNormalForGeocentricallyProjectedPoint(p);
return Geodetic2(
asin(normal.z / length(normal)), // Latitude
atan2(normal.y, normal.x)); // Longitude
}
glm::dvec3 Ellipsoid::cartesianSurfacePosition(const Geodetic2& geodetic2) const
{
glm::dvec3 Ellipsoid::cartesianSurfacePosition(const Geodetic2& geodetic2) const {
// Position on surface : height = 0
return cartesianPosition(Geodetic3({ geodetic2, 0 }));
}
glm::dvec3 Ellipsoid::cartesianPosition(const Geodetic3& geodetic3) const
{
glm::dvec3 Ellipsoid::cartesianPosition(const Geodetic3& geodetic3) const {
glm::dvec3 normal = geodeticSurfaceNormal(geodetic3.geodetic2);
glm::dvec3 k = _cached._radiiSquared * normal;
double gamma = sqrt(dot(k, normal));
@@ -169,5 +165,4 @@ glm::dvec3 Ellipsoid::cartesianPosition(const Geodetic3& geodetic3) const
return rSurface + geodetic3.height * normal;
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/geometry/geodetic2.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -24,8 +24,7 @@
#include <modules/globebrowsing/geometry/geodetic2.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
Geodetic2::Geodetic2(double latitude, double longitude)
: lat(latitude)
@@ -60,5 +59,4 @@ Geodetic2 Geodetic2::operator/(double scalar) const {
return Geodetic2(lat / scalar, lon / scalar);
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/geometry/geodeticpatch.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,8 +29,7 @@
#include <ghoul/misc/assert.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
GeodeticPatch::GeodeticPatch(double centerLat, double centerLon, double halfSizeLat,
double halfSizeLon)
@@ -241,5 +240,4 @@ Geodetic2 GeodeticPatch::closestPoint(const Geodetic2& p) const {
return Geodetic2(clampedLat, clampedLon);
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/globebrowsingmodule_lua.inl
+4 -10
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -22,7 +22,6 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/globebrowsing/globes/renderableglobe.h>
#include <modules/globebrowsing/rendering/layer/layermanager.h>
@@ -35,12 +34,10 @@
#include <openspace/scene/scene.h>
#include <openspace/scene/scenegraphnode.h>
namespace openspace {
namespace globebrowsing {
namespace luascriptfunctions {
namespace openspace::globebrowsing::luascriptfunctions {
/**
Adds a layer to the specified globe.
*Adds a layer to the specified globe.
*/
int addLayer(lua_State* L) {
using ghoul::lua::errorLocation;
@@ -176,7 +173,4 @@ int goToGeo(lua_State* L) {
return 0;
}
} // namespace luascriptfunctions
} // nameapace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::luascriptfunctions
modules/globebrowsing/globes/chunkedlodglobe.cpp
+5 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -49,8 +49,7 @@
#include <math.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
const TileIndex ChunkedLodGlobe::LEFT_HEMISPHERE_INDEX = TileIndex(0, 0, 1);
const TileIndex ChunkedLodGlobe::RIGHT_HEMISPHERE_INDEX = TileIndex(1, 0, 1);
@@ -190,8 +189,8 @@ float ChunkedLodGlobe::getHeight(glm::dvec3 position) const {
return 0;
}
ghoul::opengl::Texture* tileTexture = tile.texture();
if (!tileTexture) {
ghoul::opengl::Texture* tileTexture = tile.texture();
if (!tileTexture) {
return 0;
}
@@ -361,5 +360,4 @@ void ChunkedLodGlobe::update(const UpdateData& data) {
_renderer->update();
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/globes/pointglobe.cpp
+4 -6
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -33,8 +33,7 @@
#include <ghoul/opengl/programobject.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
PointGlobe::PointGlobe(const RenderableGlobe& owner)
: _owner(owner)
@@ -69,7 +68,7 @@ bool PointGlobe::initialize() {
glBindVertexArray(_vaoID);
std::array<glm::vec2, 6> quadVertexData = {{
std::array<glm::vec2, 6> quadVertexData = {{
glm::vec2(-1.0f, -1.0f),
glm::vec2(1.0f, -1.0f),
glm::vec2(-1.0f, 1.0f),
@@ -162,5 +161,4 @@ void PointGlobe::render(const RenderData& data) {
_programObject->deactivate();
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/globes/renderableglobe.cpp
+5 -8
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -34,14 +34,12 @@ namespace {
const char* keyRadii = "Radii";
const char* keySegmentsPerPatch = "SegmentsPerPatch";
const char* keyLayers = "Layers";
}
} // namespace
namespace openspace {
using namespace openspace::properties;
using namespace properties;
namespace openspace::globebrowsing {
namespace globebrowsing {
RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
: _debugProperties({
BoolProperty("saveOrThrowCamera", "save or throw camera", false),
@@ -284,5 +282,4 @@ void RenderableGlobe::setSaveCamera(std::shared_ptr<Camera> camera) {
_savedCamera = camera;
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/meshes/grid.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -24,8 +24,7 @@
#include <modules/globebrowsing/meshes/grid.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
Grid::Grid(int xSegments, int ySegments)
: _xSegments(xSegments)
@@ -36,5 +35,4 @@ TriangleSoup& Grid::geometry() {
return *_geometry;
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/meshes/skirtedgrid.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -26,8 +26,7 @@
#include <ghoul/misc/assert.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
SkirtedGrid::SkirtedGrid(unsigned int xSegments, unsigned int ySegments,
TriangleSoup::Positions usePositions,
@@ -172,5 +171,4 @@ std::vector<glm::vec3> SkirtedGrid::createNormals(int xSegments, int ySegments)
return normals;
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/meshes/trianglesoup.cpp
+4 -6
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -27,11 +27,10 @@
#include <ghoul/logging/logmanager.h>
namespace {
const std::string _loggerCat = "TriangleSoup";
const char* _loggerCat = "TriangleSoup";
}
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
TriangleSoup::TriangleSoup(std::vector<unsigned int> elements, Positions usePositions,
TextureCoordinates useTextures, Normals useNormals)
@@ -170,5 +169,4 @@ void TriangleSoup::drawUsingActiveProgram() {
glBindVertexArray(0);
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/other/distanceswitch.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -26,8 +26,7 @@
#include <openspace/rendering/renderable.h>
#include <openspace/util/updatestructures.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
DistanceSwitch::~DistanceSwitch() {}
@@ -73,5 +72,4 @@ void DistanceSwitch::addSwitchValue(std::shared_ptr<Renderable> renderable) {
_renderables.push_back(renderable);
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/other/pixelbuffer.cpp
+5 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -27,9 +27,9 @@
namespace {
const char* _loggerCat = "PixelBuffer";
};
} // namespace
using namespace openspace::globebrowsing;
namespace openspace::globebrowsing {
PixelBuffer::PixelBuffer(size_t numBytes, Usage usage)
: _numBytes(numBytes)
@@ -82,3 +82,5 @@ bool PixelBuffer::isMapped() const {
PixelBuffer::operator GLuint() const {
return _id;
}
} // namespace openspace::globebrowsing
modules/globebrowsing/other/statscollector.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -28,8 +28,7 @@
#include <iomanip>
#include <string>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
StatsCollector::StatsCollector(const std::string& filename, int dumpEveryXRecord,
Enabled enabled, const std::string & delimiter)
@@ -118,5 +117,4 @@ void StatsCollector::writeData() {
ofs.close();
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/other/threadpool.cpp
+4 -8
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -24,12 +24,9 @@
#include <modules/globebrowsing/other/threadpool.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
Worker::Worker(ThreadPool& pool)
: pool(pool)
{}
Worker::Worker(ThreadPool& pool) : pool(pool) {}
void Worker::operator()() {
std::function<void()> task;
@@ -106,5 +103,4 @@ void ThreadPool::clearTasks() {
} // release lock
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/rendering/chunkrenderer.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -33,8 +33,7 @@
#include <modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.h>
#include <openspace/util/updatestructures.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
ChunkRenderer::ChunkRenderer(std::shared_ptr<Grid> grid,
std::shared_ptr<LayerManager> layerManager)
@@ -336,5 +335,4 @@ void ChunkRenderer::renderChunkLocally(const Chunk& chunk, const RenderData& dat
programObject->deactivate();
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace:;globebrowsing
modules/globebrowsing/rendering/gpu/gpuchunktile.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -27,8 +27,7 @@
#include <modules/globebrowsing/tile/chunktile.h>
#include <modules/globebrowsing/tile/tile.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
void GPUChunkTile::setValue(ghoul::opengl::ProgramObject* programObject,
const ChunkTile& chunkTile)
@@ -48,5 +47,4 @@ void GPUChunkTile::deactivate() {
gpuTexture.deactivate();
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/rendering/gpu/gpuchunktilepile.cpp
+3 -6
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -24,9 +24,7 @@
#include <modules/globebrowsing/rendering/gpu/gpuchunktilepile.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
void GPUChunkTilePile::setValue(ghoul::opengl::ProgramObject* programObject,
const ChunkTilePile& chunkTilePile)
@@ -56,5 +54,4 @@ void GPUChunkTilePile::deactivate() {
}
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/rendering/gpu/gpuheightlayer.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -30,8 +30,7 @@
#include <modules/globebrowsing/tile/tiledepthtransform.h>
#include <modules/globebrowsing/tile/tileprovider/tileprovider.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
void GPUHeightLayer::setValue(ghoul::opengl::ProgramObject* programObject,
const Layer& layer, const TileIndex& tileIndex,
@@ -49,5 +48,4 @@ void GPUHeightLayer::bind(ghoul::opengl::ProgramObject* programObject, const Lay
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/rendering/gpu/gpulayer.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -26,8 +26,7 @@
#include <modules/globebrowsing/rendering/layer/layer.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
void GPULayer::setValue(ghoul::opengl::ProgramObject* programObject, const Layer& layer,
const TileIndex& tileIndex, int pileSize)
@@ -84,5 +83,4 @@ void GPULayer::deactivate() {
gpuChunkTilePile.deactivate();
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/rendering/gpu/gpulayeradjustment.cpp
+6 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -25,8 +25,7 @@
#include <modules/globebrowsing/rendering/gpu/gpulayeradjustment.h>
#include <modules/globebrowsing/rendering/layer/layeradjustment.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
void GPULayerAdjustment::setValue(ghoul::opengl::ProgramObject* programObject,
const LayerAdjustment& layerAdjustment)
@@ -44,8 +43,9 @@ void GPULayerAdjustment::setValue(ghoul::opengl::ProgramObject* programObject,
}
}
void GPULayerAdjustment::bind(const LayerAdjustment& layerAdjustment, ghoul::opengl::ProgramObject* programObject,
const std::string& nameBase)
void GPULayerAdjustment::bind(const LayerAdjustment& layerAdjustment,
ghoul::opengl::ProgramObject* programObject,
const std::string& nameBase)
{
switch (layerAdjustment.type()) {
case layergroupid::AdjustmentTypeID::None:
@@ -60,5 +60,4 @@ void GPULayerAdjustment::bind(const LayerAdjustment& layerAdjustment, ghoul::ope
}
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/rendering/gpu/gpulayergroup.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -28,8 +28,7 @@
#include <modules/globebrowsing/rendering/layer/layermanager.h>
#include <modules/globebrowsing/rendering/gpu/gpuheightlayer.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
void GPULayerGroup::setValue(ghoul::opengl::ProgramObject* programObject,
const LayerGroup& layerGroup, const TileIndex& tileIndex)
@@ -77,5 +76,4 @@ void GPULayerGroup::deactivate() {
}
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/rendering/gpu/gpulayermanager.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -26,8 +26,7 @@
#include <modules/globebrowsing/rendering/layer/layermanager.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
void GPULayerManager::setValue(ghoul::opengl::ProgramObject* programObject,
const LayerManager& layerManager,
@@ -62,5 +61,4 @@ void GPULayerManager::deactivate() {
}
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/rendering/gpu/gpulayerrendersettings.cpp
+5 -6
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -26,8 +26,7 @@
#include <modules/globebrowsing/rendering/layer/layerrendersettings.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
void GPULayerRenderSettings::setValue(ghoul::opengl::ProgramObject* programObject,
const LayerRenderSettings& layerSettings)
@@ -42,7 +41,8 @@ void GPULayerRenderSettings::setValue(ghoul::opengl::ProgramObject* programObjec
}
}
void GPULayerRenderSettings::bind(const LayerRenderSettings& layerSettings, ghoul::opengl::ProgramObject* programObject,
void GPULayerRenderSettings::bind(const LayerRenderSettings& layerSettings,
ghoul::opengl::ProgramObject* programObject,
const std::string& nameBase)
{
gpuOpacity.bind(programObject, nameBase + "opacity");
@@ -55,5 +55,4 @@ void GPULayerRenderSettings::bind(const LayerRenderSettings& layerSettings, ghou
}
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/rendering/gpu/gputiledepthtransform.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -26,8 +26,7 @@
#include <modules/globebrowsing/tile/tiledepthtransform.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
void GPUTileDepthTransform::setValue(ghoul::opengl::ProgramObject* programObject,
const TileDepthTransform& depthTransform)
@@ -43,5 +42,4 @@ void GPUTileDepthTransform::bind(ghoul::opengl::ProgramObject* programObject,
_gpuDepthScale.bind(programObject, nameBase + "depthScale");
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/rendering/gpu/gputileuvtransform.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -30,8 +30,7 @@
//#include <modules/globebrowsing/tile/tiledepthtransform.h>
#include <modules/globebrowsing/tile/tileprovider/tileprovider.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
void GPUTileUvTransform::setValue(ghoul::opengl::ProgramObject* programObject,
const TileUvTransform& tileUvTransform)
@@ -47,5 +46,4 @@ void GPUTileUvTransform::bind(ghoul::opengl::ProgramObject* programObject,
_gpuUvScale.bind(programObject, nameBase + "uvScale");
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/rendering/layer/layer.cpp
+4 -6
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -26,8 +26,7 @@
#include <modules/globebrowsing/tile/tileprovider/tileprovider.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
namespace {
const char* _loggerCat = "Layer";
@@ -38,7 +37,7 @@ namespace {
const char* keySettings = "Settings";
const char* keyAdjustment = "Adjustment";
const char* KeyBlendMode = "BlendMode";
}
} // namespace
Layer::Layer(layergroupid::GroupID id, const ghoul::Dictionary& layerDict)
: properties::PropertyOwner(layerDict.value<std::string>(keyName))
@@ -322,5 +321,4 @@ void Layer::removeVisibleProperties() {
}
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/rendering/layer/layeradjustment.cpp
+5 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -24,14 +24,13 @@
#include <modules/globebrowsing/rendering/layer/layeradjustment.h>
namespace openspace {
namespace globebrowsing {
namespace {
const char* keyType = "Type";
const char* keyChromaKeyColor = "ChromaKeyColor";
const char* keyChromaKeyTolerance = "ChromaKeyTolerance";
}
} // namespace
namespace openspace::globebrowsing {
LayerAdjustment::LayerAdjustment()
: properties::PropertyOwner("adjustment")
@@ -130,5 +129,4 @@ void LayerAdjustment::onChange(std::function<void(void)> callback) {
_onChangeCallback = std::move(callback);
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/rendering/layer/layergroup.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -30,8 +30,7 @@ namespace {
const char* _loggerCat = "LayerGroup";
}
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
LayerGroup::LayerGroup(layergroupid::GroupID id)
: properties::PropertyOwner(std::move(layergroupid::LAYER_GROUP_NAMES[id]))
@@ -125,5 +124,4 @@ void LayerGroup::onChange(std::function<void(void)> callback) {
}
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/rendering/layer/layermanager.cpp
+12 -14
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -28,23 +28,22 @@
#include <modules/globebrowsing/tile/tileprovider/tileprovider.h>
#include <modules/globebrowsing/globes/chunkedlodglobe.h>
namespace openspace {
namespace globebrowsing {
namespace {
const char* _loggerCat = "LayerManager";
}
const char* _loggerCat = "LayerManager";
} // namespace
namespace openspace::globebrowsing {
LayerManager::LayerManager(const ghoul::Dictionary& layerGroupsDict)
: properties::PropertyOwner("Layers")
{
// First create empty layer groups in case not all are specified
// First create empty layer groups in case not all are specified
_layerGroups.resize(layergroupid::NUM_LAYER_GROUPS);
for (int i = 0; i < _layerGroups.size(); ++i) {
ghoul::Dictionary emptyDict;
ghoul::Dictionary emptyDict;
_layerGroups[i] = std::make_shared<LayerGroup>(
static_cast<layergroupid::GroupID>(i), emptyDict
);
static_cast<layergroupid::GroupID>(i), emptyDict
);
}
std::vector<std::string> layerGroupNamesInDict = layerGroupsDict.keys();
@@ -57,8 +56,8 @@ LayerManager::LayerManager(const ghoul::Dictionary& layerGroupsDict)
if (groupId != layergroupid::GroupID::Unknown) {
ghoul::Dictionary layerGroupDict =
layerGroupsDict.value<ghoul::Dictionary>(groupName);
_layerGroups[static_cast<int>(groupId)] =
std::make_shared<LayerGroup>(groupId, layerGroupDict);
_layerGroups[static_cast<int>(groupId)] =
std::make_shared<LayerGroup>(groupId, layerGroupDict);
}
else {
LWARNING("Unknown layer group: " + groupName);
@@ -170,5 +169,4 @@ void LayerManager::onChange(std::function<void(void)> callback) {
}
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/rendering/layer/layerrendersettings.cpp
+5 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -24,16 +24,15 @@
#include <modules/globebrowsing/rendering/layer/layerrendersettings.h>
namespace openspace {
namespace globebrowsing {
namespace {
const char* keyOpacity = "Opacity";
const char* keyGamma = "Gamma";
const char* keyMultiplier = "Multiplier";
const char* keyOffset = "Offset";
const char* keyValueBlending = "ValueBlending";
}
} // namespace
namespace openspace::globebrowsing {
LayerRenderSettings::LayerRenderSettings()
: properties::PropertyOwner("Settings")
@@ -112,5 +111,4 @@ void LayerRenderSettings::setDefaultValues() {
valueBlending = 1.f;
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/rendering/layershadermanager.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -35,8 +35,7 @@
#include <ghoul/opengl/programobject.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
bool LayerShaderManager::LayerShaderPreprocessingData::LayerGroupPreprocessingData::operator==(
const LayerGroupPreprocessingData& other) const {
@@ -231,5 +230,4 @@ bool LayerShaderManager::updatedOnLastCall() {
return _updatedOnLastCall;
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/tile/pixelregion.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -26,8 +26,7 @@
#include <ghoul/misc/assert.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
PixelRegion::PixelRegion(const PixelCoordinate& pixelStart,
const PixelRange& numberOfPixels)
@@ -278,5 +277,4 @@ bool PixelRegion::equals(const PixelRegion& r) const {
return start == r.start && numPixels == r.numPixels;
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/tile/rawtile.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -27,8 +27,7 @@
#include <modules/globebrowsing/tile/tilemetadata.h>
#include <modules/globebrowsing/tile/tiletextureinitdata.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
RawTile::RawTile()
: imageData(nullptr)
@@ -48,5 +47,4 @@ RawTile RawTile::createDefault(const TileTextureInitData& initData) {
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.cpp
+7 -8
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -21,6 +21,7 @@
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifdef GLOBEBROWSING_USE_GDAL
#include <modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.h>
@@ -45,11 +46,10 @@
#include <algorithm>
namespace {
const std::string _loggerCat = "GdalRawTileDataReader";
const char* _loggerCat = "GdalRawTileDataReader";
}
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
std::ostream& operator<<(std::ostream& os, const PixelRegion& pr) {
return os << pr.start.x << ", " << pr.start.y << " with size " << pr.numPixels.x <<
@@ -337,8 +337,8 @@ RawTile::ReadError GdalRawTileDataReader::rasterRead(
dataDest += io.write.region.start.x * _initData.bytesPerPixel();
GDALRasterBand* gdalRasterBand = _dataset->GetRasterBand(rasterBand);
CPLErr readError = CE_Failure;
readError = gdalRasterBand->RasterIO(
CPLErr readError = CE_Failure;
readError = gdalRasterBand->RasterIO(
GF_Read,
io.read.region.start.x, // Begin read x
io.read.region.start.y, // Begin read y
@@ -397,7 +397,6 @@ int GdalRawTileDataReader::calculateTileLevelDifference(int minimumPixelSize) co
return diff;
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
#endif // GLOBEBROWSING_USE_GDAL
modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp
+4 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -37,10 +37,9 @@
namespace {
const char* _loggerCat = "GdalWrapper";
}
} // namespace
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
void gdalErrorHandler(CPLErr eErrClass, int errNo, const char *msg) {
if (GdalWrapper::ref().logGdalErrors()) {
@@ -183,8 +182,6 @@ void GdalWrapper::setGdalProxyConfiguration() {
}
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
#endif // GLOBEBROWSING_USE_GDAL
modules/globebrowsing/tile/rawtiledatareader/iodescription.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -26,8 +26,7 @@
#include <modules/globebrowsing/tile/pixelregion.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
IODescription IODescription::cut(PixelRegion::Side side, int pos) {
PixelRegion readPreCut = read.region;
@@ -62,5 +61,4 @@ IODescription IODescription::cut(PixelRegion::Side side, int pos) {
return whatCameOff;
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -53,8 +53,7 @@
#define _USE_MATH_DEFINES
#include <math.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
const PixelRegion RawTileDataReader::padding = PixelRegion(
TileTextureInitData::tilePixelStartOffset,
@@ -410,5 +409,4 @@ RawTile::ReadError RawTileDataReader::postProcessErrorCheck(
return RawTile::ReadError::None;
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/tile/rawtiledatareader/simplerawtiledatareader.cpp
+5 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -38,11 +38,10 @@
#include <ghoul/io/texture/texturereader.h>
namespace {
const std::string _loggerCat = "SimpleRawTileDataReader";
}
const char* _loggerCat = "SimpleRawTileDataReader";
} // namespace
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
SimpleRawTileDataReader::SimpleRawTileDataReader(const std::string& filePath,
const TileTextureInitData& initData,
@@ -160,5 +159,4 @@ RawTile::ReadError SimpleRawTileDataReader::rasterRead(
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp
+4 -8
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -42,11 +42,9 @@
namespace {
const char* _loggerCat = "TileDataType";
}
} // namespace
namespace openspace {
namespace globebrowsing {
namespace tiledatatype {
namespace openspace::globebrowsing::tiledatatype {
#ifdef GLOBEBROWSING_USE_GDAL
@@ -618,6 +616,4 @@ GLenum glTextureFormat(GLenum glType, ghoul::opengl::Texture::Format format) {
}
}
} // namespace tiledatatype
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::tiledatatype
modules/globebrowsing/tile/tile.cpp
+5 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -28,11 +28,10 @@
#include <modules/globebrowsing/tile/tilemetadata.h>
namespace {
const std::string _loggerCat = "Tile";
}
const char* _loggerCat = "Tile";
} // namespace
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
const Tile Tile::TileUnavailable = Tile(nullptr, nullptr, Tile::Status::Unavailable);
@@ -65,5 +64,4 @@ glm::vec2 Tile::TileUvToTextureSamplePosition(const TileUvTransform& uvTransform
return uv;
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/tile/tileindex.cpp
+4 -6
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -34,10 +34,9 @@ namespace {
const char* KeyLevel = "Level";
const char* KeyX = "X";
const char* KeyY = "Y";
}
} // namespace
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
TileIndex::TileIndex(int x, int y, int level)
: x(x), y(y), level(level)
@@ -154,5 +153,4 @@ std::ostream& operator<<(std::ostream& os, const TileIndex& ci) {
return os;
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/tile/tileloadjob.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -26,8 +26,7 @@
#include <modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
TileLoadJob::TileLoadJob(std::shared_ptr<RawTileDataReader> rawTileDataReader,
const TileIndex& tileIndex)
@@ -75,5 +74,4 @@ bool TileLoadJob::hasOwnershipOfData() const {
return _hasOwnershipOfData;
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/tile/tilemetadata.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -24,8 +24,7 @@
#include <modules/globebrowsing/tile/tilemetadata.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
void TileMetaData::serialize(std::ostream& os) {
os << maxValues.size() << std::endl;
@@ -54,5 +53,4 @@ TileMetaData TileMetaData::deserialize(std::istream& is) {
return res;
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/globebrowsing/tile/tileprovider/defaulttileprovider.cpp
+3 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -51,9 +51,7 @@ namespace {
const char* KeyPreCacheLevel = "PreCacheLevel";
}
namespace openspace {
namespace globebrowsing {
namespace tileprovider {
namespace openspace::globebrowsing::tileprovider {
DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary)
: TileProvider(dictionary)
@@ -249,6 +247,4 @@ TileDepthTransform DefaultTileProvider::depthTransform() {
}
}
} // namespace tileprovider
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::tileprovider
modules/globebrowsing/tile/tileprovider/singleimageprovider.cpp
+4 -8
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -30,11 +30,9 @@
namespace {
const char* KeyFilePath = "FilePath";
}
} // namespace
namespace openspace {
namespace globebrowsing {
namespace tileprovider {
namespace openspace::globebrowsing::tileprovider {
SingleImageProvider::SingleImageProvider(const ghoul::Dictionary& dictionary)
: _tile(nullptr, nullptr, Tile::Status::Unavailable)
@@ -98,6 +96,4 @@ int SingleImageProvider::maxLevel() {
return 1337; // unlimited
}
} // namespace tileprovider
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::tileprovider
modules/globebrowsing/tile/tileprovider/sizereferencetileprovider.cpp
+5 -12
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -36,21 +36,16 @@
#include <ghoul/io/texture/texturereader.h>
#include <ghoul/misc/dictionary.h>
using namespace ghoul::fontrendering;
namespace openspace {
namespace globebrowsing {
namespace tileprovider {
namespace {
const char* KeyRadii = "Radii";
}
} // namespace
namespace openspace::globebrowsing::tileprovider {
SizeReferenceTileProvider::SizeReferenceTileProvider(const ghoul::Dictionary& dictionary)
: TextTileProvider(LayerManager::getTileTextureInitData(layergroupid::GroupID::ColorLayers))
, _backgroundTile(Tile::TileUnavailable)
{
_fontSize = 50;
_font = OsEng.fontManager().font("Mono", _fontSize);
@@ -114,6 +109,4 @@ TileIndex::TileHashKey SizeReferenceTileProvider::toHash(const TileIndex& tileIn
return key;
}
} // namespace tileprovider
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::tileprovider
modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
+6 -10
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -36,17 +36,15 @@
#include <fstream>
namespace {
const std::string _loggerCat = "TemporalTileProvider";
const char* _loggerCat = "TemporalTileProvider";
const char* KeyFilePath = "FilePath";
const char* KeyBasePath = "BasePath";
const char* KeyPreCacheStartTime = "PreCacheStartTime";
const char* KeyPreCacheEndTime = "PreCacheEndTime";
}
} // namespace
namespace openspace {
namespace globebrowsing {
namespace tileprovider {
namespace openspace::globebrowsing::tileprovider {
const char* TemporalTileProvider::URL_TIME_PLACEHOLDER("${OpenSpaceTimeId}");
@@ -284,7 +282,7 @@ std::shared_ptr<TileProvider> TemporalTileProvider::getTileProvider(const Time&
std::shared_ptr<TileProvider> TemporalTileProvider::getTileProvider(
const TimeKey& timekey)
{
std::unordered_map<TimeKey, std::shared_ptr<TileProvider>>::iterator it = _tileProviderMap.find(timekey);
std::unordered_map<TimeKey, std::shared_ptr<TileProvider>>::iterator it = _tileProviderMap.find(timekey);
if (it != _tileProviderMap.end()) {
return it->second;
}
@@ -481,8 +479,6 @@ std::vector<Time> TimeQuantizer::quantized(const Time& start, const Time& end) c
return result;
}
} // namespace tileprovider
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::tileprovider
#endif // GLOBEBROWSING_USE_GDAL
modules/globebrowsing/tile/tileprovider/texttileprovider.cpp
+3 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -40,9 +40,7 @@
using namespace ghoul::fontrendering;
namespace openspace {
namespace globebrowsing {
namespace tileprovider {
namespace openspace::globebrowsing::tileprovider {
TextTileProvider::TextTileProvider(const TileTextureInitData& initData, size_t fontSize)
: _initData(initData)
@@ -136,6 +134,4 @@ TileIndex::TileHashKey TextTileProvider::toHash(const TileIndex& tileIndex) cons
return tileIndex.hashKey();
}
} // namespace tileprovider
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::tileprovider
modules/globebrowsing/tile/tileprovider/tileindextileprovider.cpp
+9 -10
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -28,13 +28,13 @@
#include <ghoul/font/fontrenderer.h>
namespace openspace {
namespace globebrowsing {
namespace tileprovider {
namespace openspace::globebrowsing::tileprovider {
TileIndexTileProvider::TileIndexTileProvider(const ghoul::Dictionary& dict)
: TextTileProvider(LayerManager::getTileTextureInitData(layergroupid::GroupID::ColorLayers))
{ }
: TextTileProvider(LayerManager::getTileTextureInitData(
layergroupid::GroupID::ColorLayers
))
{}
void TileIndexTileProvider::renderText(const ghoul::fontrendering::FontRenderer&
fontRenderer, const TileIndex& tileIndex) const
@@ -42,7 +42,8 @@ void TileIndexTileProvider::renderText(const ghoul::fontrendering::FontRenderer&
fontRenderer.render(
*_font,
glm::vec2(
_initData.dimensionsWithPadding().x / 4 - (_initData.dimensionsWithPadding().x / 32) * log10(1 << tileIndex.level),
_initData.dimensionsWithPadding().x / 4 -
(_initData.dimensionsWithPadding().x / 32) * log10(1 << tileIndex.level),
_initData.dimensionsWithPadding().y / 2 + _fontSize),
glm::vec4(1.0, 1.0, 1.0, 1.0),
glm::vec4(1.0, 1.0, 1.0, 1.0),
@@ -51,6 +52,4 @@ void TileIndexTileProvider::renderText(const ghoul::fontrendering::FontRenderer&
);
}
} // namespace tileprovider
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::tileprovider
modules/globebrowsing/tile/tileprovider/tileprovider.cpp
+3 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -34,9 +34,7 @@
#include <climits>
namespace openspace {
namespace globebrowsing {
namespace tileprovider {
namespace openspace::globebrowsing::tileprovider {
unsigned int TileProvider::_numTileProviders = 0;
@@ -189,6 +187,4 @@ Tile TileProvider::getDefaultTile() const {
return _defaultTile;
}
} // namespace tileprovider
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::tileprovider
modules/globebrowsing/tile/tileprovider/tileproviderbyindex.cpp
+5 -9
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -27,17 +27,15 @@
#include <ghoul/misc/dictionary.h>
namespace {
const std::string _loggerCat = "TileProviderByIndex";
const char* _loggerCat = "TileProviderByIndex";
const char* KeyDefaultProvider = "DefaultProvider";
const char* KeyProviders = "IndexTileProviders";
const char* KeyTileIndex = "TileIndex";
const char* KeyTileProvider = "TileProvider";
}
} // namespace
namespace openspace {
namespace globebrowsing {
namespace tileprovider {
namespace openspace::globebrowsing::tileprovider {
TileProviderByIndex::TileProviderByIndex(const ghoul::Dictionary& dictionary) {
ghoul::Dictionary defaultProviderDict = dictionary.value<ghoul::Dictionary>(
@@ -141,6 +139,4 @@ TileProvider* TileProviderByIndex::indexProvider(const TileIndex& tileIndex) con
return (it != _tileProviderMap.end()) ? it->second.get() : nullptr;
}
} // namespace tileprovider
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::tileprovider
modules/globebrowsing/tile/tileprovider/tileproviderbylevel.cpp
+5 -10
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -35,14 +35,11 @@ namespace {
const char* KeyMaxLevel = "MaxLevel";
const char* KeyTileProvider = "TileProvider";
const char* KeyLayerGroupID = "LayerGroupID";
}
} // namespace
namespace openspace {
namespace globebrowsing {
namespace tileprovider {
namespace openspace::globebrowsing::tileprovider {
TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary)
{
TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
std::string name = "Name unspecified";
dictionary.getValue("Name", name);
@@ -181,6 +178,4 @@ TileProvider* TileProviderByLevel::levelProvider(int level) const {
}
}
} // namespace tileprovider
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::tileprovider
modules/globebrowsing/tile/tileselector.cpp
+7 -10
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -28,12 +28,11 @@
#include <modules/globebrowsing/tile/tileprovider/tileprovider.h>
#include <modules/globebrowsing/rendering/layer/layerrendersettings.h>
namespace openspace {
namespace globebrowsing {
namespace tileselector {
namespace openspace::globebrowsing::tileselector {
ChunkTile getHighestResolutionTile(const LayerGroup& layerGroup,
const TileIndex& tileIndex) {
const TileIndex& tileIndex)
{
TileUvTransform uvTransform;
uvTransform.uvScale.x = 0;
ChunkTile mostHighResolution{
@@ -76,7 +75,7 @@ std::vector<ChunkTile> getTilesSortedByHighestResolution(const LayerGroup& layer
}
std::vector<std::pair<ChunkTile, const LayerRenderSettings*> >
std::vector<std::pair<ChunkTile, const LayerRenderSettings*>>
getTilesAndSettingsSortedByHighestResolution(const LayerGroup& layerGroup,
const TileIndex& tileIndex)
{
@@ -98,7 +97,7 @@ getTilesAndSettingsSortedByHighestResolution(const LayerGroup& layerGroup,
return tilesAndSettings;
}
std::vector<std::pair<ChunkTile, const LayerRenderSettings*> >
std::vector<std::pair<ChunkTile, const LayerRenderSettings*>>
getTilesAndSettingsUnsorted(const LayerGroup& layerGroup,
const TileIndex& tileIndex)
{
@@ -123,6 +122,4 @@ void ascendToParent(TileIndex& tileIndex, TileUvTransform& uv) {
--tileIndex;
}
} // namespace tileselector¢
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::tileselector
modules/globebrowsing/tile/tiletextureinitdata.cpp
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -25,8 +25,7 @@
#include <modules/globebrowsing/tile/tiletextureinitdata.h>
#include <modules/globebrowsing/tile/rawtiledatareader/tiledatatype.h>
namespace openspace {
namespace globebrowsing {
namespace openspace::globebrowsing {
const glm::ivec2 TileTextureInitData::tilePixelStartOffset = glm::ivec2(-2);
const glm::ivec2 TileTextureInitData::tilePixelSizeDifference = glm::ivec2(4);
@@ -148,5 +147,4 @@ unsigned int TileTextureInitData::getUniqueIdFromTextureFormat(
}
}
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing
modules/iswa/rendering/dataplane.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -28,8 +28,8 @@
#include <ghoul/opengl/programobject.h>
namespace {
const std::string _loggerCat = "DataPlane";
}
const char* _loggerCat = "DataPlane";
} // namespace
namespace openspace {
modules/iswa/rendering/datasphere.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -34,8 +34,8 @@
#endif
namespace {
const std::string _loggerCat = "DataSphere";
}
const char* _loggerCat = "DataSphere";
} // namespace
namespace openspace {
modules/iswa/rendering/datasphere.h
+2 -1
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -28,6 +28,7 @@
#include <modules/iswa/rendering/datacygnet.h>
namespace openspace {
class PowerScaledSphere;
/**
modules/iswa/rendering/iswabasegroup.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -36,9 +36,9 @@
#include <modules/iswa/rendering/kameleonplane.h>
namespace {
const std::string _loggerCat = "IswaBaseGroup";
const char* _loggerCat = "IswaBaseGroup";
using json = nlohmann::json;
}
} // namespace
namespace openspace {
modules/iswa/rendering/iswabasegroup.h
+2 -2
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -37,8 +37,8 @@
#include <modules/iswa/util/iswamanager.h>
#include <modules/iswa/util/dataprocessor.h>
namespace openspace {
class IswaCygnet;
class IswaBaseGroup : public properties::PropertyOwner{
modules/iswa/rendering/iswacygnet.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -34,8 +34,8 @@
#include <ghoul/opengl/programobject.h>
namespace {
const std::string _loggerCat = "IswaCygnet";
}
const char* _loggerCat = "IswaCygnet";
} // namespace
namespace openspace {
modules/iswa/rendering/iswacygnet.h
+2 -1
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -44,6 +44,7 @@
#include <modules/iswa/rendering/iswakameleongroup.h>
namespace openspace {
class IswaBaseGroup;
struct Metadata {
modules/iswa/rendering/iswadatagroup.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -36,9 +36,9 @@
#include <modules/iswa/rendering/kameleonplane.h>
namespace {
const std::string _loggerCat = "IswaDataGroup";
const char* _loggerCat = "IswaDataGroup";
using json = nlohmann::json;
}
} // namespace
namespace openspace{
IswaDataGroup::IswaDataGroup(std::string name, std::string type)
modules/iswa/rendering/iswakameleongroup.cpp
+2 -2
View File
@@ -36,9 +36,9 @@
#include <modules/iswa/rendering/kameleonplane.h>
namespace {
const std::string _loggerCat = "IswaDataGroup";
const char* _loggerCat = "IswaDataGroup";
using json = nlohmann::json;
}
} // namespace
namespace openspace{
IswaKameleonGroup::IswaKameleonGroup(std::string name, std::string type)
modules/iswa/rendering/iswakameleongroup.h
+2 -1
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -28,6 +28,7 @@
#include <modules/iswa/rendering/iswadatagroup.h>
namespace openspace {
class IswaKameleonGroup : public IswaDataGroup{
public:
IswaKameleonGroup(std::string name, std::string type);
modules/iswa/rendering/kameleonplane.cpp
+2 -2
View File
@@ -32,8 +32,8 @@
namespace {
using json = nlohmann::json;
const std::string _loggerCat = "KameleonPlane";
}
const char* _loggerCat = "KameleonPlane";
} // namespace
namespace openspace {
modules/iswa/rendering/screenspacecygnet.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -30,8 +30,8 @@
#include <openspace/engine/openspaceengine.h>
namespace {
const std::string _loggerCat = "ScreenSpaceCygnet";
}
const char* _loggerCat = "ScreenSpaceCygnet";
} // namespace
namespace openspace {
modules/iswa/rendering/screenspacecygnet.h
+2 -2
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -33,7 +33,7 @@
#include <openspace/engine/downloadmanager.h>
#include <modules/iswa/util/iswamanager.h>
namespace openspace{
namespace openspace {
class ScreenSpaceCygnet : public ScreenSpaceImage {
public:
modules/iswa/rendering/texturecygnet.cpp
+5 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -27,10 +27,10 @@
#include <ghoul/io/texture/texturereader.h>
namespace {
const std::string _loggerCat = "TextureCygnet";
}
const char* _loggerCat = "TextureCygnet";
} // namespace
namespace openspace{
namespace openspace {
TextureCygnet::TextureCygnet(const ghoul::Dictionary& dictionary)
:IswaCygnet(dictionary)
@@ -38,7 +38,7 @@ TextureCygnet::TextureCygnet(const ghoul::Dictionary& dictionary)
registerProperties();
}
TextureCygnet::~TextureCygnet(){}
TextureCygnet::~TextureCygnet() {}
bool TextureCygnet::updateTexture() {
modules/iswa/rendering/textureplane.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,8 +29,8 @@
#include <ghoul/opengl/programobject.h>
namespace {
const std::string _loggerCat = "TexturePlane";
}
const char* _loggerCat = "TexturePlane";
} // namespace
namespace openspace {
modules/iswa/util/dataprocessor.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -28,8 +28,8 @@
#include <fstream>
namespace {
const std::string _loggerCat = "DataProcessor";
}
const char* _loggerCat = "DataProcessor";
} // namespace
namespace openspace {
modules/iswa/util/dataprocessorjson.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,9 +29,9 @@
#include <modules/iswa/ext/json/json.hpp>
namespace {
const std::string _loggerCat = "DataProcessorJson";
const char* _loggerCat = "DataProcessorJson";
using json = nlohmann::json;
}
} // namespace
namespace openspace {
modules/iswa/util/dataprocessorkameleon.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -27,8 +27,8 @@
#include <ghoul/filesystem/filesystem.h>
namespace {
const std::string _loggerCat = "DataProcessorKameleon";
}
const char* _loggerCat = "DataProcessorKameleon";
} // namespace
namespace openspace {
modules/iswa/util/dataprocessortext.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -33,8 +33,8 @@
//#include <boost/spirit/include/phoenix_stl.hpp>
namespace {
const std::string _loggerCat = "DataProcessorText";
}
const char* _loggerCat = "DataProcessorText";
} // namespace
namespace openspace{
modules/iswa/util/iswamanager.cpp
+5 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -51,12 +51,12 @@
namespace {
using json = nlohmann::json;
const std::string _loggerCat = "IswaManager";
std::string baseUrl = "https://iswa-demo-server.herokuapp.com/";
const char* _loggerCat = "IswaManager";
const char* baseUrl = "https://iswa-demo-server.herokuapp.com/";
//const std::string baseUrl = "http://128.183.168.116:3000/";
}
} // namespace
namespace openspace{
namespace openspace {
IswaManager::IswaManager()
: properties::PropertyOwner("IswaManager")
modules/iswa/util/iswamanager.h
+2 -1
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -50,6 +50,7 @@
namespace openspace {
class IswaBaseGroup;
class IswaCygnet;
modules/kameleon/include/kameleonwrapper.h
+2 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -35,7 +35,7 @@ namespace ccmc {
class Kameleon;
class Model;
class Interpolator;
}
} // namespace ccmc
namespace openspace {
@@ -51,7 +51,6 @@ struct LinePoint {
class KameleonWrapper {
public:
enum class Model {
OpenGGCM,
BATSRUS, // Magnetosphere
modules/kameleonvolume/kameleonvolumemodule.cpp
+3 -6
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -46,13 +46,10 @@ void KameleonVolumeModule::internalInitialize() {
ghoul_assert(fTask, "No task factory existed");
fTask->registerClass<KameleonMetadataToJsonTask>("KameleonMetadataToJsonTask");
fTask->registerClass<KameleonDocumentationTask>("KameleonDocumentationTask");
}
std::vector<documentation::Documentation> KameleonVolumeModule::documentations() const
{
return std::vector<documentation::Documentation>{KameleonMetadataToJsonTask::documentation()};
std::vector<documentation::Documentation> KameleonVolumeModule::documentations() const {
return { KameleonMetadataToJsonTask::documentation() };
}
} // namespace openspace
modules/kameleonvolume/kameleonvolumereader.cpp
+2 -2
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -34,7 +34,7 @@
namespace {
const char* _loggerCat = "KameleonVolumeReader";
}
} // namespace
namespace openspace {
modules/kameleonvolume/kameleonvolumereader.h
+2 -4
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -33,9 +33,7 @@
#include <ccmc/Kameleon.h>
#include <ccmc/Interpolator.h>
namespace ccmc {
class Model;
}
namespace ccmc { class Model; }
namespace openspace {
modules/kameleonvolume/rendering/kameleonvolumeraycaster.cpp
+2 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -34,13 +34,12 @@
#include <openspace/rendering/renderable.h>
#include <modules/kameleonvolume/rendering/renderablekameleonvolume.h>
namespace {
const char* GlslRaycastPath = "${MODULES}/kameleonvolume/shaders/raycast.glsl";
const char* GlslHelperPath = "${MODULES}/kameleonvolume/shaders/helper.glsl";
const char* GlslBoundsVsPath = "${MODULES}/kameleonvolume/shaders/boundsvs.glsl";
const char* GlslBoundsFsPath = "${MODULES}/kameleonvolume/shaders/boundsfs.glsl";
}
} // namespace
namespace openspace {
modules/kameleonvolume/rendering/kameleonvolumeraycaster.h
+5 -8
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -39,12 +39,10 @@
#include <modules/volume/volumegridtype.h>
namespace ghoul {
namespace opengl {
class Texture;
class ProgramObject;
class TextureUnit;
}
namespace ghoul::opengl {
class Texture;
class ProgramObject;
class TextureUnit;
}
namespace openspace {
@@ -54,7 +52,6 @@ struct RaycastData;
class KameleonVolumeRaycaster : public VolumeRaycaster {
public:
KameleonVolumeRaycaster(
std::shared_ptr<ghoul::opengl::Texture> texture,
std::shared_ptr<TransferFunction> transferFunction,
modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+2 -4
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -43,9 +43,7 @@
namespace {
const char* _loggerCat = "RenderableKameleonVolume";
}
namespace {
const char* KeyDimensions = "Dimensions";
const char* KeyStepSize = "StepSize";
const char* KeyTransferFunction = "TransferFunction";
@@ -60,7 +58,7 @@ namespace {
const char* KeyCache = "Cache";
const char* KeyGridType = "GridType";
const char* ValueSphericalGridType = "Spherical";
}
} // namespace
namespace openspace {
modules/kameleonvolume/rendering/renderablekameleonvolume.h
+1 -2
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -40,7 +40,6 @@
#include <modules/volume/rendering/volumeclipplanes.h>
namespace openspace {
struct RenderData;
modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
+2 -2
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -43,7 +43,7 @@ namespace {
const char* JsFilename = "${OPENSPACE_DATA}/web/kameleondocumentation/script.js";
const char* BootstrapFilename = "${OPENSPACE_DATA}/web/common/bootstrap.min.css";
const char* CssFilename = "${OPENSPACE_DATA}/web/common/style.css";
}
} // namespace
namespace openspace {
modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
+2 -2
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -36,7 +36,7 @@
namespace {
const char* KeyInput = "Input";
const char* KeyOutput = "Output";
}
} // namespace
namespace openspace {
modules/multiresvolume/rendering/atlasmanager.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -34,8 +34,8 @@
#include <cstring>
namespace {
const std::string _loggerCat = "AtlasManager";
}
const char* _loggerCat = "AtlasManager";
} // namespace
namespace openspace {
modules/multiresvolume/rendering/atlasmanager.h
+3 -6
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -35,11 +35,7 @@
#include <map>
#include <set>
namespace ghoul {
namespace opengl {
class Texture;
}
}
namespace ghoul::opengl { class Texture; }
namespace openspace {
@@ -64,6 +60,7 @@ public:
unsigned int getNumDiskReads();
unsigned int getNumUsedBricks();
unsigned int getNumStreamedBricks();
private:
const unsigned int NOT_USED = UINT_MAX;
TSP* _tsp;
modules/multiresvolume/rendering/brickmanager.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -32,8 +32,8 @@
#include <fstream>
namespace {
const std::string _loggerCat = "BrickManager";
}
const char* _loggerCat = "BrickManager";
} // namespace
namespace openspace {
modules/multiresvolume/rendering/brickmanager.h
+2 -6
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -30,11 +30,7 @@
#include <string>
#include <vector>
namespace ghoul {
namespace opengl {
class Texture;
}
}
namespace ghoul::opengl { class Texture; }
namespace openspace {
modules/multiresvolume/rendering/errorhistogrammanager.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -35,8 +35,8 @@
#include <ghoul/logging/logmanager.h>
namespace {
const std::string _loggerCat = "ErrorHistogramManager";
}
const char* _loggerCat = "ErrorHistogramManager";
} // namespace
namespace openspace {
modules/multiresvolume/rendering/histogrammanager.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -31,8 +31,8 @@
#include <openspace/util/histogram.h>
namespace {
const std::string _loggerCat = "HistogramManager";
}
const char* _loggerCat = "HistogramManager";
} // namespace
namespace openspace {
modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
+3 -3
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -35,8 +35,8 @@
#include <ghoul/logging/logmanager.h>
namespace {
const std::string _loggerCat = "LocalErrorHistogramManager";
}
const char* _loggerCat = "LocalErrorHistogramManager";
} // namespace
namespace openspace {

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