mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 20:21:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Small changes.

Browse Source
This commit is contained in:
Jonathas Costa
2020-06-05 15:51:56 -04:00
parent fbd83c9e84
commit ea72753ea3
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/base/rendering/renderablesphericalgrid.cpp
View File

@@ -215,7 +215,10 @@ void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&){
modelTransform;
_gridProgram->setUniform("modelViewTransform", modelViewTransform);
_gridProgram->setUniform("projectionTransform", glm::dmat4(data.camera.projectionMatrix()));
_gridProgram->setUniform(
"MVPTransform",
glm::dmat4(data.camera.projectionMatrix()) * modelViewTransform
);
_gridProgram->setUniform("gridColor", _gridColor);

12
modules/base/shaders/grid_vs.glsl
View File

@@ -32,12 +32,16 @@ out float vs_screenSpaceDepth;
out vec4 vs_positionViewSpace;
uniform dmat4 modelViewTransform;
uniform dmat4 projectionTransform;
uniform dmat4 MVPTransform;
void main() {
dvec4 positionViewSpace = modelViewTransform * dvec4(in_position, 1.0);
dvec4 positionClipSpace = projectionTransform * positionViewSpace;
vec4 positionScreenSpace = z_normalization(vec4(positionClipSpace));
dvec4 objPosDouble = dvec4(in_position, 1.0);
dvec4 positionViewSpace = modelViewTransform * objPosDouble;
dvec4 positionClipSpace = MVPTransform * objPosDouble;
positionClipSpace.z = 0.0;
vec4 positionScreenSpace = vec4(positionClipSpace);
vs_screenSpaceDepth = float(positionClipSpace.w);
vs_positionViewSpace = vec4(positionViewSpace);