fixes #98 revisit throwing

app/Game/Client/Control/Inputs/KeyboardAndMouse.js

@@ -13,6 +13,7 @@ function (Parent, KeyboardInput, DomController, Settings, Swiper) {
 
         this.x = 0;
         this.y = 0;
+        this.mousePosition = {x:0,y:0};
         this.modifier = false;
         this.swiper = null;
         this.lastLookDirection = 1;
@@ -104,6 +105,8 @@ function (Parent, KeyboardInput, DomController, Settings, Swiper) {
     	var self = this;
 
         canvas.onmousedown = function(e) {
+            self.mousePosition = {x:0,y:0};
+
             if(!self.playerController.player.isHoldingSomething()) {
                 var options = {
                     x: self.x, 
@@ -112,6 +115,7 @@ function (Parent, KeyboardInput, DomController, Settings, Swiper) {
                 self.playerController.handActionRequest(options);
             } else {
                 self.swiper = new Swiper();
+                self.swiper.draw(e);
             }
         }
 
@@ -178,7 +182,9 @@ function (Parent, KeyboardInput, DomController, Settings, Swiper) {
             e.webkitMovementY   ||
             0;
 
-        this.swiper.swipe(movementX, -movementY);
+        this.mousePosition.x += movementX;
+        this.mousePosition.y += movementY;
+        this.swiper.swipe(this.mousePosition.x, -this.mousePosition.y);
     };
 
     KeyboardAndMouse.prototype.activateModifier = function() {

app/Game/Client/Control/Swiper.js

@@ -4,29 +4,82 @@ define([
  
 function (Nc) {
 
-	var MAX_LENGTH = 150;
+	var MAX_LENGTH = 200;
+	var MIN_LENGTH = 5;
  
 	function Swiper() {
 		this.points = [];
 		this.angleSum = 0;
 		this.lengthSum = 0;
+		this.finished = false;
 	}
  
 	Swiper.prototype.swipe = function(x, y) {
 
-	            
+		if(this.finished) return;
-	    if(this.lengthSum > MAX_LENGTH) return;
-	    
-	    this.points.push({x:x, y:y});
-
-	    Nc.trigger(Nc.ns.client.view.swiper.swipe, x, y);
 
 		var points = this.points;
 
-	    if(points.length >= 3) {
+		// Check if swipe is long enough to count
+		if(points.length >= 1) {
+			var lastPoint = points[points.length-1];
+			var a = Math.abs(x) - Math.abs(lastPoint.x);
+			var b = Math.abs(y) - Math.abs(lastPoint.y);
+			var currentLength = Math.sqrt(a * a + b * b); // Pythagoras -> hypotenuse
+			
+			if(currentLength < MIN_LENGTH) return;
+		}
+
+		points.push({x:x, y:y});
+	
+		if(points.length >= 2) {
+			
+			this.updateLengthSum(currentLength);
+
+			if(this.points.length >= 3) {
+				this.updateAngleSum(currentLength);
+			}
+		}
 
 		var i = points.length - 1;
+		Nc.trigger(Nc.ns.client.view.swiper.swipe, points[i].x, points[i].y);
+	}
 
+	Swiper.prototype.updateLengthSum = function(currentLength) {
+		var points = this.points;
+		var i = points.length - 1;
+
+		var lengthSum = this.lengthSum + Math.abs(currentLength);
+		if(lengthSum > MAX_LENGTH) {
+			
+			var diff = lengthSum - MAX_LENGTH;
+			var ratio = (currentLength - diff) / currentLength;
+
+			// Offset triangle to origin
+			var x0 = points[i].x - points[i-1].x;
+			var y0 = points[i].y - points[i-1].y;
+
+			// Multiply with ratio and offset back
+			var clippedX = x0 * ratio + points[i-1].x;
+			var clippedY = y0 * ratio + points[i-1].y;
+											 
+			points[i].x = clippedX;
+			points[i].y = clippedY;
+
+			this.finished = true;
+
+			lengthSum = MAX_LENGTH;
+		}
+
+		this.lengthSum = lengthSum;
+	};
+
+	Swiper.prototype.updateAngleSum = function(currentLength) {
+
+		var points = this.points;
+		var i = points.length - 1;
+		
+		// last two lines
 		var vectors = [
 			{ 
 				x: points[i].x - points[i-1].x,
@@ -52,10 +105,6 @@ function (Nc) {
 			+ vectors[0].y 
 			* vectors[1].y;
 		
-	        var currentLength = Math.sqrt(
-	            Math.pow(vectors[0].x, 2) 
-	            + Math.pow(vectors[0].y, 2)
-	        );
 		var lastLength = Math.sqrt(
 			Math.pow(vectors[1].x, 2) 
 			+ Math.pow(vectors[1].y, 2)
@@ -67,12 +116,7 @@ function (Nc) {
 		if(!isNaN(parseFloat(angle)) && direction != 0) {
 			this.angleSum += angle;
 		}
-	        
+	};
-	        if(!isNaN(parseFloat(currentLength))) {
-	            this.lengthSum += Math.abs(currentLength);
-	        }
-	    }
-    }
 
 	Swiper.prototype.swipeEnd = function(x, y) {
 		var angularVelocity = this.angleSum;
@@ -111,6 +155,7 @@ function (Nc) {
 		this.angleSum = 0;
 		this.lengthSum = 0;
 		this.points = [];
+		this.finished = false;
 		
 		return {
 			x: direction.x * length / 100,

app/Game/Client/View/Pixi/Layers/Swiper.js

@@ -17,11 +17,6 @@ function (Parent, PIXI, Nc, Settings) {
             Nc.on(Nc.ns.client.view.swiper.end, this.end, this)
         ];
 
-        this.offset = {
-        	x: Settings.STAGE_WIDTH / 2,
-        	y: Settings.STAGE_HEIGHT / 2
-        }
-
         this.sprite = new PIXI.Graphics();
         this.container.addChild(this.sprite);
 
@@ -31,13 +26,17 @@ function (Parent, PIXI, Nc, Settings) {
     Swiper.prototype = Object.create(Parent.prototype);
 
     Swiper.prototype.swipe = function(x, y) {
+        var offset = {
+            x: Settings.STAGE_WIDTH / 2,
+            y: Settings.STAGE_HEIGHT / 2
+        }
 
-		this.sprite.moveTo(this.offset.x + this.last.x, this.offset.y + this.last.y);
+		this.sprite.moveTo(offset.x + this.last.x, offset.y + this.last.y);
 
-		this.last.x += x;
+		this.last.x = x;
-    	this.last.y -= y;
+    	this.last.y = -y;
 
-        this.sprite.lineTo(this.offset.x + this.last.x, this.offset.y + this.last.y);
+        this.sprite.lineTo(offset.x + this.last.x, offset.y + this.last.y);
     };
  
  	Swiper.prototype.end = function(x, y) {