[glumpy] push by Nicolas.Rougier@gmail.com - Fix on_scroll handler (wrong number of parameters) on 2012-03-02 19:06 GMT

[glu...@googlecode.com]

Revision: 72f053658fa4
Author: Nicolas Rougier <Nicolas...@inria.fr>
Date: Fri Mar 2 11:06:29 2012
Log: Fix on_scroll handler (wrong number of parameters)

http://code.google.com/p/glumpy/source/detail?r=72f053658fa4

Modified:
/glumpy/figure.py

=======================================
--- /glumpy/figure.py Sat Oct 1 03:05:48 2011
+++ /glumpy/figure.py Fri Mar 2 11:06:29 2012
@@ -383,11 +383,22 @@
'''

gl.glEnable (gl.GL_DEPTH_TEST)
- gl.glEnable (gl.GL_LIGHT0)
- gl.glLightfv (gl.GL_LIGHT0, gl.GL_DIFFUSE, (1.0, 1.0, 1.0, 1.0))
- gl.glLightfv (gl.GL_LIGHT0, gl.GL_AMBIENT, (0.1, 0.1, 0.1, 1.0))
- gl.glLightfv (gl.GL_LIGHT0, gl.GL_SPECULAR, (0.0, 0.0, 0.0, 1.0))
- gl.glLightfv (gl.GL_LIGHT0, gl.GL_POSITION, (0.0, 1.0, 2.0, 1.0))
+
+ gl.glLightfv (gl.GL_LIGHT0, gl.GL_DIFFUSE, (1.0, 0.0, 0.0, 1.0))
+ gl.glLightfv (gl.GL_LIGHT0, gl.GL_AMBIENT, (0.0, 0.0, 0.0, 1.0))
+ gl.glLightfv (gl.GL_LIGHT0, gl.GL_SPECULAR,(0.0, 0.0, 0.0, 0.0))
+ gl.glLightfv (gl.GL_LIGHT0, gl.GL_POSITION,(-1.0,1.0, 1.0, 1.0))
+
+ gl.glLightfv (gl.GL_LIGHT1, gl.GL_DIFFUSE, (0.0, 1.0, 0.0, 1.0))
+ gl.glLightfv (gl.GL_LIGHT1, gl.GL_AMBIENT, (0.0, 0.0, 0.0, 0.0))
+ gl.glLightfv (gl.GL_LIGHT1, gl.GL_SPECULAR,(0.0, 0.0, 0.0, 0.0))
+ gl.glLightfv (gl.GL_LIGHT1, gl.GL_POSITION,(1.0, 1.0, 1.0, 1.0))
+
+ gl.glLightfv (gl.GL_LIGHT2, gl.GL_DIFFUSE, (0.0, 0.0, 1.0, 1.0))
+ gl.glLightfv (gl.GL_LIGHT2, gl.GL_AMBIENT, (0.0, 0.0, 0.0, 0.0))
+ gl.glLightfv (gl.GL_LIGHT2, gl.GL_SPECULAR,(0.0, 0.0, 0.0, 0.0))
+ gl.glLightfv (gl.GL_LIGHT2, gl.GL_POSITION,(0.0,-1.0, 1.0, 1.0))
+
gl.glEnable (gl.GL_BLEND)
gl.glEnable (gl.GL_COLOR_MATERIAL)
gl.glColorMaterial(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT_AND_DIFFUSE)
@@ -595,7 +606,7 @@

- def on_mouse_scroll(self, dx, dy):
+ def on_mouse_scroll(self, x, y, dx, dy):
'''
The mouse wheel was scrolled by (dx,dy).