shorter timeout and combine blip

forresto · Jun 28, 2012 · 482ee29 · 482ee29
1 parent c415ca5
commit 482ee29
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 32 deletions.
diff --git a/circle.html b/circle.html
@@ -95,7 +95,7 @@
       context.lineWidth = _strokeWidth;
       combine();
     }
-    var combineWait = 1000/30;
+    var combineWait = 10;
     var combineTimeout;
     function combine(){
       // Minimum time to do combine again, so that changing a few variables at the same time doesn't do multiple draws
@@ -156,7 +156,7 @@
     }
 
     // HACK send one 2s after load
-    setTimeout(combineDo, 2000);
+    setTimeout(combine, 2000);
 
     Meemoo
       .setInfo({

diff --git a/combine.html b/combine.html
@@ -54,8 +54,10 @@
       addLayer(image, 7);
     }
     function addLayer(image, layernumber) {
-      if (canvas.width < image.width || canvas.height < image.height) {
+      if (canvas.width < image.width) {
         canvas.width = image.width;
+      }
+      if (canvas.height < image.height) {
         canvas.height = image.height;
       }
       if (!layers[layernumber]) {
@@ -69,27 +71,17 @@
       thisCanvas.getContext("2d").putImageData(image, 0, 0);
       combine();
     }
-    var combineLast = new Date();
-    var combineWait = 1000/30;
+    var combineWait = 10;
     var combineTimeout;
     function combine(){
       // Minimum time to do combine again, so that changing a few variables at the same time doesn't do multiple draws
       if (combineTimeout) {
         clearTimeout(combineTimeout);
-        // var d = new Date();
-        // if (d-combineLast > 100){
-        //   // If tons of concurrent changes, still render occasionally
-        //   combineDo();
-        // }
       }
       combineTimeout = setTimeout(combineDo, combineWait);
     }
     function combineDo(){
-      combineLast = new Date();
-      // Clear
-      if (_clearEvery) {
-        context.clearRect(0, 0, canvas.width, canvas.height);
-      }
+      context.clearRect(0, 0, canvas.width, canvas.height);
       for (var i = 0; i < layers.length; i++) {
         if (layers[i]) {
           context.drawImage(layers[i], 0, 0);

diff --git a/rectangle.html b/rectangle.html
@@ -74,7 +74,7 @@
       context.lineWidth = _strokeWidth;
       combine();
     }
-    var combineWait = 1000/30;
+    var combineWait = 10;
     var combineTimeout;
     function combine(){
       // Minimum time to do combine again, so that changing a few variables at the same time doesn't do multiple draws
@@ -131,7 +131,7 @@
     }
 
     // HACK send one 2s after load
-    setTimeout(combineDo, 2000);
+    setTimeout(combine, 2000);
 
 
     Meemoo

diff --git a/text.html b/text.html
@@ -87,23 +87,16 @@
       context.lineWidth = _strokewidth;
       combine();
     }
-    // var combineLast = new Date();
-    var combineWait = 1000/30;
+    var combineWait = 10;
     var combineTimeout;
     function combine(){
       // Minimum time to do combine again, so that changing a few variables at the same time doesn't do multiple draws
       if (combineTimeout) {
         clearTimeout(combineTimeout);
-        // var d = new Date();
-        // if (d-combineLast > 100){
-        //   // If tons of concurrent changes, still render occasionally
-        //   combineDo();
-        // }
       }
       combineTimeout = setTimeout(combineDo, combineWait);
     }
     function combineDo(){
-      // combineLast = new Date();
       // Clear
       context.clearRect(0, 0, canvas.width, canvas.height);
       if (_background) {

diff --git a/transform.html b/transform.html
@@ -70,18 +70,12 @@
       _rotate = parseFloat(percent) * Math.PI * 2;
       combine();
     }
-    var combineLast = new Date();
-    var combineWait = 1000/30;
+    var combineWait = 10;
     var combineTimeout;
     function combine(){
       // Minimum time to do combine again, so that changing a few variables at the same time doesn't do multiple draws
       if (combineTimeout) {
         clearTimeout(combineTimeout);
-        // var d = new Date();
-        // if (d-combineLast > 100){
-        //   // If tons of concurrent changes, still render occasionally
-        //   combineDo();
-        // }
       }
       combineTimeout = setTimeout(combineDo, combineWait);
     }