Mymaster enhanced icons

CMakeLists.txt

@@ -32,7 +32,8 @@ src/glmesh.cpp
 src/loader.cpp
 src/main.cpp
 src/mesh.cpp
-src/window.cpp)
+src/window.cpp
+src/shaderlightprefs.cpp)
 
 #set project headers. 
 set(Project_Headers src/app.h
@@ -42,7 +43,8 @@ src/canvas.h
 src/glmesh.h
 src/loader.h
 src/mesh.h
-src/window.h)
+src/window.h
+src/shaderlightprefs.h)
 
 #set project resources and icon resource
 set(Project_Resources qt/qt.qrc gl/gl.qrc)
@@ -52,7 +54,7 @@ set(Icon_Resource exe/fstl.rc)
 set(OpenGL_GL_PREFERENCE GLVND)
 
 #find required packages. 
-find_package(Qt5 5.14 REQUIRED COMPONENTS Core Gui Widgets OpenGL)
+find_package(Qt5 5.12 REQUIRED COMPONENTS Core Gui Widgets OpenGL)
 find_package(OpenGL REQUIRED)
 find_package(Threads REQUIRED)
 

gl/calc_altitudes.glsl

@@ -0,0 +1,64 @@
+#version 330
+
+layout (triangles) in;
+layout (triangle_strip, max_vertices = 3) out;
+
+out vec3 ec_pos;
+noperspective out vec3 altitude;
+
+uniform vec2 portSize;
+
+void main() {
+    vec4 p0 = gl_in[0].gl_Position;
+    vec4 p1 = gl_in[1].gl_Position;
+    vec4 p2 = gl_in[2].gl_Position;
+
+    vec2 p0_f = p0.xy/p0.w;
+    vec2 p1_f = p1.xy/p1.w;
+    vec2 p2_f = p2.xy/p2.w;
+
+    // Altitude calculation :
+    // vp0p1 is the p0p1 vector
+    // vp0p2 is the p0p2 vector
+    // det(vp0p1,vp0p2) is the area of the parallelogram defined by the two vectors vp0p1 and vp0p2
+    // h0 is the altitude from p0 in the triangle (p0 p1 p2)
+    // h0 multiplied by p1p2 which is the length of vp0p1-vp0p2 is also the area of the parallelogram defined by the two vectors vp0p1 and vp0p2
+    // this leads to h0
+    //
+    // portSize is used to have an altitude in pixel
+    //
+
+    // Calculate h0 altitude from p0
+    vec2 vp0p1 = portSize*(p1_f-p0_f);
+    vec2 vp0p2 = portSize*(p2_f-p0_f);
+    float h0 = abs(determinant(mat2(vp0p1,vp0p2))) / length(vp0p1-vp0p2);
+    // release values
+    gl_Position = p0;
+    ec_pos = gl_Position.xyz;
+    altitude = vec3(h0*p0.w, 0.0, 0.0);
+    EmitVertex();
+
+    // calculate h1 altitude from p1
+    vec2 vp1p0 = portSize*(p0_f-p1_f);
+    vec2 vp1p2 = portSize*(p2_f-p1_f);
+    float h1 = abs(determinant(mat2(vp1p0,vp1p2))) / length(vp1p0-vp1p2);
+    // release values
+    gl_Position = p1;
+    ec_pos = gl_Position.xyz;
+    altitude = vec3(0.0, h1*p1.w, 0.0);
+    EmitVertex();
+
+    // calculate h2 altitude from p2
+    vec2 vp2p0 = portSize*(p0_f-p2_f);
+    vec2 vp2p1 = portSize*(p1_f-p2_f);
+    float h2 = abs(determinant(mat2(vp2p0,vp2p1))) / length(vp2p0-vp2p1);
+    // release values
+    gl_Position = p2;
+    ec_pos = gl_Position.xyz;
+    altitude = vec3(0.0, 0.0, h2*p2.w);
+    EmitVertex();
+
+    EndPrimitive();
+
+}
+

gl/gl.qrc

@@ -1,13 +1,16 @@
 <RCC>
-    <qresource prefix="gl/">
+    <qresource prefix="/gl">
         <file>mesh.frag</file>
         <file>mesh.vert</file>
         <file>mesh_wireframe.frag</file>
         <file>mesh_surfaceangle.frag</file>
+        <file>mesh_light.frag</file>
         <file>quad.frag</file>
         <file>quad.vert</file>
         <file>colored_lines.frag</file>
         <file>colored_lines.vert</file>
         <file>sphere.stl</file>
+        <file>calc_altitudes.glsl</file>
+        <file>mesh_light_120.frag</file>
     </qresource>
 </RCC>

gl/mesh_light.frag

@@ -0,0 +1,33 @@
+#version 330
+
+uniform float zoom;
+uniform vec4 ambient_light_color;
+uniform vec4 directive_light_color;
+uniform vec3 directive_light_direction;
+uniform bool useWire;
+uniform vec3 wireColor;
+uniform float wireWidth;
+
+in vec3 ec_pos;
+noperspective in vec3 altitude;
+
+void main() {
+    // Normalize light direction
+    vec3 dir = normalize(directive_light_direction);
+
+    // normal vector
+    vec3 ec_normal = normalize(cross(dFdx(ec_pos), dFdy(ec_pos)));
+    ec_normal.z *= zoom;
+    ec_normal = normalize(ec_normal);
+
+
+    vec3 color =  ambient_light_color.w * ambient_light_color.xyz + directive_light_color.w * dot(ec_normal,dir) * directive_light_color.xyz;
+
+    if (useWire) {
+        float d = min(min(altitude.x, altitude.y),altitude.z);
+        float mixVal = smoothstep(wireWidth-1.0, wireWidth+1.0,d);
+        color = mix(wireColor,color,mixVal);
+    }
+
+    gl_FragColor = vec4(color, 1.0);
+}

gl/mesh_light_120.frag

@@ -0,0 +1,23 @@
+#version 120
+
+uniform float zoom;
+uniform vec4 ambient_light_color;
+uniform vec4 directive_light_color;
+uniform vec3 directive_light_direction;
+
+varying vec3 ec_pos;
+
+void main() {
+    // Normalize light direction
+    vec3 dir = normalize(directive_light_direction);
+
+    // normal vector
+    vec3 ec_normal = normalize(cross(dFdx(ec_pos), dFdy(ec_pos)));
+    ec_normal.z *= zoom;
+    ec_normal = normalize(ec_normal);
+
+
+    vec3 color =  ambient_light_color.w * ambient_light_color.xyz + directive_light_color.w * dot(ec_normal,dir) * directive_light_color.xyz;
+
+    gl_FragColor = vec4(color, 1.0);
+}

qt/qt.qrc

@@ -2,5 +2,22 @@
     <qresource prefix="/qt">
         <file>style.qss</file>
         <file>icons/fstl_64x64.png</file>
+        <file>icons/sphere_shader1.png</file>
+        <file>icons/sphere_shader2.png</file>
+        <file>icons/sphere_shader3.png</file>
+        <file>icons/sphere_shader4.png</file>
+        <file>icons/document-open.png</file>
+        <file>icons/exit.png</file>
+        <file>icons/screenshot.png</file>
+        <file>icons/view-fullscreen.png</file>
+        <file>icons/view-refresh.png</file>
+        <file>icons/preferences-system.png</file>
+        <file>icons/axes.png</file>
+        <file>icons/orthographic.png</file>
+        <file>icons/perspective.png</file>
+        <file>icons/reset_rotation_on_load.png</file>
+        <file>icons/invert_zoom.png</file>
+        <file>icons/auto_refresh.png</file>
+        <file>icons/resolution_1_32.png</file>
     </qresource>
 </RCC>