mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-02 16:59:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Changed rendering to a more pleasant color for debugging.

Browse Source
This commit is contained in:
Kalle Bladin
2016-05-03 21:27:17 -04:00
parent 360c0a8837
commit e6e656f088
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/rendering/patchrenderer.cpp
-1
View File
@@ -148,7 +148,6 @@ namespace openspace {
Geodetic2 swCorner = newPatch.southWestCorner();
_programObject->setUniform("segmentsPerPatch", _grid->xSegments());
_programObject->setUniform("modelViewProjectionTransform", modelViewProjectionTransform);
_programObject->setUniform("minLatLon", vec2(swCorner.toLonLatVec2()));
_programObject->setUniform("lonLatScalingFactor", vec2(newPatch.size().toLonLatVec2()));
modules/globebrowsing/shaders/simple_fs.glsl
+5 -3
View File
@@ -44,7 +44,7 @@ uniform mat3 uvTransformPatchToTile10;
uniform mat3 uvTransformPatchToTile01;
uniform mat3 uvTransformPatchToTile11;
uniform int segmentsPerPatch;
//uniform int segmentsPerPatch;
in vec4 vs_position;
in vec3 fs_position;
@@ -74,8 +74,10 @@ Fragment getFragment() {
frag.color = max(color00, max(color10, max(color01, color11))) * 10;
vec4 uvColor = vec4(fract(fs_uv * segmentsPerPatch), 0.4,1);
frag.color = frag.color.a < 0.1 ? uvColor * 0.5 : frag.color;
//vec4 uvColor = vec4(fract(fs_uv * segmentsPerPatch), 0.4,1);
//frag.color = frag.color.a < 0.1 ? uvColor * 0.5 : frag.color;
frag.color = vec4(frag.color.r, frag.color.r, frag.color.r, 1);
frag.depth = vs_position.w;