Merge pull request #31 from Contraz/samplers

Remove remaining PyOpenGL + major cleanup + samplers

Author: einarf

.pylintrc

@@ -136,7 +136,8 @@ disable=print-statement,
         comprehension-escape,
         missing-docstring,
         duplicate-code,
-        no-member
+        no-member,
+        C0326
 
 
 # Enable the message, report, category or checker with the given id(s). You can

README.md

@@ -49,13 +49,11 @@ Features
 --------
 
 * A simple effect system based on python packages
-* Supports loading GLTF and obj files/scenes
+* Supports loading GLTF 2.0 and obj files/scenes
 * Support for the rocket sync-tracker system to create interesting keyframe data (Using [pyrocket](https://github.com/Contraz/pyrocket))
 * Management commands to create new projects and effects
 * Convenient wrappers for VAO, Shader, Texture, FBO etc
-* On-the-fly Shader and VAO negotiation of the needed buffer binding
 * Runtime re-loading shaders (press R)
-* Strict validation in most OpenGL operations with reasonable error feedback
 * Time line / Timer support
 * A highly pluggable framework
 * Support for custom management commands
@@ -91,11 +89,10 @@ Running tests:
 pytest
 ```
 
-Bulding docs:
+Building docs:
 
 ```bash
-cd docs
-make html
+python setup.py build_sphinx
 ```
 
 Contributors

TODO.md

@@ -25,7 +25,6 @@
 - Framebuffer Blitting
 - Textures:
   - 3D
-  - Texture Array
   - Texture Cube
 - FBOs
   - Support layers

demosys/conf/__init__.py

@@ -59,10 +59,10 @@ def __repr__(self):
             settings_module=self.SETTINGS_MODULE,
         )
 
-    def add_shader_dir(self, dir):
+    def add_shader_dir(self, directory):
         """Hack in shader directory"""
         dirs = list(self.SHADER_DIRS)
-        dirs.append(dir)
+        dirs.append(directory)
         self.SHADER_DIRS = dirs
 
     def add_texture_dir(self, directory):

demosys/conf/default_settings.py

@@ -30,8 +30,6 @@
 
 # OpenGL context configuration
 # version: (MAJOR, MINOR)
-# profile: any, core, compat
-# forward_compat: Whether we should drop fixed pipeline and only support core
 OPENGL = {
     "version": (3, 3),
 }

demosys/conf/settingsfile.py

@@ -17,7 +17,7 @@ def create(settings):
             value = ",\n".join('    "{}": {}'.format(k, to_s(v)) for k, v in value.items())
 
             # Add comma after the last dict entry
-            if len(value) > 0:
+            if value:
                 value += ','
 
             data += "%s = {\n%s\n}\n\n" % (name, value)
@@ -26,7 +26,7 @@ def create(settings):
             value = ",\n".join("    {}".format(to_s(v)) for v in value)
 
             # Add comma after the last tuple entry
-            if len(value) > 0:
+            if value:
                 value += ","
 
             data += "{} = (\n{}\n)\n\n".format(name, value)
@@ -38,8 +38,8 @@ def create(settings):
     return data[:-1]
 
 
-def to_s(t):
-    if isinstance(t, str):
-        return '"{}"'.format(t)
+def to_s(var):
+    if isinstance(var, str):
+        return '"{}"'.format(var)
     else:
-        return str(t)
+        return str(var)

demosys/context/__init__.py

@@ -6,9 +6,16 @@
 
 def window() -> 'demosys.context.base.Window':
     """The window instance we are rendering to"""
+    if not WINDOW:
+        raise RuntimeError("Attempting to get window before creation")
+
     return WINDOW
 
 
 def ctx() -> moderngl.Context:
     """ModernGL context"""
-    return WINDOW.ctx
+    win = window()
+    if not win.ctx:
+        raise RuntimeError("Attempting to get context before creation")
+
+    return win.ctx

demosys/core/finders.py

@@ -59,7 +59,6 @@ def find_cached(self, path):
         :return: The absolute path to the file or None
         """
         entry = self._cache.get(path)
-
         if entry.exists:
             return entry.abspath
 

demosys/core/management/commands/run.py

@@ -19,8 +19,9 @@ def handle(self, *args, **options):
         print(manager_path)
         try:
             manager_cls = import_string(manager_path)
-        except ImportError as e:
-            raise ImproperlyConfigured("EFFECT_MANAGER '{}' failed to initialize: {}".format(manager_path, e))
+        except ImportError as err:
+            raise ImproperlyConfigured(
+                "EFFECT_MANAGER '{}' failed to initialize: {}".format(manager_path, err))
 
         manager = manager_cls()
         demosys.run(manager=manager)

demosys/deferred/effect.py

@@ -3,4 +3,6 @@
 
 
 class DeferredEffect(Effect):
-    pass
+
+    def draw(self, time, frametime, target):
+        pass