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

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

Browse Source
This commit is contained in:
Kalle Bladin
2016-07-15 17:18:29 -04:00
parent 403ecd8209 2ec2c95cd7
commit e19a68eb1e
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/chunk/chunk.cpp
+3 -3
View File
@@ -39,7 +39,7 @@ namespace {
namespace openspace {
const float Chunk::DEFAULT_HEIGHT_VALUE = 0.0f;
const float Chunk::DEFAULT_HEIGHT = 0.0f;
Chunk::Chunk(ChunkedLodGlobe* owner, const ChunkIndex& chunkIndex, bool initVisible)
: _owner(owner)
@@ -133,8 +133,8 @@ namespace openspace {
boundingHeights.available = true;
if (preprocessData->hasMissingData[0]) {
boundingHeights.min = std::min(DEFAULT_HEIGHT_VALUE, preprocessData->minValues[0]);
boundingHeights.max = std::max(DEFAULT_HEIGHT_VALUE, preprocessData->maxValues[0]);
boundingHeights.min = std::min(DEFAULT_HEIGHT, preprocessData->minValues[0]);
boundingHeights.max = std::max(DEFAULT_HEIGHT, preprocessData->maxValues[0]);
}
}
}
modules/globebrowsing/chunk/chunk.h
+3 -1
View File
@@ -45,6 +45,9 @@ namespace openspace {
class Chunk {
public:
const static float DEFAULT_HEIGHT;
struct BoundingHeights {
float min, max;
bool available;
@@ -72,7 +75,6 @@ namespace openspace {
void setIndex(const ChunkIndex& index);
void setOwner(ChunkedLodGlobe* newOwner);
const static float DEFAULT_HEIGHT;
private:
modules/globebrowsing/chunk/chunkrenderer.cpp
+1 -1
View File
@@ -199,7 +199,7 @@ namespace openspace {
layeredTexturePreprocessingData.keyValuePairs.push_back(
std::pair<std::string, std::string>(
"defaultHeight",
std::to_string(Chunk::DEFAULT_HEIGHT_VALUE)));
std::to_string(Chunk::DEFAULT_HEIGHT)));