psychopy 2025.1.0__py3-none-any.whl → 2025.2.1__py3-none-any.whl

psychopy/visual/polygon.py

@@ -174,8 +174,12 @@ class Polygon(ShapeStim):
         if self.edges == "circle":
             # If circle is requested, calculate min edges needed for it to appear smooth
             edges = self._calculateMinEdges(self.__dict__['lineWidth'], threshold=1)
+        elif self.edges is None:
+            # if no edges, default
+            edges = 3
         else:
             edges = self.edges
+        # calculate edges
         self.vertices = self._calcEquilateralVertices(edges, self.radius)
         
     @attributeSetter

psychopy/visual/shape.py

@@ -167,7 +167,7 @@ class BaseShapeStim(BaseVisualStim, DraggingMixin, ColorMixin, ContainerMixin):
                 "fillColorSpace parameter is deprecated. Please use colorSpace instead."
             )
             fillColor = Color(fillColor, space=fillColorSpace)
-        if fillRGB is not undefined:
+        elif fillRGB is not undefined:
             logging.warning(
                 "fillRGB parameter is deprecated. Please use lineColor and colorSpace instead"
             )
@@ -178,7 +178,7 @@ class BaseShapeStim(BaseVisualStim, DraggingMixin, ColorMixin, ContainerMixin):
                 "lineColorSpace parameter is deprecated. Please use colorSpace instead."
             )
             lineColor = Color(lineColor, space=lineColorSpace)
-        if lineRGB is not undefined:
+        elif lineRGB is not undefined:
             logging.warning(
                 "lineRGB parameter is deprecated. Please use lineColor and colorSpace instead"
             )

psychopy/visual/window.py

@@ -625,7 +625,7 @@ class Window():
         self._projectionMatrixNeedsUpdate = True
         self._viewMatrixNeedsUpdate = True
 
-        self.setOrthographicView()
+        self.setDefaultView()  # initialize view/proj matrix
 
         # piloting indicator
         self._pilotingIndicator = None
@@ -822,13 +822,14 @@ class Window():
         settings.
         """
         if self._projectionMatrixNeedsUpdate:
-            widthOver2 = self.size[0] / 2.0
-            heightOver2 = self.size[1] / 2.0
-            self._projectionMatrix[:, :] = viewtools.orthoProjectionMatrix(
-                -widthOver2, widthOver2,    # -X, +X
-                -heightOver2, heightOver2,  # -Y, +Y
-                -1.0, 1.0,                  # -Z, +Z
-                dtype=numpy.float32)
+            # widthOver2 = self.size[0] / 2.0
+            # heightOver2 = self.size[1] / 2.0
+            # self._projectionMatrix[:, :] = viewtools.orthoProjectionMatrix(
+            #     -widthOver2, widthOver2,    # -X, +X
+            #     -heightOver2, heightOver2,  # -Y, +Y
+            #     -1.0, 1.0,                  # -Z, +Z
+            #     dtype=numpy.float32)
+            self._projectionMatrix[:, :] = numpy.identity(4, dtype=numpy.float32)
             self._projectionMatrixNeedsUpdate = False
 
     @property
@@ -2267,6 +2268,20 @@ class Window():
         if applyTransform:
             self.applyEyeTransform(clearDepth=clearDepth)
 
+    def setDefaultView(self, applyTransform=True, clearDepth=True):
+        """Set the projection and view matrix to PsychoPy's default.
+
+        This is the mode which is typically used for rendering 2D stimuli. It should
+        be called prior to rendering any 2D stimuli if the projection has been
+        changed.
+
+        """
+        self._updateViewMatrix()
+        self._updateProjectionMatrix()
+
+        if applyTransform:
+            self.applyEyeTransform(clearDepth=clearDepth)
+
     def setOrthographicView(self, applyTransform=True, clearDepth=True):
         """Set the projection and view matrix to render with orthographic view.
 
@@ -2290,9 +2305,17 @@ class Window():
             Clear the depth buffer.
 
         """
-        self._updateProjectionMatrix()
         self._updateViewMatrix()
 
+        widthOver2 = self.size[0] / 2.0
+        heightOver2 = self.size[1] / 2.0
+        self._projectionMatrix[:, :] = viewtools.orthoProjectionMatrix(
+            -widthOver2, widthOver2,    # -X, +X
+            -heightOver2, heightOver2,  # -Y, +Y
+            -1.0, 1.0,                  # -Z, +Z
+            dtype=numpy.float32)
+        self._projectionMatrix[:, :] = numpy.identity(4, dtype=numpy.float32)
+
         if applyTransform:
             self.applyEyeTransform(clearDepth=clearDepth)
 
@@ -2466,8 +2489,8 @@ class Window():
                                       win=self)[:2]
 
         # transform psychopy mouse coordinates to viewport coordinates
-        scrX = scrX + (self.size[0] / 2.)
-        scrY = scrY + (self.size[1] / 2.)
+        scrX += (self.size[0] / 2.)
+        scrY +=  (self.size[1] / 2.)
 
         # get the NDC coordinates of the
         projX = 2. * (scrX - self.viewport[0]) / self.viewport[2] - 1.
@@ -2724,7 +2747,7 @@ class Window():
 
         if fileExt in ['.gif', '.mpg', '.mpeg', '.mp4', '.mov']:
             # lazy loading of moviepy.editor (rarely needed)
-            from moviepy.editor import ImageSequenceClip
+            from moviepy import ImageSequenceClip
             # save variety of movies with moviepy
             numpyFrames = []
             for frame in self.movieFrames: