mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-02-05 11:09:12 -06:00
da9938584e
- added shader-side B-V (blue-visible band) index conversion to standard RGB 0-255 - distance-modulus is computed correctly (to the 9th decimal) from one of the interleaved parameters of the vbo - the apparent magnitudes are in relation to the cameras position in space. (needs a proper overlook / calibration) - sprite quads are scaled with the apparent magnitude in heuristic fashion (ogl coordinates have really no real relation to empirical data) TODO: - Look over the quad scaling which right now is scaled using the z-distance and apparent magnitude, wont work properly if we move outside of the solar system - Determine if scale of universe is proper - When zooming out the camera stops at #INF and gets stuck ( had no time to look into this ) - Very red stars need dimming, probably a threshold operation
83 lines
2.2 KiB
GLSL
83 lines
2.2 KiB
GLSL
#version 440
|
|
uniform mat4 ViewProjection;
|
|
uniform mat4 ModelTransform;
|
|
uniform vec4 campos;
|
|
uniform mat4 camrot;
|
|
//uniform vec2 scaling;
|
|
uniform vec4 objpos;
|
|
|
|
uniform sampler2D texture1;
|
|
|
|
layout(location = 0) in vec4 in_position;
|
|
layout(location = 2) in vec3 in_brightness;
|
|
|
|
out vec4 vs_position;
|
|
out vec3 vs_brightness;
|
|
|
|
out vec4 psc_position;
|
|
out vec4 cam_position;
|
|
|
|
const float k = 10.0;
|
|
const float dgr_to_rad = 0.0174532925;
|
|
|
|
vec4 psc_addition(vec4 v1, vec4 v2) {
|
|
float ds = v2.w - v1.w;
|
|
if(ds >= 0) {
|
|
float p = pow(k,-ds);
|
|
return vec4(v1.x*p + v2.x, v1.y*p + v2.y, v1.z*p + v2.z, v2.w);
|
|
} else {
|
|
float p = pow(k,ds);
|
|
return vec4(v1.x + v2.x*p, v1.y + v2.y*p, v1.z + v2.z*p, v1.w);
|
|
}
|
|
}
|
|
|
|
|
|
vec4 psc_to_meter(vec4 v1, vec2 v2) {
|
|
float factor = v2.x * pow(k,v2.y + v1.w);
|
|
return vec4(v1.xyz * factor, 1.0);
|
|
}
|
|
|
|
vec4 psc_scaling(vec4 v1, vec2 v2) {
|
|
float ds = v2.y - v1.w;
|
|
if(ds >= 0) {
|
|
return vec4(v1.xyz * v2.x * pow(k,v1.w), v2.y);
|
|
} else {
|
|
return vec4(v1.xyz * v2.x * pow(k,v2.y), v1.w);
|
|
}
|
|
}
|
|
|
|
void main()
|
|
{
|
|
vs_brightness = in_brightness;
|
|
psc_position = in_position;
|
|
cam_position = campos;
|
|
// rotate and scale vertex with model transform and add the translation
|
|
vec3 local_vertex_pos = mat3(ModelTransform) * in_position.xyz;
|
|
//vec4 lvp = ModelTransform * in_position;
|
|
|
|
// PSC addition; local vertex position and the object power scaled world position
|
|
vs_position = psc_addition(vec4(local_vertex_pos,in_position.w),objpos);
|
|
//vs_position = psc_addition(lvp,objpos);
|
|
|
|
// PSC addition; rotated and viewscaled vertex and the cmaeras negative position
|
|
vs_position = psc_addition(vs_position,vec4(-campos.xyz,campos.w));
|
|
|
|
// rotate the camera
|
|
local_vertex_pos = mat3(camrot) * vs_position.xyz;
|
|
vs_position = vec4(local_vertex_pos, vs_position.w);
|
|
//vs_position = camrot * vs_position;
|
|
|
|
vec2 scaling = vec2(1.0, -in_position.w);
|
|
|
|
// project using the rescaled coordinates,
|
|
//vec4 vs_position_rescaled = psc_scaling(vs_position, scaling);
|
|
vec4 vs_position_rescaled = psc_to_meter(vs_position, scaling);
|
|
//vs_position = vs_position_rescaled;
|
|
|
|
|
|
// project the position to view space
|
|
gl_Position = ViewProjection * vs_position_rescaled;
|
|
//gl_Position = view * model * vs_position_rescaled;
|
|
|
|
//distanceToStar = psc_subtraction(gl_Position, campos);
|
|
} |