mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-01 08:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing

Browse Source
This commit is contained in:
Erik Broberg
2016-11-29 13:35:30 +01:00
parent 322c87e499 0df09d23ad
commit 058f1460e3
11 changed files with 182 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/geometry/geodetic2.cpp
+5
View File
@@ -149,6 +149,11 @@ namespace globebrowsing {
}
}
Geodetic2 GeodeticPatch::getSize() const {
return _halfSize * 2;
}
Scalar GeodeticPatch::minLat() const {
return _center.lat - _halfSize.lat;
}
modules/globebrowsing/geometry/geodetic2.h
+1
View File
@@ -108,6 +108,7 @@ public:
Scalar isNorthern() const;
Geodetic2 getCorner(Quad q) const;
Geodetic2 getSize() const;
Scalar minLat() const;
Scalar maxLat() const;
modules/globebrowsing/globes/renderableglobe.cpp
+3 -1
View File
@@ -80,7 +80,8 @@ namespace globebrowsing {
properties::BoolProperty("levelByProjectedAreaElseDistance", "level by projected area (else distance)",false),
properties::BoolProperty("resetTileProviders", "reset tile providers", false),
properties::BoolProperty("toggleEnabledEveryFrame", "toggle enabled every frame", false),
properties::BoolProperty("collectStats", "collect stats", false)
properties::BoolProperty("collectStats", "collect stats", false),
properties::BoolProperty("onlyModelSpaceRendering", "Only Model Space Rendering", false)
})
{
@@ -144,6 +145,7 @@ namespace globebrowsing {
_debugPropertyOwner.addProperty(_debugProperties.resetTileProviders);
_debugPropertyOwner.addProperty(_debugProperties.toggleEnabledEveryFrame);
_debugPropertyOwner.addProperty(_debugProperties.collectStats);
_debugPropertyOwner.addProperty(_debugProperties.onlyModelSpaceRendering);
addPropertySubOwner(_debugPropertyOwner);
addPropertySubOwner(_layerManager.get());
modules/globebrowsing/globes/renderableglobe.h
+1
View File
@@ -73,6 +73,7 @@ public:
properties::BoolProperty resetTileProviders;
properties::BoolProperty toggleEnabledEveryFrame;
properties::BoolProperty collectStats;
properties::BoolProperty onlyModelSpaceRendering;
};
struct GeneralProperties {
modules/globebrowsing/rendering/chunkrenderer.cpp
+1 -1
View File
@@ -80,7 +80,7 @@ namespace globebrowsing {
void ChunkRenderer::renderChunk(const Chunk& chunk, const RenderData& data) {
// A little arbitrary with 10 but it works
if (chunk.tileIndex().level < 10) {
if (chunk.owner().debugProperties().onlyModelSpaceRendering || chunk.tileIndex().level < 10) {
renderChunkGlobally(chunk, data);
}
else {
modules/globebrowsing/shaders/globalchunkedlodpatch_fs.glsl
+1 -1
View File
@@ -30,7 +30,7 @@ Fragment getFragment() {
frag.color = getTileFragColor();
#if SHOW_CHUNK_EDGES
frag.color += patchBorderOverlay(fs_uv, vec3(0,1,0), 0.005);
frag.color += patchBorderOverlay(fs_uv, vec3(0,1,0), 0.02);
#endif // SHOW_CHUNK_EDGES
frag.depth = fs_position.w;