Update Shader __str__ and move _generate_enum_map.

_generate_enum_map is now in gl.py.
Shader now generates __str__ descriptions that are
in keeping with normal python __str__ results.

Author: adamlwgriffiths

pygly/gl.py

@@ -34,6 +34,21 @@
 from pyrr.utils import all_parameters_as_numpy_arrays, parameters_as_numpy_arrays
 
 
+def _generate_enum_map( enum_names ):
+    """Convert dicts of format {'GL_ENUM_NAME': value, ...}
+    to { GL_ENUM_NAME : value, ...}
+
+    Used to ignore NameErrors that would otherwise result from incomplete
+    OpenGL implementations.
+    """
+    map = {}
+    for (key, value) in enum_names.items():
+        try:
+            map[ getattr(GL, key) ] = value
+        except AttributeError:
+            pass
+    return map
+
 def _extract_version(version):
     """Extracts the major and minor versions from an OpenGL version string.
 
@@ -144,6 +159,19 @@ def type_to_string( glType ):
         GL.GLdouble:   "GLdouble",
         }[ glType ]
 
+def enum_to_type( glEnum ):
+    return {
+        GL.constants.GL_CHAR:           GL.constants.GLchar,
+        GL.constants.GL_UNSIGNED_BYTE:  GL.constants.GLubyte,
+        GL.constants.GL_BYTE:           GL.constants.GLbyte,
+        GL.constants.GL_UNSIGNED_SHORT: GL.constants.GLushort,
+        GL.constants.GL_SHORT:          GL.constants.GLshort,
+        GL.constants.GL_UNSIGNED_INT:   GL.constants.GLuint,
+        GL.constants.GL_INT:            GL.constants.GLint,
+        GL.constants.GL_FLOAT:          GL.constants.GLfloat,
+        GL.constants.GL_DOUBLE:         GL.constants.GLdouble,
+        }[ glEnum ]
+
 @contextmanager
 def attributes( attribs ):
     """Wraps glPushAttrib and glPopAttrib

pygly/shader.py

@@ -69,6 +69,8 @@
 
 from pyrr.utils import parameters_as_numpy_arrays
 
+from pygly.gl import _generate_enum_map
+
 
 def parse_shader_error( error ):
     """Parses a single GLSL error and extracts the line number
@@ -242,21 +244,6 @@ def attribute_for_name( handle, name ):
     return None
 
 
-def _generate_enum_map( enum_names ):
-    """Convert dicts of format {'GL_ENUM_NAME': value, ...}
-    to { GL_ENUM_NAME : value, ...}
-
-    Used to ignore NameErrors that would otherwise result from incomplete
-    OpenGL implementations.
-    """
-    map = {}
-    for (key, value) in enum_names.items():
-        try:
-            map[ getattr(GL, key) ] = value
-        except AttributeError:
-            pass
-    return map
-
 #: processes our enumeration to string map and stores the result
 _enum_string_map = _generate_enum_map(
     {
@@ -470,7 +457,10 @@ def _print_shader_errors( self, buffer ):
             print( "\tCode: %s" % lines[ line - 1 ] )
 
     def __str__( self ):
-        string = "Shader:\t%s" % ( enum_to_string( self.type ) )
+        string = "%s(type=%s)" % (
+            self.__class__.__name__,
+            enum_to_string( self.type )
+            )
         return string
 
 
@@ -670,14 +660,10 @@ def __getitem__(self, name):
             raise KeyError( name )
 
     def __str__( self ):
-        string = \
-            "ShaderProgram:\n" \
-            "Linked:\t%s\n" \
-            "%s\n" \
-            "%s" % (
-            str(self.linked),
-            str(self.attributes),
-            str(self.uniforms)
+        string = "%s(uniforms=[%s], attributes=[%s])" % (
+            self.__class__.__name__,
+            str( self.uniforms ),
+            str( self.attributes )
             )
         return string
 
@@ -805,10 +791,13 @@ def __setitem__( self, name, value ):
         self[ name ].value = value
 
     def __str__( self ):
-        string = "Uniforms:\n"
+        string = "%s(" % (self.__class__.__name__)
+
         for uniform in self:
-            string += str(uniform) + "\n"
-        return string[:-1]
+            string += str(uniform) + ", "
+        string = string[:-2] + ")"
+
+        return string
 
 
 class Uniform( object ):
@@ -948,7 +937,7 @@ def value( self, *args ):
     def __str__( self ):
         """Returns a human readable string representing the Uniform.
         """
-        return "%s:\t%s\t%s\t%d" % (
+        return "%s(name=%s, type=%s, location=%d)" % (
             self.__class__.__name__,
             self.name,
             enum_to_string( self.type ),
@@ -1280,10 +1269,12 @@ def __setitem__( self, name, value ):
         self[ name ].location = value
 
     def __str__( self ):
-        string = "Attributes:\n"
+        string = "%s(" % (self.__class__.__name__)
+
         for attribute in self:
-            string += str(attribute) + "\n"
-        return string[:-1]
+            string += str(attribute) + ", "
+
+        return string[:-2] + ")"
 
 
 class Attribute( object ):
@@ -1338,7 +1329,7 @@ def location( self, location ):
     def __str__( self ):
         """Returns a human readable string representing the Attribute.
         """
-        return "%s:\t%s\t%s\t%d" % (
+        return "%s(name=%s, type=%s, location=%d)" % (
             self.__class__.__name__,
             self.name,
             enum_to_string( self.type ),