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

Changed names in DU following Carter's asking. Fixed bug in min plane size clipping procedure.

Browse Source
This commit is contained in:
Jonathas Costa
2017-12-08 16:11:58 -05:00
parent b031245a19
commit 52da2297be
6 changed files with 43 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/digitaluniverse/rendering/renderableplanescloud.cpp
+6 -2
View File
@@ -602,8 +602,12 @@ void RenderablePlanesCloud::renderPlanes(const RenderData&,
glm::vec4 bottomLeft = vertex0 / vertex0.w;
bottomLeft = ((bottomLeft + glm::vec4(1.0)) / glm::vec4(2.0)) * glm::vec4(viewport[2], viewport[3], 1.0, 1.0);
if ((std::fabs(topRight.y - bottomLeft.y) < _planeMinSize) ||
(std::fabs(topRight.x - bottomLeft.x) < _planeMinSize)) {
float lengthY = std::fabs(topRight.y - bottomLeft.y);
float lengthX = std::fabs(topRight.x - bottomLeft.x);
float lengthXY = glm::length(glm::vec2(topRight) - glm::vec2(bottomLeft));
float biggestAxis = lengthY > lengthX ? (lengthY > lengthXY ? lengthY : lengthXY) :
(lengthX > lengthXY ? lengthX : lengthXY);
if (biggestAxis < _planeMinSize ) {
continue;
}
modules/digitaluniverse/shaders/billboard2_gs.glsl
+28 -54
View File
@@ -109,37 +109,19 @@ void main() {
vec4 initialPosition = z_normalization(vec4(modelViewProjectionTransform *
dvec4(dpos.xyz - scaledRight - scaledUp, dpos.w)));
vs_screenSpaceDepth = initialPosition.w;
// gl_Position = initialPosition;
// EmitVertex();
// texCoord = corners[1];
vec4 secondPosition = z_normalization(vec4(modelViewProjectionTransform *
dvec4(dpos.xyz + scaledRight - scaledUp, dpos.w)));
// gl_Position = secondPosition;
// EmitVertex();
//texCoord = corners[2];
vec4 crossCorner = z_normalization(vec4(modelViewProjectionTransform *
dvec4(dpos.xyz + scaledUp + scaledRight, dpos.w)));
// gl_Position = crossCorner;
// EmitVertex();
// EndPrimitive(); // First Triangle
// texCoord = corners[0];
// gl_Position = initialPosition;
// EmitVertex();
// texCoord = corners[2];
// gl_Position = crossCorner;
// EmitVertex();
// texCoord = corners[3];
vec4 thirdPosition = z_normalization(vec4(modelViewProjectionTransform *
dvec4(dpos.xyz + scaledUp - scaledRight, dpos.w)));
// gl_Position = thirdPosition;
// EmitVertex();
// EndPrimitive(); // Second Triangle
// Testing size:
vec4 topRight = secondPosition/secondPosition.w;
topRight = ((topRight + vec4(1.0)) / vec4(2.0)) * vec4(screenSize.x, screenSize.y, 1.0, 1.0);
@@ -147,15 +129,8 @@ void main() {
bottomLeft = ((bottomLeft + vec4(1.0)) / vec4(2.0)) * vec4(screenSize.x, screenSize.y, 1.0, 1.0);
float height = abs(topRight.y - bottomLeft.y);
float width = abs(topRight.x - bottomLeft.x);
// if ((height < (2.0 * maxBillboardSize)) ||
// (width < (2.0 * maxBillboardSize))) {
// ta = 1.0 - (height - maxBillboardSize)/(maxBillboardSize);
// //ta = 0.5;
// }
float var = (height+width);
float width = abs(topRight.x - bottomLeft.x);
float var = (height + width);
if ((height > maxBillboardSize) ||
(width > maxBillboardSize)) {
@@ -177,7 +152,7 @@ void main() {
dvec4(dpos.xyz + scaledUp - scaledRight, dpos.w)));
// Fade-out
float maxVar = 3.0f * maxBillboardSize;
float maxVar = 2.0f * maxBillboardSize;
float minVar = maxBillboardSize;
ta = 1.0f - ( (var - minVar)/(maxVar - minVar) );
if (ta == 0.0f)
@@ -191,27 +166,26 @@ void main() {
if (ta == 0.0f)
return;
}
{
// Build primitive
texCoord = corners[0];
gl_Position = initialPosition;
EmitVertex();
texCoord = corners[1];
gl_Position = secondPosition;
EmitVertex();
texCoord = corners[2];
gl_Position = crossCorner;
EmitVertex();
EndPrimitive(); // First Triangle
texCoord = corners[0];
gl_Position = initialPosition;
EmitVertex();
texCoord = corners[2];
gl_Position = crossCorner;
EmitVertex();
texCoord = corners[3];
gl_Position = thirdPosition;
EmitVertex();
EndPrimitive(); // Second Triangle
}
// Build primitive
texCoord = corners[0];
gl_Position = initialPosition;
EmitVertex();
texCoord = corners[1];
gl_Position = secondPosition;
EmitVertex();
texCoord = corners[2];
gl_Position = crossCorner;
EmitVertex();
EndPrimitive(); // First Triangle
texCoord = corners[0];
gl_Position = initialPosition;
EmitVertex();
texCoord = corners[2];
gl_Position = crossCorner;
EmitVertex();
texCoord = corners[3];
gl_Position = thirdPosition;
EmitVertex();
EndPrimitive(); // Second Triangle
}
modules/digitaluniverse/shaders/dumesh_fs.glsl
+1 -1
View File
@@ -44,6 +44,6 @@ Fragment getFragment() {
frag.gPosition = vs_positionViewSpace;
frag.gOtherData = vec4(0.0, 0.0, 0.0, 1.0);
frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
return frag;
}