mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-25 13:38:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Clearified latlon interface.

Browse Source
This commit is contained in:
Kalle Bladin
2016-04-14 20:27:43 -04:00
parent acf4297491
commit 4fd0b0643c
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/shaders/clipmappatch_spheremapping_vs.glsl
+5 -5
View File
@@ -28,7 +28,7 @@ uniform mat4 modelViewProjectionTransform;
uniform float globeRadius;
uniform vec2 minLatLon;
uniform vec2 latLonScalingFactor;
uniform vec2 lonLatScalingFactor;
uniform ivec2 contraction; // [-1, 1]
layout(location = 1) in vec2 in_uv;
@@ -46,10 +46,10 @@ vec3 latLonToCartesian(float latitude, float longitude, float radius) {
}
vec3 globalInterpolation(vec2 uv) {
vec2 latLonInput;
latLonInput.y = minLatLon.y + latLonScalingFactor.y * uv.y; // Lat
latLonInput.x = minLatLon.x + latLonScalingFactor.x * uv.x; // Lon
vec3 positionModelSpace = latLonToCartesian(latLonInput.y, latLonInput.x, globeRadius);
vec2 lonLatInput;
lonLatInput.y = minLatLon.y + lonLatScalingFactor.y * uv.y; // Lat
lonLatInput.x = minLatLon.x + lonLatScalingFactor.x * uv.x; // Lon
vec3 positionModelSpace = latLonToCartesian(lonLatInput.y, lonLatInput.x, globeRadius);
return positionModelSpace;
}
modules/globebrowsing/shaders/latlonpatch_spheremapping_vs.glsl
+5 -5
View File
@@ -28,7 +28,7 @@ uniform mat4 modelViewProjectionTransform;
uniform float globeRadius;
uniform vec2 minLatLon;
uniform vec2 latLonScalingFactor;
uniform vec2 lonLatScalingFactor;
layout(location = 1) in vec2 in_UV;
@@ -45,10 +45,10 @@ vec3 latLonToCartesian(float latitude, float longitude, float radius) {
}
vec3 globalInterpolation() {
vec2 latLonInput;
latLonInput.y = minLatLon.y + latLonScalingFactor.y * in_UV.y; // Lat
latLonInput.x = minLatLon.x + latLonScalingFactor.x * in_UV.x; // Lon
vec3 positionModelSpace = latLonToCartesian(latLonInput.y, latLonInput.x, globeRadius);
vec2 lonLatInput;
lonLatInput.y = minLatLon.y + lonLatScalingFactor.y * in_UV.y; // Lat
lonLatInput.x = minLatLon.x + lonLatScalingFactor.x * in_UV.x; // Lon
vec3 positionModelSpace = latLonToCartesian(lonLatInput.y, lonLatInput.x, globeRadius);
return positionModelSpace;
}