/ - Diff - celutz - tetaneutral.net

Révision 235b072f

Ajouté par Jocelyn Dealande il y a environ 10 ans

ID 235b072fbfdbbcf324ac02056020dd0e7b8fb786
Parent cb1eaa6a
Enfant 651f2478

Marc patch to handle touch events

     var border_width = 2;
     var imageObj = new Array();
     var fingr = 0;  // mémorisation de lécart entre doigts;
     var last  = {x:0,y:0};
     var shift = {x:0,y:0};
     var mouse = {x:0,y:0};
-...
     function onImageClick(e) {
         hide_contextmenu();
         shift.x = last.x;
         shift.y = last.y;
         speed.x = 0;
         speed.y = 0;
         mouse.x = e.pageX;
         mouse.y = e.pageY;
         var index = {};
         if (e.touches && e.touches.length == 2) {
     	e.preventDefault();
     	fingr = Math.sqrt((e.touches[0].clientX - e.touches[1].clientX)^2 +
     			  (e.touches[0].clientY - e.touches[1].clientY)^2);
         } else {
     	if (e.touches) {
     	    e.preventDefault();
     	    index.x = e.changedTouches[0].clientX;
     	    index.y = e.changedTouches[0].clientY;
     	} else {
     	    index.x = e.pageX;
     	    index.y = e.pageY;
+    	}
     	shift.x = last.x;
     	shift.y = last.y;
     	speed.x = 0;
     	speed.y = 0;
     	mouse.x = index.x;
     	mouse.y = index.y;
+        }
         clearTimeout(tmt);  //arrêt de l'éffet eventuel d'amorti en cours.
         canvas.addEventListener('mousemove', stickImage, false);
         canvas.addEventListener('touchmove', stickImage, false);
         canvas.addEventListener('mouseup', launchImage, false);
         canvas.addEventListener('touchend', launchImage, false);
         //canvas.addEventListener('mouseout', launchImage, false);
         canvas.style.cursor='move';
         //document.onmousemove = stickImage;
         document.onmouseup = launchImage;
         //document.onmouseup = launchImage;
         hide_links();
+    }
     function stickImage(e) {
         var xs = mouse.x - e.pageX + shift.x;
         var ys = mouse.y - e.pageY + shift.y;
         var index = {};
         if (e.changedTouches && e.changedTouches.length == 2) {
     	e.preventDefault();
     	// cas du zoom à 2 doigts
     	var nfingr = Math.sqrt((e.changedTouches[0].clientX - e.changedTouches[1].clientX)^2 +
     			       (e.changedTouches[0].clientY - e.changedTouches[1].clientY)^2);
     	var evt = {}
     	evt.pageX = (e.changedTouches[0].clientX + e.changedTouches[1].clientX)/2;
     	evt.pageY = (e.changedTouches[0].clientY + e.changedTouches[1].clientY)/2;
     	if (fingr > nfingr*2 || fingr < nfingr/2) {
     	    evt.wheelDelta = fingr - nfingr;
     	    fingr = nfingr;
     	    return wheel_zoom(evt);
     	} else {
     	    return;
+    	}
+        }
         if (e.touches) {
     	e.preventDefault();
     	index.x = e.changedTouches[0].clientX;
     	index.y = e.changedTouches[0].clientY;
         } else {
     	index.x = e.pageX;
     	index.y = e.pageY;
+        }
         var xs = mouse.x - index.x + shift.x;
         var ys = mouse.y - index.y + shift.y;
         speed.x = xs - last.x;  //mémorisation des vitesses horizontales
         speed.y = ys - last.y;  //et verticales lors de ce déplacement
         putImage(xs, ys);
+    }
     function launchImage(e) {
         var index = {};
         if (e.touches) {
     	e.preventDefault();
     	index.x = e.changedTouches[0].clientX;
     	index.y = e.changedTouches[0].clientY;
         } else {
     	index.x = e.pageX;
     	index.y = e.pageY;
+        }
         distort_canvas(0);
         canvas.removeEventListener('mousemove', stickImage, false);
         canvas.removeEventListener('touchmove', stickImage, false);
         //document.onmousemove = null;
         shift.x = e.pageX - mouse.x + shift.x;
         shift.y = e.pageY - mouse.y + shift.y;
         shift.x = index.x - mouse.x + shift.x;
         shift.y = index.y - mouse.y + shift.y;
         tmt = setTimeout(inertialImage, 100);
+    }
-...
     	zshift.x = event.pageX-canvas.width/2-canvas_pos.x;
     	zshift.y = event.pageY-canvas.height/2-canvas_pos.y;
+        }
         event.preventDefault();
         //event.preventDefault();
         if (event.wheelDelta < 0 && zoom_control.value < zoom_control.max) {
     	zoom_control.value++;
     	change_zoom(zshift.x, zshift.y);
-...
+    }
     function display_links(e) {
         var index = {};
         if (e.touches) {
     	e.preventDefault();
     	index.x = e.changedTouches[0].clientX;
     	index.y = e.changedTouches[0].clientY;
         } else {
     	index.x = e.pageX;
     	index.y = e.pageY;
+        }
         var info = document.getElementById('info');
         var mouse_x = e.pageX-canvas_pos.x;
         var mouse_y = e.pageY-canvas_pos.y;
         var mouse_x = index.x-canvas_pos.x;
         var mouse_y = index.y-canvas_pos.y;
         var pos_x = nmodulo(last.x + mouse_x - canvas.width/2, zm.im.width);
         var pos_y = last.y + mouse_y - canvas.height/2;
         //var cap = ((pos_x/zm.im.width)*360).toFixed(2);
         var res = zm.get_cap_ele(pos_x, zm.im.height/2 - pos_y);
         //var ele = ((zm.im.height/2 - pos_y)/zm.im.width)*360;
         info.innerHTML = 'élévation : '+res.ele.toFixed(2)+'<br/>cap : '+res.cap.toFixed(2);
         info.style.top = e.pageY+'px';
         info.style.left = e.pageX+'px';
         info.style.top = index.y+'px';
         info.style.left = index.x+'px';
         info.style.backgroundColor = '#FFC';
         info.style.display = 'block';
         canvas.style.cursor='crosshair';
-...
     function hide_links() {
         canvas.removeEventListener( "mousemove", display_links, false);
         canvas.removeEventListener( "touchmove", display_links, false);
         var info = document.getElementById('info');
         info.style.display = 'none';
+    }
     function show_links() {
         canvas.addEventListener( "mousemove", display_links, false);
         canvas.addEventListener( "touchmove", display_links, false);
     //    var info = document.getElementById('info');
     //    info.style.display = 'block';
+    }
-...
     function clean_canvas_events(e) {
         canvas.removeEventListener('mousemove', stickImage, false);
         canvas.removeEventListener('touchmove', stickImage, false);
         document.getElementById('info').style.display = 'none';
         speed.x = 0;
         speed.y = 0;
-...
     	localisation.addEventListener('mouseout',paramOut,false);
+        }
         canvas.addEventListener('mousedown', onImageClick, false);
         canvas.addEventListener('touchstart', onImageClick, false);
         document.addEventListener('keydown', keys, false);
         canvas.addEventListener('mousewheel', wheel_zoom, false);
         window.onresize = canvas_resize;

Formats disponibles : Unified diff

Projet

Général

Profil

Révision 235b072f

Ajouté par Jocelyn Dealande il y a environ 10 ans