mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 03:00:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #987 from OpenSpace/issue/981

Browse Source 
Issue/981 - Star Rendering Cuts
This commit is contained in:
Jonathas Costa
2019-12-12 12:39:44 -05:00
committed by GitHub
parent cca438262b 53595ba045
commit a8d65e5456
3 changed files with 37 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@
#include "fragment.glsl"
flat in vec4 gs_colorMap;
in float vs_screenSpaceDepth;
flat in float vs_screenSpaceDepth;
in vec2 texCoord;
in float ta;

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

@@ -55,7 +55,7 @@ flat in float dvarScaling[];
flat out vec4 gs_colorMap;
out vec2 texCoord;
out float vs_screenSpaceDepth;
flat out float vs_screenSpaceDepth;
out float ta;
const double PARSEC = 0.308567756e17LF;
@@ -171,17 +171,22 @@ void main() {
// Build primitive
texCoord = corners[3];
gl_Position = thirdPosition;
EmitVertex();
texCoord = corners[0];
gl_Position = initialPosition;
EmitVertex();
texCoord = corners[2];
gl_Position = crossCorner;
EmitVertex();
texCoord = corners[1];
gl_Position = secondPosition;
EmitVertex();
texCoord = corners[3];
gl_Position = thirdPosition;
EmitVertex();
texCoord = corners[2];
gl_Position = crossCorner;
EmitVertex();
EndPrimitive();
}

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

@@ -82,14 +82,6 @@ void main() {
vs_position = gl_in[0].gl_Position; // in object space
dvec4 dpos = modelMatrix * dvec4(vs_position);
dvec4 clipTestPos = cameraViewProjectionMatrix * dpos;
clipTestPos /= clipTestPos.w;
if ((clipTestPos.x < -1.0 || clipTestPos.x > 1.0) ||
(clipTestPos.y < -1.0 || clipTestPos.y > 1.0))
{
return;
}
ge_bvLumAbsMagAppMag = vs_bvLumAbsMagAppMag[0];
ge_velocity = vs_velocity[0];
ge_speed = vs_speed[0];
@@ -156,96 +148,43 @@ void main() {
dvec3 scaledUp = dvec3(0.0);
vec4 bottomLeftVertex, bottomRightVertex, topLeftVertex, topRightVertex;
// if (distanceToStarInParsecs > 1800.0) {
// scaledRight = scaleMultiply * invariantRight * 0.5f;
// scaledUp = scaleMultiply * invariantUp * 0.5f;
// } else {
dvec3 normal = normalize(eyePosition - dpos.xyz);
dvec3 newRight = normalize(cross(cameraUp, normal));
dvec3 newUp = cross(normal, newRight);
scaledRight = scaleMultiply * newRight;
scaledUp = scaleMultiply * newUp;
//}
dvec3 normal = normalize(eyePosition - dpos.xyz);
dvec3 newRight = normalize(cross(cameraUp, normal));
dvec3 newUp = cross(normal, newRight);
scaledRight = scaleMultiply * newRight;
scaledUp = scaleMultiply * newUp;
bottomLeftVertex = z_normalization(vec4(cameraViewProjectionMatrix *
dvec4(dpos.xyz - scaledRight - scaledUp, dpos.w)));
gs_screenSpaceDepth = bottomLeftVertex.w;
topRightVertex = z_normalization(vec4(cameraViewProjectionMatrix *
dvec4(dpos.xyz + scaledUp + scaledRight, dpos.w)));
topRightVertex = z_normalization(vec4(cameraViewProjectionMatrix *
dvec4(dpos.xyz + scaledUp + scaledRight, dpos.w)));
// Testing size:
// vec3 tmpPos = vec3(eyePositionDelta);
// vec4 falseBottomLeftVertex = z_normalization(vec4(cameraViewProjectionMatrix *
// dvec4(tmpPos - scaledRight - scaledUp, dpos.w)));
bottomRightVertex = z_normalization(vec4(cameraViewProjectionMatrix *
dvec4(dpos.xyz + scaledRight - scaledUp, dpos.w)));
// vec4 falseTopRightVertex = z_normalization(vec4(cameraViewProjectionMatrix *
// dvec4(tmpPos + scaledUp + scaledRight, dpos.w)));
// vec2 halfViewSize = vec2(screenSize.x, screenSize.y) * 0.5f;
// vec2 topRight = falseTopRightVertex.xy/falseTopRightVertex.w;
// vec2 bottomLeft = falseBottomLeftVertex.xy/falseBottomLeftVertex.w;
// Complete algebra
// topRight = ((topRight + vec2(1.0)) * halfViewSize) - vec2(0.5);
// bottomLeft = ((bottomLeft + vec2(1.0)) * halfViewSize) - vec2(0.5);
//vec2 sizes = abs(topRight - bottomLeft);
// Optimized version
// vec2 sizes = abs(halfViewSize * (topRight - bottomLeft));
// float height = sizes.y;
// float width = sizes.x;
// if ((height > billboardSize) ||
// (width > billboardSize)) {
// float correctionScale = height > billboardSize ? billboardSize / height :
// billboardSize / width;
// scaledRight *= correctionScale;
// scaledUp *= correctionScale;
// bottomLeftVertex = z_normalization(vec4(cameraViewProjectionMatrix *
// dvec4(dpos.xyz - scaledRight - scaledUp, dpos.w)));
// gs_screenSpaceDepth = bottomLeftVertex.w;
// topRightVertex = z_normalization(vec4(cameraViewProjectionMatrix *
// dvec4(dpos.xyz + scaledUp + scaledRight, dpos.w)));
// bottomRightVertex = z_normalization(vec4(cameraViewProjectionMatrix *
// dvec4(dpos.xyz + scaledRight - scaledUp, dpos.w)));
// topLeftVertex = z_normalization(vec4(cameraViewProjectionMatrix *
// dvec4(dpos.xyz + scaledUp - scaledRight, dpos.w)));
// } else {
// if (width < 2.0f) {
// float maxVar = 2.0f;
// float minVar = 1.0f;
// float var = (height + width);
// float ta = ( (var - minVar)/(maxVar - minVar) );
// if (ta == 0.0f)
// return;
// }
// float minSize = 30.f;
// if ((width < minSize) || (height < minSize))
// return;
bottomRightVertex = z_normalization(vec4(cameraViewProjectionMatrix *
dvec4(dpos.xyz + scaledRight - scaledUp, dpos.w)));
topLeftVertex = z_normalization(vec4(cameraViewProjectionMatrix *
topLeftVertex = z_normalization(vec4(cameraViewProjectionMatrix *
dvec4(dpos.xyz + scaledUp - scaledRight, dpos.w)));
// }
// Build primitive
gl_Position = topLeftVertex;
psfCoords = vec2(-1.0, 1.0);
EmitVertex();
gl_Position = bottomLeftVertex;
psfCoords = vec2(-1.0, -1.0);
EmitVertex();
gl_Position = topRightVertex;
psfCoords = vec2(1.0, 1.0);
EmitVertex();
gl_Position = bottomRightVertex;
psfCoords = vec2(1.0, -1.0);
EmitVertex();
gl_Position = topLeftVertex;
psfCoords = vec2(-1.0, 1.0);
EmitVertex();
gl_Position = topRightVertex;
psfCoords = vec2(1.0, 1.0);
EmitVertex();
EndPrimitive();
}