c-eyes@anaximeno: Version 3.0.1 (#6466)

* Check if optimization available before using it
* Updated eye drawing process
* Optimize the should redraw check function
* Refactor clear area process

Author: anaximeno

c-eyes@anaximeno/files/c-eyes@anaximeno/6.2/applet.js

@@ -78,6 +78,8 @@ class Eye extends Applet.Applet {
 
 		this.refresh_handler_id = 0;
 
+		this.cos_repaint_angle = Math.cos(this.repaint_angle);
+
 		this._last_mouse_x = undefined;
 		this._last_mouse_y = undefined;
 		this._last_eye_x = undefined;
@@ -91,7 +93,7 @@ class Eye extends Applet.Applet {
 	get repaint_interval() {
 		let repaint_interval = this._repaint_interval;
 
-		if (this.optimization_mode != "manual") {
+		if (this.optimization_mode != "manual" && this.optimization_mode in Optimizations) {
 			let r = Optimizations[this.optimization_mode]["repaint_interval_ms"];
 			if (r != null || r != undefined) repaint_interval = r;
 		}
@@ -102,7 +104,7 @@ class Eye extends Applet.Applet {
 	get repaint_angle() {
 		let repaint_angle = this._repaint_angle;
 
-		if (this.optimization_mode != "manual") {
+		if (this.optimization_mode != "manual" && this.optimization_mode in Optimizations) {
 			let r = Optimizations[this.optimization_mode]["repaint_angle_rad"];
 			if (r != null || r != undefined) repaint_angle = r;
 		}
@@ -122,7 +124,7 @@ class Eye extends Applet.Applet {
 			{
 				key: "repaint-angle",
 				value: "_repaint_angle",
-				cb: null,
+				cb: () => this.cos_repaint_angle = Math.cos(this.repaint_angle),
 			},
 			{
 				key: "mode",
@@ -398,17 +400,18 @@ class Eye extends Applet.Applet {
 		) {
 			should_redraw = true;
 		} else {
-			const dist = (x, y) => Math.sqrt(x * x + y * y);
+			const sq_dist = (x, y) => x * x + y * y;
 			const [last_x, last_y] = [this._last_mouse_x - ox, this._last_mouse_y - oy];
 			const [current_x, current_y] = [mouse_x - ox, mouse_y - oy];
-			const dist_prod = dist(last_x, last_y) * dist(current_x, current_y);
+			const current_sq_dist = sq_dist(current_x, current_y);
+			const last_sq_dist = sq_dist(last_x, last_y);
 
-			if (dist_prod == 0) {
+			if (last_sq_dist === 0 || current_sq_dist === 0) {
 				should_redraw = true;
 			} else {
 				const dot_prod = current_x * last_x + current_y * last_y;
-				const angle = Math.acos(dot_prod / dist_prod);
-				should_redraw = angle >= this.repaint_angle;
+				const cos_angle = dot_prod / Math.sqrt(last_sq_dist * current_sq_dist);
+				should_redraw = cos_angle <= this.cos_repaint_angle;
 			}
 		}
 

c-eyes@anaximeno/files/c-eyes@anaximeno/6.2/eyeModes.js

@@ -36,7 +36,7 @@ class EyeMode {
     topAndLatSizes(area_width, area_height, options) {
         let top_size, lat_size;
 
-        if(options.is_vertical) {
+        if (options.is_vertical) {
             top_size = area_width;
             lat_size = area_height;
         } else {
@@ -46,41 +46,45 @@ class EyeMode {
 
         return [top_size, lat_size];
     }
+
+    /** Add a ransparent background to avoid blemishes from previous drawings. */
+    clearArea(cr, area_width, area_height) {
+        cr.save();
+        cr.setSourceRGBA(0, 0, 0, 0);
+        cr.rectangle(0, 0, area_width, area_height);
+        cr.fill();
+        cr.restore();
+    }
 }
 
 class EyelidMode extends EyeMode {
     drawEye(area, options) {
-        let [area_width, area_height] = area.get_surface_size();
-        let [mouse_x, mouse_y] = [options.mouse_x, options.mouse_y];
-        let [area_x, area_y] = [options.area_x, options.area_y];
-
-        area_x += area_width / 2;
-        area_y += area_height / 2;
-
-        mouse_x -= area_x;
-        mouse_y -= area_y;
+        const [area_width, area_height] = area.allocation.get_size();
+        const mouse_x = options.mouse_x - options.area_x - area_width / 2;
+        const mouse_y = options.mouse_y - options.area_y - area_height / 2;
 
         const mouse_ang = Math.atan2(mouse_y, mouse_x);
         let mouse_rad = Math.sqrt(mouse_x * mouse_x + mouse_y * mouse_y);
 
-        let [top_size, lat_size] = this.topAndLatSizes(area_width, area_height, options);
-        let eye_rad = (top_size - options.padding) / 2;
-        if (2 * eye_rad > lat_size) eye_rad = lat_size / 2;
+        const [top_size, lat_size] = this.topAndLatSizes(area_width, area_height, options);
+        let eye_rad = Math.min(top_size - options.padding, lat_size) / 2;
 
         const iris_rad = eye_rad * 0.5;
         const pupil_rad = iris_rad * 0.4;
 
         const max_rad = eye_rad * (Math.pow(Math.cos(mouse_ang), 4) * 0.5 + 0.25);
 
-        if (mouse_rad > max_rad)
-            mouse_rad = max_rad;
+        mouse_rad = Math.min(mouse_rad, max_rad);
 
         const iris_arc = Math.asin(iris_rad / eye_rad);
         const iris_r = eye_rad * Math.cos(iris_arc);
 
         const eye_ang = Math.atan(mouse_rad / iris_r);
 
         let cr = area.get_context();
+        this.clearArea(cr, area_width, area_height);
+
+        cr.save();
 
         // -- Drawing the base of the eye
 
@@ -91,12 +95,12 @@ class EyelidMode extends EyeMode {
 
         const x_def = iris_rad * Math.cos(mouse_ang) * (Math.sin(eye_ang));
         const y_def = iris_rad * Math.sin(mouse_ang) * (Math.sin(eye_ang));
-        let amp;
 
         const top_lid = 0.8;
         const bottom_lid = 0.6;
 
-        amp = eye_rad * top_lid;
+        let amp = eye_rad * top_lid;
+
         cr.moveTo(-eye_rad, 0);
         cr.curveTo(x_def - iris_rad, y_def + amp,
             x_def + iris_rad, y_def + amp, eye_rad, 0);
@@ -142,45 +146,39 @@ class EyelidMode extends EyeMode {
         cr.arc(0, 0, 1.0, 0, 2 * Math.PI);
         cr.fill();
 
-        cr.save();
         cr.restore();
-        cr.$dispose();
     }
 }
 
 
 class BulbMode extends EyeMode {
     drawEye(area, options) {
-        let [area_width, area_height] = area.get_surface_size();
-        let [mouse_x, mouse_y] = [options.mouse_x, options.mouse_y];
-        let [area_x, area_y] = [options.area_x, options.area_y];
-
-        area_x += area_width / 2;
-        area_y += area_height / 2;
-
-        mouse_x -= area_x;
-        mouse_y -= area_y;
+        const [area_width, area_height] = area.allocation.get_size();
+        const mouse_x = options.mouse_x - options.area_x - area_width / 2;
+        const mouse_y = options.mouse_y - options.area_y - area_height / 2;
 
         let mouse_rad = Math.sqrt(mouse_x * mouse_x + mouse_y * mouse_y);
         const mouse_ang = Math.atan2(mouse_y, mouse_x);
 
-        let [top_size, lat_size] = this.topAndLatSizes(area_width, area_height, options);
-        let eye_rad = (top_size - options.padding) / 2;
-        if (2 * eye_rad > lat_size) eye_rad = lat_size / 2.1;
+        const [top_size, lat_size] = this.topAndLatSizes(area_width, area_height, options);
+        let eye_rad = Math.min(top_size - options.padding, lat_size) / 2;
 
         const iris_rad = eye_rad * 0.6;
         const pupil_rad = iris_rad * 0.4;
 
         const max_rad = eye_rad * Math.cos(Math.asin((iris_rad) / eye_rad)) - options.line_width;
 
-        if (mouse_rad > max_rad) mouse_rad = max_rad;
+        mouse_rad = Math.min(mouse_rad, max_rad);
 
         const iris_arc = Math.asin(iris_rad / eye_rad);
         const iris_r = eye_rad * Math.cos(iris_arc);
 
         const eye_ang = Math.atan(mouse_rad / iris_r);
 
-        const cr = area.get_context();
+        let cr = area.get_context();
+        this.clearArea(cr, area_width, area_height);
+
+        cr.save();
 
         // -- Drawing the base of the eye
 
@@ -217,9 +215,7 @@ class BulbMode extends EyeMode {
         cr.arc(0, 0, 1.0, 0, 2 * Math.PI);
         cr.fill();
 
-        cr.save();
         cr.restore();
-        cr.$dispose();
     }
 }
 

c-eyes@anaximeno/files/c-eyes@anaximeno/metadata.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.0.0",
+  "version": "3.0.1",
   "uuid": "c-eyes@anaximeno",
   "name": "Cinnamon Eyes",
   "multiversion": true,