Skip to content

Add ends and pics between tiles #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add ends and pics between tiles #156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 76 additions & 39 deletions src/app/core/operations/tile/tile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Drawdown, NumParam, Operation, OperationInlet, OpInput, OpParamVal } from "../../model/datatypes";
import { NumParam, Operation, OperationInlet, OpInput, OpParamVal } from "../../model/datatypes";
import { initDraftFromDrawdown, updateWarpSystemsAndShuttles, updateWeftSystemsAndShuttles, warps, wefts } from "../../model/drafts";
import { getAllDraftsAtInlet, getInputDraft, getOpParamValById, parseDraftNames } from "../../model/operations";
import { Sequence } from "../../model/sequence";
Expand All @@ -8,68 +8,105 @@ const name = "tile";
const old_names = [];

//PARAMS
const warp_repeats:NumParam =
{name: 'warp-repeats',
type: 'number',
min: 1,
max: 100,
value: 2,
dx: 'the number of times to repeat this time across the width'
const warp_repeats: NumParam =
{
name: 'warp-repeats',
type: 'number',
min: 1,
max: 100,
value: 2,
dx: 'the number of times to repeat this tile across the width'
};

const weft_repeats: NumParam = {name: 'weft-repeats',
type: 'number',
min: 1,
max: 100,
value: 2,
dx: 'the number of times to repeat this time across the length'
const weft_repeats: NumParam = {
name: 'weft-repeats',
type: 'number',
min: 1,
max: 100,
value: 2,
dx: 'the number of times to repeat this tile across the length'
}

const ends_between: NumParam = {
name: 'ends between',
type: 'number',
min: 0,
max: 10000,
value: 0,
dx: 'Number of ends between tiles'
}

const pics_between: NumParam = {
name: 'pics between',
type: 'number',
min: 0,
max: 10000,
value: 0,
dx: 'Number of pics between tiles'
}

const params = [warp_repeats, weft_repeats];
const params = [warp_repeats, weft_repeats, ends_between, pics_between];

//INLETS
const draft_inlet: OperationInlet = {
name: 'draft',
type: 'static',
value: null,
uses: "draft",
dx: 'the draft to tile',
num_drafts: 1
}

const inlets = [draft_inlet];
name: 'draft',
type: 'static',
value: null,
uses: "draft",
dx: 'the draft to tile',
num_drafts: 1
}

const inlets = [draft_inlet];

const perform = (op_params: Array<OpParamVal>, op_inputs: Array<OpInput>) => {

const perform = (op_params: Array<OpParamVal>, op_inputs: Array<OpInput>) => {

let input_draft = getInputDraft(op_inputs);
if(input_draft == null) return Promise.resolve([]);

if (input_draft == null) return Promise.resolve([]);

let warp_rep = getOpParamValById(0, op_params);
let weft_rep = getOpParamValById(1, op_params);
let ends_between = getOpParamValById(2, op_params);
let pics_between = getOpParamValById(3, op_params);

const w = (warp_rep * warps(input_draft.drawdown)) + ((warp_rep - 1) * ends_between);

let pattern = new Sequence.TwoD;

for (let i = 0; i < weft_rep; i++) {
for (let y = 0; y < wefts(input_draft.drawdown); y++) {
let s = new Sequence.OneD;
for (let x = 0; x < warp_rep; x++) {
s.pushRow(input_draft.drawdown[y]);
if (x < warp_rep - 1) {
s.pushMultiple(2, ends_between);
}
}
pattern.pushWeftSequence(s.val());
}
if (i < weft_rep - 1) {
for (let p = 0; p < pics_between; p++) {
let s = new Sequence.OneD;
s.pushMultiple(2, w);
pattern.pushWeftSequence(s.val());
}
}
}

const w = warp_rep * warps(input_draft.drawdown);
const h = weft_rep * wefts(input_draft.drawdown);

let seq = new Sequence.TwoD();
seq.import(input_draft.drawdown);

let dd: Drawdown = seq.fill(w,h).export();
let d = initDraftFromDrawdown(dd);
let d = initDraftFromDrawdown(pattern.export());
// TODO: Ask how to properly update warp systems and materials
d = updateWeftSystemsAndShuttles(d, input_draft);
d = updateWarpSystemsAndShuttles(d, input_draft);

return Promise.resolve([d]);
}
}

const generateName = (param_vals: Array<OpParamVal>, op_inputs: Array<OpInput>) : string => {
const generateName = (param_vals: Array<OpParamVal>, op_inputs: Array<OpInput>): string => {

let drafts = getAllDraftsAtInlet(op_inputs, 0);
return 'tile('+parseDraftNames(drafts)+")";
return 'tile(' + parseDraftNames(drafts) + ")";
}


export const tile: Operation = {name, old_names, params, inlets, perform, generateName};
export const tile: Operation = { name, old_names, params, inlets, perform, generateName };