Skip to content
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.

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

[MPQEditor] Revisit 'MPQData' #1532

Merged
merged 1 commit into from
Apr 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 35 additions & 3 deletions src/MPQEditor/MPQData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ export class MPQData {
return this._defaultModelLayers;
}

// get layers, which will NOT be qauntized by default
getLayers(): string[] {
return this._content[MPQData._layersKey].map(
(item: any) => item[MPQData._nameKey]
);
}

// update section(quantization parameter) of nondefault layer
updateSectionOfLayer(name: string, section: string, value: string) {
let layer = this._content[MPQData._layersKey].find(
Expand Down Expand Up @@ -105,10 +112,35 @@ export class MPQData {
this.filterDefaultModelLayersByContent();
}

setLayers(names: string[]) {
let layersToAdd = Array<string>();
let layersToDefault = Array<string>();
this._content[MPQData._layersKey].forEach((layer: any) => {
let foundIndex = names.findIndex(
(name: string) => name === layer[MPQData._nameKey]
);
if (foundIndex < 0) {
// name to default
layersToDefault.push(layer["name"]);
}
});
names.forEach((name: any) => {
let foundIndex = this._content[MPQData._layersKey].findIndex(
(x: any) => x[MPQData._nameKey] === name
);
if (foundIndex < 0) {
// name to add
layersToAdd.push(name);
}
});
this.setLayersToDefault(layersToDefault);
this.addLayers(layersToAdd);

return layersToAdd;
}

private filterDefaultModelLayersByContent() {
let layers = this._content[MPQData._layersKey].map(
(item: any) => item[MPQData._nameKey]
);
let layers = this.getLayers();
this._defaultModelLayers = this._allModelLayers?.filter(
(name) =>
layers.find((filterName: string) => name === filterName) === undefined
Expand Down
73 changes: 73 additions & 0 deletions src/Tests/MPQEditor/MPQData.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,5 +166,78 @@ suite("MPQEditor", function () {
assert.throws(() => data.setLayersToDefault(["layer_2"]));
});
});

suite("#getLayers", function () {
test("get layers", function () {
let data = new MPQData();
data.setWithString(defaultMPQText);
let allLayers = ["layer_1", "layer_2"];
data.setAllModelLayers(allLayers);
// add specific layer
data.addLayers(["layer_1"]);

const layers = data.getLayers();
let index = layers?.findIndex((name) => name === "layer_1");

assert.isTrue(layers.length === 1);
assert.isTrue(index === 0);
});

test("NEG: get empty layers", function () {
let data = new MPQData();
data.setWithString(defaultMPQText);
const layers = data.getLayers();
assert(layers.length === 0);
});
});

suite("#getLayers", function () {
test("get layers", function () {
let data = new MPQData();
data.setWithString(defaultMPQText);
let allLayers = ["layer_1", "layer_2"];
data.setAllModelLayers(allLayers);
// add specific layer
data.addLayers(["layer_1"]);

const layers = data.getLayers();
let index = layers?.findIndex((name) => name === "layer_1");

assert.isTrue(layers.length === 1);
assert.isTrue(index === 0);
});

test("NEG: get empty layers", function () {
let data = new MPQData();
data.setWithString(defaultMPQText);
const layers = data.getLayers();
assert(layers.length === 0);
});
});

suite("#setLayers", function () {
test("set layers", function () {
let data = new MPQData();
data.setWithString(defaultMPQText);
let allLayers = ["layer_1", "layer_2"];
data.setAllModelLayers(allLayers);
// add specific layer
data.setLayers(["layer_1"]);

const layers = data.getLayers();
let index = layers?.findIndex((name) => name === "layer_1");

assert.isTrue(layers.length === 1);
assert.isTrue(index === 0);
});

test("NEG: set empty layers", function () {
let data = new MPQData();
data.setWithString(defaultMPQText);
data.setLayers([]);
const layers = data.getLayers();
assert(layers.length === 0);
});
});
});
});