Aufgrund einer Störung des s3 Storage, könnten in nächster Zeit folgende GitLab Funktionen nicht zur Verfügung stehen: LFS, Container Registry, Job Artifacs, Uploads (Wiki, Bilder, Projekt-Exporte). Wir bitten um Verständnis. Es wird mit Hochdruck an der Behebung des Problems gearbeitet. Weitere Informationen zur Störung des Object Storage finden Sie hier: https://maintenance.itc.rwth-aachen.de/ticket/status/messages/59-object-storage-pilot

Commit f5863752 authored by Anakin's avatar Anakin
Browse files

fixed the light problem,

very basic light at the moment, needs a lot of work:
- custom position,
- custom intensities,
- calculate at better positions,
others:
- adjust zoom speed
parent 1c962a48
......@@ -39,7 +39,7 @@ private:
struct {
QVector3D position = { 1,1,1 };
QVector3D intensities = { 1,1,1 };
QVector3D intensities = { 1,0.25,0.25 };
} m_light;
QOpenGLShaderProgram m_program;
......
......@@ -4,8 +4,9 @@ precision mediump int;
precision mediump float;
#endif
uniform mat3 n_matrix;
//uniform mat3 n_matrix;
uniform sampler2D texture;
uniform mat4 norm_matrix;
uniform mat4 m_matrix;
uniform struct Light {
......@@ -21,7 +22,7 @@ varying vec3 v_normal;
void main()
{
mat3 normalMatrix = transpose(inverse(mat3(m_matrix)));
mat3 n_matrix = transpose(inverse(mat3(norm_matrix * m_matrix)));
vec3 normal = normalize(n_matrix * v_normal);
vec3 surfaceToLight = light.position - v_position;
......
......@@ -179,7 +179,8 @@ void OglViewerWidget::initializeGL()
{
initializeOpenGLFunctions();
glClearColor(0.5000f, 0.8000f, 1.0000f, 0.0000f);
//glClearColor(0.5000f, 0.8000f, 1.0000f, 0.0000f);
glClearColor(0.02f, 0.01f, 0.01f, 0.0000f);
initShaders();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment