wip

cura/CuraApplication.py

@@ -415,6 +415,8 @@ class CuraApplication(QtApplication):
         controller = self.getController()
 
         controller.setActiveView("SolidView")
+        # controller.setActiveView("LayerView")
+
         controller.setCameraTool("CameraTool")
         controller.setSelectionTool("SelectionTool")
 
@@ -455,6 +457,8 @@ class CuraApplication(QtApplication):
         self._qml_import_paths.append(Resources.getPath(self.ResourceTypes.QmlFiles))
         self.initializeEngine()
 
+        # self.callLater(controller.setActiveView, "LayerView")
+
         if self._engine.rootObjects:
             self.closeSplash()
 

plugins/CuraEngineBackend/ProcessSlicedLayersJob.py

@@ -85,6 +85,7 @@ class ProcessSlicedLayersJob(Job):
                 min_layer_number = layer.id
 
         current_layer = 0
+        all_normals = []
 
         for layer in self._layers:
             abs_layer_number = layer.id + abs(min_layer_number)
@@ -127,6 +128,9 @@ class ProcessSlicedLayersJob(Job):
                 this_poly = LayerPolygon.LayerPolygon(layer_data, extruder, line_types, new_points, line_widths)
                 this_poly.buildCache()
 
+                normals = this_poly.getNormals()
+                all_normals.append(normals)
+                
                 this_layer.polygons.append(this_poly)
 
                 Job.yieldThread()
@@ -143,7 +147,9 @@ class ProcessSlicedLayersJob(Job):
             if self._progress:
                 self._progress.setProgress(progress)
 
+        # layer_data.calculateNormals()
         # We are done processing all the layers we got from the engine, now create a mesh out of the data
+        layer_data._normals = numpy.concatenate(all_normals)
         layer_mesh = layer_data.build()
 
         if self._abort_requested:

plugins/LayerView/layers.shader

@@ -1,35 +1,141 @@
 [shaders]
 vertex =
+    uniform highp mat4 u_modelMatrix;
+    uniform highp mat4 u_viewProjectionMatrix;
     uniform highp mat4 u_modelViewProjectionMatrix;
     uniform lowp float u_active_extruder;
     uniform lowp float u_shade_factor;
+    uniform highp mat4 u_normalMatrix;
 
     attribute highp vec4 a_vertex;
     attribute lowp vec4 a_color;
+    attribute highp vec4 a_normal;
+
     varying lowp vec4 v_color;
+
+    varying highp vec3 v_vertex;
+    varying highp vec3 v_normal;
+
     void main()
     {
-        gl_Position = u_modelViewProjectionMatrix * a_vertex;
+        vec4 world_space_vert = u_modelMatrix * a_vertex;
+        gl_Position = u_viewProjectionMatrix * world_space_vert;
+        // gl_Position = u_modelViewProjectionMatrix * a_vertex;
         // shade the color depending on the extruder index stored in the alpha component of the color
         v_color = (a_color.a == u_active_extruder) ? a_color : a_color * u_shade_factor;
         v_color.a = 1.0;
+
+        v_vertex = world_space_vert.xyz;
+        v_normal = (u_normalMatrix * normalize(a_normal)).xyz;
     }
 
-fragment =
-    varying lowp vec4 v_color;
+geometry =
+    #version 410
+
+    layout(lines) in;
+    layout(triangle_strip, max_vertices = 6) out;
+
+    in vec4 v_color[];
+    in vec3 v_vertex[];
+    in vec3 v_normal[];
+
+    out vec4 f_color;
+    out vec3 f_normal;
+    out vec3 f_vertex;
 
     void main()
     {
-        gl_FragColor = v_color;
+        int i;
+        vec4 delta;
+        vec3 g_normal;
+        vec3 g_offset;
+
+        delta = vec4(gl_in[1].gl_Position.xy, 0.0, 0.0) - vec4(gl_in[0].gl_Position.xy, 0.0, 0.0);
+        g_normal = normalize(vec3(delta.y, -delta.x, delta.z));
+        //g_offset = vec3(3.5, 3.5, 0.0); //5.0 * g_normal;  // vec3(3.5, 3.5, 0.0);
+        g_offset = normalize(vec3(g_normal.x, g_normal.y, 0)); //5.0 * g_normal;  // vec3(3.5, 3.5, 0.0);
+        f_vertex = v_vertex[0];
+
+        f_normal = v_normal[0];
+        f_color = v_color[0];
+        gl_Position = gl_in[0].gl_Position + g_offset;
+        EmitVertex();
+
+        f_normal = -v_normal[0];
+        f_color = v_color[0];
+        gl_Position = gl_in[0].gl_Position - g_offset;
+        EmitVertex();
+
+        f_normal = v_normal[0];
+        f_color = v_color[1];
+        gl_Position = gl_in[1].gl_Position + g_offset;
+        EmitVertex();
+
+        EndPrimitive();
+
+
+        f_vertex = v_vertex[1];
+
+        f_normal = -v_normal[0];
+        f_color = v_color[0];
+        gl_Position = gl_in[0].gl_Position - g_offset;
+        EmitVertex();
+
+        f_normal = v_normal[0];
+        f_color = v_color[1];
+        gl_Position = gl_in[1].gl_Position + g_offset;
+        EmitVertex();
+
+        f_normal = -v_normal[0];
+        f_color = v_color[1];
+        gl_Position = gl_in[1].gl_Position - g_offset;
+        EmitVertex();
+
+        EndPrimitive();
+
+    }
+
+fragment =
+    varying lowp vec4 f_color;
+    varying lowp vec3 f_normal;
+    varying lowp vec3 f_vertex;
+
+    uniform mediump vec4 u_diffuseColor;
+    //uniform highp vec3 u_lightPosition;
+
+    void main()
+    {
+        mediump vec4 finalColor = vec4(0.0);
+
+        finalColor += f_color;
+
+        highp vec3 normal = normalize(f_normal);
+        highp vec3 lightDir = normalize(vec3(0.0, 100.0, -50.0) - f_vertex);
+
+        // Diffuse Component
+        highp float NdotL = clamp(abs(dot(normal, lightDir)), 0.0, 1.0);
+        finalColor += (NdotL * u_diffuseColor);
+
+        finalColor.a = 1.0;
+        gl_FragColor = finalColor;
+
+        //gl_FragColor = f_color;
+        //gl_FragColor = vec4(f_normal, 1.0);
     }
 
 [defaults]
 u_active_extruder = 0.0
 u_shade_factor = 0.60
+u_diffuseColor = [1.0, 0.79, 0.14, 1.0]
+# u_lightPosition = light_0_position
 
 [bindings]
 u_modelViewProjectionMatrix = model_view_projection_matrix
+u_modelMatrix = model_matrix
+u_viewProjectionMatrix = view_projection_matrix
+u_normalMatrix = normal_matrix
 
 [attributes]
 a_vertex = vertex
 a_color = color
+a_normal = normal

resources/shaders/overhang.shader

@@ -20,6 +20,40 @@ vertex =
         v_normal = (u_normalMatrix * normalize(a_normal)).xyz;
     }
 
+geometry =
+    #version 410
+
+    layout(triangles) in;
+    layout(triangle_strip, max_vertices = 6) out;
+
+    in vec3 v_normal[];
+    in vec3 v_vertex[];
+
+    out vec3 f_normal;
+    out vec3 f_vertex;
+
+    void main()
+    {
+        int i;
+        for(i = 0; i < 3; i++)
+        {
+            f_normal = v_normal[i];
+            f_vertex = v_vertex[i];
+            gl_Position = gl_in[i].gl_Position + vec4(-50, 0.0, 0.0, 0.0);
+            EmitVertex();
+        }
+        EndPrimitive();
+
+        for(i = 0; i < 3; i++)
+        {
+            f_normal = v_normal[i];
+            f_vertex = v_vertex[i];
+            gl_Position = gl_in[i].gl_Position + vec4(50, 0.0, 0.0, 0.0);
+            EmitVertex();
+        }
+        EndPrimitive();
+    }
+
 fragment =
     uniform mediump vec4 u_ambientColor;
     uniform mediump vec4 u_diffuseColor;
@@ -31,27 +65,28 @@ fragment =
     uniform lowp float u_overhangAngle;
     uniform lowp vec4 u_overhangColor;
 
-    varying highp vec3 v_vertex;
-    varying highp vec3 v_normal;
+    varying highp vec3 f_vertex;
+    varying highp vec3 f_normal;
 
     void main()
     {
+
         mediump vec4 finalColor = vec4(0.0);
 
-        /* Ambient Component */
+        // Ambient Component
         finalColor += u_ambientColor;
 
-        highp vec3 normal = normalize(v_normal);
-        highp vec3 lightDir = normalize(u_lightPosition - v_vertex);
+        highp vec3 normal = normalize(f_normal);
+        highp vec3 lightDir = normalize(u_lightPosition - f_vertex);
 
-        /* Diffuse Component */
+        // Diffuse Component
         highp float NdotL = clamp(abs(dot(normal, lightDir)), 0.0, 1.0);
         finalColor += (NdotL * u_diffuseColor);
 
-        /* Specular Component */
-        /* TODO: We should not do specularity for fragments facing away from the light.*/
+        // Specular Component
+        // TODO: We should not do specularity for fragments facing away from the light.
         highp vec3 reflectedLight = reflect(-lightDir, normal);
-        highp vec3 viewVector = normalize(u_viewPosition - v_vertex);
+        highp vec3 viewVector = normalize(u_viewPosition - f_vertex);
         highp float NdotR = clamp(dot(viewVector, reflectedLight), 0.0, 1.0);
         finalColor += pow(NdotR, u_shininess) * u_specularColor;