Merge pull request #137 from chemlab/outlinecustom

Improved outline by adding color

chemlab/graphics/postprocessing/outline.py

@@ -11,7 +11,7 @@
 import os
 
 class OutlineEffect(object):
-    """Add a black, cartoon-like outline.
+    """Add a colored, cartoon-like outline.
 
     This effect analyzes each point to be drawn and check if it's at a
     point of discontinuity, either because there's a change in surface normal
@@ -27,11 +27,14 @@ class OutlineEffect(object):
     
         Set the edge-determination test to both depth and normal
         discontinuity or either one of the two.
-
+    color: 3d vectors
+    
+        Set the color to the rgb value specified (each value between 0 and 1)
+    
     """
 
 
-    def __init__(self, widget, kind='depthnormal'):
+    def __init__(self, widget, kind='depthnormal', color=(0, 0, 0)):
         self.widget = widget
         curdir = os.path.dirname(__file__)
         vert = open(os.path.join(curdir, 'shaders', 'noeffect.vert')).read()
@@ -44,7 +47,7 @@ def __init__(self, widget, kind='depthnormal'):
             raise Exception('The kind of outline should be choosen between depthnormal, depthonly and normalonly')
 
         self.kind = kind
-
+        self.outline_color = np.array(color)
         self.quad_program = shaders.compileProgram(vertex, fragment)
 
     def render(self, fb, texturedict):
@@ -62,6 +65,8 @@ def render(self, fb, texturedict):
         set_uniform(self.quad_program, 'inv_projection', 'mat4fv',
                     inv_projection)
 
+        set_uniform(self.quad_program, "outline_color", "3f", self.outline_color)
+
         normal_id = glGetUniformLocation(self.quad_program, b"s_norm")
         glUniform1i(normal_id, 0)        
 
@@ -107,4 +112,4 @@ def render(self, fb, texturedict):
         glDisableClientState(GL_VERTEX_ARRAY)
 
     def on_resize(self, w, h):
-        pass
+        pass

chemlab/graphics/postprocessing/shaders/outline.frag

@@ -5,6 +5,7 @@ uniform sampler2D s_color;
 uniform vec2 texcoordOffset;
 uniform mat4 inv_projection;
 uniform int whichoutline; // 0 - depthnormal; 1 - depthonly; 0 - normalonly;
+uniform vec3 outline_color;
 
 vec2 offsets [8];
 
@@ -78,6 +79,6 @@ void main() {
     illum = 1.0 - darkness_norm;
   }
 
-  gl_FragColor.rgb = texture2D(s_color, pos).rgb * illum;
+  gl_FragColor.rgb = mix(outline_color.rgb, texture2D(s_color, pos).rgb, illum);
   gl_FragColor.a = 1.0;
 }

tests/test_graphics.py

@@ -388,7 +388,8 @@ def test_outline():
     sr = v.add_renderer(AtomRenderer, mol.r_array, mol.type_array,
                         'impostors', shading='toon')
 
-    v.add_post_processing(OutlineEffect, 'depthnormal')
+    #v.add_post_processing(OutlineEffect, 'depthnormal')
+    v.add_post_processing(OutlineEffect, 'depthnormal', color=[0, 0, 1])
     v.add_post_processing(SSAOEffect, ssao_power=4.0)
     v.add_post_processing(FXAAEffect)
     v.add_post_processing(GammaCorrectionEffect)
@@ -539,4 +540,4 @@ def test_molecular_viewer():
 
     v.run()
 
-
+