mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-08 04:20:14 -05:00
More work on loading screen
Multithreaded SceneGraphNode initialization
This commit is contained in:
@@ -24,10 +24,11 @@
|
||||
|
||||
#version __CONTEXT__
|
||||
|
||||
in vec2 st;
|
||||
out vec4 FragColor;
|
||||
|
||||
uniform vec4 color;
|
||||
uniform sampler2D logoTexture;
|
||||
|
||||
void main() {
|
||||
FragColor = color;
|
||||
FragColor = texture(logoTexture, st);
|
||||
}
|
||||
|
||||
@@ -25,9 +25,11 @@
|
||||
#version __CONTEXT__
|
||||
|
||||
in vec2 in_position;
|
||||
in vec2 in_st;
|
||||
|
||||
uniform mat4 ortho;
|
||||
out vec2 st;
|
||||
|
||||
void main() {
|
||||
gl_Position = ortho * vec4(in_position, 0.0, 1.0);
|
||||
gl_Position = vec4(in_position, 0.0, 1.0);
|
||||
st = in_st;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user