diff options
| author | Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr> | 2018-07-31 16:22:25 +0200 |
|---|---|---|
| committer | Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr> | 2018-07-31 16:22:25 +0200 |
| commit | 159ef14fb9e198bb0066ea14e6b980f065de63dd (patch) | |
| tree | bc37c7d4ba09ee59deb708897fa0571709aec293 /silx/gui/plot/backends/glutils/GLText.py | |
| parent | 270d5ddc31c26b62379e3caa9044dd75ccc71847 (diff) | |
New upstream version 0.8.0+dfsg
Diffstat (limited to 'silx/gui/plot/backends/glutils/GLText.py')
| -rw-r--r-- | silx/gui/plot/backends/glutils/GLText.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/silx/gui/plot/backends/glutils/GLText.py b/silx/gui/plot/backends/glutils/GLText.py index cef0c5a..1540e26 100644 --- a/silx/gui/plot/backends/glutils/GLText.py +++ b/silx/gui/plot/backends/glutils/GLText.py @@ -1,7 +1,7 @@ # coding: utf-8 # /*########################################################################## # -# Copyright (c) 2014-2017 European Synchrotron Radiation Facility +# Copyright (c) 2014-2018 European Synchrotron Radiation Facility # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -195,8 +195,9 @@ class Text2D(object): gl.glUniform1i(prog.uniforms['texText'], texUnit) + mat = numpy.dot(matrix, mat4Translate(int(self.x), int(self.y))) gl.glUniformMatrix4fv(prog.uniforms['matrix'], 1, gl.GL_TRUE, - matrix * mat4Translate(int(self.x), int(self.y))) + mat.astype(numpy.float32)) gl.glUniform4f(prog.uniforms['color'], *self.color) if self.bgColor is not None: |