Save primes as they're found

Author: JacksonRG

src/timeline/index.html

@@ -42,7 +42,7 @@
 
 		<!-- RULER NAME (left of screen) -->
 		<div tl-rulertime id="ruler_label">
-			<div id="ruler_time">{{playheadTime.hour}}:{{playheadTime.min}}:{{playheadTime.sec}}:{{playheadTime.frame}}</div>
+			<div id="ruler_time">{{playheadTime.hour}}:{{playheadTime.min}}:{{playheadTime.sec}},{{playheadTime.frame}}</div>
 		</div>
 		<!-- RULER (right of screen) -->
 		<div id="scrolling_ruler">

src/timeline/js/controllers.js

@@ -93,7 +93,7 @@ App.controller("TimelineCtrl", function ($scope) {
     // Use JQuery to move playhead (for performance reasons) - scope.apply is too expensive here
     $(".playhead-top").css("left", ($scope.project.playhead_position * $scope.pixelsPerSecond) + "px");
     $(".playhead-line").css("left", ($scope.project.playhead_position * $scope.pixelsPerSecond) + "px");
-    $("#ruler_time").text($scope.playheadTime.hour + ":" + $scope.playheadTime.min + ":" + $scope.playheadTime.sec + ":" + $scope.playheadTime.frame);
+    $("#ruler_time").text($scope.playheadTime.hour + ":" + $scope.playheadTime.min + ":" + $scope.playheadTime.sec + "," + $scope.playheadTime.frame);
   };
 
   // Move the playhead to a specific frame

src/timeline/js/directives/ruler.js

@@ -163,7 +163,7 @@ App.directive("tlRuler", function ($timeout) {
       /**
        * 
        */
-      function drawTimesHighZoom() {
+      function drawTimes() {
         // Delete old tick marks
         ruler = $('#ruler');
         ruler.addClass('no_bg');
@@ -178,27 +178,23 @@ App.directive("tlRuler", function ($timeout) {
         time[0] -= time[0]%1;
         time[1] -= time[1]%1 - 1;
 
+        startFrame = time[0] * Math.round(fps);
+        endFrame = time[1] * Math.round(fps);
+
         t = time[0];
         let tPrev;
         showTime = true;
 
         // timePerTick = framesPerTick(scope.pixelsPerSecond, scope.project.fps.num ,scope.project.fps.num) / fps;
         // console.log('FPT: ' + framesPerTick(scope.pixelsPerSecond, scope.project.fps.num ,scope.project.fps.num));
-        dF = 1;
-        dT = () => { return dF / fps };
-        dP = () => { return dT() * scope.pixelsPerSecond};
-        while (dP() < 50) {
-          dF *= 2;
-        }
-        timePerTick = dT();
         fpt = framesPerTick(scope.pixelsPerSecond, scope.project.fps.num ,scope.project.fps.den)
-        timePerTick = fpt / fps;
-        while (t <= time[1]){
-          if (Math.floor(t) != Math.floor(tPrev)) {
-            // In the case that FPS is not a whole number.
-            // Every new second, make sure we start ON the second.
-            t = Math.floor(t);
-          }
+        frame = startFrame
+        console.log ("Start: "+ startFrame)
+        console.log ("End : "+ endFrame)
+        console.log ("FPT : "+ fpt)
+        console.log ("start Time : "+ time[0])
+        while ( frame <= endFrame){
+          t = frame / fps;
           pos = t * scope.pixelsPerSecond;
           tickSpan = $('<span style="left:'+pos+'px;"></span>');
           tickSpan.addClass("tick_mark");
@@ -209,8 +205,11 @@ App.directive("tlRuler", function ($timeout) {
             timeText = secondsToTime(t, scope.project.fps.num, scope.project.fps.den);
             timeSpan[0].innerText = timeText['hour'] + ':' +
               timeText['min'] + ':' +
-              timeText['sec'] + ',' +
-              timeText['frame'];
+              timeText['sec'];
+            if (fpt < Math.round(fps)) {
+              timeSpan[0].innerText += ',' + timeText['frame'];
+            }
+              // timeText['frame'];
             tickSpan[0].style['height'] = '20px';
             showTime = false;
           } else {
@@ -219,44 +218,11 @@ App.directive("tlRuler", function ($timeout) {
           ruler.append(timeSpan);
           ruler.append(tickSpan);
 
-          tPrev = t;
-          t += timePerTick;
+          frame += fpt;
         }
         return;
       }
 
-      drawTimes = () => {
-        /*scope.project.scale < 0.340522133938706*/
-        if (scope.project.scale < 1) {
-          drawTimesHighZoom();
-          return;
-        }
-        ruler = $("#ruler");
-        if (ruler[0].className.includes('no_bg')) { ruler.removeClass('no_bg') }
-        width = $("body").width();
-        $("#ruler span").remove();
-        start = Math.max(scope.scrollLeft - width, 100);
-        end = Math.min(scope.scrollLeft + (2*width), $('#ruler').width());
-
-        scale = scope.project.scale;
-
-        for (var i = start - (start % 100) ; i < end; i += 100) {
-          /* create and format span */
-          s = $('<span style="left: ' + i + 'px;">');
-          s.addClass("ruler_time");
-
-          /* Calculate Time */
-          var time = i  / scope.pixelsPerSecond;
-          var text_time = secondsToTime(time, scope.project.fps.num, scope.project.fps.den);
-          s[0].innerText= text_time["hour"] + ":" + text_time["min"] + ":" + text_time["sec"];
-          if (scope.project.scale < 1) {
-            s[0].innerText += ',' + text_time['frame'];
-          }
-
-          ruler.append(s);
-        }
-      }
-
       scope.$watch("project.scale + project.duration + scrollLeft", function (val) {
         if (val) {
           $timeout(function () {

src/timeline/js/functions.js

@@ -166,7 +166,7 @@ function secondsToTime(secs, fps_num, fps_den) {
   var week = Math.floor(day / 7);
   day = day % 7;
 
-  var frame = Math.round((milli / 1000.0) * (fps_num / fps_den)) + 1;
+  var frame = Math.floor((milli / 1000.0) * (fps_num / fps_den)) + 1;
   return {
     "week": padNumber(week, 2),
     "day": padNumber(day, 2),
@@ -342,8 +342,11 @@ function primesUpTo(n) {
   primes = [...Array(n+1).keys()]; // List from 0 to n
   primes = primes.slice(2,primes.length -1); // 0 and 1 divide nothing and everything
   primes.forEach( p => {
-      primes = primes.filter( test => { return (test % p != 0) || (test == p) } );
+    primes = primes.filter( test => { return (test % p != 0) || (test == p) } );
   });
+  primes.forEach( p => {
+    global_primes.add(p);
+  })
   return primes;
 }
 
@@ -377,15 +380,15 @@ function primeFactorsOf(n) {
  */
 function framesPerTick(pps, fps_num, fps_den) {
   fps = fps_num / fps_den;
-  dF = 1;
-  dT = () => { return dF / fps };
-  dP = () => { return dT() * pps };
+  frames = 1;
+  seconds = () => { return frames / fps };
+  pixels = () => { return seconds() * pps };
   factors = primeFactorsOf(Math.round(fps));
-  while (dP() < 50) {
-      dF *= factors.shift() || 2;
+  while (pixels() < 35) {
+      frames *= factors.shift() || 2;
   }
 
-  return dF;
+  return frames;
 }
 
 /**