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

Changes from comments.

Browse Source
This commit is contained in:
Jonathas Costa
2018-04-22 09:52:21 -04:00
parent 4e8ebb0bb8
commit 7285a66c89
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/digitaluniverse/shaders/billboard_fs.glsl
View File

@@ -62,6 +62,8 @@ Fragment getFragment() {
Fragment frag;
frag.color = fullColor;
frag.depth = vs_screenSpaceDepth;
// Setting the position of the billboards to not interact
// with the ATM.
frag.gPosition = vec4(-1e32, -1e32, -1e32, 1.0);
frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);

7
modules/digitaluniverse/shaders/billboard_gs.glsl
View File

@@ -30,7 +30,7 @@ layout(points) in;
layout(triangle_strip, max_vertices = 4) out;
uniform float scaleFactor;
uniform dvec3 up;
uniform dvec3 up;
uniform dvec3 right;
uniform dvec3 cameraPosition; // in world space (no SGCT View was considered)
uniform dvec3 cameraLookUp; // in world space (no SGCT View was considered)
@@ -83,6 +83,7 @@ void main() {
} else if (pos.w == 5.f) {
unit = 1E9 * PARSEC;
} else if (pos.w == 6.f) {
// Convertion factor from Parsecs to GigalightYears
unit = 306391534.73091 * PARSEC;
}
@@ -152,6 +153,7 @@ void main() {
initialPosition = z_normalization(vec4(cameraViewProjectionMatrix *
dvec4(dpos.xyz - scaledRight - scaledUp, dpos.w)));
vs_screenSpaceDepth = initialPosition.w;
secondPosition = z_normalization(vec4(cameraViewProjectionMatrix *
dvec4(dpos.xyz + scaledRight - scaledUp, dpos.w)));
crossCorner = z_normalization(vec4(cameraViewProjectionMatrix *
@@ -173,6 +175,5 @@ void main() {
texCoord = corners[1];
gl_Position = secondPosition;
EmitVertex();
EndPrimitive();
EndPrimitive();
}