Fixed bug

glumpy · Dec 21, 2015 · fea04a1 · fea04a1
1 parent 85c0715
commit fea04a1
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 1 deletion.
diff --git a/examples/transform-image.py b/examples/transform-image.py
diff --git a/examples/transform-linear-log-scale.py b/examples/transform-linear-log-scale.py
diff --git a/examples/transform-linear-scale.py b/examples/transform-linear-scale.py
diff --git a/examples/transform-log-polar.py b/examples/transform-log-polar.py
diff --git a/examples/transform-log-scale.py b/examples/transform-log-scale.py
diff --git a/examples/transform-ortho.py b/examples/transform-ortho.py
diff --git a/examples/transform-pan-zoom.py b/examples/transform-pan-zoom.py
diff --git a/examples/transform-polar.py b/examples/transform-polar.py
diff --git a/examples/transform-power-scale.py b/examples/transform-power-scale.py
diff --git a/examples/transform-pvm.py b/examples/transform-pvm.py
diff --git a/examples/transform-rotate.py b/examples/transform-rotate.py
diff --git a/examples/transform-trackball.py b/examples/transform-trackball.py
diff --git a/glumpy/gl.py b/glumpy/gl.py
@@ -18,6 +18,7 @@
                'OpenGL.arrays.numpymodule.NumpyHandler',[
                    'glumpy.gloo.buffer.VertexBuffer',
                    'glumpy.gloo.buffer.IndexBuffer',
+                   'glumpy.gloo.atlas.Atlas',
                    'glumpy.gloo.texture.Texture2D',
                    'glumpy.gloo.texture.Texture1D',
                    'glumpy.gloo.texture.FloatTexture2D',

diff --git a/glumpy/graphics/collections/agg_glyph_collection.py b/glumpy/graphics/collections/agg_glyph_collection.py
@@ -138,7 +138,7 @@ def bake(self, text, font, anchor_x='center', anchor_y='center'):
                 vertices[index]['texcoord'] = (u0,v0),(u0,v1),(u1,v1),(u1,v0)
                 vertices[index]['offset'] = offset
                 indices[index] = index*4
-                indices[index] += 0,1,2, 0,2,3
+                indices[index] += np.array([0,1,2, 0,2,3], dtype=np.uint32)
                 pen[0] = pen[0]+glyph.advance[0]/64. + kerning
                 pen[1] = pen[1]+glyph.advance[1]/64.
                 prev = charcode