update aperture function to deal with circle and wedge

Author: Remi-Gau

apertureTexture.m

@@ -1,59 +1,90 @@
 function cfg = apertureTexture(action, cfg, thisEvent)
-
+    
     transparent = [0 0 0 0];
-
+    
     switch action
-
+        
         case 'init'
-
-            % we take the screen height as maximum aperture width if not
-            % specified.
-            if ~isfield(cfg.aperture, 'width') || isempty(cfg.aperture.width)
-                cfg.aperture.width = cfg.screen.winRect(4) / cfg.screen.ppd;
+            
+            switch cfg.aperture.type
+                
+                case 'circle'
+                    % we take the screen height as maximum aperture width if not
+                    % specified.
+                    if ~isfield(cfg.aperture, 'width') || isempty(cfg.aperture.width)
+                        cfg.aperture.width = cfg.screen.winRect(4) / cfg.screen.ppd;
+                    end
+                    cfg.aperture = degToPix('width', cfg.aperture, cfg);
             end
-            cfg.aperture = degToPix('width', cfg.aperture, cfg);
-
+            
             cfg.aperture.texture = Screen('MakeTexture', cfg.screen.win, ...
                 cfg.color.background(1) * ones(cfg.screen.winRect([4 3])));
-
+            
         case 'make'
-
+            
+            xCenter = cfg.screen.center(1);
+            yCenter = cfg.screen.center(2);
+            
             switch cfg.aperture.type
-
+                
                 case 'none'
-
+                    
                     Screen('Fillrect', cfg.aperture.texture, transparent);
-
+                    
                 case 'circle'
-
+                    
                     diameter = cfg.aperture.widthPix;
-
-                    xPos = cfg.screen.center(1);
-                    yPos = cfg.screen.center(2);
+                    
                     if isfield(cfg.aperture, 'xPosPix')
-                        xPos = cfg.screen.center(1) + cfg.aperture.xPosPix;
+                        xCenter = cfg.screen.center(1) + cfg.aperture.xPosPix;
                     end
                     if isfield(cfg.aperture, 'yPosPix')
-                        yPos = cfg.screen.center(2) + cfg.aperture.yPosPix;
+                        yCenter = cfg.screen.center(2) + cfg.aperture.yPosPix;
                     end
-
+                    
                     Screen('FillOval', cfg.aperture.texture, transparent, ...
                         CenterRectOnPoint([0 0 repmat(diameter, 1, 2)], ...
-                        xPos, yPos));
+                        xCenter, yCenter));
+                    
+                case 'ring'
+                    
+                    Screen('Fillrect', cfg.aperture.texture, cfg.color.background);
+                    
+                    Screen('FillOval', cfg.aperture.texture, transparent, ...
+                        CenterRectOnPoint( ...
+                        [0 0 repmat(cfg.ring.outerRimPix, 1, 2)], ...
+                        xCenter, yCenter));
+                    
+                    Screen('FillOval', cfg.aperture.texture, [cfg.color.background 255], ...
+                        CenterRectOnPoint( ...
+                        [0 0 repmat(cfg.ring.innerRimPix, 1, 2)], ...
+                        xCenter, yCenter));
+                    
+                case 'wedge'
+                    
+                    Screen('Fillrect', cfg.aperture.texture, cfg.color.background);
+                    
+                    Screen('FillArc', cfg.aperture.texture, transparent, ...
+                        CenterRect( ...
+                        [0 0 repmat(cfg.stimRect(4), 1, 2)], ...
+                        cfg.screen.winRect), ...
+                        thisEvent.angle, ... % start angle
+                        cfg.aperture.width); % arc angle
+                    
 
                 otherwise
 
                     error('unknown aperture type: %s.', cfg.aperture.type);
-
+                    
             end
-
+            
         case 'draw'
-
+            
             Screen('DrawTexture', cfg.screen.win, cfg.aperture.texture);
-
+            
             % Screen('DrawTexture', cfg.screen.win, apertureTexture, ...
             % cfg.screen.winRect, cfg.screen.winRect, current.apertureAngle - 90);
-
+            
     end
-
+    
 end