胡斌

improve: save the line_width of last point

正在显示 1 个修改的文件 包含 10 行增加5 行删除
@@ -371,8 +371,9 @@ @@ -371,8 +371,9 @@
371 drawMouse(); 371 drawMouse();
372 } 372 }
373 373
374 - var last_ext_press = 0; 374 +
375 /* 375 /*
  376 + var last_ext_press = 0;
376 function draw_ext_input(px,py,press) { 377 function draw_ext_input(px,py,press) {
377 x = px * ratio_x; 378 x = px * ratio_x;
378 y = py * ratio_y; 379 y = py * ratio_y;
@@ -397,12 +398,13 @@ @@ -397,12 +398,13 @@
397 398
398 399
399 var previousPoint = new Point(0,0,0), currentPoint= new Point(0,0,0); 400 var previousPoint = new Point(0,0,0), currentPoint= new Point(0,0,0);
  401 + var previousWidth = 0;
400 var kWIDTH_MIN = 0.2; 402 var kWIDTH_MIN = 0.2;
401 var kWIDTH_MAX = 3.0; 403 var kWIDTH_MAX = 3.0;
402 //current width 404 //current width
403 var strokeWidth = 3.0; 405 var strokeWidth = 3.0;
404 var rotate_degree = 0; 406 var rotate_degree = 0;
405 - var pressure_level = 2048.0; 407 + var pressure_level = 2048.0 - 1;
406 408
407 function draw_ext_input(px, py, press) { 409 function draw_ext_input(px, py, press) {
408 if(press == 0) { 410 if(press == 0) {
@@ -455,6 +457,7 @@ @@ -455,6 +457,7 @@
455 ctx.beginPath(); //Start path 457 ctx.beginPath(); //Start path
456 ctx.arc(pt.x, pt.y, line_width, 0, Math.PI * 2, true); // Draw a point using the arc function of the canvas with a point structure. 458 ctx.arc(pt.x, pt.y, line_width, 0, Math.PI * 2, true); // Draw a point using the arc function of the canvas with a point structure.
457 ctx.fill(); 459 ctx.fill();
  460 + previousWidth = line_width;
458 } 461 }
459 462
460 function draw_line(pt) { 463 function draw_line(pt) {
@@ -478,7 +481,7 @@ @@ -478,7 +481,7 @@
478 481
479 var stepx, stepy ,stepw; 482 var stepx, stepy ,stepw;
480 var times = 0; 483 var times = 0;
481 - var w0 = (kWIDTH_MAX - kWIDTH_MIN)/pressure_level * previousPoint.p + kWIDTH_MIN; 484 + var w0 = previousWidth;
482 var w1 = (kWIDTH_MAX - kWIDTH_MIN)/pressure_level * pt.p + kWIDTH_MIN; 485 var w1 = (kWIDTH_MAX - kWIDTH_MIN)/pressure_level * pt.p + kWIDTH_MIN;
483 var dw = w1 - w0; 486 var dw = w1 - w0;
484 487
@@ -512,6 +515,8 @@ @@ -512,6 +515,8 @@
512 y += stepy; 515 y += stepy;
513 w += stepw; 516 w += stepw;
514 } 517 }
  518 +
  519 + previousWidth = w1;
515 } 520 }
516 521
517 522
@@ -1338,7 +1343,7 @@ @@ -1338,7 +1343,7 @@
1338 if(cur_pen_type == 0) { 1343 if(cur_pen_type == 0) {
1339 ext_input_panel_width = 21000; 1344 ext_input_panel_width = 21000;
1340 ext_input_panel_height = 29800; 1345 ext_input_panel_height = 29800;
1341 - pressure_level = 2048.0; 1346 + pressure_level = 2048.0 - 1;
1342 var w = ext_input_panel_width * 1.0; 1347 var w = ext_input_panel_width * 1.0;
1343 var h = ext_input_panel_height * 1.0; 1348 var h = ext_input_panel_height * 1.0;
1344 var canvasw = w / h * canvas_height; 1349 var canvasw = w / h * canvas_height;
@@ -1347,7 +1352,7 @@ @@ -1347,7 +1352,7 @@
1347 rotate_degree = 0; 1352 rotate_degree = 0;
1348 } 1353 }
1349 else { 1354 else {
1350 - pressure_level = 1024.0; 1355 + pressure_level = 1024.0 - 1;
1351 } 1356 }
1352 1357
1353 1358