mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-24 05:49:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Issue/871 (#874)

Browse Source 
* Fixed wrong merging.
* Add flat qualifiers to both geometry and fragment shaders
This commit is contained in:
Jonathas Costa
2019-05-18 16:46:10 -04:00
committed by Emil Axelsson
parent 1c0b892771
commit 916cc1d76d
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/space/shaders/star_ge.glsl
View File

@@ -36,12 +36,13 @@ in vec4 vs_gPosition[];
in float vs_speed[];
out vec4 vs_position;
out vec4 ge_bvLumAbsMagAppMag;
out vec3 ge_velocity;
out float ge_speed;
out vec2 psfCoords;
out float ge_observationDistance;
out float gs_screenSpaceDepth;
flat out vec4 ge_bvLumAbsMagAppMag;
flat out vec3 ge_velocity;
flat out float ge_speed;
flat out float ge_observationDistance;
flat out float gs_screenSpaceDepth;
uniform float magnitudeExponent;
uniform dvec3 eyePosition;

13
modules/space/shaders/star_vs.glsl
View File

@@ -34,19 +34,6 @@ in float in_speed;
out vec4 vs_bvLumAbsMagAppMag;
out vec3 vs_velocity;
out float vs_speed;
out vec4 vs_correctedPositionViewSpace;
out vec4 psc_position;
out vec3 vs_brightness;
out vec4 vs_gPosition;
/*
uniform mat4 view;
uniform mat4 projection;
uniform float FWHM;
uniform float betaConstant;
*/
void main() {
vs_bvLumAbsMagAppMag = in_bvLumAbsMagAppMag;