Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
OpenSpace
Commits
b573c610
Commit
b573c610
authored
9 years ago
by
Kalle Bladin
Browse files
Options
Download
Email Patches
Plain Diff
Use anisotropic filtering for tiles.
parent
fa4bb154
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
modules/globebrowsing/shaders/globalchunkedlodpatch_fs.glsl
+0
-2
modules/globebrowsing/shaders/globalchunkedlodpatch_fs.glsl
modules/globebrowsing/shaders/localchunkedlodpatch_fs.glsl
+1
-1
modules/globebrowsing/shaders/localchunkedlodpatch_fs.glsl
modules/globebrowsing/tile/tileprovider.cpp
+4
-4
modules/globebrowsing/tile/tileprovider.cpp
with
5 additions
and
7 deletions
+5
-7
modules/globebrowsing/shaders/globalchunkedlodpatch_fs.glsl
+
0
-
2
View file @
b573c610
...
...
@@ -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
(
...
...
This diff is collapsed.
Click to expand it.
modules/globebrowsing/shaders/localchunkedlodpatch_fs.glsl
+
1
-
1
View file @
b573c610
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
modules/globebrowsing/tile/tileprovider.cpp
+
4
-
4
View file @
b573c610
...
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help