mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

(#3596) added vertex normals to ring quad vertex attribs

Browse Source
This commit is contained in:
benpm
2025-04-25 16:10:33 -06:00
parent e0df6d6c2e
commit 0aa1edcfde
5 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/globebrowsing/shaders/advanced_rings_fs.glsl
View File

@@ -31,6 +31,7 @@
in vec2 vs_st;
in float vs_screenSpaceDepth;
in vec4 shadowCoords;
in vec3 vs_normal;
uniform sampler2DShadow shadowMapTexture;
uniform sampler1D ringTextureFwrd;

3
modules/globebrowsing/shaders/advanced_rings_vs.glsl
View File

@@ -28,10 +28,12 @@
layout(location = 0) in vec2 in_position;
layout(location = 1) in vec2 in_st;
layout(location = 2) in vec3 in_normal;
out vec2 vs_st;
out float vs_screenSpaceDepth;
out vec4 shadowCoords;
out vec3 vs_normal;
uniform dmat4 modelViewProjectionMatrix;
@@ -43,6 +45,7 @@ uniform dmat4 shadowMatrix;
void main() {
vs_st = in_st;
vs_normal = mat3(modelViewProjectionMatrix) * in_normal;
dvec4 positionClipSpace = modelViewProjectionMatrix * dvec4(in_position, 0.0, 1.0);
vec4 positionClipSpaceZNorm = z_normalization(vec4(positionClipSpace));

1
modules/globebrowsing/shaders/rings_fs.glsl
View File

@@ -31,6 +31,7 @@
in vec2 vs_st;
in float vs_screenSpaceDepth;
in vec4 shadowCoords;
in vec3 vs_normal;
uniform sampler2DShadow shadowMapTexture;
uniform sampler1D ringTexture;

3
modules/globebrowsing/shaders/rings_vs.glsl
View File

@@ -28,10 +28,12 @@
layout(location = 0) in vec2 in_position;
layout(location = 1) in vec2 in_st;
layout(location = 2) in vec3 in_normal;
out vec2 vs_st;
out float vs_screenSpaceDepth;
out vec4 shadowCoords;
out vec3 vs_normal;
uniform dmat4 modelViewProjectionMatrix;
@@ -43,6 +45,7 @@ uniform dmat4 shadowMatrix;
void main() {
vs_st = in_st;
vs_normal = mat3(modelViewProjectionMatrix) * in_normal;
dvec4 positionClipSpace = modelViewProjectionMatrix * dvec4(in_position, 0.0, 1.0);
vec4 positionClipSpaceZNorm = z_normalization(vec4(positionClipSpace));

24
modules/globebrowsing/src/ringscomponent.cpp
View File

@@ -769,15 +769,18 @@ void RingsComponent::createPlane() {
GLfloat y;
GLfloat s;
GLfloat t;
GLfloat nx;
GLfloat ny;
GLfloat nz;
};
const std::array<VertexData, 6> vertices = {
VertexData{ -size, -size, 0.f, 0.f },
VertexData{ size, size, 1.f, 1.f },
VertexData{ -size, size, 0.f, 1.f },
VertexData{ -size, -size, 0.f, 0.f },
VertexData{ size, -size, 1.f, 0.f },
VertexData{ size, size, 1.f, 1.f },
VertexData{ -size, -size, 0.f, 0.f, 0.f, 0.f, 1.f },
VertexData{ size, size, 1.f, 1.f, 0.f, 0.f, 1.f },
VertexData{ -size, size, 0.f, 1.f, 0.f, 0.f, 1.f },
VertexData{ -size, -size, 0.f, 0.f, 0.f, 0.f, 1.f },
VertexData{ size, -size, 1.f, 0.f, 0.f, 0.f, 1.f },
VertexData{ size, size, 1.f, 1.f, 0.f, 0.f, 1.f },
};
glBindVertexArray(_quad);
@@ -801,6 +804,15 @@ void RingsComponent::createPlane() {
sizeof(VertexData),
reinterpret_cast<void*>(offsetof(VertexData, s))
);
glEnableVertexAttribArray(2);
glVertexAttribPointer(
2,
3,
GL_FLOAT,
GL_FALSE,
sizeof(VertexData),
reinterpret_cast<void*>(offsetof(VertexData, nx))
);
}
void RingsComponent::compileShadowShader() {