Skip to content

Commit

Permalink
from(image, [coherence = false]) supported also at construction time
Browse files Browse the repository at this point in the history
  • Loading branch information
@nakednous
nakednous committed Jan 18, 2023
1 parent a690c3a commit 56e90f8
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 44 deletions.
4 changes: 1 addition & 3 deletions examples/imaging/sketch.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@ function setup() {
pg = createGraphics(i.width, i.height);
//pg.image(i, 0, 0, 400, 200);
pg.image(i, 0, 0);
console.log('cl', Quadrille.CELL_LENGTH);
Quadrille.CELL_LENGTH = 8;
console.log('cl', Quadrille.CELL_LENGTH);
Quadrille.OUTLINE_WEIGHT = 0.5;
//Quadrille.SPATIAL_COHERENCE = false;
i_quadrille = createQuadrille(50, i);
//Quadrille.SPATIAL_COHERENCE = true;
pg_quadrille = createQuadrille(50, pg);
pg_quadrille = createQuadrille(50, pg, true);
}

function draw() {
Expand Down
91 changes: 50 additions & 41 deletions p5.quadrille.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@ class Quadrille {
this.from(arguments[1], arguments[2]);
return;
}
if (arguments.length === 3 && typeof arguments[0] === 'number' && typeof arguments[1] !== 'number' && typeof arguments[2] === 'boolean') {
this._memory2D = Array(Math.round(arguments[0] * arguments[1].height / arguments[1].width)).fill().map(() => Array(arguments[0]).fill(0));
this.from(arguments[1], arguments[2]);
return;
}
if (arguments.length === 4 && typeof arguments[0] === 'number' && typeof arguments[1] === 'number' && typeof arguments[2] === 'number') {
this._memory2D = Array(arguments[1]).fill().map(() => Array(arguments[0]).fill(0));
this.rand(arguments[2], arguments[3]);
Expand Down Expand Up @@ -321,53 +326,20 @@ class Quadrille {

/**
* Converts image (p5.Image or p5.Graphics) or bitboard (integer) to quadrille. Forms:
* 1. from(image); or,
* 1. from(image, [coherence = false]); or,
* 2. from(bitboard, pattern) where pattern may be either a p5.Image, p5.Graphics,
* p5.Color, a 4-length color array, a string or a number.
*/
from() {
if (arguments.length === 1 && (arguments[0] instanceof p5.Image || arguments[0] instanceof p5.Graphics)) {
if (arguments.length === 0) {
console.warn('from always expects params');
return;
}
// a. image
if (arguments[0] instanceof p5.Image || arguments[0] instanceof p5.Graphics) {
let image = new p5.Image(arguments[0].width, arguments[0].height);
image.copy(arguments[0], 0, 0, arguments[0].width, arguments[0].height, 0, 0, arguments[0].width, arguments[0].height);
let coherence = true;
// a. image
if (coherence) {
// 1st method uses image.resize
image.resize(this.width, this.height);
image.loadPixels();
for (let i = 0; i < image.pixels.length / 4; i++) {
let r = image.pixels[4 * i];
let g = image.pixels[4 * i + 1];
let b = image.pixels[4 * i + 2];
let a = image.pixels[4 * i + 3];
let _ = this._fromIndex(i);
this._memory2D[_.row][_.col] = [r, g, b, a];
}
}
else {
// 2nd method seems to give better visual results
image.loadPixels();
let r = Array(this.height).fill().map(() => Array(this.width).fill(0));
let g = Array(this.height).fill().map(() => Array(this.width).fill(0));
let b = Array(this.height).fill().map(() => Array(this.width).fill(0));
let a = Array(this.height).fill().map(() => Array(this.width).fill(0));
let t = Array(this.height).fill().map(() => Array(this.width).fill(0));
for (let i = 0; i < image.pixels.length / 4; i++) {
let _ = this._fromIndex(i, image.width);
let _i = Math.floor(_.row * this.height / image.height);
let _j = Math.floor(_.col * this.width / image.width);
r[_i][_j] += image.pixels[4 * i];
g[_i][_j] += image.pixels[4 * i + 1];
b[_i][_j] += image.pixels[4 * i + 2];
a[_i][_j] += image.pixels[4 * i + 3];
t[_i][_j] += 1;
}
for (let i = 0; i < this.height; i++) {
for (let j = 0; j < this.width; j++) {
this._memory2D[i][j] = [r[i][j] / t[i][j], g[i][j] / t[i][j], b[i][j] / t[i][j], a[i][j] / t[i][j]];
}
}
}
arguments.length === 1 ? this._pixelator2(image) : arguments[1] ? this._pixelator1(image) : this._pixelator2(image);
}
// b. bitboard, pattern
if (arguments.length === 2 && typeof arguments[0] === 'number') {
Expand All @@ -384,6 +356,43 @@ class Quadrille {
}
}

_pixelator1(image) {
image.resize(this.width, this.height);
image.loadPixels();
for (let i = 0; i < image.pixels.length / 4; i++) {
let r = image.pixels[4 * i];
let g = image.pixels[4 * i + 1];
let b = image.pixels[4 * i + 2];
let a = image.pixels[4 * i + 3];
let _ = this._fromIndex(i);
this._memory2D[_.row][_.col] = [r, g, b, a];
}
}

_pixelator2(image) {
image.loadPixels();
let r = Array(this.height).fill().map(() => Array(this.width).fill(0));
let g = Array(this.height).fill().map(() => Array(this.width).fill(0));
let b = Array(this.height).fill().map(() => Array(this.width).fill(0));
let a = Array(this.height).fill().map(() => Array(this.width).fill(0));
let t = Array(this.height).fill().map(() => Array(this.width).fill(0));
for (let i = 0; i < image.pixels.length / 4; i++) {
let _ = this._fromIndex(i, image.width);
let _i = Math.floor(_.row * this.height / image.height);
let _j = Math.floor(_.col * this.width / image.width);
r[_i][_j] += image.pixels[4 * i];
g[_i][_j] += image.pixels[4 * i + 1];
b[_i][_j] += image.pixels[4 * i + 2];
a[_i][_j] += image.pixels[4 * i + 3];
t[_i][_j] += 1;
}
for (let i = 0; i < this.height; i++) {
for (let j = 0; j < this.width; j++) {
this._memory2D[i][j] = [r[i][j] / t[i][j], g[i][j] / t[i][j], b[i][j] / t[i][j], a[i][j] / t[i][j]];
}
}
}

_fromIndex(index, width = this.width) {
return { row: (index / width) | 0, col: index % width };
}
Expand Down

0 comments on commit 56e90f8

Please sign in to comment.