psychopy 2024.2.5__py3-none-any.whl → 2025.1.1__py3-none-any.whl

psychopy/visual/image.py

@@ -4,7 +4,7 @@
 """Display an image on `psycopy.visual.Window`"""
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 # Ensure setting pyglet.options['debug_gl'] to False is done prior to any
@@ -24,12 +24,15 @@ from fractions import Fraction
 
 import psychopy  # so we can get the __path__
 from psychopy import logging, colors, layout
+from psychopy.tools import gltools as gt
 
 from psychopy.tools.attributetools import attributeSetter, setAttribute
 from psychopy.visual.basevisual import (
     BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin, TextureMixin
 )
 
+USE_LEGACY_GL = pyglet.version < '2.0'
+
 
 class ImageStim(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin,
                 TextureMixin):
@@ -109,9 +112,15 @@ class ImageStim(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin,
         self.texRes = texRes  # rebuilds the mask
         self.size = size
 
-        # generate a displaylist ID
-        self._listID = GL.glGenLists(1)
-        self._updateList()  # ie refresh display list
+        if self.win.USE_LEGACY_GL:
+            # generate a displaylist ID
+            self._listID = GL.glGenLists(1)
+            self._updateList()  # ie refresh display list
+        else:
+            # normalized texture coordinates
+            self._texCoords = numpy.array(
+                [[1, 0], [0, 0], [0, 1], [1, 1]], dtype=float)
+            self._maskCoords = self._texCoords.copy()
 
         # set autoLog now that params have been initialised
         wantLog = autoLog is None and self.win.autoLog
@@ -119,6 +128,16 @@ class ImageStim(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin,
         if self.autoLog:
             logging.exp("Created %s = %s" % (self.name, str(self)))
 
+    def __del__(self):
+        """Remove textures from graphics card to prevent crash
+        """
+        try:
+            #if hasattr(self, '_listID'):
+                # GL.glDeleteLists(self._listID, 1)
+            self.clearTextures()
+        except (ImportError, ModuleNotFoundError, TypeError):
+            pass  # has probably been garbage-collected already
+
     def _updateListShaders(self):
         """
         The user shouldn't need this method since it gets called
@@ -192,18 +211,31 @@ class ImageStim(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin,
 
         GL.glEndList()
 
-    def __del__(self):
-        """Remove textures from graphics card to prevent crash
+    def _drawLegacyGL(self, win):
+        """Legacy draw routine.
         """
-        try:
-            if hasattr(self, '_listID'):
-                GL.glDeleteLists(self._listID, 1)
-            self.clearTextures()
-        except (ImportError, ModuleNotFoundError, TypeError):
-            pass  # has probably been garbage-collected already
+        GL.glPushMatrix()  # push before the list, pop after
+        win.setScale('pix')
+        GL.glColor4f(*self._foreColor.render('rgba1'))
+
+        if self._needTextureUpdate:
+            self.setImage(value=self._imName, log=False)
+        if self._needUpdate:
+            self._updateList()
+        GL.glCallList(self._listID)
+
+        # return the view to previous state
+        GL.glPopMatrix()
 
     def draw(self, win=None):
-        """Draw.
+        """Draw the stimulus on the window.
+
+        Parameters
+        ----------
+        win : `~psychopy.visual.Window`, optional
+            The window to draw the stimulus on. If None, the stimulus will be
+            drawn on the window that was passed to the constructor.
+
         """
         # check the type of image we're dealing with
         if (type(self.image) != numpy.ndarray and
@@ -222,18 +254,64 @@ class ImageStim(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin,
             if videoFrame is not None:
                 self._movieFrameToTexture(videoFrame)
 
-        GL.glPushMatrix()  # push before the list, pop after
+        if win.USE_LEGACY_GL:
+            self._drawLegacyGL(win)
+            return
+
+        win.setOrthographicView()
         win.setScale('pix')
-        GL.glColor4f(*self._foreColor.render('rgba1'))
+
+        # GL.glColor4f(*self._foreColor.render('rgba1'))
 
         if self._needTextureUpdate:
             self.setImage(value=self._imName, log=False)
-        if self._needUpdate:
-            self._updateList()
-        GL.glCallList(self._listID)
 
-        # return the view to previous state
-        GL.glPopMatrix()
+        if self.isLumImage:  # select the appropriate shader
+            # for a luminance image do recoloring
+            _prog = self.win._progSignedTexMask
+        else:
+            # for an rgb image there is no recoloring
+            _prog = self.win._progImageStim
+
+        gt.useProgram(_prog)
+
+        # bind textures
+        GL.glEnable(GL.GL_TEXTURE_2D)
+        GL.glActiveTexture(GL.GL_TEXTURE1)  # mask
+        GL.glBindTexture(GL.GL_TEXTURE_2D, self._maskID)
+        GL.glActiveTexture(GL.GL_TEXTURE0)  # color/lum image
+        GL.glBindTexture(GL.GL_TEXTURE_2D, self._texID)
+
+        # set the shader uniforms
+        gt.setUniformSampler2D(_prog, b'uTexture', 0)  # is texture unit 0
+        gt.setUniformSampler2D(_prog, b'uMask', 1)  # mask is texture unit 1
+        gt.setUniformValue(_prog, b'uColor', self._foreColor.render('rgba1'))
+        gt.setUniformMatrix(
+            _prog, 
+            b'uProjectionMatrix', 
+            win._projectionMatrix,
+            transpose=True)
+        gt.setUniformMatrix(
+            _prog, 
+            b'uModelViewMatrix', 
+            win._viewMatrix,
+            transpose=True)
+
+        # draw the image
+        gt.drawClientArrays({
+            'gl_Vertex': self.verticesPix,
+            'gl_MultiTexCoord0': self._texCoords,
+            'gl_MultiTexCoord1': self._maskCoords}, 
+            'GL_QUADS')
+        
+        gt.useProgram(None)
+
+        # unbind the textures
+        GL.glActiveTexture(GL.GL_TEXTURE1)
+        GL.glBindTexture(GL.GL_TEXTURE_2D, 0)
+        GL.glActiveTexture(GL.GL_TEXTURE0)
+        GL.glBindTexture(GL.GL_TEXTURE_2D, 0)
+        GL.glDisable(GL.GL_TEXTURE_2D)
 
     def _movieFrameToTexture(self, movieSrc):
         """Convert a movie frame to a texture and use it.

psychopy/visual/line.py

@@ -6,7 +6,7 @@
 """
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 
@@ -17,7 +17,7 @@ from psychopy import logging
 import numpy
 
 from psychopy.visual.shape import ShapeStim
-from psychopy.tools.attributetools import attributeSetter, setAttribute
+from psychopy.tools.attributetools import attributeSetter, setAttribute, undefined
 
 
 class Line(ShapeStim):
@@ -51,11 +51,6 @@ class Line(ShapeStim):
     lineColor : array_like, str, :class:`~psychopy.colors.Color` or None
         Color of the line. If `None`, a fully transparent color is used which
         makes the line invisible. *Deprecated* use `color` instead.
-    lineColorSpace : str or None
-        Colorspace to use for the line. These change how the values passed to
-        `lineColor` are interpreted. *Deprecated*. Please use `colorSpace` to
-        set the line colorspace. This arguments may be removed in a future
-        version.
     pos : array_like
         Initial translation (`x`, `y`) of the line on-screen relative to the
         origin located at the center of the window or buffer in `units`.
@@ -92,9 +87,6 @@ class Line(ShapeStim):
         smoother (less-pixelated) line.
     draggable : bool
         Can this stimulus be dragged by a mouse click?
-    lineRGB: array_like, :class:`~psychopy.colors.Color` or None
-        *Deprecated*. Please use `color` instead. This argument may be removed
-        in a future version.
     name : str
         Optional name of the stimuli for logging.
     autoLog : bool
@@ -123,16 +115,13 @@ class Line(ShapeStim):
 
     """
 
-    _defaultFillColor = None
-    _defaultLineColor = "white"
-
     def __init__(self,
                  win,
                  start=(-.5, -.5),
                  end=(.5, .5),
                  units=None,
                  lineWidth=1.5,
-                 lineColor=False,
+                 lineColor="white",
                  colorSpace='rgb',
                  pos=(0, 0),
                  size=1.0,
@@ -147,11 +136,11 @@ class Line(ShapeStim):
                  autoLog=None,
                  autoDraw=False,
                  # legacy
-                 color=False,
-                 fillColor=False,
-                 lineColorSpace=None,
-                 lineRGB=False,
-                 fillRGB=False,
+                 color=undefined,
+                 fillColor=undefined,
+                 lineColorSpace=undefined,
+                 lineRGB=undefined,
+                 fillRGB=undefined,
                  ):
 
         """
@@ -170,9 +159,6 @@ class Line(ShapeStim):
             units=units,
             lineWidth=lineWidth,
             lineColor=lineColor,
-            lineColorSpace=None,
-            fillColor=None,
-            fillColorSpace=lineColorSpace,  # have these set to the same
             vertices=(start, end),
             anchor=anchor,
             closeShape=False,
@@ -184,13 +170,17 @@ class Line(ShapeStim):
             depth=depth,
             interpolate=interpolate,
             draggable=draggable,
-            lineRGB=lineRGB,
-            fillRGB=fillRGB,
             name=name,
             autoLog=autoLog,
             autoDraw=autoDraw,
+            colorSpace=colorSpace,
+            # legacy
             color=color,
-            colorSpace=colorSpace)
+            fillColor=fillColor,
+            lineColorSpace=lineColorSpace,
+            lineRGB=lineRGB,
+            fillRGB=fillRGB,
+        )
 
         del self._tesselVertices
 

psychopy/visual/movie.py

@@ -5,7 +5,7 @@
 """
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from psychopy.visual.movies import MovieStim

psychopy/visual/movie2.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 #
 # Contributed by Sol Simpson, April 2014.
@@ -9,12 +9,13 @@
 # of avbin
 
 
-from psychopy.tools.pkgtools import PluginStub
+from psychopy.plugins import PluginStub
 
 
 class MovieStim2(
     PluginStub,
     plugin="psychopy-legacy",
-    doclink="https://psychopy.github.io/psychopy-legacy/coder/visual/MovieStim2"
+    docsHome="https://psychopy.github.io/psychopy-legacy",
+    docsRef="/coder/MovieStim2"
 ):
     pass

psychopy/visual/movie3.py

@@ -2,16 +2,17 @@
 # -*- coding: utf-8 -*-
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 
-from psychopy.tools.pkgtools import PluginStub
+from psychopy.plugins import PluginStub
 
 
 class MovieStim3(
     PluginStub,
     plugin="psychopy-legacy",
-    doclink="https://psychopy.github.io/psychopy-legacy/coder/visual/MovieStim3"
+    docsHome="https://psychopy.github.io/psychopy-legacy",
+    docsRef="/coder/MovieStim3"
 ):
     pass

psychopy/visual/movies/__init__.py

@@ -5,7 +5,7 @@
 """
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 __all__ = ['MovieStim']

psychopy/visual/movies/frame.py

@@ -5,7 +5,7 @@
 """
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 __all__ = ["MovieFrame", "NULL_MOVIE_FRAME_INFO", "MOVIE_FRAME_NOT_READY"]

psychopy/visual/movies/metadata.py

@@ -5,7 +5,7 @@
 """
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 __all__ = ["MovieMetadata", "NULL_MOVIE_METADATA"]

psychopy/visual/movies/players/__init__.py

@@ -5,7 +5,7 @@
 """
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 __all__ = ["getMoviePlayer"]

psychopy/visual/movies/players/_base.py

@@ -5,7 +5,7 @@
 """
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 __all__ = ["BaseMoviePlayer"]

psychopy/visual/movies/players/ffpyplayer_player.py

@@ -5,7 +5,7 @@
 """
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 __all__ = [
@@ -923,8 +923,7 @@ class FFPyPlayer(BaseMoviePlayer):
     def isFinished(self):
         """`True` if the video is finished (`bool`).
         """
-        # why is this the same as STOPPED?
-        return self._status == FINISHED
+        return self._tStream.isFinished
 
     def play(self, log=False):
         """Start or continue a paused movie from current position.

psychopy/visual/nnlvs.py

@@ -735,11 +735,12 @@ class VisualSystemHD(window.Window):
         offset = 0 if eye == 'left' else frameW
         self.viewport = self.scissor = (offset, 0, frameW, frameH)
 
-        GL.glMatrixMode(GL.GL_PROJECTION)
-        GL.glLoadIdentity()
-        GL.glOrtho(-1, 1, -1, 1, -1, 1)
-        GL.glMatrixMode(GL.GL_MODELVIEW)
-        GL.glLoadIdentity()
+        if self.USE_LEGACY_GL:
+            GL.glMatrixMode(GL.GL_PROJECTION)
+            GL.glLoadIdentity()
+            GL.glOrtho(-1, 1, -1, 1, -1, 1)
+            GL.glMatrixMode(GL.GL_MODELVIEW)
+            GL.glLoadIdentity()
 
         # anti-aliasing the edges of the polygon
         GL.glEnable(GL.GL_MULTISAMPLE)
@@ -795,7 +796,9 @@ class VisualSystemHD(window.Window):
         # frameBuffer
         GL.glActiveTexture(GL.GL_TEXTURE0)
         GL.glEnable(GL.GL_TEXTURE_2D)
-        GL.glColor3f(1.0, 1.0, 1.0)  # glColor multiplies with texture
+        if self.USE_LEGACY_GL:
+            GL.glColor3f(1.0, 1.0, 1.0)  # glColor multiplies with texture
+
         GL.glColorMask(True, True, True, True)
 
         # blit the textures to the back buffer

psychopy/visual/noise.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # some code provided by Andrew Schofield
 # Distributed under the terms of the GNU General Public License (GPL).
 
@@ -15,7 +15,7 @@ These are optional components that can be obtained by installing the
 
 """
 
-from psychopy.tools.pkgtools import PluginStub
+from psychopy.plugins import PluginStub
 
 # Requires shaders if you don't have them it will just throw and error.
 # Ensure setting pyglet.options['debug_gl'] to False is done prior to any
@@ -26,19 +26,7 @@ from psychopy.tools.pkgtools import PluginStub
 class NoiseStim(
     PluginStub,
     plugin="psychopy-visionscience",
-    doclink="https://psychopy.github.io/psychopy-visionscience/coder/NoiseStim/"
+    docsHome="https://psychopy.github.io/psychopy-visionscience",
+    docsRef="/coder/NoiseStim/"
 ):
     pass
-
-
-
-class NoiseStim:
-    """
-    `psychopy.visual.NoiseStim` is now located within the `psychopy-visionscience` plugin. You
-    can find the documentation for it `here
-    <https://psychopy.github.io/psychopy-visionscience/coder/NoiseStim>`_
-    """
-
-
-if __name__ == "__main__":
-    pass

psychopy/visual/patch.py

@@ -6,15 +6,16 @@ please use the :class:`~psychopy.visual.GratingStim`
 or the :class:`~psychopy.visual.ImageStim` classes.'''
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
-from psychopy.tools.pkgtools import PluginStub
+from psychopy.plugins import PluginStub
 
 
 class PatchStim(
     PluginStub,
     plugin="psychopy-legacy",
-    doclink="https://psychopy.github.io/psychopy-legacy/coder/visual/PatchStim"
+    docsHome="https://psychopy.github.io/psychopy-legacy",
+    docsRef="/coder/PatchStim"
 ):
     pass

psychopy/visual/pie.py

@@ -4,7 +4,7 @@
 """Create a pie shape."""
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from psychopy.visual.shape import BaseShapeStim
@@ -48,11 +48,6 @@ class Pie(BaseShapeStim):
     lineColor, fillColor : array_like, str, :class:`~psychopy.colors.Color` or None
         Color of the shape outline and fill. If `None`, a fully transparent
         color is used which makes the fill or outline invisible.
-    lineColorSpace, fillColorSpace : str
-        Colorspace to use for the outline and fill. These change how the
-        values passed to `lineColor` and `fillColor` are interpreted.
-        *Deprecated*. Please use `colorSpace` to set both outline and fill
-        colorspace. These arguments may be removed in a future version.
     pos : array_like
         Initial position (`x`, `y`) of the shape on-screen relative to
         the origin located at the center of the window or buffer in `units`.
@@ -85,9 +80,6 @@ class Pie(BaseShapeStim):
     interpolate : bool
         Enable smoothing (anti-aliasing) when drawing shape outlines. This
         produces a smoother (less-pixelated) outline of the shape.
-    lineRGB, fillRGB: array_like, :class:`~psychopy.colors.Color` or None
-        *Deprecated*. Please use `lineColor` and `fillColor`. These
-        arguments may be removed in a future version.
     name : str
         Optional name of the stimuli for logging.
     autoLog : bool
@@ -116,9 +108,6 @@ class Pie(BaseShapeStim):
 
     """
 
-    _defaultFillColor = None
-    _defaultLineColor = None
-
     def __init__(self,
                  win,
                  radius=.5,
@@ -127,8 +116,8 @@ class Pie(BaseShapeStim):
                  edges=32,
                  units='',
                  lineWidth=1.5,
-                 lineColor=False,
-                 fillColor=False,
+                 lineColor=None,
+                 fillColor=None,
                  pos=(0, 0),
                  size=1.0,
                  ori=0.0,

psychopy/visual/polygon.py

@@ -5,17 +5,18 @@
 :class:`~psychopy.visual.ShapeStim`"""
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import psychopy  # so we can get the __path__
-from psychopy.visual.shape import BaseShapeStim
-from psychopy.tools.attributetools import attributeSetter, setAttribute
+from psychopy.visual.shape import ShapeStim
+from psychopy.tools.attributetools import attributeSetter, setAttribute, undefined
+from psychopy.tools import gltools as gt
 
 import numpy as np
 
 
-class Polygon(BaseShapeStim):
+class Polygon(ShapeStim):
     """Creates a regular polygon (triangles, pentagons, ...). This is
     a lazy-imported class, therefore import using full path 
     `from psychopy.visual.polygon import Polygon` when inheriting from it.
@@ -45,11 +46,6 @@ class Polygon(BaseShapeStim):
     lineColor, fillColor : array_like, str, :class:`~psychopy.colors.Color` or `None`
         Color of the shape's outline and fill. If `None`, a fully
         transparent color is used which makes the fill or outline invisible.
-    lineColorSpace, fillColorSpace : str
-        Colorspace to use for the outline and fill. These change how the
-        values passed to `lineColor` and `fillColor` are interpreted.
-        *Deprecated*. Please use `colorSpace` to set both outline and fill
-        colorspace. These arguments may be removed in a future version.
     pos : array_like
         Initial position (`x`, `y`) of the shape on-screen relative to the
         origin located at the center of the window or buffer in `units`.
@@ -84,9 +80,6 @@ class Polygon(BaseShapeStim):
     interpolate : bool
         Enable smoothing (anti-aliasing) when drawing shape outlines. This
         produces a smoother (less-pixelated) outline of the shape.
-    lineRGB, fillRGB: array_like, :class:`~psychopy.colors.Color` or None
-        *Deprecated*. Please use `lineColor` and `fillColor`. These
-        arguments may be removed in a future version.
     name : str
         Optional name of the stimuli for logging.
     autoLog : bool
@@ -106,9 +99,7 @@ class Polygon(BaseShapeStim):
         Can this stimulus be dragged by a mouse click?
 
     """
-
-    _defaultFillColor = "white"
-    _defaultLineColor = "white"
+    _tesselMode = 'fan'  # fastest for regular/equilateral polygons
 
     def __init__(self,
                  win,
@@ -116,8 +107,8 @@ class Polygon(BaseShapeStim):
                  radius=.5,
                  units='',
                  lineWidth=1.5,
-                 lineColor=False,
-                 fillColor=False,
+                 lineColor="white",
+                 fillColor="white",
                  pos=(0, 0),
                  size=1.0,
                  anchor=None,
@@ -132,11 +123,11 @@ class Polygon(BaseShapeStim):
                  autoDraw=False,
                  colorSpace='rgb',
                  # legacy
-                 color=False,
-                 fillColorSpace=None,
-                 lineColorSpace=None,
-                 lineRGB=False,
-                 fillRGB=False,
+                 color=undefined,
+                 fillColorSpace=undefined,
+                 lineColorSpace=undefined,
+                 lineRGB=undefined,
+                 fillRGB=undefined,
                  ):
 
         # what local vars are defined (these are the init params) for use by
@@ -155,9 +146,7 @@ class Polygon(BaseShapeStim):
             units=units,
             lineWidth=lineWidth,
             lineColor=lineColor,
-            lineColorSpace=lineColorSpace,
             fillColor=fillColor,
-            fillColorSpace=fillColorSpace,
             vertices=self.vertices,
             closeShape=True,
             pos=pos,
@@ -169,13 +158,17 @@ class Polygon(BaseShapeStim):
             depth=depth,
             interpolate=interpolate,
             draggable=draggable,
-            lineRGB=lineRGB,
-            fillRGB=fillRGB,
             name=name,
             autoLog=autoLog,
             autoDraw=autoDraw,
+            colorSpace=colorSpace,
+            # legacy
             color=color,
-            colorSpace=colorSpace)
+            fillColorSpace=fillColorSpace,
+            lineColorSpace=lineColorSpace,
+            lineRGB=lineRGB,
+            fillRGB=fillRGB,
+        )
 
     def _calcVertices(self):
         if self.edges == "circle":
@@ -184,7 +177,7 @@ class Polygon(BaseShapeStim):
         else:
             edges = self.edges
         self.vertices = self._calcEquilateralVertices(edges, self.radius)
-
+        
     @attributeSetter
     def edges(self, edges):
         """Number of edges of the polygon. Floats are rounded to int.