mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 12:10:52 -06: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:
Erik Broberg
2016-06-22 20:25:50 -04:00
parent 3ed227df11 38e774882a
commit 87c1fdc4de
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/globebrowsing/shaders/globalchunkedlodpatch_fs.glsl
View File

@@ -73,8 +73,6 @@ Fragment getFragment() {
frag.color = vec4(0.1,0.1,0.1,1);
//LevelWeights levelWeights = getLevelWeights(levelInterpolationParameter);
#if USE_COLORTEXTURE
frag.color = calculateColor(

2
modules/globebrowsing/shaders/localchunkedlodpatch_fs.glsl
View File

@@ -68,7 +68,7 @@ in vec3 ellipsoidNormalCameraSpace;
Fragment getFragment() {
Fragment frag;
frag.color = vec4(1,1,1,1);
frag.color = vec4(0.1,0.1,0.1,1);
#if USE_COLORTEXTURE

8
modules/globebrowsing/tile/tileprovider.cpp
View File

@@ -155,13 +155,13 @@ namespace openspace {
dataLayout.glType,
Texture::FilterMode::Linear,
Texture::WrappingMode::ClampToEdge);
// The texture should take ownership of the data
std::shared_ptr<Texture> texture = std::shared_ptr<Texture>(texturePtr);
//texture->setFilter(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
texture->uploadTexture();
texture->uploadTexture();
// AnisotropicMipMap must be set after texture is uploaded. Why?!
texture->setFilter(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
Tile tile = {
texture,