refactoring dot functions

Author: Remi-Gau

src/dot/computeCartCoord.m

@@ -1,5 +1,7 @@
 function cartesianCoordinates = computeCartCoord(positions, cfg)
     cartesianCoordinates = ...
-        [positions(:,1) - cfg.screen.winWidth /  2, ... % x coordinate
-        positions(:,2) + cfg.screen.winWidth / 2]; % y coordinate
+        [positions(:,1) + cfg.dot.matrixWidth, ... % x coordinate
+        positions(:,2) + cfg.dot.matrixWidth]; % y coordinate
+    
+%         cartesianCoordinates = positions;
 end

src/dot/generateNewDotPositions.m

@@ -0,0 +1,5 @@
+function newPositions = generateNewDotPositions(cfg, dotNumber)
+    
+    newPositions = rand(dotNumber, 2) * cfg.dot.matrixWidth;
+    
+end

src/dot/initDots.m

@@ -38,7 +38,7 @@
     % These can never be bigger than 1 or lower than 0
     % [0,0] is the top / left of the square
     % [1,1] is the bottom / right of the square
-    dots.positions = rand(cfg.dot.number, 2) * cfg.screen.winWidth;
+    dots.positions = generateNewDotPositions(cfg, cfg.dot.number);
 
     %% Set vertical and horizontal speed for all dots
     dots = setDotDirection(cfg, dots);

src/dot/reseedDots.m

@@ -8,6 +8,8 @@
     cartesianCoordinates = computeCartCoord(dots.positions, cfg);
     [~, radius] = cart2pol(cartesianCoordinates(:, 1), cartesianCoordinates(:, 2));
 
+
+    
     % Create a logical vector to detect any dot that has:
     % - an xy position inferior to 0
     % - an xy position superior to winWidth
@@ -16,24 +18,26 @@
     % - has been been picked to be killed
 
     N = any([ ...
-        dots.positions > cfg.screen.winWidth, ...
+        dots.positions > cfg.dot.matrixWidth, ...
         dots.positions < 0, ...
         dots.time > dots.lifeTime, ...
         radius - cfg.dot.sizePix < fixationWidthPix / 2, ...
         rand(cfg.dot.number, 1) < cfg.dot.proportionKilledPerFrame, ...
         ], 2) ;
-
+    
     % If there is any such dot we relocate it to a new random position
     % and change its lifetime to 1
     if any(N)
 
-        dots.positions(N, :) = rand(sum(N), 2) * cfg.screen.winWidth;
+        dots.positions(N, :) = generateNewDotPositions(cfg, sum(N));
 
         dots = setDotDirection(cfg, dots);
+        
         [horVector, vertVector] = decomposeMotion(dots.directionAllDots);
         dots.speeds = [horVector, vertVector] * dots.speedPixPerFrame;
 
         dots.time(N, 1) = 1;
+        
     end
 
 end