eraser
This commit is contained in:
parent
548de846f8
commit
02ed7f9f08
@ -128,7 +128,6 @@ header {
|
|||||||
height: 100%;
|
height: 100%;
|
||||||
width: 15rem;
|
width: 15rem;
|
||||||
background: #262626;
|
background: #262626;
|
||||||
display: table;
|
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: -15rem;
|
left: -15rem;
|
||||||
top: 5rem;
|
top: 5rem;
|
||||||
@ -216,8 +215,8 @@ header {
|
|||||||
margin-top: 1rem;
|
margin-top: 1rem;
|
||||||
}
|
}
|
||||||
.bottom {
|
.bottom {
|
||||||
display: table-row;
|
position: absolute;
|
||||||
vertical-align: bottom;
|
bottom: 5rem;
|
||||||
button {
|
button {
|
||||||
margin-left: 3.5rem;
|
margin-left: 3.5rem;
|
||||||
}
|
}
|
||||||
|
@ -90,6 +90,7 @@
|
|||||||
<li><label><span>Fur</span></label></li>
|
<li><label><span>Fur</span></label></li>
|
||||||
<li><label><span>Pen</span></label></li>
|
<li><label><span>Pen</span></label></li>
|
||||||
<li><label><span>Line</span></label></li>
|
<li><label><span>Line</span></label></li>
|
||||||
|
<li><label><span>Eraser</span></label></li>
|
||||||
</ol>
|
</ol>
|
||||||
</section>
|
</section>
|
||||||
<menu>
|
<menu>
|
||||||
|
@ -53,7 +53,9 @@ function save() {
|
|||||||
}).on('mouseup', function(e) {
|
}).on('mouseup', function(e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
window.active = false;
|
window.active = false;
|
||||||
|
|
||||||
|
|
||||||
|
if( settings.type = 'eraser' ) return;
|
||||||
if(window.points.history.last < window.points.history.length-1) {
|
if(window.points.history.last < window.points.history.length-1) {
|
||||||
window.points.history.splice(window.points.history.last+1);
|
window.points.history.splice(window.points.history.last+1);
|
||||||
}
|
}
|
||||||
|
@ -45,12 +45,6 @@ function line(x1, y1, x2, y2, opts, overlay) {
|
|||||||
if( opts.fill ) c.fill();
|
if( opts.fill ) c.fill();
|
||||||
}
|
}
|
||||||
|
|
||||||
function erase(x1, y1, x2, y2, overlay) {
|
|
||||||
var c = window.c;
|
|
||||||
if( overlay ) var c = window.o;
|
|
||||||
c.clearRect(x1, y1, x2 - x1, y2 - y1);
|
|
||||||
}
|
|
||||||
|
|
||||||
function undo() {
|
function undo() {
|
||||||
var history = window.points.history;
|
var history = window.points.history;
|
||||||
if( history.last > 1 ) {
|
if( history.last > 1 ) {
|
||||||
@ -117,7 +111,7 @@ function startPoint(x, y) {
|
|||||||
window.o.fill();
|
window.o.fill();
|
||||||
}
|
}
|
||||||
|
|
||||||
if( old.type == 'line' ) {
|
if( old.type == 'line' && current.type == 'line' ) {
|
||||||
if( points[points.indexOf(old)-1].type !== 'line' ) erase(old.x-5, old.y-5, old.x+5, old.y+5, true);
|
if( points[points.indexOf(old)-1].type !== 'line' ) erase(old.x-5, old.y-5, old.x+5, old.y+5, true);
|
||||||
line(old.x, old.y, x, y);
|
line(old.x, old.y, x, y);
|
||||||
}
|
}
|
||||||
@ -188,6 +182,20 @@ function drawPoint(x,y) {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case 'eraser': {
|
||||||
|
c.globalCompositeOperation = 'destination-out';
|
||||||
|
line(capture.x, capture.y, x, y);
|
||||||
|
|
||||||
|
var current = {
|
||||||
|
x : x,
|
||||||
|
y : y,
|
||||||
|
start : capture.start,
|
||||||
|
type : capture.type
|
||||||
|
}
|
||||||
|
|
||||||
|
points.push(current);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ $(document).ready(function() {
|
|||||||
window.points.history = [{ data: c.createImageData($c.width(), $c.height()), points: []}];
|
window.points.history = [{ data: c.createImageData($c.width(), $c.height()), points: []}];
|
||||||
|
|
||||||
sizeAndPos();
|
sizeAndPos();
|
||||||
$(window).resize(sizeAndPos);
|
//$(window).resize(sizeAndPos);
|
||||||
|
|
||||||
$('.color-picker').change(function() {
|
$('.color-picker').change(function() {
|
||||||
var c = $(this).find('.color').val();
|
var c = $(this).find('.color').val();
|
||||||
|
@ -32,13 +32,13 @@ function save() {
|
|||||||
var pics = navigator.getDeviceStorage('pictures');
|
var pics = navigator.getDeviceStorage('pictures');
|
||||||
var r = pics.addNamed(file, save['file name'] + '.png');
|
var r = pics.addNamed(file, save['file name'] + '.png');
|
||||||
r.onsuccess = function() {
|
r.onsuccess = function() {
|
||||||
alert('Your sketch was successfuly saved to pictures/' + this.result.name);
|
alert('Your sketch was successfuly saved to ' + this.result);
|
||||||
}
|
}
|
||||||
r.onerror = function() {
|
r.onerror = function() {
|
||||||
alert('Something bad happened when we tried to save your file\n Possible problems: \n Duplicate name \n Permission problems')
|
alert('Something bad happened when we tried to save your file\n Possible problems: \n Duplicate name \n Permission problems')
|
||||||
console.warn(this.error);
|
console.warn(this.error);
|
||||||
}
|
}
|
||||||
c.putImageData(window.points.history[window.points.history.length-1].data, 0, 0);
|
c.putImageData(window.points.history[window.points.history.last].data, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
$('.menu').on('tap', function() {
|
$('.menu').on('tap', function() {
|
||||||
@ -61,6 +61,8 @@ function save() {
|
|||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
window.active = false;
|
window.active = false;
|
||||||
|
|
||||||
|
if( settings.type == 'eraser' ) return;
|
||||||
|
|
||||||
if(window.points.history.last < window.points.history.length-1) {
|
if(window.points.history.last < window.points.history.length-1) {
|
||||||
window.points.history.splice(window.points.history.last+1);
|
window.points.history.splice(window.points.history.last+1);
|
||||||
}
|
}
|
||||||
@ -111,7 +113,7 @@ function save() {
|
|||||||
if( i > 0 ) {
|
if( i > 0 ) {
|
||||||
var key = $(this).html().toLowerCase();
|
var key = $(this).html().toLowerCase();
|
||||||
var value = $(this).parent().find('ol:nth-of-type('+i+') li[aria-selected] span').html();
|
var value = $(this).parent().find('ol:nth-of-type('+i+') li[aria-selected] span').html();
|
||||||
if( key !== 'file name' ) value = key.toLowerCase();
|
if( key !== 'file name' ) value = value.toLowerCase();
|
||||||
|
|
||||||
window[v][key] = value;
|
window[v][key] = value;
|
||||||
}
|
}
|
||||||
|
@ -25,6 +25,9 @@
|
|||||||
"description": "برنامهی رایگان طراحی/نقاشی"
|
"description": "برنامهی رایگان طراحی/نقاشی"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"orientation": [
|
||||||
|
"portrait"
|
||||||
|
],
|
||||||
"permissions": {
|
"permissions": {
|
||||||
"device-storage:pictures": {
|
"device-storage:pictures": {
|
||||||
"description": "Required to save sketched pics",
|
"description": "Required to save sketched pics",
|
||||||
|
Loading…
Reference in New Issue
Block a user