diff options
Diffstat (limited to 'silx/gui/plot/backends/glutils/GLSupport.py')
| -rw-r--r-- | silx/gui/plot/backends/glutils/GLSupport.py | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/silx/gui/plot/backends/glutils/GLSupport.py b/silx/gui/plot/backends/glutils/GLSupport.py index 3f473be..18c5eb7 100644 --- a/silx/gui/plot/backends/glutils/GLSupport.py +++ b/silx/gui/plot/backends/glutils/GLSupport.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 @@ -36,11 +36,20 @@ import numpy from ...._glutils import gl -def buildFillMaskIndices(nIndices): - if nIndices <= numpy.iinfo(numpy.uint16).max + 1: - dtype = numpy.uint16 - else: - dtype = numpy.uint32 +def buildFillMaskIndices(nIndices, dtype=None): + """Returns triangle strip indices for rendering a filled polygon mask + + :param int nIndices: Number of points + :param Union[numpy.dtype,None] dtype: + If specified the dtype of the returned indices array + :return: 1D array of indices constructing a triangle strip + :rtype: numpy.ndarray + """ + if dtype is None: + if nIndices <= numpy.iinfo(numpy.uint16).max + 1: + dtype = numpy.uint16 + else: + dtype = numpy.uint32 lastIndex = nIndices - 1 splitIndex = lastIndex // 2 + 1 @@ -158,35 +167,35 @@ class Shape2D(object): def mat4Ortho(left, right, bottom, top, near, far): """Orthographic projection matrix (row-major)""" - return numpy.matrix(( + return numpy.array(( (2./(right - left), 0., 0., -(right+left)/float(right-left)), (0., 2./(top - bottom), 0., -(top+bottom)/float(top-bottom)), (0., 0., -2./(far-near), -(far+near)/float(far-near)), - (0., 0., 0., 1.)), dtype=numpy.float32) + (0., 0., 0., 1.)), dtype=numpy.float64) def mat4Translate(x=0., y=0., z=0.): """Translation matrix (row-major)""" - return numpy.matrix(( + return numpy.array(( (1., 0., 0., x), (0., 1., 0., y), (0., 0., 1., z), - (0., 0., 0., 1.)), dtype=numpy.float32) + (0., 0., 0., 1.)), dtype=numpy.float64) def mat4Scale(sx=1., sy=1., sz=1.): """Scale matrix (row-major)""" - return numpy.matrix(( + return numpy.array(( (sx, 0., 0., 0.), (0., sy, 0., 0.), (0., 0., sz, 0.), - (0., 0., 0., 1.)), dtype=numpy.float32) + (0., 0., 0., 1.)), dtype=numpy.float64) def mat4Identity(): """Identity matrix""" - return numpy.matrix(( + return numpy.array(( (1., 0., 0., 0.), (0., 1., 0., 0.), (0., 0., 1., 0.), - (0., 0., 0., 1.)), dtype=numpy.float32) + (0., 0., 0., 1.)), dtype=numpy.float64) |