RF: relocate _shadersPyglet -> visual._shaders.py

jeremygray · Dec 6, 2015 · c8f6351 · c8f6351
1 parent b8d2fe7
commit c8f6351
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 167 deletions.
diff --git a/psychopy/_shadersPygame.NOT_USED b/psychopy/_shadersPygame.NOT_USED
diff --git a/psychopy/hardware/crs/shaders.py b/psychopy/hardware/crs/shaders.py
@@ -13,7 +13,7 @@
 #    It is, for example, Mario's idea to add the 0.01 to avoid rounding issues
 
 from __future__ import absolute_import
-from psychopy._shadersPyglet import compileProgram, vertSimple
+from psychopy.visual._shaders import compileProgram, vertSimple
 
 bitsMonoModeFrag="""
 /* Mono++ output formatter

diff --git a/psychopy/_shadersPyglet.py → psychopy/visual/_shaders.py b/psychopy/_shadersPyglet.py → psychopy/visual/_shaders.py
@@ -2,7 +2,13 @@
 # Copyright (C) 2015 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
-from ctypes import byref, cast, c_int, c_char, c_char_p, POINTER, create_string_buffer
+"""shaders programs for either pyglet or pygame
+"""
+
+from __future__ import absolute_import
+
+from ctypes import (byref, cast, c_int, c_char, c_char_p,
+                    POINTER, create_string_buffer)
 import pyglet
 GL=pyglet.gl
 import sys

diff --git a/psychopy/visual/secondorder.py b/psychopy/visual/secondorder.py
@@ -12,6 +12,9 @@
 # other calls to pyglet or pyglet submodules, otherwise it may not get picked
 # up by the pyglet GL engine and have no effect.
 # Shaders will work but require OpenGL2.0 drivers AND PyOpenGL3.0+
+
+from __future__ import absolute_import
+
 import pyglet
 pyglet.options['debug_gl'] = False
 import ctypes
@@ -22,10 +25,10 @@
 
 from psychopy.tools.arraytools import val2array
 from psychopy.tools.attributetools import attributeSetter
-from psychopy.visual.grating import GratingStim
+from .grating import GratingStim
 import numpy
 
-import psychopy._shadersPyglet as _shaders
+from . import _shaders
 
 #we need a different shader program for this (3 textures)
 carrierEnvelopeMaskFrag = '''
@@ -436,7 +439,7 @@ def _updateListNoShaders(self):
         GL.glMultiTexCoord2f(GL.GL_TEXTURE2,Rmask,Tmask)
         GL.glVertex2f(vertsPix[3,0], vertsPix[3,1])
         GL.glEnd()
-        
+
         #disable mask
         GL.glActiveTextureARB(GL.GL_TEXTURE2_ARB)
         GL.glDisable(GL.GL_TEXTURE_2D)
@@ -461,7 +464,7 @@ def clearTextures(self):
         GL.glDeleteTextures(1, self._carrierID)
         GL.glDeleteTextures(1, self._envelopeID)
         GL.glDeleteTextures(1, self._maskID)
-    
+
     def _calcEnvCyclesPerStim(self):
 
         if self.units in ['norm', 'height']:
@@ -470,4 +473,3 @@ def _calcEnvCyclesPerStim(self):
         else:
             #self._cycles = self.sf * self.size
             self._envcycles = self.envsf * self.size
-
diff --git a/psychopy/visual/window.py b/psychopy/visual/window.py
@@ -6,6 +6,8 @@
 # Copyright (C) 2015 Jonathan Peirce
 # Distributed under the terms of the GNU General Public License (GPL).
 
+from __future__ import absolute_import
+
 import sys
 import os
 import weakref
@@ -56,9 +58,9 @@
 from psychopy.tools.attributetools import attributeSetter, setAttribute
 from psychopy.tools.arraytools import val2array
 from psychopy import makeMovies
-from psychopy.visual.text import TextStim
-from psychopy.visual.grating import GratingStim
-from psychopy.visual.helpers import setColor
+from .text import TextStim
+from .grating import GratingStim
+from .helpers import setColor
 from . import glob_vars
 
 try:
@@ -80,7 +82,7 @@
 
 from psychopy.gamma import getGammaRamp, setGammaRamp, setGamma
 #import pyglet.gl, pyglet.window, pyglet.image, pyglet.font, pyglet.event
-import psychopy._shadersPyglet as _shaders
+from . import _shaders
 try:
     from pyglet import media
     havePygletMedia = True