severeral updates on some base functions

Author: Remi-Gau

apertureTexture.m

@@ -27,11 +27,20 @@
                 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;
+                    end
+                    if isfield(cfg.aperture, 'yPosPix')
+                        yPos = cfg.screen.center(2) + cfg.aperture.yPosPix;
+                    end
 
                     Screen('FillOval', cfg.aperture.texture, transparent, ...
                         CenterRectOnPoint([0 0 repmat(diameter, 1, 2)], ...
-                        cfg.screen.winRect(3) / 2, cfg.screen.winRect(4) / 2));
-
+                        xPos, yPos));
+                        
             end
 
         case 'draw'

computeFOV.m

@@ -3,8 +3,15 @@
     %
     % computes the number of degrees of visual angle in the whole field of view
     %
+    % δ = 2 arctan ( d / 2D )
+    %
+    %  δ is the angular diameter, and d is the actual diameter of the object, 
+    %  and D is the distance to the object. 
+    %  The result obtained is in radians. 
+    %
 
-    FOV = 2 * ...
-        (180 * (atan(cfg.screen.monitorWidth / (2 * cfg.screen.monitorDistance)) / pi));
+    FOV =  ...
+        180 / pi * ...
+        2 * atan( cfg.screen.monitorWidth / (2 * cfg.screen.monitorDistance) );
 
 end

decompMotion.m

@@ -0,0 +1,5 @@
+function [horVector, vertVector] = decompMotion(angleMotion)
+    % decompose angle of start motion into horizontal and vertical vector
+    horVector = cos(pi * angleMotion / 180);
+    vertVector = -sin(pi * angleMotion / 180);
+end

dotTexture.m

@@ -7,14 +7,16 @@
                 cfg.color.background(1) * ones(cfg.screen.winRect([4 3])));
 
         case 'make'
+            
+            dotType = 2;
 
             Screen('FillRect', cfg.dot.texture, cfg.color.background);
             Screen('DrawDots', cfg.dot.texture, ...
                 thisEvent.dot.positions, ...
                 cfg.dot.sizePix, ...
                 cfg.dot.color, ...
                 cfg.screen.center, ...
-                1);
+                dotType);
 
         case 'draw'
 

drawFixation.m

@@ -2,12 +2,15 @@ function drawFixation(cfg)
     % Define the parameters of the fixation cross in `cfg` and `expParameters`
 
     if strcmp(cfg.fixation.type, 'cross')
+        
+        smooth = 1;
+        
         Screen('DrawLines', ...
             cfg.screen.win, ...
             cfg.fixation.allCoords, ...
             cfg.fixation.lineWidthPix, ...
             cfg.fixation.color, ...
-            [cfg.screen.center(1) cfg.screen.center(2)], 1);
+            [cfg.screen.center(1) cfg.screen.center(2)], smooth);
     end
 
 end

initFixation.m

@@ -0,0 +1,19 @@
+function cfg = initFixation(cfg)
+
+    if strcmp(cfg.fixation.type, 'cross')
+
+        % Convert some values from degrees to pixels
+        cfg.fixation = degToPix('width', cfg.fixation, cfg);
+        cfg.fixation = degToPix('xDisplacement', cfg.fixation, cfg);
+        cfg.fixation = degToPix('yDisplacement', cfg.fixation, cfg);
+
+        % Prepare fixation cross
+        cfg.fixation.xCoords = [-cfg.fixation.widthPix cfg.fixation.widthPix 0 0] + ...
+            cfg.fixation.xDisplacementPix;
+        cfg.fixation.yCoords = [0 0 -cfg.fixation.widthPix cfg.fixation.widthPix] + ...
+            cfg.fixation.yDisplacementPix;
+        cfg.fixation.allCoords = [cfg.fixation.xCoords; cfg.fixation.yCoords];
+
+    end
+
+end

initPTB.m

@@ -59,7 +59,7 @@
     % monitor width
     % This assumes that the window fills the whole screen
     cfg.screen.FOV = computeFOV(cfg);
-    cfg.screen.ppd = cfg.screen.winRect(3) / cfg.screen.FOV;
+    cfg.screen.ppd = cfg.screen.winWidth / cfg.screen.FOV;
 
     % Initialize visual parmaters for fixation cross or dot
     cfg = initFixation(cfg);
@@ -182,28 +182,11 @@ function initDebug(cfg)
 
     % Enable alpha-blending, set it to a blend equation useable for linear
     % superposition with alpha-weighted source.
+    % Required for drwing smooth lines and screen('DrawDots')
     Screen('BlendFunction', cfg.screen.win, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
 end
 
-function cfg = initFixation(cfg)
-
-    if strcmp(cfg.fixation.type, 'cross')
-
-        % Convert some values from degrees to pixels
-        cfg.fixation = degToPix('width', cfg.fixation, cfg);
-
-        % Prepare fixation cross
-        cfg.fixation.xCoords = [-cfg.fixation.widthPix cfg.fixation.widthPix 0 0] + ...
-            cfg.fixation.xDisplacement;
-        cfg.fixation.yCoords = [0 0 -cfg.fixation.widthPix cfg.fixation.widthPix] + ...
-            cfg.fixation.yDisplacement;
-        cfg.fixation.allCoords = [cfg.fixation.xCoords; cfg.fixation.yCoords];
-
-    end
-
-end
-
 function initText(cfg)
 
     Screen('TextFont', cfg.screen.win, cfg.text.font);