some simplifications

Author: andreaskundig

public/animations/carreQuiTourne.js

@@ -1,24 +1,17 @@
 define({
+        setup: function (context){
+            this.rotation = 0;
+        },
         draw: function (context, borders){
             context.fillStyle = "rgb(100,250,0)";
             context.fillRect(0, 0, context.canvas.width, context.canvas.height);
 
             context.save();
-            context.translate(this.halfWidth, this.halfHeight);
-            context.scale(3, 3);
-            context.rotate(this.rotation* this.toRadians);
-
-            this.rotation = this.rotation + 1;
-
+            context.translate(75, 75);
+            context.rotate(this.rotation);
             context.fillStyle = "rgb(150,20,200)";
-            context.fillRect(-25, -25, 50, 50);
-
+            context.fillRect(-75, -75, 150, 150);
             context.restore();
-        },
-        setup: function (context){
-            this.toRadians =  Math.PI / 180; 
-
-            this.rotation = 0;
-            this.halfWidth = context.canvas.width / 2;
-            this.halfHeight = context.canvas.height / 2;
+            
+            this.rotation += Math.PI / 180;
         }});

public/animations/copieBordNordOuest.js

@@ -1,23 +1,17 @@
-define([], 
-function(){
+
+define(["bibs/imageDataUtils"],  
+function(idu){
     return {
         setup: function(context){
         },
         draw: function(context, borders){
-            // paste current image one pixel down
-
-            // west
-            var currentImage = context.getImageData(0, 0, context.canvas.width, context.canvas.height);
-            context.putImageData(currentImage, 1, 0);
-            // add new line
-            context.putImageData(borders.west, 0, 0);
+           var speed = 2;
 
+           var vertical = true;
+           idu.pushLine(context, borders, null, vertical, speed);
 
-            // north
+           vertical = false
+           idu.pushLine(context, borders, null, vertical, speed);
 
-            currentImage = context.getImageData(0, 0, context.canvas.width, context.canvas.height);
-            context.putImageData(currentImage, 0, 1);
-            // add new line
-            context.putImageData(borders.north, 0, 0);
         }};
 });

public/animations/webCamQuiTourne.js

@@ -1,25 +1,21 @@
 define(["bibs/webCam"], function(webCam){
     return {
         setup: function(context){
-            if (this.v == null){
-                this.v = webCam.provideVideoContext(320, 240);
-            }
+            this.webCam = webCam.makeWebCam();
             this.rotation = 0;
-            this.toRadians =  Math.PI / 180; 
-            this.diagonal = Math.sqrt(2 * Math.pow(150,2));
         },
         draw: function(context, borders){
 
             context.save();
             context.translate(75, 75);
-            context.rotate(this.rotation * this.toRadians);
-            var width = this.diagonal;
-            var height = width * 240 / 320;
-            context.drawImage(this.v, - width / 2, - height / 2, 
-                              width, height);
+            context.rotate(this.rotation );
+            context.scale(0.8, 0.8);
+            context.translate(- this.webCam.context.width / 2,
+                              - this.webCam.context.height / 2);
+            this.webCam.copyFromCam(context);
             context.restore();
 
-            this.rotation = this.rotation + 1;
+            this.rotation = this.rotation + Math.PI / 180 / 3;
         }
     };
 });

public/bibs/imageDataUtils.js

@@ -168,6 +168,7 @@ define({
         this.copyContextPixels(ctx, opts.copyRectangle, opts.pastePoint);
     },
     pushLine: function(ctx, borders, rec, horiz, speed, filter){
+        rec = rec || this.rectangle(0, 0, ctx.canvas.width, ctx.canvas.height);
         var positiveDir = speed > 0,
             pixels = this.linePixels(ctx, borders, rec, horiz, positiveDir);
         this.pushPixels(ctx, pixels, rec, horiz, speed, filter);

public/bibs/webCam.js

@@ -7,7 +7,6 @@ define( function(context){
     };
 
     var provideVideoContext = function(width, height){
-        applyVendorPrefix();
 	var video = document.createElement("video");
 	video.width = width;
 	video.height = height;
@@ -41,5 +40,25 @@ define( function(context){
 
         return video;
     };
-    return {provideVideoContext: provideVideoContext};
+    
+    var makeWebCam = function(width, height){
+        if(!width){
+            width = 320;
+            height = 240;
+        }
+
+        applyVendorPrefix();
+        var videoContext =  provideVideoContext(width, height);
+        
+        return {
+            context: videoContext,
+            copyFromCam : function(context){
+                context.drawImage(videoContext, 0, 0, 
+                                  videoContext.width, videoContext.height);
+            }
+        };
+
+    };
+
+    return {makeWebCam: makeWebCam };
 });