58 Commits
Author SHA1 Message Date
MrKBear a13e1a3ec0 Optmize file load func 2022-06-02 10:57:11 +08:00
MrKBear 3e6bef2ee7 Merge branch 'master' into dev-mrkbear 2022-05-27 20:01:46 +08:00
MrKBear bd8a9d1cdb Add statistics panel 2022-05-26 21:47:42 +08:00
MrKBear 4ea3c9e1f4 Add statistics panel 2022-05-26 17:08:04 +08:00
MrKBear 2dbbd0952a Add statistics panel 2022-05-25 22:00:13 +08:00
MrKBear ce99b17fcb Add statistics panel 2022-05-24 14:07:47 +08:00
MrKBear fcbe646b67 Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/living-together into dev-mrkbear 2022-05-24 11:39:06 +08:00
MrKBear a8b1c21ed6 Fix ZH_CN I18N num error 2022-05-24 11:38:56 +08:00
MrKBear 7adadb6d46 Merge pull request 'Add setting option' (#55) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/55
2022-05-20 14:45:26 +08:00
MrKBear 8b35074fe8 Merge branch 'master' into dev-mrkbear 2022-05-20 14:45:22 +08:00
MrKBear c582388317 Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/living-together into dev-mrkbear 2022-05-20 14:44:00 +08:00
MrKBear 70ff9fa0ad Add setting option 2022-05-20 14:41:52 +08:00
MrKBear ac0fef2901 Merge pull request 'Add ant behavior' (#54) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/54
2022-05-12 20:23:20 +08:00
MrKBear 7e2281add1 Merge branch 'master' into dev-mrkbear 2022-05-12 20:23:16 +08:00
MrKBear 4eb6637062 fix brownian behavior 2022-05-12 20:22:18 +08:00
MrKBear 8670b577f9 Add sample tracking behavior 2022-05-11 13:09:51 +08:00
MrKBear 4768667803 Add sample tracking behavior 2022-05-11 11:43:41 +08:00
MrKBear 571e80d542 Fix boundary logic & Add wastage behavior 2022-05-10 14:55:45 +08:00
MrKBear da493bc6ae Contact Attacking behavior add assimilate & Tracking add view range 2022-05-09 23:26:17 +08:00
MrKBear 904de02140 Brownian behavior add limit by range 2022-05-09 21:24:28 +08:00
MrKBear 4ade5d4bc3 Add manufacture behavior 2022-05-08 21:33:38 +08:00
MrKBear 920958b1a2 Merge pull request 'Add avoidance behavior & direction cluster behavior & central cluster behavior' (#53) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/53
2022-05-07 12:10:39 +08:00
MrKBear e814f5e061 Merge branch 'master' into dev-mrkbear 2022-05-07 12:10:33 +08:00
MrKBear dfb3905c9b Add central cluster behavior 2022-05-07 12:09:05 +08:00
MrKBear 974cd2951d Add direction cluster behavior 2022-05-06 23:12:00 +08:00
MrKBear f660aefa4c Add avoidance behavior 2022-05-06 18:55:31 +08:00
MrKBear c6b0f84cef Merge pull request 'Add line info into spline first point' (#52) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/52
2022-05-06 11:36:35 +08:00
MrKBear 456c21f6c2 Merge branch 'master' into dev-mrkbear 2022-05-06 11:36:31 +08:00
MrKBear 436ba7b3d9 Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/living-together into dev-mrkbear 2022-05-06 00:04:50 +08:00
MrKBear dcd2d10147 Add line info into spline first point 2022-05-06 00:04:46 +08:00
MrKBear 658765141c Merge pull request 'Add parse to obj function & Bind clip recoder & loader event' (#51) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/51
2022-05-04 14:53:24 +08:00
MrKBear 1825f3fc14 Merge branch 'master' into dev-mrkbear 2022-05-04 14:53:17 +08:00
MrKBear 904dee9e86 Add parse to obj function 2022-05-04 11:13:54 +08:00
MrKBear 73b68e1eac Bind clip recoder & loader event 2022-05-03 14:57:32 +08:00
MrKBear 6c23ce62ff Merge pull request 'Add clip archive function & optmize clip frame structor & clip details panel' (#50) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/50
2022-05-02 23:57:00 +08:00
MrKBear e11518ce8a Merge branch 'master' into dev-mrkbear 2022-05-02 23:56:48 +08:00
MrKBear 2b53ccea2b Add clip archive function & optmize clip frame structor 2022-05-02 23:55:06 +08:00
MrKBear e3681f2f32 Add clip details panel 2022-05-02 16:09:02 +08:00
MrKBear c86ff9ef1a Merge pull request 'Add clip player & offline renderer' (#49) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/49
2022-05-01 18:41:11 +08:00
MrKBear 7002d49155 Merge branch 'master' into dev-mrkbear 2022-05-01 18:41:05 +08:00
MrKBear a689d23b5f Add offline renderer function & offline pop component 2022-05-01 18:37:56 +08:00
MrKBear be22102f95 Add command bar start action handel 2022-05-01 13:28:28 +08:00
MrKBear 53ae625c92 Bind slider handel function 2022-05-01 13:03:49 +08:00
MrKBear a0547095e2 Add clip player logic 2022-05-01 12:34:03 +08:00
MrKBear a0a1b52b3f Add clip player logic 2022-04-30 22:20:18 +08:00
MrKBear 5b0635270c Merge pull request 'Add clip model & clipList component & recoder panel' (#48) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/48
2022-04-30 20:51:30 +08:00
MrKBear 6c6ea52eff Merge branch 'master' into dev-mrkbear 2022-04-30 20:51:25 +08:00
MrKBear c067088157 Add clip list component 2022-04-30 20:40:02 +08:00
MrKBear 53e6c9db9c Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/living-together into dev-mrkbear 2022-04-30 13:59:29 +08:00
MrKBear 41fe51ec9c Add clip list component 2022-04-30 13:59:22 +08:00
MrKBear 5a3ec7d2af Add record function 2022-04-29 22:10:45 +08:00
MrKBear 776a5f571e Add record model into actuator 2022-04-29 14:32:00 +08:00
MrKBear bc67782365 Add clip player 2022-04-29 12:12:06 +08:00
MrKBear c923efcd99 Add cilp model; 2022-04-27 16:22:30 +08:00
MrKBear 0a5bcd76f0 Merge pull request 'Add loading page' (#47) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/47
2022-04-26 20:48:11 +08:00
MrKBear 393e7e7fe2 Merge branch 'master' into dev-mrkbear 2022-04-26 20:48:06 +08:00
MrKBear d53acf0146 Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/living-together into dev-mrkbear 2022-04-26 20:47:23 +08:00
MrKBear fea2a9af16 Add loading page 2022-04-26 19:26:54 +08:00
48 changed files with 3912 additions and 65 deletions
File diff suppressed because one or more lines are too long
+304
View File
@@ -0,0 +1,304 @@
const PATH = require("path");
const FS = require("fs");
const MINIMIST = require("minimist");
const READLINE = require("readline-sync");
const ARGS = MINIMIST(process.argv.slice(2), {
alias: {i: ["input", "save"], o: ["output", "obj"]}
});
// 获取路径
const inputFilePath = PATH.resolve(ARGS.i ?? "./save.ltss");
const outputFilePath = PATH.resolve(ARGS.o ?? "./output.obj");
// 读取文件
const fileString = FS.readFileSync(inputFilePath);
console.log("文件读取成功...\r\n");
/**
* 引入所需类型
* @typedef {import("../source/Model/Archive").IArchiveObject} IArchiveObject
* @typedef {import("../source/Model/Clip").IArchiveClip} IArchiveClip
*/
/**
* 解析文件
* @type {IArchiveObject}
*/
const archive = JSON.parse(fileString);
console.log("文件解析成功...\r\n");
// 打印全部的剪辑列表
if (archive.clipPool.length > 0) {
console.log("这个存档中存在以下剪辑:");
}
archive.clipPool.map((item, index) => {
console.log(" \033[44;30m" + (index + 1) + "\033[40;32m " + item.name + " [" + item.id + "]\033[0m");
});
/**
* 选择剪辑
* @type {IArchiveClip}
*/
let clip;
if (archive.clipPool.length <= 0) {
console.log("存档中没有剪辑, 退出程序...\r\n");
process.exit();
} else if (archive.clipPool.length === 1) {
console.log("\r\n存档中只有一个剪辑, 自动选择...\r\n");
clip = archive.clipPool[0];
} else {
console.log("\r\n请选择一个剪辑: ");
let userInput = READLINE.question();
for (let i = 0; i < archive.clipPool.length; i++) {
if ((i + 1) == userInput) {
clip = archive.clipPool[i];
break;
}
}
}
// 选择提示
if (clip) {
console.log("已选择剪辑: " + clip.name + "\r\n");
} else {
console.log("没有选择任何剪辑, 退出程序...\r\n");
process.exit();
}
// 解压缩文件
console.log("正在还原压缩剪辑记录...\r\n");
const frames = clip.frames;
/**
* @type {Map<string, {name: string, type: string, select?: boolean}}
*/
const objectMapper = new Map();
const LastFrameData = "@";
/**
* @type {IArchiveClip["frames"]}
*/
const F = [];
frames.forEach((frame) => {
/**
* @type {IArchiveClip["frames"][number]["commands"]}
*/
const FCS = [];
frame.commands.forEach((command) => {
// 压缩指令
const FC = {
id: command.id,
type: command.type
};
/**
* 上一帧
* @type {IArchiveClip["frames"][number]}
*/
const lastFrame = F[F.length - 1];
/**
* 上一帧指令
* @type {IArchiveClip["frames"][number]["commands"][number]}
*/
const lastCommand = lastFrame?.commands.filter((c) => {
if (c.type === command.type && c.id === command.id) {
return true;
} else {
return false;
}
})[0];
// 记录
FC.name = (LastFrameData === command.name) ? lastCommand?.name : command.name;
FC.data = (LastFrameData === command.data) ? lastCommand?.data : command.data;
FC.mapId = (LastFrameData === command.mapId) ? lastCommand?.mapId : command.mapId;
FC.position = (LastFrameData === command.position) ? lastCommand?.position : command.position;
FC.radius = (LastFrameData === command.radius) ? lastCommand?.radius : command.radius;
// 获取 Mapper
const mapper = objectMapper.get(FC.id);
if (mapper) {
mapper.type = FC.type ?? mapper.type;
mapper.name = FC.name ?? mapper.name;
} else {
objectMapper.set(FC.id, {
type: FC.type,
name: FC.name
});
}
FCS.push(FC);
});
F.push({
duration: frame.duration,
process: frame.process,
commands: FCS
});
});
console.log("剪辑记录还原成功...\r\n");
console.log("剪辑共 " + F.length + " 帧, 对象 " + objectMapper.size + " 个\r\n");
if (objectMapper.size) {
console.log("剪辑记录中存在以下对象:");
} else {
console.log("剪辑记录中没有任何对象,退出程序...");
process.exit();
}
let objectMapperForEachIndex = 1;
objectMapper.forEach((item, key) => {
console.log(" \033[44;30m" + (objectMapperForEachIndex ++) + "\033[40;32m " + item.type + " " + item.name + " [" + key + "]\033[0m");
});
/**
* @type {number[]}
*/
const pointMapper = [];
/**
* @param {number} x
* @param {number} y
* @param {number} z
* @returns {number}
*/
function getPointID(x, y, z) {
let search = -1;
let pointMapperLength = (pointMapper.length / 3);
// for (let i = 0; i < pointMapperLength; i++) {
// if (
// pointMapper[i * 3 + 0] === x &&
// pointMapper[i * 3 + 1] === y &&
// pointMapper[i * 3 + 2] === z
// ) {
// search = i;
// }
// }
if (search >= 0) {
return search;
} else {
pointMapper.push(x);
pointMapper.push(y);
pointMapper.push(z);
return pointMapperLength + 1;
}
}
let frameId = 0;
/**
* @type {Map<string, {id: number, start: number, last: number, name: string, point: number[]}[]>}
*/
const objectLineMapper = new Map();
/**
* @param {string} obj
* @param {number} id
* @param {number} point
*/
function recordPoint(obj, id, point) {
let searchObj = objectLineMapper.get(obj);
if (searchObj) {
/**
* @type {{id: number, start: number, last: number, point: number[]}}
*/
let search;
for (let i = 0; i < searchObj.length; i++) {
if (searchObj[i].id === id && searchObj[i].last === (frameId - 1)) {
search = searchObj[i];
}
}
if (search) {
search.point.push(point);
search.last = frameId;
} else {
searchObj.push({
id: id,
start: frameId,
last: frameId,
point: [point]
});
}
} else {
objectLineMapper.set(obj, [{
id: id,
start: frameId,
last: frameId,
point: [point]
}]);
}
}
console.log("\r\n正在收集多边形数据...\r\n");
for (frameId = 0; frameId < F.length; frameId ++) {
F[frameId].commands.forEach((command) => {
if (command.type === "points" && command.mapId && command.data) {
command.mapId.forEach((pid, index) => {
const x = command.data[index * 3 + 0];
const y = command.data[index * 3 + 1]
const z = command.data[index * 3 + 2]
if (
x !== undefined &&
y !== undefined &&
z !== undefined
) {
recordPoint(command.id, pid, getPointID(x, y, z));
}
})
}
});
}
let pointCount = (pointMapper.length / 3);
console.log("收集点数据 " + pointCount + "个\r\n");
console.log("收集样条:");
let objectLineMapperIndexPrint = 1;
objectLineMapper.forEach((item, key) => {
let iName = objectMapper.get(key).name;
console.log(" \033[44;30m" + (objectLineMapperIndexPrint ++) + "\033[40;32m " + item.length + " " + iName + " [" + key + "]\033[0m");
});
console.log("\r\n正在生成 .obj 文件...\r\n");
let fileStr = ""; let fileStrVec = "";
objectLineMapper.forEach((item, key) => {
for (let i = 0; i < item.length; i++) {
fileStr += "\r\n";
fileStr += ("o " + objectMapper.get(key).name + " " + item[i].id + "\r\n");
fileStr += "usemtl default\r\n";
fileStr += "l ";
fileStr += getPointID(
item[i].start / (F.length - 1),
item[i].last / (F.length - 1),
(item[i].last - item[i].start) / (F.length - 1)
) + " ";
fileStr += item[i].point.join(" ");
fileStr += "\r\n";
}
fileStr += "\r\n";
});
pointCount = (pointMapper.length / 3);
for (let i = 0; i < pointCount; i++) {
fileStrVec += ("v " + pointMapper[i * 3 + 0] + " " + pointMapper[i * 3 + 1] + " " + pointMapper[i * 3 + 2] + "\r\n");
}
const file = "# Create with Living Together (Parse from .ltss file)\r\n\r\n" + fileStrVec + fileStr;
console.log("正在生成保存文件...\r\n");
FS.writeFileSync(outputFilePath, file);
console.log("成功\r\n");
+41
View File
@@ -11,14 +11,17 @@
"dependencies": { "dependencies": {
"@fluentui/react": "^8.56.0", "@fluentui/react": "^8.56.0",
"@juggle/resize-observer": "^3.3.1", "@juggle/resize-observer": "^3.3.1",
"chart.js": "^3.7.1",
"detect-port": "^1.3.0", "detect-port": "^1.3.0",
"downloadjs": "^1.4.7", "downloadjs": "^1.4.7",
"express": "^4.17.3", "express": "^4.17.3",
"gl-matrix": "^3.4.3", "gl-matrix": "^3.4.3",
"react": "^17.0.2", "react": "^17.0.2",
"react-chartjs-2": "^4.1.0",
"react-dnd": "^16.0.1", "react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1", "react-dnd-html5-backend": "^16.0.1",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"readline-sync": "^1.4.10",
"uuid": "^8.3.2" "uuid": "^8.3.2"
}, },
"devDependencies": { "devDependencies": {
@@ -2199,6 +2202,11 @@
"url": "https://github.com/chalk/chalk?sponsor=1" "url": "https://github.com/chalk/chalk?sponsor=1"
} }
}, },
"node_modules/chart.js": {
"version": "3.7.1",
"resolved": "https://registry.npmmirror.com/chart.js/-/chart.js-3.7.1.tgz",
"integrity": "sha512-8knRegQLFnPQAheZV8MjxIXc5gQEfDFD897BJgv/klO/vtIyFFmgMXrNfgrXpbTr/XbTturxRgxIXx/Y+ASJBA=="
},
"node_modules/chokidar": { "node_modules/chokidar": {
"version": "3.5.3", "version": "3.5.3",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -6209,6 +6217,15 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
"node_modules/react-chartjs-2": {
"version": "4.1.0",
"resolved": "https://registry.npmmirror.com/react-chartjs-2/-/react-chartjs-2-4.1.0.tgz",
"integrity": "sha512-AsUihxEp8Jm1oBhbEovE+w50m9PVNhz1sfwEIT4hZduRC0m14gHWHd0cUaxkFDb8HNkdMIGzsNlmVqKiOpU74g==",
"peerDependencies": {
"chart.js": "^3.5.0",
"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
}
},
"node_modules/react-dnd": { "node_modules/react-dnd": {
"version": "16.0.1", "version": "16.0.1",
"resolved": "https://registry.npmmirror.com/react-dnd/-/react-dnd-16.0.1.tgz", "resolved": "https://registry.npmmirror.com/react-dnd/-/react-dnd-16.0.1.tgz",
@@ -6367,6 +6384,14 @@
"node": ">=8.10.0" "node": ">=8.10.0"
} }
}, },
"node_modules/readline-sync": {
"version": "1.4.10",
"resolved": "https://registry.npmmirror.com/readline-sync/-/readline-sync-1.4.10.tgz",
"integrity": "sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==",
"engines": {
"node": ">= 0.8.0"
}
},
"node_modules/rechoir": { "node_modules/rechoir": {
"version": "0.7.1", "version": "0.7.1",
"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
@@ -10104,6 +10129,11 @@
"supports-color": "^7.1.0" "supports-color": "^7.1.0"
} }
}, },
"chart.js": {
"version": "3.7.1",
"resolved": "https://registry.npmmirror.com/chart.js/-/chart.js-3.7.1.tgz",
"integrity": "sha512-8knRegQLFnPQAheZV8MjxIXc5gQEfDFD897BJgv/klO/vtIyFFmgMXrNfgrXpbTr/XbTturxRgxIXx/Y+ASJBA=="
},
"chokidar": { "chokidar": {
"version": "3.5.3", "version": "3.5.3",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -13191,6 +13221,12 @@
"object-assign": "^4.1.1" "object-assign": "^4.1.1"
} }
}, },
"react-chartjs-2": {
"version": "4.1.0",
"resolved": "https://registry.npmmirror.com/react-chartjs-2/-/react-chartjs-2-4.1.0.tgz",
"integrity": "sha512-AsUihxEp8Jm1oBhbEovE+w50m9PVNhz1sfwEIT4hZduRC0m14gHWHd0cUaxkFDb8HNkdMIGzsNlmVqKiOpU74g==",
"requires": {}
},
"react-dnd": { "react-dnd": {
"version": "16.0.1", "version": "16.0.1",
"resolved": "https://registry.npmmirror.com/react-dnd/-/react-dnd-16.0.1.tgz", "resolved": "https://registry.npmmirror.com/react-dnd/-/react-dnd-16.0.1.tgz",
@@ -13309,6 +13345,11 @@
"picomatch": "^2.2.1" "picomatch": "^2.2.1"
} }
}, },
"readline-sync": {
"version": "1.4.10",
"resolved": "https://registry.npmmirror.com/readline-sync/-/readline-sync-1.4.10.tgz",
"integrity": "sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw=="
},
"rechoir": { "rechoir": {
"version": "0.7.1", "version": "0.7.1",
"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
+7 -3
View File
@@ -20,6 +20,7 @@
"build-run-web": "npm run build-web & npm run build-service & npm run run-service", "build-run-web": "npm run build-web & npm run build-service & npm run run-service",
"release-run-web": "npm run release-web & npm run release-service & npm run run-service", "release-run-web": "npm run release-web & npm run release-service & npm run run-service",
"copy-fluent-icon": "fse mkdirp ./build/font-icon/ & fse emptyDir ./build/font-icon/ & fse copy ./node_modules/@fluentui/font-icons-mdl2/fonts/ ./build/font-icon/", "copy-fluent-icon": "fse mkdirp ./build/font-icon/ & fse emptyDir ./build/font-icon/ & fse copy ./node_modules/@fluentui/font-icons-mdl2/fonts/ ./build/font-icon/",
"copy-loading-page": "fse mkdirp ./build & fse copy ./assets/LoadingPage.html ./build/LoadingPage.html",
"build-run-desktop-web": "npm run build-desktop-web & npm run copy-fluent-icon & npm run build-service & npm run run-service", "build-run-desktop-web": "npm run build-desktop-web & npm run copy-fluent-icon & npm run build-service & npm run run-service",
"release-run-desktop-web": "npm run release-desktop-web & npm run copy-fluent-icon & npm run release-service & npm run run-service", "release-run-desktop-web": "npm run release-desktop-web & npm run copy-fluent-icon & npm run release-service & npm run run-service",
"skip-electron-ci": "set ELECTRON_SKIP_BINARY_DOWNLOAD=1& npm ci", "skip-electron-ci": "set ELECTRON_SKIP_BINARY_DOWNLOAD=1& npm ci",
@@ -28,12 +29,12 @@
"electron-cache": "set ELECTRON_SKIP_BINARY_DOWNLOAD=& set ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/& set ELECTRON_CUSTOM_DIR={{ version }}& node ./node_modules/electron/install.js", "electron-cache": "set ELECTRON_SKIP_BINARY_DOWNLOAD=& set ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/& set ELECTRON_CUSTOM_DIR={{ version }}& node ./node_modules/electron/install.js",
"electron": "set LIVING_TOGETHER_BASE_PATH=./build& set LIVING_TOGETHER_WEB_PATH=/& npx electron ./build/Electron.js", "electron": "set LIVING_TOGETHER_BASE_PATH=./build& set LIVING_TOGETHER_WEB_PATH=/& npx electron ./build/Electron.js",
"hmr-electron": "npm run build-electron & set LIVING_TOGETHER_SERVICE=http://127.0.0.1:12000& npm run electron", "hmr-electron": "npm run build-electron & set LIVING_TOGETHER_SERVICE=http://127.0.0.1:12000& npm run electron",
"build-run-electron": "npm run build-desktop-web & npm run copy-fluent-icon & npm run build-electron & npm run electron", "build-run-electron": "npm run build-desktop-web & npm run copy-fluent-icon & npm run copy-loading-page & npm run build-electron & npm run electron",
"release-run-electron": "npm run release-desktop-web & npm run copy-fluent-icon & npm run release-electron & npm run electron", "release-run-electron": "npm run release-desktop-web & npm run copy-fluent-icon & npm run copy-loading-page & npm run release-electron & npm run electron",
"copy-package-json": "fse mkdirp ./bundle/ & node ./config/electron.forge.config.js --out ./bundle", "copy-package-json": "fse mkdirp ./bundle/ & node ./config/electron.forge.config.js --out ./bundle",
"copy-build-result": "fse mkdirp ./bundle/ & fse mkdirp ./build/ & fse copy ./build/ ./bundle/", "copy-build-result": "fse mkdirp ./bundle/ & fse mkdirp ./build/ & fse copy ./build/ ./bundle/",
"copy-electron-icon": "fse mkdirp ./bundle/ & fse copy ./assets/living-together.ico ./bundle/living-together.ico & fse copy ./assets/living-together.icns ./bundle/living-together.icns", "copy-electron-icon": "fse mkdirp ./bundle/ & fse copy ./assets/living-together.ico ./bundle/living-together.ico & fse copy ./assets/living-together.icns ./bundle/living-together.icns",
"electron-app-ci": "cd ./bundle & npm install & cd ../", "electron-app-ci": "cd ./bundle & set ELECTRON_SKIP_BINARY_DOWNLOAD=1& npm i & set ELECTRON_SKIP_BINARY_DOWNLOAD=& set ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/& set ELECTRON_CUSTOM_DIR={{ version }}& node ./node_modules/electron/install.js & cd ../",
"gen-bundle": "fse emptyDir ./bundle/ & npm run copy-package-json & npm run copy-electron-icon & npm run electron-app-ci" "gen-bundle": "fse emptyDir ./bundle/ & npm run copy-package-json & npm run copy-electron-icon & npm run electron-app-ci"
}, },
"keywords": [ "keywords": [
@@ -70,14 +71,17 @@
"dependencies": { "dependencies": {
"@fluentui/react": "^8.56.0", "@fluentui/react": "^8.56.0",
"@juggle/resize-observer": "^3.3.1", "@juggle/resize-observer": "^3.3.1",
"chart.js": "^3.7.1",
"detect-port": "^1.3.0", "detect-port": "^1.3.0",
"downloadjs": "^1.4.7", "downloadjs": "^1.4.7",
"express": "^4.17.3", "express": "^4.17.3",
"gl-matrix": "^3.4.3", "gl-matrix": "^3.4.3",
"react": "^17.0.2", "react": "^17.0.2",
"react-chartjs-2": "^4.1.0",
"react-dnd": "^16.0.1", "react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1", "react-dnd-html5-backend": "^16.0.1",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"readline-sync": "^1.4.10",
"uuid": "^8.3.2" "uuid": "^8.3.2"
} }
} }
+86
View File
@@ -0,0 +1,86 @@
import { Behavior } from "@Model/Behavior";
import { Group } from "@Model/Group";
import { Individual } from "@Model/Individual";
import { Model } from "@Model/Model";
type IAvoidanceBehaviorParameter = {
avoid: "CLG",
strength: "number",
range: "number"
}
type IAvoidanceBehaviorEvent = {}
class Avoidance extends Behavior<IAvoidanceBehaviorParameter, IAvoidanceBehaviorEvent> {
public override behaviorId: string = "Avoidance";
public override behaviorName: string = "$Title";
public override iconName: string = "FastMode";
public override describe: string = "$Intro";
public override category: string = "$Interactive";
public override parameterOption = {
avoid: { name: "$Avoid", type: "CLG" },
strength: { type: "number", name: "$Strength", defaultValue: 1, numberMin: 0, numberStep: .1 },
range: { type: "number", name: "$Range", defaultValue: 4, numberMin: 0, numberStep: .1 }
};
public effect = (individual: Individual, group: Group, model: Model, t: number): void => {
let currentDistant: number = Infinity;
let avoidTarget = undefined as Individual | undefined;
for (let i = 0; i < this.parameter.avoid.objects.length; i++) {
const targetGroup = this.parameter.avoid.objects[i];
targetGroup.individuals.forEach((targetIndividual) => {
// 排除自己
if (targetIndividual === individual) return;
let dis = targetIndividual.distanceTo(individual);
if (dis < currentDistant && dis <= this.parameter.range) {
avoidTarget = targetIndividual;
currentDistant = dis;
}
});
}
if (avoidTarget && currentDistant !== Infinity) {
individual.applyForce(
(individual.position[0] - avoidTarget.position[0]) * this.parameter.strength / currentDistant,
(individual.position[1] - avoidTarget.position[1]) * this.parameter.strength / currentDistant,
(individual.position[2] - avoidTarget.position[2]) * this.parameter.strength / currentDistant
);
}
}
public override terms: Record<string, Record<string, string>> = {
"$Title": {
"ZH_CN": "躲避",
"EN_US": "Avoidance"
},
"$Intro": {
"ZH_CN": "远离视野范围内最近的躲避目标",
"EN_US": "Stay away from the nearest evasive target in the field of vision"
},
"$Avoid": {
"ZH_CN": "躲避对象",
"EN_US": "Avoid object"
},
"$Strength": {
"ZH_CN": "躲避强度",
"EN_US": "Avoidance intensity"
},
"$Range": {
"ZH_CN": "视野范围",
"EN_US": "Field of vision"
}
};
}
export { Avoidance };
+12
View File
@@ -7,6 +7,12 @@ import { Tracking } from "@Behavior/Tracking";
import { ContactAttacking } from "@Behavior/ContactAttacking"; import { ContactAttacking } from "@Behavior/ContactAttacking";
import { ContactAssimilate } from "@Behavior/ContactAssimilate"; import { ContactAssimilate } from "@Behavior/ContactAssimilate";
import { DelayAssimilate } from "@Behavior/DelayAssimilate"; import { DelayAssimilate } from "@Behavior/DelayAssimilate";
import { Avoidance } from "@Behavior/Avoidance";
import { DirectionCluster } from "@Behavior/DirectionCluster";
import { CentralCluster } from "@Behavior/CentralCluster";
import { Manufacture } from "@Behavior/Manufacture";
import { Wastage } from "@Behavior/Wastage";
import { SampleTracking } from "@Behavior/SampleTracking";
const AllBehaviors: IAnyBehaviorRecorder[] = [ const AllBehaviors: IAnyBehaviorRecorder[] = [
new BehaviorRecorder(Template), new BehaviorRecorder(Template),
@@ -17,6 +23,12 @@ const AllBehaviors: IAnyBehaviorRecorder[] = [
new BehaviorRecorder(ContactAttacking), new BehaviorRecorder(ContactAttacking),
new BehaviorRecorder(ContactAssimilate), new BehaviorRecorder(ContactAssimilate),
new BehaviorRecorder(DelayAssimilate), new BehaviorRecorder(DelayAssimilate),
new BehaviorRecorder(Avoidance),
new BehaviorRecorder(DirectionCluster),
new BehaviorRecorder(CentralCluster),
new BehaviorRecorder(Manufacture),
new BehaviorRecorder(Wastage),
new BehaviorRecorder(SampleTracking),
] ]
/** /**
+10 -4
View File
@@ -48,11 +48,17 @@ class BoundaryConstraint extends Behavior<IBoundaryConstraintBehaviorParameter,
if (ox || oy || oz) { if (ox || oy || oz) {
let currentFLen = individual.vectorLength(rx, ry, rz); const backFocus: number[] = [0, 0, 0];
if (ox) backFocus[0] = rx - rx * rangeList[i].radius[0] / Math.abs(rx);
if (oy) backFocus[1] = ry - ry * rangeList[i].radius[1] / Math.abs(ry);
if (oz) backFocus[2] = rz - rz * rangeList[i].radius[2] / Math.abs(rz);
let currentFLen = individual.vectorLength(backFocus);
if (currentFLen < fLen) { if (currentFLen < fLen) {
fx = rx; fx = backFocus[0];
fy = ry; fy = backFocus[1];
fz = rz; fz = backFocus[2];
fLen = currentFLen; fLen = currentFLen;
} }
+133 -6
View File
@@ -7,7 +7,9 @@ type IBrownianBehaviorParameter = {
maxFrequency: "number", maxFrequency: "number",
minFrequency: "number", minFrequency: "number",
maxStrength: "number", maxStrength: "number",
minStrength: "number" minStrength: "number",
dirLimit: "boolean",
angle: "number"
} }
type IBrownianBehaviorEvent = {} type IBrownianBehaviorEvent = {}
@@ -28,9 +30,88 @@ class Brownian extends Behavior<IBrownianBehaviorParameter, IBrownianBehaviorEve
maxFrequency: { type: "number", name: "$Max.Frequency", defaultValue: 5, numberStep: .1, numberMin: 0 }, maxFrequency: { type: "number", name: "$Max.Frequency", defaultValue: 5, numberStep: .1, numberMin: 0 },
minFrequency: { type: "number", name: "$Min.Frequency", defaultValue: 0, numberStep: .1, numberMin: 0 }, minFrequency: { type: "number", name: "$Min.Frequency", defaultValue: 0, numberStep: .1, numberMin: 0 },
maxStrength: { type: "number", name: "$Max.Strength", defaultValue: 10, numberStep: .01, numberMin: 0 }, maxStrength: { type: "number", name: "$Max.Strength", defaultValue: 10, numberStep: .01, numberMin: 0 },
minStrength: { type: "number", name: "$Min.Strength", defaultValue: 0, numberStep: .01, numberMin: 0 } minStrength: { type: "number", name: "$Min.Strength", defaultValue: 0, numberStep: .01, numberMin: 0 },
dirLimit: { type: "boolean", name: "$Direction.Limit", defaultValue: false },
angle: {
type: "number", name: "$Angle", defaultValue: 180, numberStep: 5,
numberMin: 0, numberMax: 360, condition: { key: "dirLimit", value: true }
}
}; };
private randomFocus360(): number[] {
let randomVec = [
Math.random() * 2 - 1,
Math.random() * 2 - 1,
Math.random() * 2 - 1
];
let randomVecLen = (randomVec[0] ** 2 + randomVec[1] ** 2 + randomVec[2] ** 2) ** 0.5;
return [randomVec[0] / randomVecLen, randomVec[1] / randomVecLen, randomVec[2] / randomVecLen];
}
private rotateWithVec(vec: number[], r: number[], ang: number) {
const cos = Math.cos(ang); const sin = Math.sin(ang);
const a1 = r[0] ?? 0; const a2 = r[1] ?? 0; const a3 = r[2] ?? 0;
return [
(cos + (1 - cos) * a1 * a1) * (vec[0] ?? 0) +
((1 - cos) * a1 * a2 - sin * a3) * (vec[1] ?? 0) +
((1 - cos) * a1 * a3 + sin * a2) * (vec[2] ?? 0),
((1 - cos) * a1 * a2 + sin * a3) * (vec[0] ?? 0) +
(cos + (1 - cos) * a2 * a2) * (vec[1] ?? 0) +
((1 - cos) * a2 * a3 - sin * a1) * (vec[2] ?? 0),
((1 - cos) * a1 * a3 - sin * a2) * (vec[0] ?? 0) +
((1 - cos) * a2 * a3 + sin * a1) * (vec[1] ?? 0) +
(cos + (1 - cos) * a3 * a3) * (vec[2] ?? 0)
]
}
private angle2Vector(v1: number[], v2: number[]): number {
return Math.acos(
(v1[0] * v2[0] + v1[1] * v2[1] + v1[2] * v2[2]) /
(
(v1[0] ** 2 + v1[1] ** 2 + v1[2] ** 2) ** 0.5 *
(v2[0] ** 2 + v2[1] ** 2 + v2[2] ** 2) ** 0.5
)
) * 180 / Math.PI;
}
private randomFocusRange(dir: number[], angle: number): number[] {
// 计算 X-Z 投影
let pxz = [dir[0] ?? 0, 0, dir[2] ?? 0];
// 通过叉乘计算垂直向量
let dxz: number[];
// 如果投影向量没有长度,使用单位向量
if (pxz[0] ** 2 + pxz[2] ** 2 === 0) {
dxz = [0, 0, 1];
}
// 通过叉乘计算垂直轴线
else {
dxz = [
dir[1] * pxz[2] - pxz[1] * dir[2],
dir[2] * pxz[0] - pxz[2] * dir[0],
dir[0] * pxz[1] - pxz[0] * dir[1]
];
let lenDxz = (dxz[0] ** 2 + dxz[1] ** 2 + dxz[2] ** 2) ** 0.5;
dxz = [dxz[0] / lenDxz, dxz[1] / lenDxz, dxz[2] / lenDxz];
}
// 航偏角 360 随机旋转
let randomH = this.rotateWithVec(dxz, dir, Math.random() * Math.PI * 2);
// 俯仰角 180 * R 随机旋转
let randomP = this.rotateWithVec(dir, randomH, (Math.random() - 0.5) * 2 * angle * Math.PI / 180);
return randomP;
}
public effect = (individual: Individual, group: Group, model: Model, t: number): void => { public effect = (individual: Individual, group: Group, model: Model, t: number): void => {
const {maxFrequency, minFrequency, maxStrength, minStrength} = this.parameter; const {maxFrequency, minFrequency, maxStrength, minStrength} = this.parameter;
@@ -41,11 +122,49 @@ class Brownian extends Behavior<IBrownianBehaviorParameter, IBrownianBehaviorEve
currentTime += t; currentTime += t;
if (currentTime > nextTime) { if (currentTime > nextTime) {
let randomDir: number[];
// 开启角度限制
if (this.parameter.dirLimit) {
// 计算当前速度大小
const vLen = individual.vectorLength(individual.velocity);
// 随机旋转算法
if (vLen > 0) {
randomDir = this.randomFocusRange(
[
individual.velocity[0] / vLen,
individual.velocity[1] / vLen,
individual.velocity[2] / vLen
],
this.parameter.angle / 2
);
if (isNaN(randomDir[0]) || isNaN(randomDir[1]) || isNaN(randomDir[2])) {
randomDir = this.randomFocus360()
}
}
else {
randomDir = this.randomFocus360()
}
}
// 随机生成算法
else {
randomDir = this.randomFocus360()
}
const randomLength = minStrength + Math.random() * (maxStrength - minStrength);
individual.applyForce( individual.applyForce(
minStrength + (Math.random() * 2 - 1) * (maxStrength - minStrength), randomDir[0] * randomLength,
minStrength + (Math.random() * 2 - 1) * (maxStrength - minStrength), randomDir[1] * randomLength,
minStrength + (Math.random() * 2 - 1) * (maxStrength - minStrength) randomDir[2] * randomLength
); );
nextTime = minFrequency + Math.random() * (maxFrequency - minFrequency); nextTime = minFrequency + Math.random() * (maxFrequency - minFrequency);
currentTime = 0; currentTime = 0;
} }
@@ -78,7 +197,15 @@ class Brownian extends Behavior<IBrownianBehaviorParameter, IBrownianBehaviorEve
"$Min.Strength": { "$Min.Strength": {
"ZH_CN": "最小强度", "ZH_CN": "最小强度",
"EN_US": "Minimum strength" "EN_US": "Minimum strength"
} },
"$Direction.Limit": {
"ZH_CN": "开启角度限制",
"EN_US": "Enable limit angle"
},
"$Angle": {
"ZH_CN": "限制立体角 (deg)",
"EN_US": "Restricted solid angle (deg)"
}
}; };
} }
+96
View File
@@ -0,0 +1,96 @@
import { Behavior } from "@Model/Behavior";
import { Group } from "@Model/Group";
import { Individual } from "@Model/Individual";
import { Model } from "@Model/Model";
type ICentralClusterBehaviorParameter = {
cluster: "CLG",
strength: "number",
range: "number"
}
type ICentralClusterBehaviorEvent = {}
class CentralCluster extends Behavior<ICentralClusterBehaviorParameter, ICentralClusterBehaviorEvent> {
public override behaviorId: string = "CentralCluster";
public override behaviorName: string = "$Title";
public override iconName: string = "ZoomToFit";
public override describe: string = "$Intro";
public override category: string = "$Interactive";
public override parameterOption = {
cluster: { name: "$Cluster", type: "CLG" },
strength: { type: "number", name: "$Strength", defaultValue: 1, numberMin: 0, numberStep: .1 },
range: { type: "number", name: "$Range", defaultValue: 4, numberMin: 0, numberStep: .1 }
};
public effect = (individual: Individual, group: Group, model: Model, t: number): void => {
let findCount = 0;
let centerPos: number[] = [0, 0, 0];
for (let i = 0; i < this.parameter.cluster.objects.length; i++) {
const targetGroup = this.parameter.cluster.objects[i];
targetGroup.individuals.forEach((targetIndividual) => {
// 排除自己
if (targetIndividual === individual) return;
let dis = targetIndividual.distanceTo(individual);
if (dis <= this.parameter.range) {
centerPos[0] += targetIndividual.position[0];
centerPos[1] += targetIndividual.position[1];
centerPos[2] += targetIndividual.position[2];
findCount ++;
}
});
}
if (findCount > 0) {
let dirX = centerPos[0] / findCount - individual.position[0];
let dirY = centerPos[1] / findCount - individual.position[1];
let dirZ = centerPos[2] / findCount - individual.position[2];
let length = individual.vectorLength(dirX, dirY, dirZ);
if (length > 0) {
individual.applyForce(
dirX * this.parameter.strength / length,
dirY * this.parameter.strength / length,
dirZ * this.parameter.strength / length
);
}
}
}
public override terms: Record<string, Record<string, string>> = {
"$Title": {
"ZH_CN": "中心结群",
"EN_US": "Central cluster"
},
"$Intro": {
"ZH_CN": "个体将按照视野范围内目标方向结群对象个体的几何中心移动",
"EN_US": "The individual will move according to the geometric center of the grouped object individual in the target direction within the field of view"
},
"$Cluster": {
"ZH_CN": "中心结群对象",
"EN_US": "Central clustering object"
},
"$Strength": {
"ZH_CN": "结群强度",
"EN_US": "Clustering strength"
},
"$Range": {
"ZH_CN": "视野范围",
"EN_US": "Field of vision"
}
};
}
export { CentralCluster };
+18 -4
View File
@@ -6,6 +6,7 @@ import { Model } from "@Model/Model";
type IContactAssimilateBehaviorParameter = { type IContactAssimilateBehaviorParameter = {
target: "CLG", target: "CLG",
assimilate: "CG", assimilate: "CG",
self: "CG",
success: "number", success: "number",
range: "number" range: "number"
} }
@@ -27,15 +28,13 @@ class ContactAssimilate extends Behavior<IContactAssimilateBehaviorParameter, IC
public override parameterOption = { public override parameterOption = {
target: { type: "CLG", name: "$Target" }, target: { type: "CLG", name: "$Target" },
assimilate: { type: "CG", name: "$Assimilate" }, assimilate: { type: "CG", name: "$Assimilate" },
self: { type: "CG", name: "$Self" },
range: { type: "number", name: "$Range", defaultValue: .05, numberMin: 0, numberStep: .01 }, range: { type: "number", name: "$Range", defaultValue: .05, numberMin: 0, numberStep: .01 },
success: { type: "number", name: "$Success", defaultValue: 90, numberMin: 0, numberMax: 100, numberStep: 5 } success: { type: "number", name: "$Success", defaultValue: 90, numberMin: 0, numberMax: 100, numberStep: 5 }
}; };
public effect = (individual: Individual, group: Group, model: Model, t: number): void => { public effect = (individual: Individual, group: Group, model: Model, t: number): void => {
let assimilateGroup = this.parameter.assimilate.objects;
if (!assimilateGroup) return;
for (let i = 0; i < this.parameter.target.objects.length; i++) { for (let i = 0; i < this.parameter.target.objects.length; i++) {
const targetGroup = this.parameter.target.objects[i]; const targetGroup = this.parameter.target.objects[i];
@@ -50,7 +49,18 @@ class ContactAssimilate extends Behavior<IContactAssimilateBehaviorParameter, IC
// 成功判定 // 成功判定
if (Math.random() * 100 < this.parameter.success) { if (Math.random() * 100 < this.parameter.success) {
targetIndividual.transfer(assimilateGroup!);
// 同化目标
let assimilateGroup = this.parameter.assimilate.objects;
if (assimilateGroup) {
targetIndividual.transfer(assimilateGroup);
}
// 同化目标
let selfGroup = this.parameter.self.objects;
if (selfGroup) {
individual.transfer(selfGroup);
}
} }
} }
}); });
@@ -70,6 +80,10 @@ class ContactAssimilate extends Behavior<IContactAssimilateBehaviorParameter, IC
"ZH_CN": "到哪个群...", "ZH_CN": "到哪个群...",
"EN_US": "To group..." "EN_US": "To group..."
}, },
"$Self": {
"ZH_CN": "自身同化到...",
"EN_US": "Self assimilate to..."
},
"$Range": { "$Range": {
"ZH_CN": "同化范围 (m)", "ZH_CN": "同化范围 (m)",
"EN_US": "Assimilate range (m)" "EN_US": "Assimilate range (m)"
+12 -2
View File
@@ -6,7 +6,8 @@ import { Model } from "@Model/Model";
type IContactAttackingBehaviorParameter = { type IContactAttackingBehaviorParameter = {
target: "CLG", target: "CLG",
success: "number", success: "number",
range: "number" range: "number",
assimilate: "CG",
} }
type IContactAttackingBehaviorEvent = {} type IContactAttackingBehaviorEvent = {}
@@ -26,7 +27,8 @@ class ContactAttacking extends Behavior<IContactAttackingBehaviorParameter, ICon
public override parameterOption = { public override parameterOption = {
target: { type: "CLG", name: "$Target" }, target: { type: "CLG", name: "$Target" },
range: { type: "number", name: "$Range", defaultValue: .05, numberMin: 0, numberStep: .01 }, range: { type: "number", name: "$Range", defaultValue: .05, numberMin: 0, numberStep: .01 },
success: { type: "number", name: "$Success", defaultValue: 90, numberMin: 0, numberMax: 100, numberStep: 5 } success: { type: "number", name: "$Success", defaultValue: 90, numberMin: 0, numberMax: 100, numberStep: 5 },
assimilate: { type: "CG", name: "$Assimilate"}
}; };
public effect = (individual: Individual, group: Group, model: Model, t: number): void => { public effect = (individual: Individual, group: Group, model: Model, t: number): void => {
@@ -46,6 +48,10 @@ class ContactAttacking extends Behavior<IContactAttackingBehaviorParameter, ICon
// 成功判定 // 成功判定
if (Math.random() * 100 < this.parameter.success) { if (Math.random() * 100 < this.parameter.success) {
targetIndividual.die(); targetIndividual.die();
if (this.parameter.assimilate?.objects) {
individual.transfer(this.parameter.assimilate.objects);
}
} }
} }
}); });
@@ -72,6 +78,10 @@ class ContactAttacking extends Behavior<IContactAttackingBehaviorParameter, ICon
"$Intro": { "$Intro": {
"ZH_CN": "攻击进入共进范围的目标群个体", "ZH_CN": "攻击进入共进范围的目标群个体",
"EN_US": "Attack the target group and individual entering the range" "EN_US": "Attack the target group and individual entering the range"
},
"$Assimilate": {
"ZH_CN": "同化",
"EN_US": "Assimilate"
} }
}; };
} }
+93
View File
@@ -0,0 +1,93 @@
import { Behavior } from "@Model/Behavior";
import { Group } from "@Model/Group";
import { Individual } from "@Model/Individual";
import { Model } from "@Model/Model";
type IDirectionClusterBehaviorParameter = {
cluster: "CLG",
strength: "number",
range: "number"
}
type IDirectionClusterBehaviorEvent = {}
class DirectionCluster extends Behavior<IDirectionClusterBehaviorParameter, IDirectionClusterBehaviorEvent> {
public override behaviorId: string = "DirectionCluster";
public override behaviorName: string = "$Title";
public override iconName: string = "RawSource";
public override describe: string = "$Intro";
public override category: string = "$Interactive";
public override parameterOption = {
cluster: { name: "$Cluster", type: "CLG" },
strength: { type: "number", name: "$Strength", defaultValue: 1, numberMin: 0, numberStep: .1 },
range: { type: "number", name: "$Range", defaultValue: 4, numberMin: 0, numberStep: .1 }
};
public effect = (individual: Individual, group: Group, model: Model, t: number): void => {
let findCount = 0;
let centerDir: number[] = [0, 0, 0];
for (let i = 0; i < this.parameter.cluster.objects.length; i++) {
const targetGroup = this.parameter.cluster.objects[i];
targetGroup.individuals.forEach((targetIndividual) => {
// 排除自己
if (targetIndividual === individual) return;
let dis = targetIndividual.distanceTo(individual);
if (dis <= this.parameter.range) {
centerDir[0] += targetIndividual.velocity[0];
centerDir[1] += targetIndividual.velocity[1];
centerDir[2] += targetIndividual.velocity[2];
findCount ++;
}
});
}
if (findCount > 0) {
let length = individual.vectorLength(centerDir);
if (length) {
individual.applyForce(
centerDir[0] * this.parameter.strength / length,
centerDir[1] * this.parameter.strength / length,
centerDir[2] * this.parameter.strength / length
);
}
}
}
public override terms: Record<string, Record<string, string>> = {
"$Title": {
"ZH_CN": "方向结群",
"EN_US": "Directional clustering"
},
"$Intro": {
"ZH_CN": "个体将按照视野范围内目标方向结群对象个体的平均移动方向移动",
"EN_US": "Individuals will move according to the average moving direction of the grouped object individuals in the target direction within the field of vision"
},
"$Cluster": {
"ZH_CN": "方向结群对象",
"EN_US": "Directional clustering object"
},
"$Strength": {
"ZH_CN": "结群强度",
"EN_US": "Clustering strength"
},
"$Range": {
"ZH_CN": "视野范围",
"EN_US": "Field of vision"
}
};
}
export { DirectionCluster };
+83
View File
@@ -0,0 +1,83 @@
import { Behavior } from "@Model/Behavior";
import { Group } from "@Model/Group";
import { Individual } from "@Model/Individual";
import { Model } from "@Model/Model";
type IManufactureBehaviorParameter = {
maxFrequency: "number",
minFrequency: "number",
genTarget: "CG",
}
type IManufactureBehaviorEvent = {}
class Manufacture extends Behavior<IManufactureBehaviorParameter, IManufactureBehaviorEvent> {
public override behaviorId: string = "Manufacture";
public override behaviorName: string = "$Title";
public override iconName: string = "ProductionFloorManagement";
public override describe: string = "$Intro";
public override category: string = "$Initiative";
public override parameterOption = {
genTarget: { type: "CG", name: "$Gen.Target" },
maxFrequency: { type: "number", name: "$Max.Frequency", defaultValue: 5, numberStep: .1, numberMin: 0 },
minFrequency: { type: "number", name: "$Min.Frequency", defaultValue: 0, numberStep: .1, numberMin: 0 }
};
public effect = (individual: Individual, group: Group, model: Model, t: number): void => {
const {genTarget, maxFrequency, minFrequency} = this.parameter;
if (genTarget.objects) {
let nextTime = individual.getData("Manufacture.nextTime") ??
minFrequency + Math.random() * (maxFrequency - minFrequency);
let currentTime = individual.getData("Manufacture.currentTime") ?? 0;
if (currentTime > nextTime) {
// 生成个体
let newIndividual = genTarget.objects.new(1);
newIndividual.position = individual.position.concat([]);
nextTime = minFrequency + Math.random() * (maxFrequency - minFrequency);
currentTime = 0;
}
currentTime += t;
individual.setData("Manufacture.nextTime", nextTime);
individual.setData("Manufacture.currentTime", currentTime);
}
}
public override terms: Record<string, Record<string, string>> = {
"$Title": {
"ZH_CN": "生产",
"EN_US": "Manufacture"
},
"$Intro": {
"ZH_CN": "在指定的群创造新的个体",
"EN_US": "Create new individuals in a given group"
},
"$Gen.Target": {
"ZH_CN": "目标群",
"EN_US": "Target group"
},
"$Max.Frequency": {
"ZH_CN": "最大频率",
"EN_US": "Maximum frequency"
},
"$Min.Frequency": {
"ZH_CN": "最小频率",
"EN_US": "Minimum frequency"
}
};
}
export { Manufacture };
+4 -4
View File
@@ -31,11 +31,11 @@ class PhysicsDynamics extends Behavior<IPhysicsDynamicsBehaviorParameter, IPhysi
limit: { name: "$Limit", type: "boolean", defaultValue: true }, limit: { name: "$Limit", type: "boolean", defaultValue: true },
maxAcceleration: { maxAcceleration: {
name: "$Max.Acceleration", type: "number", defaultValue: 6.25, name: "$Max.Acceleration", type: "number", defaultValue: 6.25,
numberStep: .1, numberMin: 0, condition: { key: "limit", value: true } numberStep: .1, numberMin: 0.0001, condition: { key: "limit", value: true }
}, },
maxVelocity: { maxVelocity: {
name: "$Max.Velocity", type: "number", defaultValue: 12.5, name: "$Max.Velocity", type: "number", defaultValue: 12.5,
numberStep: .1, numberMin: 0, condition: { key: "limit", value: true } numberStep: .1, numberMin: 0.0001, condition: { key: "limit", value: true }
}, },
}; };
@@ -64,7 +64,7 @@ class PhysicsDynamics extends Behavior<IPhysicsDynamicsBehaviorParameter, IPhysi
// 加速度约束 // 加速度约束
if (this.parameter.limit) { if (this.parameter.limit) {
const lengthA = individual.vectorLength(individual.acceleration); const lengthA = individual.vectorLength(individual.acceleration);
if (lengthA > this.parameter.maxAcceleration) { if (lengthA > this.parameter.maxAcceleration && lengthA) {
individual.acceleration[0] = individual.acceleration[0] * this.parameter.maxAcceleration / lengthA; individual.acceleration[0] = individual.acceleration[0] * this.parameter.maxAcceleration / lengthA;
individual.acceleration[1] = individual.acceleration[1] * this.parameter.maxAcceleration / lengthA; individual.acceleration[1] = individual.acceleration[1] * this.parameter.maxAcceleration / lengthA;
individual.acceleration[2] = individual.acceleration[2] * this.parameter.maxAcceleration / lengthA; individual.acceleration[2] = individual.acceleration[2] * this.parameter.maxAcceleration / lengthA;
@@ -79,7 +79,7 @@ class PhysicsDynamics extends Behavior<IPhysicsDynamicsBehaviorParameter, IPhysi
// 速度约束 // 速度约束
if (this.parameter.limit) { if (this.parameter.limit) {
const lengthV = individual.vectorLength(individual.velocity); const lengthV = individual.vectorLength(individual.velocity);
if (lengthV > this.parameter.maxVelocity) { if (lengthV > this.parameter.maxVelocity && lengthV) {
individual.velocity[0] = individual.velocity[0] * this.parameter.maxVelocity / lengthV; individual.velocity[0] = individual.velocity[0] * this.parameter.maxVelocity / lengthV;
individual.velocity[1] = individual.velocity[1] * this.parameter.maxVelocity / lengthV; individual.velocity[1] = individual.velocity[1] * this.parameter.maxVelocity / lengthV;
individual.velocity[2] = individual.velocity[2] * this.parameter.maxVelocity / lengthV; individual.velocity[2] = individual.velocity[2] * this.parameter.maxVelocity / lengthV;
+160
View File
@@ -0,0 +1,160 @@
import { Behavior } from "@Model/Behavior";
import { Group } from "@Model/Group";
import { Individual } from "@Model/Individual";
import { Model } from "@Model/Model";
type ISampleTrackingBehaviorParameter = {
target: "CLG",
key: "string",
strength: "number",
range: "number",
angle: "number",
accuracy: "number"
}
type ISampleTrackingBehaviorEvent = {}
class SampleTracking extends Behavior<ISampleTrackingBehaviorParameter, ISampleTrackingBehaviorEvent> {
public override behaviorId: string = "SampleTracking";
public override behaviorName: string = "$Title";
public override iconName: string = "Video360Generic";
public override describe: string = "$Intro";
public override category: string = "$Initiative";
public override parameterOption = {
target: { type: "CLG", name: "$Target" },
key: { type: "string", name: "$Key"},
range: { type: "number", name: "$Range", defaultValue: 4, numberMin: 0, numberStep: .1 },
angle: { type: "number", name: "$Angle", defaultValue: 180, numberMin: 0, numberMax: 360, numberStep: 5 },
strength: { type: "number", name: "$Strength", defaultValue: 1, numberMin: 0, numberStep: .1 },
accuracy: { type: "number", name: "$Accuracy", defaultValue: 5, numberMin: 0, numberMax: 180, numberStep: 1 }
};
private angle2Vector(v1: number[], v2: number[]): number {
return Math.acos(
(v1[0] * v2[0] + v1[1] * v2[1] + v1[2] * v2[2]) /
(
(v1[0] ** 2 + v1[1] ** 2 + v1[2] ** 2) ** 0.5 *
(v2[0] ** 2 + v2[1] ** 2 + v2[2] ** 2) ** 0.5
)
) * 180 / Math.PI;
}
public effect = (individual: Individual, group: Group, model: Model, t: number): void => {
const dirArr: number[][] = []; const valArr: number[] = [];
for (let i = 0; i < this.parameter.target.objects.length; i++) {
const targetGroup = this.parameter.target.objects[i];
targetGroup.individuals.forEach((targetIndividual) => {
// 计算距离
let dis = targetIndividual.distanceTo(individual);
if (dis > this.parameter.range) return;
// 计算方向
let targetDir = [
targetIndividual.position[0] - individual.position[0],
targetIndividual.position[1] - individual.position[1],
targetIndividual.position[2] - individual.position[2]
];
// 计算视线角度
let angle = this.angle2Vector(individual.velocity, targetDir);
// 在可视角度内
if (angle < (this.parameter.angle ?? 360) / 2) {
// 采样
let isFindNest = false;
for (let i = 0; i < valArr.length; i++) {
// 计算采样角度
let sampleAngle = this.angle2Vector(dirArr[i], targetDir);
// 小于采样精度,合并
if (sampleAngle < this.parameter.accuracy ?? 5) {
dirArr[i][0] += targetDir[0];
dirArr[i][1] += targetDir[1];
dirArr[i][2] += targetDir[2];
valArr[i] += targetIndividual.getData(this.parameter.key) ?? 0;
isFindNest = true;
}
}
if (!isFindNest) {
// 保存
dirArr.push(targetDir);
valArr.push(targetIndividual.getData(this.parameter.key) ?? 0);
}
}
});
}
// 计算最大方向
let maxVal = -1; let maxDir: number[] | undefined;
for (let i = 0; i < valArr.length; i++) {
if (valArr[i] > maxVal) {
maxVal = valArr[i];
maxDir = dirArr[i];
}
}
if (maxDir) {
const dir = individual.vectorNormalize(maxDir);
individual.applyForce(
dir[0] * this.parameter.strength,
dir[1] * this.parameter.strength,
dir[2] * this.parameter.strength
);
}
}
public override terms: Record<string, Record<string, string>> = {
"$Title": {
"ZH_CN": "采样追踪",
"EN_US": "Sample tracking"
},
"$Target": {
"ZH_CN": "追踪目标",
"EN_US": "Tracking target"
},
"$Key": {
"ZH_CN": "计算键值",
"EN_US": "Calculate key value"
},
"$Accuracy": {
"ZH_CN": "采样精度",
"EN_US": "Sampling accuracy"
},
"$Range": {
"ZH_CN": "追踪范围 (m)",
"EN_US": "Tracking range (m)"
},
"$Strength": {
"ZH_CN": "追踪强度系数",
"EN_US": "Tracking intensity coefficient"
},
"$Intro": {
"ZH_CN": "个体将主动向目标个体较多的方向发起追踪",
"EN_US": "Individuals will actively initiate tracking in the direction of more target individuals"
},
"$Interactive": {
"ZH_CN": "交互",
"EN_US": "Interactive"
},
"$Angle": {
"ZH_CN": "可视角度",
"EN_US": "Viewing angle"
}
};
}
export { SampleTracking };
+32 -3
View File
@@ -7,6 +7,7 @@ type ITrackingBehaviorParameter = {
target: "CLG", target: "CLG",
strength: "number", strength: "number",
range: "number", range: "number",
angle: "number",
lock: "boolean" lock: "boolean"
} }
@@ -28,12 +29,23 @@ class Tracking extends Behavior<ITrackingBehaviorParameter, ITrackingBehaviorEve
target: { type: "CLG", name: "$Target" }, target: { type: "CLG", name: "$Target" },
lock: { type: "boolean", name: "$Lock", defaultValue: false }, lock: { type: "boolean", name: "$Lock", defaultValue: false },
range: { type: "number", name: "$Range", defaultValue: 4, numberMin: 0, numberStep: .1 }, range: { type: "number", name: "$Range", defaultValue: 4, numberMin: 0, numberStep: .1 },
angle: { type: "number", name: "$Angle", defaultValue: 180, numberMin: 0, numberMax: 360, numberStep: 5 },
strength: { type: "number", name: "$Strength", defaultValue: 1, numberMin: 0, numberStep: .1 } strength: { type: "number", name: "$Strength", defaultValue: 1, numberMin: 0, numberStep: .1 }
}; };
private target: Individual | undefined = undefined; private target: Individual | undefined = undefined;
private currentDistant: number = Infinity; private currentDistant: number = Infinity;
private angle2Vector(v1: number[], v2: number[]): number {
return Math.acos(
(v1[0] * v2[0] + v1[1] * v2[1] + v1[2] * v2[2]) /
(
(v1[0] ** 2 + v1[1] ** 2 + v1[2] ** 2) ** 0.5 *
(v2[0] ** 2 + v2[1] ** 2 + v2[2] ** 2) ** 0.5
)
) * 180 / Math.PI;
}
private searchTarget(individual: Individual) { private searchTarget(individual: Individual) {
for (let i = 0; i < this.parameter.target.objects.length; i++) { for (let i = 0; i < this.parameter.target.objects.length; i++) {
@@ -46,8 +58,21 @@ class Tracking extends Behavior<ITrackingBehaviorParameter, ITrackingBehaviorEve
let dis = targetIndividual.distanceTo(individual); let dis = targetIndividual.distanceTo(individual);
if (dis < this.currentDistant && dis <= this.parameter.range) { if (dis < this.currentDistant && dis <= this.parameter.range) {
this.target = targetIndividual;
this.currentDistant = dis; // 计算目标方位
const targetDir = [
targetIndividual.position[0] - individual.position[0],
targetIndividual.position[1] - individual.position[1],
targetIndividual.position[2] - individual.position[2]
];
// 计算角度
const angle = this.angle2Vector(individual.velocity, targetDir);
if (angle < (this.parameter.angle ?? 360) / 2) {
this.target = targetIndividual;
this.currentDistant = dis;
}
} }
}); });
@@ -150,7 +175,11 @@ class Tracking extends Behavior<ITrackingBehaviorParameter, ITrackingBehaviorEve
"$Interactive": { "$Interactive": {
"ZH_CN": "交互", "ZH_CN": "交互",
"EN_US": "Interactive" "EN_US": "Interactive"
} },
"$Angle": {
"ZH_CN": "可视角度",
"EN_US": "Viewing angle"
}
}; };
} }
+100
View File
@@ -0,0 +1,100 @@
import { Behavior } from "@Model/Behavior";
import { Group } from "@Model/Group";
import { Individual } from "@Model/Individual";
import { Model } from "@Model/Model";
type IWastageBehaviorParameter = {
key: "string",
value: "number",
speed: "number",
threshold: "number",
kill: "boolean",
assimilate: "CG"
}
type IWastageBehaviorEvent = {}
class Wastage extends Behavior<IWastageBehaviorParameter, IWastageBehaviorEvent> {
public override behaviorId: string = "Wastage";
public override behaviorName: string = "$Title";
public override iconName: string = "BackgroundColor";
public override describe: string = "$Intro";
public override category: string = "$Initiative";
public override parameterOption = {
key: { type: "string", name: "$Key" },
value: { type: "number", name: "$Value", defaultValue: 100, numberStep: 1 },
speed: { type: "number", name: "$Speed", defaultValue: 1, numberStep: .1 },
threshold: { type: "number", name: "$Threshold", defaultValue: 0, numberStep: 1 },
kill: { type: "boolean", name: "$Kill", defaultValue: true },
assimilate: { type: "CG", name: "$Assimilate", condition: { key: "kill", value: false } }
};
public effect = (individual: Individual, group: Group, model: Model, t: number): void => {
const key = this.parameter.key;
if (!key) return;
let currentValue = individual.getData(`Wastage.${key}`) ?? this.parameter.value;
currentValue -= this.parameter.speed * t;
// 超过阈值
if (currentValue < this.parameter.threshold) {
currentValue = undefined;
// 杀死个体
if (this.parameter.kill) {
individual.die();
}
// 开启同化
else if (this.parameter.assimilate.objects) {
individual.transfer(this.parameter.assimilate.objects);
}
}
individual.setData(`Wastage.${key}`, currentValue);
}
public override terms: Record<string, Record<string, string>> = {
"$Title": {
"ZH_CN": "流逝",
"EN_US": "Wastage"
},
"$Intro": {
"ZH_CN": "随着时间流逝",
"EN_US": "As time goes by"
},
"$Key": {
"ZH_CN": "元数据",
"EN_US": "Metadata"
},
"$Value": {
"ZH_CN": "默认数值",
"EN_US": "Default value"
},
"$Speed": {
"ZH_CN": "流逝速度 (c/s)",
"EN_US": "Passing speed (c/s)"
},
"$Threshold": {
"ZH_CN": "阈值",
"EN_US": "Threshold"
},
"$Kill": {
"ZH_CN": "死亡",
"EN_US": "Death"
},
"$Assimilate": {
"ZH_CN": "同化",
"EN_US": "Assimilate"
}
};
}
export { Wastage };
+148
View File
@@ -0,0 +1,148 @@
@import "../Theme/Theme.scss";
$clip-item-height: 45px;
div.clip-list-root {
margin: -5px;
display: flex;
flex-wrap: wrap;
div.clip-item {
margin: 5px;
height: $clip-item-height;
user-select: none;
border-radius: 3px;
overflow: hidden;
cursor: pointer;
display: flex;
div.clip-item-hole-view {
height: 100%;
width: 10px;
box-sizing: border-box;
display: flex;
flex-direction: column;
justify-items: center;
justify-content: space-between;
padding: 5px;
padding-right: 0;
div.clip-item-hole {
width: 5px;
height: 5px;
background-color: #000000;
flex-shrink: 0;
}
}
div.clip-icon-view {
width: $clip-item-height;
height: $clip-item-height;
display: flex;
justify-content: center;
align-items: center;
i.icon {
display: inline-block;
font-size: 25px;
}
i.delete {
display: none;
}
i.delete:hover {
color: $lt-red;
}
}
div.clip-item-content {
width: calc( 100% - 65px );
padding-right: 10px;
max-width: 125px;
height: $clip-item-height;
display: flex;
flex-direction: column;
justify-content: center;
div {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
width: 100%;
}
div.info {
opacity: .75;
}
}
}
div.clip-item.disable {
cursor: not-allowed;
}
div.clip-item.able:hover {
div.clip-icon-view {
i.icon {
display: none;
}
i.delete {
display: inline-block;
}
}
}
div.add-button {
width: 26px;
height: 26px;
display: flex;
justify-content: center;
align-items: center;
}
}
div.dark.clip-list-root {
div.clip-item {
background-color: $lt-bg-color-lvl3-dark;
div.clip-item-hole-view div.clip-item-hole {
background-color: $lt-bg-color-lvl4-dark;
}
}
div.clip-item.able:hover {
color: $lt-font-color-lvl2-dark;
background-color: $lt-bg-color-lvl2-dark;
}
div.clip-item.focus {
color: $lt-font-color-lvl1-dark;
background-color: $lt-bg-color-lvl1-dark;
}
}
div.light.clip-list-root {
div.clip-item {
background-color: $lt-bg-color-lvl3-light;
div.clip-item-hole-view div.clip-item-hole {
background-color: $lt-bg-color-lvl4-light;
}
}
div.clip-item.able:hover {
color: $lt-font-color-lvl2-light;
background-color: $lt-bg-color-lvl2-light;
}
div.clip-item.focus {
color: $lt-font-color-lvl1-light;
background-color: $lt-bg-color-lvl1-light;
}
}
+130
View File
@@ -0,0 +1,130 @@
import { Localization } from "@Component/Localization/Localization";
import { Theme } from "@Component/Theme/Theme";
import { Icon } from "@fluentui/react";
import { Clip } from "@Model/Clip";
import { Component, ReactNode } from "react";
import "./ClipList.scss";
interface IClipListProps {
clips: Clip[];
focus?: Clip;
disable?: boolean;
add?: () => any;
click?: (clip: Clip) => any;
delete?: (clip: Clip) => any;
}
class ClipList extends Component<IClipListProps> {
private isInnerClick: boolean = false;
private resolveCallback(fn?: (p: any) => any, p?: any): any {
if (this.props.disable) {
return false;
}
if (fn) {
return fn(p);
}
}
private parseTime(time?: number): string {
if (time === undefined) {
return "0:0:0:0";
}
const h = Math.floor(time / 3600);
const m = Math.floor((time % 3600) / 60);
const s = Math.floor((time % 3600) % 60);
const ms = Math.floor((time % 1) * 1000);
return `${h}:${m}:${s}:${ms}`;
}
private getClipInfo(clip: Clip): string {
let fps = Math.round((clip.frames.length - 1) / clip.time);
if (isNaN(fps)) fps = 0;
return `${this.parseTime(clip.time)} ${fps}fps`;
}
private renderClip(clip: Clip) {
const focus = clip.equal(this.props.focus);
const disable = this.props.disable;
const classList = ["clip-item"];
if (focus) {
classList.push("focus");
}
if (disable) {
classList.push("disable");
} else {
classList.push("able");
}
return <div
key={clip.id}
className={classList.join(" ")}
onClick={() => {
if (this.isInnerClick) {
this.isInnerClick = false;
} else {
this.resolveCallback(this.props.click, clip);
}
}}
>
<div className="clip-item-hole-view">
{new Array(4).fill(0).map((_, index) => {
return <div className="clip-item-hole" key={index}/>
})}
</div>
<div className="clip-icon-view">
<Icon iconName="MyMoviesTV" className="icon"/>
<Icon
iconName="Delete"
className="delete"
onClick={() => {
this.isInnerClick = true;
this.resolveCallback(this.props.delete, clip);
}}
/>
</div>
<div className="clip-item-content">
<div className="title">{clip.name}</div>
<div className="info">{
clip.isRecording ?
<Localization i18nKey="Panel.Info.Behavior.Clip.Uname.Clip"/> :
this.getClipInfo(clip)
}</div>
</div>
</div>;
}
private renderAddButton(): ReactNode {
const classList = ["clip-item", "add-button"];
if (this.props.disable) {
classList.push("disable");
} else {
classList.push("able");
}
return <div
key="ADD_BUTTON"
className={classList.join(" ")}
onClick={() => this.resolveCallback(this.props.add)}
>
<Icon iconName="Add"/>
</div>
}
public render(): ReactNode {
return <Theme className="clip-list-root">
{ this.props.clips.map((clip => {
return this.renderClip(clip);
})) }
{ this.renderAddButton() }
</Theme>;
}
}
export { ClipList };
+58 -12
View File
@@ -9,6 +9,7 @@ import { SettingPopup } from "@Component/SettingPopup/SettingPopup";
import { BehaviorPopup } from "@Component/BehaviorPopup/BehaviorPopup"; import { BehaviorPopup } from "@Component/BehaviorPopup/BehaviorPopup";
import { MouseMod } from "@GLRender/ClassicRenderer"; import { MouseMod } from "@GLRender/ClassicRenderer";
import { ArchiveSave } from "@Context/Archive"; import { ArchiveSave } from "@Context/Archive";
import { ActuatorModel } from "@Model/Actuator";
import "./CommandBar.scss"; import "./CommandBar.scss";
const COMMAND_BAR_WIDTH = 45; const COMMAND_BAR_WIDTH = 45;
@@ -50,6 +51,62 @@ class CommandBar extends Component<IMixinSettingProps & IMixinStatusProps, IComm
isSaveRunning: false isSaveRunning: false
}; };
private renderPlayActionButton(): ReactNode {
let icon: string = "Play";
let handel: () => any = () => {};
// 播放模式
if (this.props.status?.focusClip) {
// 暂停播放
if (this.props.status?.actuator.mod === ActuatorModel.Play) {
icon = "Pause";
handel = () => {
this.props.status?.actuator.pausePlay();
console.log("ClipRecorder: Pause play...");
};
}
// 开始播放
else {
icon = "Play";
handel = () => {
this.props.status?.actuator.playing();
console.log("ClipRecorder: Play start...");
};
}
}
// 正在录制中
else if (
this.props.status?.actuator.mod === ActuatorModel.Record ||
this.props.status?.actuator.mod === ActuatorModel.Offline
) {
// 暂停录制
icon = "Stop";
handel = () => {
this.props.status?.actuator.endRecord();
console.log("ClipRecorder: Rec end...");
};
}
// 正常控制主时钟
else {
icon = this.props.status?.actuator.start() ? "Pause" : "Play";
handel = () => this.props.status?.actuator.start(
!this.props.status?.actuator.start()
);
}
return <CommandButton
iconName={icon}
i18NKey="Command.Bar.Play.Info"
click={handel}
/>;
}
public render(): ReactNode { public render(): ReactNode {
const mouseMod = this.props.status?.mouseMod ?? MouseMod.Drag; const mouseMod = this.props.status?.mouseMod ?? MouseMod.Drag;
@@ -84,13 +141,7 @@ class CommandBar extends Component<IMixinSettingProps & IMixinStatusProps, IComm
}} }}
/> />
<CommandButton {this.renderPlayActionButton()}
iconName={this.props.status?.actuator.start() ? "Pause" : "Play"}
i18NKey="Command.Bar.Play.Info"
click={() => this.props.status ? this.props.status.actuator.start(
!this.props.status.actuator.start()
) : undefined}
/>
<CommandButton <CommandButton
iconName="HandsFree" iconName="HandsFree"
@@ -137,11 +188,6 @@ class CommandBar extends Component<IMixinSettingProps & IMixinStatusProps, IComm
this.props.status ? this.props.status.newLabel() : undefined; this.props.status ? this.props.status.newLabel() : undefined;
}} }}
/> />
<CommandButton
iconName="Camera"
i18NKey="Command.Bar.Camera.Info"
/>
</div> </div>
<div> <div>
<CommandButton <CommandButton
@@ -0,0 +1,8 @@
@import "../Theme/Theme.scss";
div.offline-render-popup {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 10px;
}
@@ -0,0 +1,124 @@
import { Component, ReactNode } from "react";
import { Popup } from "@Context/Popups";
import { useStatusWithEvent, IMixinStatusProps } from "@Context/Status";
import { Localization } from "@Component/Localization/Localization";
import { AttrInput } from "@Input/AttrInput/AttrInput";
import { Message } from "@Input/Message/Message";
import { ConfirmContent } from "@Component/ConfirmPopup/ConfirmPopup";
import { ProcessPopup } from "@Component/ProcessPopup/ProcessPopup";
import { Emitter } from "@Model/Emitter";
import "./OfflineRender.scss";
interface IOfflineRenderProps {
close?: () => any;
}
interface IOfflineRenderState {
time: number;
fps: number;
name: string;
}
class OfflineRender extends Popup<IOfflineRenderProps> {
public minWidth: number = 250;
public minHeight: number = 150;
public width: number = 400;
public height: number = 300;
public maskForSelf: boolean = true;
public onRenderHeader(): ReactNode {
return <Localization i18nKey="Popup.Offline.Render.Title"/>
}
public render(): ReactNode {
return <OfflineRenderComponent {...this.props} close={() => {
this.close();
}}/>
}
}
@useStatusWithEvent()
class OfflineRenderComponent extends Component<IOfflineRenderProps & IMixinStatusProps, IOfflineRenderState> {
public constructor(props: IOfflineRenderProps & IMixinStatusProps) {
super(props);
this.state = {
name: this.props.status?.getNewClipName() ?? "",
time: 10,
fps: 60
}
}
public render(): ReactNode {
return <ConfirmContent
className="offline-render-popup"
actions={[{
i18nKey: "Popup.Offline.Render.Input.Start",
onClick: () => {
// 获取新实例
let newClip = this.props.status?.newClip();
if (newClip) {
newClip.name = this.state.name;
this.props.status?.actuator.offlineRender(newClip, this.state.time, this.state.fps);
// 开启进度条弹窗
this.props.status?.popup.showPopup(ProcessPopup, {});
}
// 关闭这个弹窗
this.props.close && this.props.close();
}
}]}
>
<Message i18nKey="Popup.Offline.Render.Message" isTitle first/>
<AttrInput
id={"Render-Name"}
value={this.state.name}
keyI18n="Popup.Offline.Render.Input.Name"
maxLength={15}
valueChange={(val) => {
this.setState({
name: val
});
}}
/>
<AttrInput
isNumber
id={"Render-Time"}
value={this.state.time}
keyI18n="Popup.Offline.Render.Input.Time"
max={3600}
min={1}
valueChange={(val) => {
this.setState({
time: parseFloat(val)
});
}}
/>
<AttrInput
isNumber
id={"Render-FPS"}
max={1000}
min={1}
value={this.state.fps}
keyI18n="Popup.Offline.Render.Input.Fps"
valueChange={(val) => {
this.setState({
fps: parseFloat(val)
});
}}
/>
</ConfirmContent>
}
}
export { OfflineRender };
@@ -0,0 +1,42 @@
@import "../Theme/Theme.scss";
div.process-popup {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 10px;
div.ms-ProgressIndicator {
transform: none;
div.ms-ProgressIndicator-progressTrack {
transform: none;
}
div.ms-ProgressIndicator-progressBar {
transform: none;
}
}
}
div.confirm-root.dark div.ms-ProgressIndicator {
div.ms-ProgressIndicator-progressTrack {
background-color: $lt-bg-color-lvl3-dark;
}
div.ms-ProgressIndicator-progressBar {
background-color: $lt-font-color-normal-dark;
}
}
div.confirm-root.light div.ms-ProgressIndicator {
div.ms-ProgressIndicator-progressTrack {
background-color: $lt-bg-color-lvl3-light;
}
div.ms-ProgressIndicator-progressBar {
background-color: $lt-font-color-normal-light;
}
}
@@ -0,0 +1,89 @@
import { Component, ReactNode } from "react";
import { Popup } from "@Context/Popups";
import { Localization } from "@Component/Localization/Localization";
import { ConfirmContent } from "@Component/ConfirmPopup/ConfirmPopup";
import { useStatusWithEvent, IMixinStatusProps } from "@Context/Status";
import { ProgressIndicator } from "@fluentui/react";
import { ActuatorModel } from "@Model/Actuator";
import "./ProcessPopup.scss";
interface IProcessPopupProps {
close?: () => void;
}
class ProcessPopup extends Popup<IProcessPopupProps> {
public minWidth: number = 400;
public minHeight: number = 150;
public width: number = 400;
public height: number = 150;
public maskForSelf: boolean = true;
public onClose(): void {}
public onRenderHeader(): ReactNode {
return <Localization i18nKey="Popup.Offline.Render.Process.Title"/>
}
public render(): ReactNode {
return <ProcessPopupComponent {...this.props} close={() => this.close()}/>
}
}
@useStatusWithEvent("offlineLoop", "actuatorStartChange", "recordLoop")
class ProcessPopupComponent extends Component<IProcessPopupProps & IMixinStatusProps> {
public render(): ReactNode {
let current = this.props.status?.actuator.offlineCurrentFrame ?? 0;
let all = this.props.status?.actuator.offlineAllFrame ?? 0;
const isRendering = this.props.status?.actuator.mod === ActuatorModel.Offline;
let i18nKey = "";
let color: undefined | "red";
let onClick = () => {};
if (isRendering) {
i18nKey = "Popup.Offline.Render.Input.End";
color = "red";
onClick = () => {
this.props.status?.actuator.endOfflineRender();
this.forceUpdate();
}
}
else {
i18nKey = "Popup.Offline.Render.Input.Finished";
onClick = () => {
this.props.close && this.props.close();
}
}
return <ConfirmContent
className="process-popup"
actions={[{
i18nKey: i18nKey,
color: color,
onClick: onClick
}]}
>
<ProgressIndicator
percentComplete={current / all}
barHeight={3}
/>
<Localization
i18nKey="Popup.Offline.Render.Process"
options={{
current: current.toString(),
all: all.toString()
}}
/>
</ConfirmContent>
}
}
export { ProcessPopup };
+160
View File
@@ -0,0 +1,160 @@
@import "../Theme/Theme.scss";
div.recorder-root {
width: 100%;
box-sizing: border-box;
padding: 10px 10px 0 10px;
div.recorder-slider {
width: 100%;
transition: none;
div.ms-Slider-slideBox {
height: 16px;
transition: none;
}
span.ms-Slider-thumb {
width: 12px;
height: 12px;
line-height: 16px;
border-width: 3px;
transition: none;
top: -4px;
}
span.ms-Slider-active {
height: 3px;
transition: none;
}
span.ms-Slider-inactive {
height: 3px;
transition: none;
}
}
div.recorder-slider.disable {
opacity: .6;
}
div.recorder-content {
width: 100%;
height: 32px;
display: flex;
justify-content: space-between;
align-items: center;
box-sizing: border-box;
padding: 0 8px;
div.time-view {
flex-shrink: 1;
width: 50%;
text-align: left;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
div.ctrl-button {
cursor: pointer;
user-select: none;
width: 96px;
flex-shrink: 0;
text-align: center;
display: flex;
justify-content: center;
align-items: center;
div.ctrl-action {
width: 32px;
height: 32px;
display: flex;
justify-content: center;
align-items: center;
}
div.ctrl-action-main {
font-size: 1.5em;
}
div.ctrl-action.disable {
cursor: not-allowed;
opacity: .6;
}
}
div.speed-view {
flex-shrink: 1;
width: 50%;
text-align: right;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
}
div.recorder-root.light {
div.recorder-slider {
span.ms-Slider-thumb {
background-color: $lt-bg-color-lvl1-light;
border-color: $lt-font-color-normal-light;
}
span.ms-Slider-active {
background-color: $lt-font-color-normal-light;
}
span.ms-Slider-inactive {
background-color: $lt-bg-color-lvl1-light;
}
}
div.recorder-content {
div.ctrl-button div.ctrl-action:hover {
background-color: $lt-bg-color-lvl3-light;
color: $lt-font-color-lvl1-light;
}
div.ctrl-button div.ctrl-action.disable:hover {
background-color: $lt-bg-color-lvl4-light;
color: $lt-font-color-normal-light;
}
}
}
div.recorder-root.dark {
div.recorder-slider {
span.ms-Slider-thumb {
background-color: $lt-bg-color-lvl1-dark;
border-color: $lt-font-color-normal-dark;
}
span.ms-Slider-active {
background-color: $lt-font-color-normal-dark;
}
span.ms-Slider-inactive {
background-color: $lt-bg-color-lvl1-dark;
}
}
div.recorder-content {
div.ctrl-button div.ctrl-action:hover {
background-color: $lt-bg-color-lvl3-dark;
color: $lt-font-color-lvl1-dark;
}
div.ctrl-button div.ctrl-action.disable:hover {
background-color: $lt-bg-color-lvl4-dark;
color: $lt-font-color-normal-dark;
}
}
}
+136
View File
@@ -0,0 +1,136 @@
import { Localization } from "@Component/Localization/Localization";
import { BackgroundLevel, FontLevel, Theme } from "@Component/Theme/Theme";
import { Icon, Slider } from "@fluentui/react";
import { Component, ReactNode } from "react";
import "./Recorder.scss";
interface IRecorderProps {
mode: "P" | "R",
running?: boolean,
name?: string;
fps?: number;
allFrame?: number;
currentFrame?: number;
allTime?: number;
currentTime?: number;
action?: () => void;
valueChange?: (value: number) => any;
}
class Recorder extends Component<IRecorderProps> {
private parseTime(time?: number): string {
if (time === undefined) {
return "0:0:0:0";
}
const h = Math.floor(time / 3600);
const m = Math.floor((time % 3600) / 60);
const s = Math.floor((time % 3600) % 60);
const ms = Math.floor((time % 1) * 1000);
return `${h}:${m}:${s}:${ms}`;
}
private getRecordInfo(): ReactNode {
if (this.props.mode === "P") {
return <Localization
i18nKey="Panel.Info.Behavior.Clip.Time.Formate"
options={{
current: this.parseTime(this.props.currentTime),
all: this.parseTime(this.props.allTime),
fps: this.props.fps ? this.props.fps.toString() : "0"
}}
/>;
}
else if (this.props.mode === "R") {
return <Localization
i18nKey="Panel.Info.Behavior.Clip.Record.Formate"
options={{
time: this.parseTime(this.props.currentTime),
}}
/>;
}
}
private getActionIcon(): string {
if (this.props.mode === "P") {
if (this.props.running) {
return "Pause";
} else {
return "Play";
}
}
else if (this.props.mode === "R") {
if (this.props.running) {
return "Stop";
} else {
return "StatusCircleRing";
}
}
return "Play";
}
public render(): ReactNode {
const isSliderDisable = this.props.mode === "R";
const isJumpDisable = this.props.mode === "R";
return <Theme
className="recorder-root"
backgroundLevel={BackgroundLevel.Level4}
fontLevel={FontLevel.normal}
>
<Slider
min={0}
disabled={isSliderDisable}
value={this.props.currentFrame}
max={this.props.allFrame}
className={"recorder-slider" + (isSliderDisable ? " disable" : "")}
showValue={false}
onChange={(value) => {
if (this.props.valueChange && !isSliderDisable) {
this.props.valueChange(value);
}
}}
/>
<div className="recorder-content">
<div className="time-view">
{this.getRecordInfo()}
</div>
<div className="ctrl-button">
<div
className={"ctrl-action" + (isJumpDisable ? " disable" : "")}
onClick={() => {
if (this.props.valueChange && !isJumpDisable && this.props.currentFrame !== undefined) {
this.props.valueChange(this.props.currentFrame - 1);
}
}}
>
<Icon iconName="Back"/>
</div>
<div className="ctrl-action ctrl-action-main" onClick={this.props.action}>
<Icon iconName={this.getActionIcon()}/>
</div>
<div
className={"ctrl-action" + (isJumpDisable ? " disable" : "")}
onClick={() => {
if (this.props.valueChange && !isJumpDisable && this.props.currentFrame !== undefined) {
this.props.valueChange(this.props.currentFrame + 1);
}
}}
>
<Icon iconName="Forward"/>
</div>
</div>
<div className="speed-view">
{
this.props.name ?
<span>{this.props.name}</span> :
<Localization i18nKey="Panel.Info.Behavior.Clip.Uname.Clip"/>
}
</div>
</div>
</Theme>;
}
}
export { Recorder };
@@ -3,4 +3,6 @@
div.setting-popup { div.setting-popup {
width: 100%; width: 100%;
height: 100%; height: 100%;
box-sizing: border-box;
padding: 10px;
} }
+37 -2
View File
@@ -2,8 +2,11 @@ import { Component, ReactNode } from "react";
import { Popup } from "@Context/Popups"; import { Popup } from "@Context/Popups";
import { Theme } from "@Component/Theme/Theme"; import { Theme } from "@Component/Theme/Theme";
import { Localization } from "@Component/Localization/Localization"; import { Localization } from "@Component/Localization/Localization";
import { useSettingWithEvent, IMixinSettingProps, Themes } from "@Context/Setting";
import { ComboInput } from "@Input/ComboInput/ComboInput";
import "./SettingPopup.scss"; import "./SettingPopup.scss";
interface ISettingPopupProps { interface ISettingPopupProps {
} }
@@ -24,10 +27,42 @@ class SettingPopup extends Popup<ISettingPopupProps> {
} }
} }
class SettingPopupComponent extends Component<ISettingPopupProps> { @useSettingWithEvent("themes", "language")
class SettingPopupComponent extends Component<ISettingPopupProps & IMixinSettingProps> {
public render(): ReactNode { public render(): ReactNode {
return <Theme className="setting-popup"></Theme> return <Theme className="setting-popup">
<ComboInput
keyI18n="Language"
allOption={[
{ key: "EN_US", i18n: "EN_US" },
{ key: "ZH_CN", i18n: "ZH_CN" }
]}
value={{
key: this.props.setting?.language ?? "EN_US",
i18n: this.props.setting?.language ?? "EN_US"
}}
valueChange={(data) => {
this.props.setting?.setProps("language", data.key as any);
}}
/>
<ComboInput
keyI18n="Themes"
allOption={[
{ key: Themes.dark as any, i18n: "Themes.Dark" },
{ key: Themes.light as any, i18n: "Themes.Light" }
]}
value={{
key: this.props.setting?.themes ?? Themes.dark as any,
i18n: this.props.setting?.themes === Themes.dark ? "Themes.Dark" : "Themes.Light"
}}
valueChange={(data) => {
this.props.setting?.setProps("themes", parseInt(data.key));
}}
/>
</Theme>
} }
} }
+5
View File
@@ -44,6 +44,11 @@ class Setting extends Emitter<ISettingEvents> {
*/ */
public layout: Layout = new Layout(); public layout: Layout = new Layout();
/**
* 是否显示线性图表
*/
public lineChartType: boolean = false;
/** /**
* 设置参数 * 设置参数
*/ */
+62
View File
@@ -14,6 +14,7 @@ import { PopupController } from "@Context/Popups";
import { Behavior } from "@Model/Behavior"; import { Behavior } from "@Model/Behavior";
import { IParameter, IParamValue } from "@Model/Parameter"; import { IParameter, IParamValue } from "@Model/Parameter";
import { Actuator } from "@Model/Actuator"; import { Actuator } from "@Model/Actuator";
import { Clip } from "@Model/Clip";
function randomColor(unNormal: boolean = false) { function randomColor(unNormal: boolean = false) {
const color = [ const color = [
@@ -35,19 +36,25 @@ interface IStatusEvent {
fileChange: void; fileChange: void;
renderLoop: number; renderLoop: number;
physicsLoop: number; physicsLoop: number;
recordLoop: number;
offlineLoop: number;
modelUpdate: void;
mouseModChange: void; mouseModChange: void;
focusObjectChange: void; focusObjectChange: void;
focusLabelChange: void; focusLabelChange: void;
focusBehaviorChange: void; focusBehaviorChange: void;
objectChange: void; objectChange: void;
focusClipChange: void;
rangeLabelChange: void; rangeLabelChange: void;
groupLabelChange: void; groupLabelChange: void;
groupBehaviorChange: void; groupBehaviorChange: void;
clipChange: void;
labelChange: void; labelChange: void;
rangeAttrChange: void; rangeAttrChange: void;
labelAttrChange: void; labelAttrChange: void;
groupAttrChange: void; groupAttrChange: void;
behaviorAttrChange: void; behaviorAttrChange: void;
clipAttrChange: void;
individualChange: void; individualChange: void;
behaviorChange: void; behaviorChange: void;
popupChange: void; popupChange: void;
@@ -98,6 +105,11 @@ class Status extends Emitter<IStatusEvent> {
*/ */
public focusBehavior?: Behavior; public focusBehavior?: Behavior;
/**
* 焦点行为
*/
public focusClip?: Clip;
private drawTimer?: NodeJS.Timeout; private drawTimer?: NodeJS.Timeout;
private delayDraw = () => { private delayDraw = () => {
@@ -119,11 +131,15 @@ class Status extends Emitter<IStatusEvent> {
// 循环事件 // 循环事件
this.actuator.on("loop", (t) => { this.emit("physicsLoop", t) }); this.actuator.on("loop", (t) => { this.emit("physicsLoop", t) });
this.actuator.on("record", (t) => { this.emit("recordLoop", t) });
this.actuator.on("offline", (t) => { this.emit("offlineLoop", t) });
this.actuator.on("modelUpdate", () => { this.emit("modelUpdate") });
// 对象变化事件 // 对象变化事件
this.model.on("objectChange", () => this.emit("objectChange")); this.model.on("objectChange", () => this.emit("objectChange"));
this.model.on("labelChange", () => this.emit("labelChange")); this.model.on("labelChange", () => this.emit("labelChange"));
this.model.on("behaviorChange", () => this.emit("behaviorChange")); this.model.on("behaviorChange", () => this.emit("behaviorChange"));
this.model.on("clipChange", () => this.emit("clipChange"));
// 弹窗事件 // 弹窗事件
this.popup.on("popupChange", () => this.emit("popupChange")); this.popup.on("popupChange", () => this.emit("popupChange"));
@@ -160,11 +176,15 @@ class Status extends Emitter<IStatusEvent> {
this.emit("objectChange"); this.emit("objectChange");
this.emit("labelChange"); this.emit("labelChange");
this.emit("behaviorChange"); this.emit("behaviorChange");
this.emit("clipChange");
// 清除焦点对象 // 清除焦点对象
this.setBehaviorObject(); this.setBehaviorObject();
this.setFocusObject(new Set()); this.setFocusObject(new Set());
this.setLabelObject(); this.setLabelObject();
this.setClipObject();
this.actuator.endPlay();
this.actuator.start(false);
// 映射 // 映射
this.emit("fileLoad"); this.emit("fileLoad");
@@ -182,11 +202,13 @@ class Status extends Emitter<IStatusEvent> {
this.on("objectChange", handelFileChange); this.on("objectChange", handelFileChange);
this.on("behaviorChange", handelFileChange); this.on("behaviorChange", handelFileChange);
this.on("labelChange", handelFileChange); this.on("labelChange", handelFileChange);
this.on("clipChange", handelFileChange);
this.on("individualChange", handelFileChange); this.on("individualChange", handelFileChange);
this.on("groupAttrChange", handelFileChange); this.on("groupAttrChange", handelFileChange);
this.on("rangeAttrChange", handelFileChange); this.on("rangeAttrChange", handelFileChange);
this.on("labelAttrChange", handelFileChange); this.on("labelAttrChange", handelFileChange);
this.on("behaviorAttrChange", handelFileChange); this.on("behaviorAttrChange", handelFileChange);
this.on("clipAttrChange", handelFileChange);
this.on("fileChange", () => this.archive.emit("fileChange")); this.on("fileChange", () => this.archive.emit("fileChange"));
} }
@@ -220,6 +242,16 @@ class Status extends Emitter<IStatusEvent> {
this.emit("focusBehaviorChange"); this.emit("focusBehaviorChange");
} }
/**
* 更新焦点行为
*/
public setClipObject(clip?: Clip) {
if (this.focusClip !== clip) {
this.focusClip = clip;
}
this.emit("focusClipChange");
}
/** /**
* 修改范围属性 * 修改范围属性
*/ */
@@ -263,6 +295,18 @@ class Status extends Emitter<IStatusEvent> {
} }
} }
/**
* 修改剪辑属性
*/
public changeClipAttrib<K extends keyof Clip>
(id: ObjectID, key: K, val: Clip[K]) {
const clip = this.model.getClipById(id);
if (clip && clip instanceof Clip) {
clip[key] = val;
this.emit("clipAttrChange");
}
}
public addGroupBehavior(id: ObjectID, val: Behavior) { public addGroupBehavior(id: ObjectID, val: Behavior) {
const group = this.model.getObjectById(id); const group = this.model.getObjectById(id);
if (group && group instanceof Group) { if (group && group instanceof Group) {
@@ -403,6 +447,24 @@ class Status extends Emitter<IStatusEvent> {
return label; return label;
} }
public getNewClipName() {
let searchKey = I18N(this.setting.language, "Object.List.New.Clip", { id: "" });
let nextIndex = 1;
this.model.clipPool.forEach((obj) => {
nextIndex = Math.max(nextIndex, this.getNextNumber(
obj.name, searchKey
));
});
return I18N(this.setting.language, "Object.List.New.Clip", {
id: nextIndex.toString()
});
}
public newClip() {
const clip = this.model.addClip(this.getNewClipName());
return clip;
}
public setMouseMod(mod: MouseMod) { public setMouseMod(mod: MouseMod) {
this.mouseMod = mod; this.mouseMod = mod;
if (this.renderer instanceof ClassicRenderer) { if (this.renderer instanceof ClassicRenderer) {
+35 -1
View File
@@ -29,12 +29,38 @@ class ElectronApp {
); );
} }
public loadingPage?: BrowserWindow;
public simulatorWindow?: BrowserWindow; public simulatorWindow?: BrowserWindow;
public async showLoadingPage() {
return new Promise((r) => {
this.loadingPage = new BrowserWindow({
width: 603,
height: 432,
fullscreenable: false,
skipTaskbar: true,
resizable: false,
titleBarStyle: 'hidden',
frame: false,
show: false
});
this.loadingPage.loadFile(ENV.LIVING_TOGETHER_LOADING_PAGE ?? "./LoadingPage.html");
this.loadingPage.on("ready-to-show", () => {
this.loadingPage?.show();
r(undefined);
});
});
}
public async runMainThread() { public async runMainThread() {
await app.whenReady(); await app.whenReady();
await this.showLoadingPage();
await this.runService(); await this.runService();
let preload = pathJoin(__dirname, "./SimulatorWindow.js"); let preload = pathJoin(__dirname, "./SimulatorWindow.js");
@@ -50,11 +76,19 @@ class ElectronApp {
frame: false, frame: false,
minWidth: 460, minWidth: 460,
minHeight: 300, minHeight: 300,
webPreferences: { preload } webPreferences: { preload },
show: false,
}); });
this.simulatorWindow.loadURL(this.serviceUrl + (ENV.LIVING_TOGETHER_WEB_PATH ?? "/resources/app.asar/")); this.simulatorWindow.loadURL(this.serviceUrl + (ENV.LIVING_TOGETHER_WEB_PATH ?? "/resources/app.asar/"));
this.simulatorWindow.on("ready-to-show", () => {
setTimeout(() => {
this.loadingPage?.close();
this.simulatorWindow?.show();
}, 1220);
});
this.handelSimulatorWindowBehavior(); this.handelSimulatorWindowBehavior();
this.handelFileChange(); this.handelFileChange();
+28
View File
@@ -1,6 +1,10 @@
const EN_US = { const EN_US = {
"Language": "Language",
"EN_US": "English (US)", "EN_US": "English (US)",
"ZH_CN": "Chinese (Simplified)", "ZH_CN": "Chinese (Simplified)",
"Themes": "Themes",
"Themes.Dark": "Dark",
"Themes.Light": "Light",
"Header.Bar.Title": "Living Together | Emulator", "Header.Bar.Title": "Living Together | Emulator",
"Header.Bar.Title.Info": "Group Behavior Research Emulator", "Header.Bar.Title.Info": "Group Behavior Research Emulator",
"Header.Bar.File.Name.Info": "{file} ({status})", "Header.Bar.File.Name.Info": "{file} ({status})",
@@ -31,6 +35,7 @@ const EN_US = {
"Object.List.New.Group": "Group object {id}", "Object.List.New.Group": "Group object {id}",
"Object.List.New.Range": "Range object {id}", "Object.List.New.Range": "Range object {id}",
"Object.List.New.Label": "Label {id}", "Object.List.New.Label": "Label {id}",
"Object.List.New.Clip": "Clip {id}",
"Object.List.No.Data": "There are no objects in the model, click the button to create it", "Object.List.No.Data": "There are no objects in the model, click the button to create it",
"Object.Picker.List.No.Data": "There is no model in the model for this option", "Object.Picker.List.No.Data": "There is no model in the model for this option",
"Behavior.Picker.Add.Button": "Click here to assign behavior to this group", "Behavior.Picker.Add.Button": "Click here to assign behavior to this group",
@@ -53,6 +58,15 @@ const EN_US = {
"Panel.Info.Behavior.List.View": "Edit view behavior list", "Panel.Info.Behavior.List.View": "Edit view behavior list",
"Panel.Title.Behavior.Details.View": "Behavior", "Panel.Title.Behavior.Details.View": "Behavior",
"Panel.Info.Behavior.Details.View": "Edit view Behavior attributes", "Panel.Info.Behavior.Details.View": "Edit view Behavior attributes",
"Panel.Title.Behavior.Clip.Player": "Recording",
"Panel.Info.Behavior.Clip.Player": "Pre render recorded data",
"Panel.Title.Behavior.Clip.Details": "Clip",
"Panel.Info.Behavior.Clip.Details": "Edit view clip attributes",
"Panel.Info.Statistics": "View statistics",
"Panel.Title.Statistics": "Statistics",
"Panel.Info.Behavior.Clip.Time.Formate": "{current} / {all} / {fps}fps",
"Panel.Info.Behavior.Clip.Record.Formate": "Record: {time}",
"Panel.Info.Behavior.Clip.Uname.Clip": "Waiting for recording...",
"Popup.Title.Unnamed": "Popup message", "Popup.Title.Unnamed": "Popup message",
"Popup.Title.Confirm": "Confirm message", "Popup.Title.Confirm": "Confirm message",
"Popup.Action.Yes": "Confirm", "Popup.Action.Yes": "Confirm",
@@ -63,8 +77,19 @@ const EN_US = {
"Popup.Action.Objects.Confirm.Restore": "Restore", "Popup.Action.Objects.Confirm.Restore": "Restore",
"Popup.Delete.Objects.Confirm": "Are you sure you want to delete this object(s)? The object is deleted and cannot be recalled.", "Popup.Delete.Objects.Confirm": "Are you sure you want to delete this object(s)? The object is deleted and cannot be recalled.",
"Popup.Delete.Behavior.Confirm": "Are you sure you want to delete this behavior? The behavior is deleted and cannot be recalled.", "Popup.Delete.Behavior.Confirm": "Are you sure you want to delete this behavior? The behavior is deleted and cannot be recalled.",
"Popup.Delete.Clip.Confirm": "Are you sure you want to delete this clip? The clip cannot be restored after deletion.",
"Popup.Restore.Behavior.Confirm": "Are you sure you want to reset all parameters of this behavior? This operation cannot be recalled.", "Popup.Restore.Behavior.Confirm": "Are you sure you want to reset all parameters of this behavior? This operation cannot be recalled.",
"Popup.Setting.Title": "Preferences setting", "Popup.Setting.Title": "Preferences setting",
"Popup.Offline.Render.Title": "Offline rendering",
"Popup.Offline.Render.Process.Title": "Rendering progress",
"Popup.Offline.Render.Message": "Rendering Parameters",
"Popup.Offline.Render.Input.Name": "Clip name",
"Popup.Offline.Render.Input.Time": "Duration (s)",
"Popup.Offline.Render.Input.Fps": "FPS (f/s)",
"Popup.Offline.Render.Input.Start": "Start rendering",
"Popup.Offline.Render.Input.End": "Terminate rendering",
"Popup.Offline.Render.Input.Finished": "Finished",
"Popup.Offline.Render.Process": "Number of frames completed: {current} / {all}",
"Popup.Load.Save.Title": "Load save", "Popup.Load.Save.Title": "Load save",
"Popup.Load.Save.confirm": "Got it", "Popup.Load.Save.confirm": "Got it",
"Popup.Load.Save.Overwrite": "Overwrite and continue", "Popup.Load.Save.Overwrite": "Overwrite and continue",
@@ -143,6 +168,9 @@ const EN_US = {
"Panel.Info.Behavior.Details.Parameter.Key.Vec.X": "{key} X", "Panel.Info.Behavior.Details.Parameter.Key.Vec.X": "{key} X",
"Panel.Info.Behavior.Details.Parameter.Key.Vec.Y": "{key} Y", "Panel.Info.Behavior.Details.Parameter.Key.Vec.Y": "{key} Y",
"Panel.Info.Behavior.Details.Parameter.Key.Vec.Z": "{key} Z", "Panel.Info.Behavior.Details.Parameter.Key.Vec.Z": "{key} Z",
"Panel.Info.Clip.List.Error.Nodata": "There is no clip, please click the record button to record, or click the plus sign to create",
"Panel.Info.Clip.Details.Error.Nodata": "Specify a clip to view an attribute",
"Panel.Info.Statistics.Nodata": "There are no groups in the model or clip",
"Info.Hint.Save.After.Close": "Any unsaved progress will be lost. Are you sure you want to continue?", "Info.Hint.Save.After.Close": "Any unsaved progress will be lost. Are you sure you want to continue?",
"Info.Hint.Load.File.Title": "Load save", "Info.Hint.Load.File.Title": "Load save",
"Info.Hint.Load.File.Intro": "Release to load the dragged save file", "Info.Hint.Load.File.Intro": "Release to load the dragged save file",
+32 -4
View File
@@ -1,6 +1,10 @@
const ZH_CN = { const ZH_CN = {
"Language": "语言",
"EN_US": "英语 (美国)", "EN_US": "英语 (美国)",
"ZH_CN": "中文 (简体)", "ZH_CN": "中文 (简体)",
"Themes": "主题",
"Themes.Dark": "黑暗",
"Themes.Light": "亮色",
"Header.Bar.Title": "群生共进 | 仿真器", "Header.Bar.Title": "群生共进 | 仿真器",
"Header.Bar.Title.Info": "群体行为研究仿真器", "Header.Bar.Title.Info": "群体行为研究仿真器",
"Header.Bar.File.Name.Info": "{file} ({status})", "Header.Bar.File.Name.Info": "{file} ({status})",
@@ -22,15 +26,16 @@ const ZH_CN = {
"Command.Bar.Camera.Info": "渲染器设置", "Command.Bar.Camera.Info": "渲染器设置",
"Command.Bar.Setting.Info": "全局设置", "Command.Bar.Setting.Info": "全局设置",
"Input.Error.Not.Number": "请输入数字", "Input.Error.Not.Number": "请输入数字",
"Input.Error.Max": "输入数值须小于 {number}", "Input.Error.Max": "输入数值须小于 {num}",
"Input.Error.Min": "输入数值须大于 {number}", "Input.Error.Min": "输入数值须大于 {num}",
"Input.Error.Length": "输入内容长度须小于 {number}", "Input.Error.Length": "输入内容长度须小于 {num}",
"Input.Error.Length.Less": "输入内容长度须大于 {number}", "Input.Error.Length.Less": "输入内容长度须大于 {num}",
"Input.Error.Select": "选择对象 ...", "Input.Error.Select": "选择对象 ...",
"Input.Error.Combo": "选择选项 ...", "Input.Error.Combo": "选择选项 ...",
"Object.List.New.Group": "群对象 {id}", "Object.List.New.Group": "群对象 {id}",
"Object.List.New.Range": "范围对象 {id}", "Object.List.New.Range": "范围对象 {id}",
"Object.List.New.Label": "标签 {id}", "Object.List.New.Label": "标签 {id}",
"Object.List.New.Clip": "剪辑片段 {id}",
"Object.List.No.Data": "模型中没有任何对象,点击按钮以创建", "Object.List.No.Data": "模型中没有任何对象,点击按钮以创建",
"Object.Picker.List.No.Data": "模型中没有合适此选项的模型", "Object.Picker.List.No.Data": "模型中没有合适此选项的模型",
"Behavior.Picker.Add.Button": "点击此处以赋予行为到此群", "Behavior.Picker.Add.Button": "点击此处以赋予行为到此群",
@@ -53,6 +58,15 @@ const ZH_CN = {
"Panel.Info.Behavior.List.View": "编辑查看行为列表", "Panel.Info.Behavior.List.View": "编辑查看行为列表",
"Panel.Title.Behavior.Details.View": "行为", "Panel.Title.Behavior.Details.View": "行为",
"Panel.Info.Behavior.Details.View": "编辑查看行为属性", "Panel.Info.Behavior.Details.View": "编辑查看行为属性",
"Panel.Title.Behavior.Clip.Player": "录制",
"Panel.Info.Behavior.Clip.Player": "预渲染录制数据",
"Panel.Title.Behavior.Clip.Details": "剪辑",
"Panel.Info.Behavior.Clip.Details": "编辑查看剪辑片段属性",
"Panel.Info.Statistics": "查看统计信息",
"Panel.Title.Statistics": "统计",
"Panel.Info.Behavior.Clip.Time.Formate": "{current} / {all} / {fps} fps",
"Panel.Info.Behavior.Clip.Record.Formate": "录制: {time}",
"Panel.Info.Behavior.Clip.Uname.Clip": "等待录制...",
"Popup.Title.Unnamed": "弹窗消息", "Popup.Title.Unnamed": "弹窗消息",
"Popup.Title.Confirm": "确认消息", "Popup.Title.Confirm": "确认消息",
"Popup.Action.Yes": "确定", "Popup.Action.Yes": "确定",
@@ -63,8 +77,19 @@ const ZH_CN = {
"Popup.Action.Objects.Confirm.Restore": "重置", "Popup.Action.Objects.Confirm.Restore": "重置",
"Popup.Delete.Objects.Confirm": "你确定要删除这个(些)对象吗?对象被删除将无法撤回。", "Popup.Delete.Objects.Confirm": "你确定要删除这个(些)对象吗?对象被删除将无法撤回。",
"Popup.Delete.Behavior.Confirm": "你确定要删除这个行为吗?行为被删除将无法撤回。", "Popup.Delete.Behavior.Confirm": "你确定要删除这个行为吗?行为被删除将无法撤回。",
"Popup.Delete.Clip.Confirm": "你确定删除这个剪辑片段,剪辑片段删除后将无法恢复。",
"Popup.Restore.Behavior.Confirm": "你确定要重置此行为的全部参数吗?此操作无法撤回。", "Popup.Restore.Behavior.Confirm": "你确定要重置此行为的全部参数吗?此操作无法撤回。",
"Popup.Setting.Title": "首选项设置", "Popup.Setting.Title": "首选项设置",
"Popup.Offline.Render.Title": "离线渲染",
"Popup.Offline.Render.Process.Title": "渲染进度",
"Popup.Offline.Render.Message": "渲染参数",
"Popup.Offline.Render.Input.Name": "剪辑名称",
"Popup.Offline.Render.Input.Time": "时长 (s)",
"Popup.Offline.Render.Input.Fps": "帧率 (f/s)",
"Popup.Offline.Render.Input.Start": "开始渲染",
"Popup.Offline.Render.Input.End": "终止渲染",
"Popup.Offline.Render.Input.Finished": "完成",
"Popup.Offline.Render.Process": "完成帧数: {current} / {all}",
"Popup.Load.Save.Title": "加载存档", "Popup.Load.Save.Title": "加载存档",
"Popup.Load.Save.confirm": "我知道了", "Popup.Load.Save.confirm": "我知道了",
"Popup.Load.Save.Overwrite": "覆盖并继续", "Popup.Load.Save.Overwrite": "覆盖并继续",
@@ -143,6 +168,9 @@ const ZH_CN = {
"Panel.Info.Behavior.Details.Parameter.Key.Vec.X": "{key} X 坐标", "Panel.Info.Behavior.Details.Parameter.Key.Vec.X": "{key} X 坐标",
"Panel.Info.Behavior.Details.Parameter.Key.Vec.Y": "{key} Y 坐标", "Panel.Info.Behavior.Details.Parameter.Key.Vec.Y": "{key} Y 坐标",
"Panel.Info.Behavior.Details.Parameter.Key.Vec.Z": "{key} Z 坐标", "Panel.Info.Behavior.Details.Parameter.Key.Vec.Z": "{key} Z 坐标",
"Panel.Info.Clip.List.Error.Nodata": "没有剪辑片段,请点击录制按钮录制,或者点击加号创建",
"Panel.Info.Clip.Details.Error.Nodata": "请指定一个剪辑片段以查看属性",
"Panel.Info.Statistics.Nodata": "模型或剪辑中不存在任何群",
"Info.Hint.Save.After.Close": "任何未保存的进度都会丢失, 确定要继续吗?", "Info.Hint.Save.After.Close": "任何未保存的进度都会丢失, 确定要继续吗?",
"Info.Hint.Load.File.Title": "加载存档", "Info.Hint.Load.File.Title": "加载存档",
"Info.Hint.Load.File.Intro": "释放以加载拽入的存档", "Info.Hint.Load.File.Intro": "释放以加载拽入的存档",
+333 -2
View File
@@ -1,9 +1,20 @@
import { Model } from "@Model/Model"; import { Model } from "@Model/Model";
import { Emitter } from "@Model/Emitter"; import { Emitter } from "@Model/Emitter";
import { Clip, IFrame } from "@Model/Clip";
enum ActuatorModel {
Play = 1,
Record = 2,
View = 3,
Offline = 4
}
interface IActuatorEvent { interface IActuatorEvent {
startChange: boolean; startChange: boolean;
record: number;
loop: number; loop: number;
offline: number;
modelUpdate: void;
} }
/** /**
@@ -26,6 +37,154 @@ class Actuator extends Emitter<IActuatorEvent> {
*/ */
private startFlag: boolean = false; private startFlag: boolean = false;
/**
* 模式
*/
public mod: ActuatorModel = ActuatorModel.View;
/**
* 录制剪辑
*/
public recordClip?: Clip;
/**
* 播放剪辑
*/
public playClip?: Clip;
/**
* 播放帧
*/
public playFrame?: IFrame;
/**
* 播放帧数
*/
public playFrameId: number = 0;
/**
* 开始录制
*/
public startRecord(clip: Clip) {
// 记录录制片段
this.recordClip = clip;
clip.isRecording = true;
// 如果仿真未开启,开启仿真
if (!this.start()) this.start(true);
// 设置状态
this.mod = ActuatorModel.Record;
}
/**
* 结束录制
*/
public endRecord() {
this.recordClip && (this.recordClip.isRecording = false);
this.recordClip = undefined;
// 如果仿真未停止,停止仿真
if (this.start()) this.start(false);
// 设置状态
this.mod = ActuatorModel.View;
}
public startPlay(clip: Clip) {
// 如果仿真正在进行,停止仿真
if (this.start()) this.start(false);
// 如果正在录制,阻止播放
if (this.mod === ActuatorModel.Record) {
return;
}
// 如果正在播放,暂停播放
if (this.mod === ActuatorModel.Play) {
this.pausePlay();
}
// 设置播放对象
this.playClip = clip;
// 设置播放帧数
this.playFrameId = 0;
this.playFrame = clip.frames[this.playFrameId];
// 播放第一帧
clip.play(this.playFrame);
// 激发时钟状态事件
this.emit("startChange", true);
}
public endPlay() {
// 如果正在播放,暂停播放
if (this.mod === ActuatorModel.Play) {
this.pausePlay();
}
// 更新模式
this.mod = ActuatorModel.View;
// 清除状态
this.playClip = undefined;
this.playFrameId = 0;
this.playFrame = undefined;
// 渲染模型
this.model.draw();
// 激发时钟状态事件
this.emit("startChange", false);
}
/**
* 是否播放完毕
*/
public isPlayEnd() {
if (this.playClip && this.playFrame) {
if (this.playFrameId >= (this.playClip.frames.length - 1)) {
return true;
} else {
return false;
}
} else {
return true;
}
}
public playing() {
// 如果播放完毕了,从头开始播放
if (this.isPlayEnd() && this.playClip) {
this.startPlay(this.playClip);
}
// 更新模式
this.mod = ActuatorModel.Play;
// 启动播放时钟
this.playTicker();
// 激发时钟状态事件
this.emit("startChange", false);
}
public pausePlay() {
// 更新模式
this.mod = ActuatorModel.View;
// 激发时钟状态事件
this.emit("startChange", false);
}
/** /**
* 主时钟状态控制 * 主时钟状态控制
*/ */
@@ -58,6 +217,160 @@ class Actuator extends Emitter<IActuatorEvent> {
public tickerType: 1 | 2 = 2; public tickerType: 1 | 2 = 2;
private playTickerTimer?: number;
/**
* 设置播放进度
*/
public setPlayProcess(id: number) {
if (this.playClip && id >= 0 && id < this.playClip.frames.length) {
// 跳转值这帧
this.playFrameId = id;
this.playFrame = this.playClip.frames[this.playFrameId];
this.emit("record", this.playFrame.duration);
if (this.mod !== ActuatorModel.Play) {
this.playClip.play(this.playFrame);
}
}
}
/**
* 离线渲染参数
*/
public offlineAllFrame: number = 0;
public offlineCurrentFrame: number = 0;
private offlineRenderTickTimer?: number;
/**
* 关闭离线渲染
*/
public endOfflineRender() {
// 清除 timer
clearTimeout(this.offlineRenderTickTimer);
this.recordClip && (this.recordClip.isRecording = false);
this.recordClip = undefined;
// 设置状态
this.mod = ActuatorModel.View;
// 激发结束事件
this.start(false);
this.emit("record", 0);
}
/**
* 离线渲染 tick
*/
private offlineRenderTick(dt: number) {
if (this.mod !== ActuatorModel.Offline) {
return;
}
if (this.offlineCurrentFrame >= this.offlineAllFrame) {
return this.endOfflineRender();
}
// 更新模型
this.model.update(dt);
// 录制
this.recordClip?.record(dt);
// 限制更新频率
if (this.offlineCurrentFrame % 10 === 0) {
this.emit("offline", dt);
}
this.offlineCurrentFrame++
if (this.offlineCurrentFrame <= this.offlineAllFrame) {
// 下一个 tick
this.offlineRenderTickTimer = setTimeout(() => this.offlineRenderTick(dt)) as any;
} else {
this.endOfflineRender();
}
}
/**
* 离线渲染
*/
public offlineRender(clip: Clip, time: number, fps: number) {
// 记录录制片段
this.recordClip = clip;
clip.isRecording = true;
// 如果仿真正在进行,停止仿真
if (this.start()) this.start(false);
// 如果正在录制,阻止
if (this.mod === ActuatorModel.Record || this.mod === ActuatorModel.Offline) {
return;
}
// 如果正在播放,暂停播放
if (this.mod === ActuatorModel.Play) {
this.pausePlay();
}
// 设置状态
this.mod = ActuatorModel.Offline;
// 计算帧数
this.offlineCurrentFrame = 0;
this.offlineAllFrame = Math.round(time * fps) - 1;
let dt = time / this.offlineAllFrame;
// 第一帧渲染
clip.record(0);
// 开启时钟
this.offlineRenderTick(dt);
this.emit("record", dt);
}
/**
* 播放时钟
*/
private playTicker() {
if (this.playClip && this.playFrame && this.mod === ActuatorModel.Play) {
// 播放当前帧
this.playClip.play(this.playFrame);
// 没有完成播放,继续播放
if (!this.isPlayEnd()) {
// 跳转值下一帧
this.playFrameId ++;
this.playFrame = this.playClip.frames[this.playFrameId];
this.emit("record", this.playFrame.duration);
// 清除计时器,保证时钟唯一性
clearTimeout(this.playTickerTimer);
// 延时
this.playTickerTimer = setTimeout(() => {
this.playTicker();
}, this.playFrame.duration * 1000) as any;
} else {
this.pausePlay();
}
} else {
this.pausePlay();
}
}
private ticker(t: number) { private ticker(t: number) {
if (this.startFlag && t !== 0) { if (this.startFlag && t !== 0) {
if (this.lastTime === 0) { if (this.lastTime === 0) {
@@ -72,13 +385,31 @@ class Actuator extends Emitter<IActuatorEvent> {
} else { } else {
this.alignTimer += durTime; this.alignTimer += durTime;
if (this.alignTimer > (1 / this.fps)) { if (this.alignTimer > (1 / this.fps)) {
// 更新模型
this.model.update(this.alignTimer * this.speed); this.model.update(this.alignTimer * this.speed);
// 绘制模型
this.model.draw();
// 录制模型
if (
this.mod === ActuatorModel.Record ||
this.mod === ActuatorModel.Offline
) {
this.recordClip?.record(this.alignTimer * this.speed);
this.emit("record", this.alignTimer);
}
this.emit("loop", this.alignTimer); this.emit("loop", this.alignTimer);
this.emit("modelUpdate");
this.alignTimer = 0; this.alignTimer = 0;
} }
} }
} }
} else { }
else {
this.emit("loop", Infinity); this.emit("loop", Infinity);
} }
} }
@@ -122,4 +453,4 @@ class Actuator extends Emitter<IActuatorEvent> {
} }
} }
export { Actuator } export { Actuator, ActuatorModel }
+33 -10
View File
@@ -8,6 +8,7 @@ import { IArchiveIndividual, Individual } from "@Model/Individual";
import { Behavior, IArchiveBehavior } from "@Model/Behavior"; import { Behavior, IArchiveBehavior } from "@Model/Behavior";
import { getBehaviorById } from "@Behavior/Behavior"; import { getBehaviorById } from "@Behavior/Behavior";
import { IArchiveParseFn, IObjectParamArchiveType, IRealObjectType } from "@Model/Parameter"; import { IArchiveParseFn, IObjectParamArchiveType, IRealObjectType } from "@Model/Parameter";
import { Clip, IArchiveClip } from "@Model/Clip";
interface IArchiveEvent { interface IArchiveEvent {
fileSave: Archive; fileSave: Archive;
@@ -20,6 +21,7 @@ interface IArchiveObject {
objectPool: IArchiveCtrlObject[]; objectPool: IArchiveCtrlObject[];
labelPool: IArchiveLabel[]; labelPool: IArchiveLabel[];
behaviorPool: IArchiveBehavior[]; behaviorPool: IArchiveBehavior[];
clipPool: IArchiveClip[];
} }
class Archive extends Emitter<IArchiveEvent> { class Archive extends Emitter<IArchiveEvent> {
@@ -51,7 +53,7 @@ class Archive extends Emitter<IArchiveEvent> {
// 存贮 CtrlObject // 存贮 CtrlObject
const objectPool: IArchiveCtrlObject[] = []; const objectPool: IArchiveCtrlObject[] = [];
model.objectPool.forEach(obj => { model.objectPool?.forEach(obj => {
let archiveObject = obj.toArchive(); let archiveObject = obj.toArchive();
// 处理每个群的个体 // 处理每个群的个体
@@ -60,7 +62,7 @@ class Archive extends Emitter<IArchiveEvent> {
const group: Group = obj as Group; const group: Group = obj as Group;
const individuals: IArchiveIndividual[] = []; const individuals: IArchiveIndividual[] = [];
group.individuals.forEach((item) => { group.individuals?.forEach((item) => {
individuals.push(item.toArchive()); individuals.push(item.toArchive());
}); });
@@ -72,22 +74,29 @@ class Archive extends Emitter<IArchiveEvent> {
// 存储 Label // 存储 Label
const labelPool: IArchiveLabel[] = []; const labelPool: IArchiveLabel[] = [];
model.labelPool.forEach(obj => { model.labelPool?.forEach(obj => {
labelPool.push(obj.toArchive()); labelPool.push(obj.toArchive());
}); });
// 存储全部行为 // 存储全部行为
const behaviorPool: IArchiveBehavior[] = []; const behaviorPool: IArchiveBehavior[] = [];
model.behaviorPool.forEach(obj => { model.behaviorPool?.forEach(obj => {
behaviorPool.push(obj.toArchive()); behaviorPool.push(obj.toArchive());
}); });
// 存储全部剪辑片段
const clipPool: IArchiveClip[] = [];
model.clipPool?.forEach(obj => {
clipPool.push(obj.toArchive());
});
// 生成存档对象 // 生成存档对象
const fileData: IArchiveObject = { const fileData: IArchiveObject = {
nextIndividualId: model.nextIndividualId, nextIndividualId: model.nextIndividualId,
objectPool: objectPool, objectPool: objectPool,
labelPool: labelPool, labelPool: labelPool,
behaviorPool: behaviorPool behaviorPool: behaviorPool,
clipPool: clipPool
}; };
return JSON.stringify(fileData); return JSON.stringify(fileData);
@@ -105,7 +114,7 @@ class Archive extends Emitter<IArchiveEvent> {
// 实例化全部对象 // 实例化全部对象
const objectPool: CtrlObject[] = []; const objectPool: CtrlObject[] = [];
const individualPool: Individual[] = []; const individualPool: Individual[] = [];
archive.objectPool.forEach((obj) => { archive.objectPool?.forEach((obj) => {
let ctrlObject: CtrlObject | undefined = undefined; let ctrlObject: CtrlObject | undefined = undefined;
@@ -116,7 +125,7 @@ class Archive extends Emitter<IArchiveEvent> {
// 实例化全部个体 // 实例化全部个体
const individuals: Array<Individual> = []; const individuals: Array<Individual> = [];
archiveGroup.individuals.forEach((item) => { archiveGroup.individuals?.forEach((item) => {
const newIndividual = new Individual(newGroup); const newIndividual = new Individual(newGroup);
newIndividual.id = item.id; newIndividual.id = item.id;
individuals.push(newIndividual); individuals.push(newIndividual);
@@ -140,7 +149,7 @@ class Archive extends Emitter<IArchiveEvent> {
// 实例化全部标签 // 实例化全部标签
const labelPool: Label[] = []; const labelPool: Label[] = [];
archive.labelPool.forEach((item) => { archive.labelPool?.forEach((item) => {
const newLabel = new Label(model); const newLabel = new Label(model);
newLabel.id = item.id; newLabel.id = item.id;
labelPool.push(newLabel); labelPool.push(newLabel);
@@ -148,13 +157,21 @@ class Archive extends Emitter<IArchiveEvent> {
// 实例化全部行为 // 实例化全部行为
const behaviorPool: Behavior[] = []; const behaviorPool: Behavior[] = [];
archive.behaviorPool.forEach((item) => { archive.behaviorPool?.forEach((item) => {
const recorder = getBehaviorById(item.behaviorId); const recorder = getBehaviorById(item.behaviorId);
const newBehavior = recorder.new(); const newBehavior = recorder.new();
newBehavior.id = item.id; newBehavior.id = item.id;
behaviorPool.push(newBehavior); behaviorPool.push(newBehavior);
}); });
// 实例化全部剪辑
const clipPool: Clip[] = [];
archive.clipPool?.forEach((item) => {
const newClip = new Clip(model);
newClip.id = item.id;
clipPool.push(newClip);
});
// 内置标签集合 // 内置标签集合
const buildInLabel = [model.allGroupLabel, model.allRangeLabel, model.currentGroupLabel] const buildInLabel = [model.allGroupLabel, model.allRangeLabel, model.currentGroupLabel]
@@ -238,6 +255,12 @@ class Archive extends Emitter<IArchiveEvent> {
item.fromArchive(archive.behaviorPool[index], parseFunction); item.fromArchive(archive.behaviorPool[index], parseFunction);
return item; return item;
}); });
// 加载剪辑
model.clipPool = clipPool.map((item, index) => {
item.fromArchive(archive.clipPool[index], parseFunction);
return item;
});
} }
/** /**
@@ -278,4 +301,4 @@ class Archive extends Emitter<IArchiveEvent> {
} }
} }
export { Archive }; export { Archive, IArchiveObject };
+456
View File
@@ -0,0 +1,456 @@
import { IAnyObject, Model } from "@Model/Model";
import { v4 as uuid } from "uuid";
import { Group } from "@Model/Group";
import { Range } from "@Model/Range";
import { archiveObject2Parameter, IArchiveParseFn, parameter2ArchiveObject } from "@Model/Parameter";
interface IDrawCommand {
type: "points" | "cube";
id: string;
name?: string;
data?: Float32Array;
mapId?: number[];
position?: number[];
radius?: number[];
parameter?: IAnyObject;
}
interface IFrame {
commands: IDrawCommand[];
duration: number;
process: number;
}
interface IArchiveClip {
id: string;
time: number;
name: string;
frames: IFrame[];
}
/**
* 剪辑片段
*/
class Clip {
public id: string;
/**
* 时间
*/
public time: number = 0;
/**
* 用户自定义名称
*/
public name: string = "";
/**
* 模型
*/
public model: Model;
/**
* 全部帧
*/
public frames: IFrame[] = [];
/**
* 是否正在录制
*/
public isRecording: boolean = false;
/**
* 判断两个 RenderParameter 是否相同
*/
public isRenderParameterEqual(p1?: IAnyObject, p2?: IAnyObject, r: boolean = true): boolean {
if ((p1 && !p2) || (!p1 && p2)) {
return false;
}
if (!p1 && !p2) {
return true;
}
for (let key in p1!) {
// 对象递归校验
if (typeof p1[key] === "object" && !Array.isArray(p1[key])) {
if (!(typeof (p2 as any)[key] === "object" && !Array.isArray((p2 as any)[key]))) {
return false;
}
// 递归校验
if (r) {
if (!this.isRenderParameterEqual(p1[key], (p2 as any)[key], false)) {
return false;
}
}
// 浅校验
else {
if (p1[key] !== (p2 as any)[key]) {
return false;
}
}
}
// 数组遍历校验
else if (Array.isArray(p1[key])) {
if (!Array.isArray((p2 as any)[key])) {
return false;
}
for (let j = 0; j < p1[key].length; j++) {
if (p1[key][j] !== (p2 as any)[key][j]) {
return false;
}
}
}
// 数值直接校验
else if (p1[key] !== (p2 as any)[key]) {
return false;
}
}
return true;
}
public cloneRenderParameter(p?: IAnyObject, res: IAnyObject = {}, r: boolean = true): IAnyObject | undefined {
if (!p) return undefined;
for (let key in p) {
// 对象递归克隆
if (typeof p[key] === "object" && !Array.isArray(p[key]) && r) {
this.cloneRenderParameter(p[key], res, false);
}
// 数组克隆
else if (Array.isArray(p[key])) {
(res as any)[key] = p[key].concat([]);
}
// 数值克隆
else {
(res as any)[key] = p[key];
}
}
return res;
}
public isArrayEqual(a1?: Array<number | string>, a2?: Array<number | string>): boolean {
if ((a1 && !a2) || (!a1 && a2)) {
return false;
}
if (!a1 && !a2) {
return true;
}
for (let i = 0; i < a1!.length; i++) {
if (a1![i] !== a2![i]) {
return false;
}
}
return true;
}
/**
* 从上一帧获取指令数据
*/
public getCommandFromLastFrame(type: IDrawCommand["type"], id: string, frame?: IFrame): IDrawCommand | undefined {
let lastCommand: IDrawCommand[] = (frame ?? this.frames[this.frames.length - 1])?.commands;
if (lastCommand) {
for (let i = 0; i < lastCommand.length; i++) {
if (type === lastCommand[i].type && id === lastCommand[i].id) {
return lastCommand[i];
}
}
}
return undefined;
}
/**
* ID 映射
*/
private sorterIdMapper: Map<string, number> = new Map();
private sorterIdMapperNextId: number = 1;
/**
* 获取映射ID
*/
private getMapperId = (id: string): number => {
let mapperId = this.sorterIdMapper.get(id);
if (mapperId === undefined) {
mapperId = this.sorterIdMapperNextId ++;
this.sorterIdMapper.set(id, mapperId);
return mapperId;
} else {
return mapperId;
}
}
/**
* 录制一帧
*/
public record(t: number): IFrame {
const commands: IDrawCommand[] = [];
for (let i = 0; i < this.model.objectPool.length; i++) {
let object = this.model.objectPool[i];
object.renderParameter.color = object.color;
if (object.display && object instanceof Group) {
// 获取上一帧指令
const lastCommand = this.getCommandFromLastFrame("points", object.id);
// 记录
const dataBuffer = object.exportPositionId(this.getMapperId);
const recodeData: IDrawCommand = {
type: "points",
id: object.id,
name: object.displayName,
data: dataBuffer[0]
}
// 对比校验
if (this.isRenderParameterEqual(object.renderParameter, lastCommand?.parameter)) {
recodeData.parameter = lastCommand?.parameter;
} else {
recodeData.parameter = this.cloneRenderParameter(object.renderParameter);
}
if (this.isArrayEqual(dataBuffer[1], lastCommand?.mapId)) {
recodeData.mapId = lastCommand?.mapId;
} else {
recodeData.mapId = dataBuffer[1];
}
commands.push(recodeData);
}
if (object.display && object instanceof Range) {
// 获取上一帧指令
const lastCommand = this.getCommandFromLastFrame("cube", object.id);
// 记录
const recodeData: IDrawCommand = {
type: "cube",
id: object.id,
name: object.displayName
}
// 释放上一帧的内存
if (this.isArrayEqual(object.position, lastCommand?.position)) {
recodeData.position = lastCommand?.position;
} else {
recodeData.position = object.position.concat([]);
}
if (this.isArrayEqual(object.radius, lastCommand?.radius)) {
recodeData.radius = lastCommand?.radius;
} else {
recodeData.radius = object.radius.concat([]);
}
if (this.isRenderParameterEqual(object.renderParameter, lastCommand?.parameter)) {
recodeData.parameter = lastCommand?.parameter;
} else {
recodeData.parameter = this.cloneRenderParameter(object.renderParameter);
}
commands.push(recodeData);
}
}
const dt = this.frames.length <= 0 ? 0 : t;
this.time += dt;
const frame: IFrame = {
commands: commands,
duration: dt,
process: this.time
};
this.frames.push(frame);
return frame;
}
public readonly LastFrameData: "@" = "@";
/**
* 压缩帧数据
*/
public compressed(): IFrame[] {
const resFrame: IFrame[] = [];
for (let i = 0; i < this.frames.length; i++) {
const commands = this.frames[i].commands;
const res: IDrawCommand[] = [];
// 处理指令
for (let j = 0; j < commands.length; j++) {
// 压缩指令
const command: IDrawCommand = {
id: commands[j].id,
type: commands[j].type
};
// 搜索上一帧相同指令
const lastCommand = this.frames[i - 1] ?
this.getCommandFromLastFrame(command.type, command.id, this.frames[i - 1]) :
undefined;
// 记录
command.name = (lastCommand?.name === commands[j].name) ?
this.LastFrameData as any : commands[j].name;
command.data = (lastCommand?.data === commands[j].data) ?
this.LastFrameData as any : Array.from(commands[j].data ?? []);
command.mapId = (lastCommand?.mapId === commands[j].mapId) ?
this.LastFrameData as any : commands[j].mapId;
command.position = (lastCommand?.position === commands[j].position) ?
this.LastFrameData as any : commands[j].position?.concat([]);
command.radius = (lastCommand?.radius === commands[j].radius) ?
this.LastFrameData as any : commands[j].radius?.concat([]);
command.parameter = (lastCommand?.parameter === commands[j].parameter) ?
this.LastFrameData as any : parameter2ArchiveObject(commands[j].parameter as any);
res.push(command);
}
resFrame.push({
duration: this.frames[i].duration,
process: this.frames[i].process,
commands: res
})
}
return resFrame;
};
/**
* 加载压缩帧数据
*/
public uncompressed(frames: IFrame[], paster: IArchiveParseFn): IFrame[] {
const resFrame: IFrame[] = [];
for (let i = 0; i < frames.length; i++) {
const commands = frames[i].commands;
const res: IDrawCommand[] = [];
// 处理指令
for (let j = 0; j < commands.length; j++) {
// 压缩指令
const command: IDrawCommand = {
id: commands[j].id,
type: commands[j].type
};
// 搜索上一帧相同指令
const lastCommand = resFrame[resFrame.length - 1] ?
this.getCommandFromLastFrame(command.type, command.id, resFrame[resFrame.length - 1]) :
undefined;
// 记录
command.name = (this.LastFrameData as any === commands[j].name) ?
lastCommand?.name : commands[j].name;
command.data = (this.LastFrameData as any === commands[j].data) ?
lastCommand?.data : new Float32Array(commands[j].data ?? []);
command.mapId = (this.LastFrameData as any === commands[j].mapId) ?
lastCommand?.mapId : commands[j].mapId;
command.position = (this.LastFrameData as any === commands[j].position) ?
lastCommand?.position : commands[j].position;
command.radius = (this.LastFrameData as any === commands[j].radius) ?
lastCommand?.radius : commands[j].radius;
command.parameter = (this.LastFrameData as any === commands[j].parameter) ?
lastCommand?.parameter : archiveObject2Parameter(commands[j].parameter as any, paster);
res.push(command);
}
resFrame.push({
duration: frames[i].duration,
process: frames[i].process,
commands: res
})
}
return resFrame;
}
/**
* 播放一帧
*/
public play(frame: IFrame) {
// 清除全部渲染状态
this.model.renderer.clean();
// 执行全部渲染指令
for (let i = 0; i < frame.commands.length; i++) {
const command: IDrawCommand = frame.commands[i];
if (command.type === "cube") {
this.model.renderer.cube(command.id, command.position, command.radius, command.parameter);
}
else if (frame.commands[i].type === "points") {
this.model.renderer.points(command.id, command.data, command.parameter);
}
}
}
public equal(clip?: Clip) {
return clip === this || clip?.id === this.id;
}
public constructor(model: Model) {
this.model = model;
this.id = uuid();
}
public toArchive(): IArchiveClip {
return {
id: this.id,
time: this.time,
name: this.name,
frames: this.compressed()
};
}
public fromArchive(archive: IArchiveClip, paster: IArchiveParseFn): void {
this.id = archive.id,
this.time = archive.time,
this.name = archive.name,
this.frames = this.uncompressed(archive.frames, paster);
}
}
export { Clip, IFrame, IArchiveClip };
+16
View File
@@ -428,6 +428,22 @@ class Group extends CtrlObject<IArchiveGroup> {
return dataBuffer; return dataBuffer;
} }
/**
* 导出个体id列表
*/
public exportPositionId(idMapper: (id: string) => number ): [Float32Array, number[]] {
let bi = 0; let ii = 0;
let dataBuffer = new Float32Array(this.individuals.size * 3);
let idBUffer: number[] = new Array(this.individuals.size).fill("");
this.individuals.forEach((individual) => {
idBUffer[ii ++] = idMapper(individual.id);
dataBuffer[bi ++] = individual.position[0];
dataBuffer[bi ++] = individual.position[1];
dataBuffer[bi ++] = individual.position[2];
});
return [dataBuffer, idBUffer];
}
public override toArchive(): IArchiveCtrlObject & IArchiveGroup { public override toArchive(): IArchiveCtrlObject & IArchiveGroup {
return { return {
...super.toArchive(), ...super.toArchive(),
+55 -2
View File
@@ -5,6 +5,7 @@ import { IParamValue } from "@Model/Parameter";
import { CtrlObject } from "@Model/CtrlObject"; import { CtrlObject } from "@Model/CtrlObject";
import { Emitter } from "@Model/Emitter"; import { Emitter } from "@Model/Emitter";
import { AbstractRenderer } from "@Model/Renderer"; import { AbstractRenderer } from "@Model/Renderer";
import { Clip } from "@Model/Clip";
import { Behavior, IAnyBehavior, IAnyBehaviorRecorder } from "@Model/Behavior"; import { Behavior, IAnyBehavior, IAnyBehaviorRecorder } from "@Model/Behavior";
/** /**
@@ -22,6 +23,7 @@ type ModelEvent = {
objectChange: CtrlObject[]; objectChange: CtrlObject[];
individualChange: Group; individualChange: Group;
behaviorChange: IAnyBehavior; behaviorChange: IAnyBehavior;
clipChange: Clip[];
}; };
/** /**
@@ -330,6 +332,59 @@ class Model extends Emitter<ModelEvent> {
} }
} }
/**
* 剪辑数据
*/
public clipPool: Clip[] = [];
/**
* 新建剪辑片段
*/
public addClip(name?: string): Clip {
let newClip = new Clip(this);
newClip.name = name ?? "";
this.clipPool.push(newClip);
console.log(`Model: Create clip ${name ?? newClip.id}`);
this.emit("clipChange", this.clipPool);
return newClip;
}
public getClipById(id: ObjectID): Clip | undefined {
for (let i = 0; i < this.clipPool.length; i++) {
if (this.clipPool[i].id.toString() === id.toString()) {
return this.clipPool[i];
}
}
}
/**
* 删除一个剪辑片段
*/
public deleteClip(name: ObjectID | Clip) {
let deletedClip: Clip | undefined;
let index = 0;
for (let i = 0; i < this.clipPool.length; i++) {
if (name instanceof Clip) {
if (this.clipPool[i].equal(name)) {
deletedClip = this.clipPool[i];
index = i;
}
}
else if (name === this.clipPool[i].id) {
deletedClip = this.clipPool[i];
index = i;
}
}
if (deletedClip) {
this.clipPool.splice(index, 1);
console.log(`Model: Delete clip ${deletedClip.name ?? deletedClip.id}`);
this.emit("clipChange", this.clipPool);
}
}
/** /**
* 渲染器 * 渲染器
*/ */
@@ -372,8 +427,6 @@ class Model extends Emitter<ModelEvent> {
object.runner(t, "finalEffect"); object.runner(t, "finalEffect");
} }
} }
this.draw();
} }
public draw() { public draw() {
@@ -64,7 +64,7 @@ class SimulatorDesktop extends Component {
items: [ items: [
{panels: ["RenderView"]}, {panels: ["RenderView"]},
{ {
items: [{panels: ["BehaviorList"]}, {panels: ["LabelList"]}], items: [{panels: ["BehaviorList", "ClipPlayer"]}, {panels: ["LabelList"]}],
scale: 80, scale: 80,
layout: LayoutDirection.X layout: LayoutDirection.X
} }
@@ -74,9 +74,9 @@ class SimulatorDesktop extends Component {
}, },
{ {
items: [{ items: [{
panels: ["ObjectList"] panels: ["ObjectList", "Statistics"]
}, { }, {
panels: ["GroupDetails", "RangeDetails", "LabelDetails", "BehaviorDetails"] panels: ["GroupDetails", "RangeDetails", "LabelDetails", "BehaviorDetails", "ClipDetails"]
}], }],
scale: 30, scale: 30,
layout: LayoutDirection.Y layout: LayoutDirection.Y
+3 -3
View File
@@ -55,7 +55,7 @@ class SimulatorWeb extends Component {
items: [ items: [
{panels: ["RenderView"]}, {panels: ["RenderView"]},
{ {
items: [{panels: ["BehaviorList"]}, {panels: ["LabelList"]}], items: [{panels: ["BehaviorList", "ClipPlayer"]}, {panels: ["LabelList"]}],
scale: 80, scale: 80,
layout: LayoutDirection.X layout: LayoutDirection.X
} }
@@ -65,9 +65,9 @@ class SimulatorWeb extends Component {
}, },
{ {
items: [{ items: [{
panels: ["ObjectList"] panels: ["ObjectList", "Statistics"]
}, { }, {
panels: ["GroupDetails", "RangeDetails", "LabelDetails", "BehaviorDetails"] panels: ["GroupDetails", "RangeDetails", "LabelDetails", "BehaviorDetails", "ClipDetails"]
}], }],
scale: 30, scale: 30,
layout: LayoutDirection.Y layout: LayoutDirection.Y
+60
View File
@@ -0,0 +1,60 @@
import { Component, ReactNode } from "react";
import { useStatusWithEvent, IMixinStatusProps } from "@Context/Status";
import { TogglesInput } from "@Input/TogglesInput/TogglesInput";
import { ConfirmPopup } from "@Component/ConfirmPopup/ConfirmPopup";
import { AttrInput } from "@Input/AttrInput/AttrInput";
import { Message } from "@Input/Message/Message";
import { Clip } from "@Model/Clip";
import "./ClipDetails.scss";
@useStatusWithEvent("focusClipChange", "clipAttrChange")
class ClipDetails extends Component<IMixinStatusProps> {
private renderFrom(clip: Clip) {
return <>
<Message i18nKey="Common.Attr.Title.Basic" isTitle first/>
<AttrInput
keyI18n="Common.Attr.Key.Display.Name"
maxLength={15}
value={clip.name}
valueChange={(value) => {
if (this.props.status) {
this.props.status.changeClipAttrib(clip.id, "name", value);
}
}}
/>
<TogglesInput
keyI18n="Common.Attr.Key.Delete" onIconName="delete" red
offIconName="delete" valueChange={() => {
const status = this.props.status;
if (status) {
status.popup.showPopup(ConfirmPopup, {
infoI18n: "Popup.Delete.Clip.Confirm",
titleI18N: "Popup.Action.Objects.Confirm.Title",
yesI18n: "Popup.Action.Objects.Confirm.Delete",
red: "yes",
yes: () => {
status.setClipObject();
this.props.status?.actuator.endPlay();
status.model.deleteClip(clip.id);
}
});
}
}}
/>
</>;
}
public render(): ReactNode {
if (this.props.status && this.props.status.focusClip) {
return this.renderFrom(this.props.status.focusClip);
}
return <Message i18nKey="Panel.Info.Clip.Details.Error.Nodata"/>;
}
}
export { ClipDetails };
+6
View File
@@ -0,0 +1,6 @@
div.Clip-player-clip-list-root {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 10px;
}
+97
View File
@@ -0,0 +1,97 @@
import { Component, ReactNode } from "react";
import { ClipList } from "@Component/ClipList/ClipList";
import { useStatusWithEvent, IMixinStatusProps } from "@Context/Status";
import { useSetting, IMixinSettingProps } from "@Context/Setting";
import { BackgroundLevel, FontLevel, Theme } from "@Component/Theme/Theme";
import { Message } from "@Input/Message/Message";
import { Clip } from "@Model/Clip";
import { ActuatorModel } from "@Model/Actuator";
import { ConfirmPopup } from "@Component/ConfirmPopup/ConfirmPopup";
import { OfflineRender } from "@Component/OfflineRender/OfflineRender"
import "./ClipPlayer.scss";
@useSetting
@useStatusWithEvent("clipChange", "focusClipChange", "actuatorStartChange", "clipAttrChange")
class ClipPlayer extends Component<IMixinStatusProps & IMixinSettingProps> {
private isInnerClick: boolean = false;
private renderMessage(): ReactNode {
return <Message i18nKey="Panel.Info.Clip.List.Error.Nodata"/>;
}
private isClipListDisable() {
return !this.props.status?.focusClip &&
(
this.props.status?.actuator.mod === ActuatorModel.Record ||
this.props.status?.actuator.mod === ActuatorModel.Offline
);
}
private renderClipList(clipList: Clip[]): ReactNode {
return <ClipList
focus={this.props.status?.focusClip}
clips={clipList}
disable={this.isClipListDisable()}
delete={(clip) => {
this.isInnerClick = true;
const status = this.props.status;
if (status) {
status.popup.showPopup(ConfirmPopup, {
infoI18n: "Popup.Delete.Clip.Confirm",
titleI18N: "Popup.Action.Objects.Confirm.Title",
yesI18n: "Popup.Action.Objects.Confirm.Delete",
red: "yes",
yes: () => {
status.setClipObject();
this.props.status?.actuator.endPlay();
status.model.deleteClip(clip.id);
}
});
}
}}
add={() => {
this.isInnerClick = true;
this.props.status?.popup.showPopup(OfflineRender, {});
}}
click={(clip) => {
this.isInnerClick = true;
this.props.status?.setClipObject(clip);
this.props.status?.actuator.startPlay(clip);
this.props.setting?.layout.focus("ClipDetails");
}}
/>;
}
public render(): ReactNode {
const clipList = this.props.status?.model.clipPool ?? [];
return <Theme
className="Clip-player-clip-list-root"
fontLevel={FontLevel.normal}
backgroundLevel={BackgroundLevel.Level4}
onClick={()=>{
// 拦截禁用状态的事件
if (this.isClipListDisable()) {
return;
}
if (this.isInnerClick) {
this.isInnerClick = false;
}
else {
this.props.status?.setClipObject();
this.props.status?.actuator.endPlay();
}
}}
>
{ clipList.length > 0 ? null : this.renderMessage() }
{ this.renderClipList(clipList) }
</Theme>;
}
}
export { ClipPlayer };
+103
View File
@@ -0,0 +1,103 @@
import { Component, ReactNode } from "react";
import { useStatusWithEvent, IMixinStatusProps } from "@Context/Status";
import { Recorder } from "@Component/Recorder/Recorder";
import { ActuatorModel } from "@Model/Actuator";
@useStatusWithEvent("actuatorStartChange", "focusClipChange", "recordLoop", "clipAttrChange")
class ClipRecorder extends Component<IMixinStatusProps> {
public render(): ReactNode {
let mod: "P" | "R" = this.props.status?.focusClip ? "P" : "R";
let runner: boolean = false;
let currentTime: number | undefined = 0;
let allTime: number | undefined = 0;
let name: string | undefined;
let currentFrame: number | undefined = 0;
let allFrame: number | undefined = 0;
let fps: number | undefined = 0;
// 是否开始录制
if (mod === "R") {
// 是否正在录制
runner = this.props.status?.actuator.mod === ActuatorModel.Record ||
this.props.status?.actuator.mod === ActuatorModel.Offline;
currentTime = this.props.status?.actuator.recordClip?.time ?? 0;
name = this.props.status?.actuator.recordClip?.name;
}
else if (mod === "P") {
// 是否正在播放
runner = this.props.status?.actuator.mod === ActuatorModel.Play;
name = this.props.status?.focusClip?.name;
allTime = this.props.status?.focusClip?.time;
allFrame = this.props.status?.focusClip?.frames.length;
currentFrame = this.props.status?.actuator.playFrameId;
currentTime = this.props.status?.actuator.playFrame?.process;
if (allFrame !== undefined) {
allFrame --;
}
if (allTime !== undefined && allFrame !== undefined) {
fps = Math.round(allFrame / allTime);
}
}
return <Recorder
name={name}
currentTime={currentTime}
allTime={allTime}
currentFrame={currentFrame}
allFrame={allFrame}
mode={mod}
running={runner}
fps={fps}
action={() => {
// 开启录制
if (mod === "R" && !runner) {
// 获取新实例
let newClip = this.props.status?.newClip();
// 开启录制时钟
this.props.status?.actuator.startRecord(newClip!);
console.log("ClipRecorder: Rec start...");
}
// 暂停录制
if (mod === "R" && runner) {
// 暂停录制时钟
this.props.status?.actuator.endRecord();
console.log("ClipRecorder: Rec end...");
}
// 开始播放
if (mod === "P" && !runner) {
// 启动播放时钟
this.props.status?.actuator.playing();
console.log("ClipRecorder: Play start...");
}
// 暂停播放
if (mod === "P" && runner) {
// 启动播放时钟
this.props.status?.actuator.pausePlay();
console.log("ClipRecorder: Pause play...");
}
}}
valueChange={(value) => {
this.props.status?.actuator.setPlayProcess(value);
}}
/>
}
}
export { ClipRecorder };
+19
View File
@@ -10,6 +10,10 @@ import { LabelDetails } from "@Panel/LabelDetails/LabelDetails";
import { GroupDetails } from "@Panel/GroupDetails/GroupDetails"; import { GroupDetails } from "@Panel/GroupDetails/GroupDetails";
import { BehaviorList } from "@Panel/BehaviorList/BehaviorList"; import { BehaviorList } from "@Panel/BehaviorList/BehaviorList";
import { BehaviorDetails } from "@Panel/BehaviorDetails/BehaviorDetails"; import { BehaviorDetails } from "@Panel/BehaviorDetails/BehaviorDetails";
import { ClipPlayer } from "@Panel/ClipPlayer/ClipPlayer";
import { ClipRecorder } from "@Panel/ClipPlayer/ClipRecorder";
import { ClipDetails } from "@Panel/ClipDetails/ClipDetails";
import { Statistics } from "@Panel/Statistics/Statistics";
interface IPanelInfo { interface IPanelInfo {
nameKey: string; nameKey: string;
@@ -31,6 +35,9 @@ type PanelId = ""
| "GroupDetails" // 群属性 | "GroupDetails" // 群属性
| "BehaviorList" // 行为列表 | "BehaviorList" // 行为列表
| "BehaviorDetails" // 行为属性 | "BehaviorDetails" // 行为属性
| "ClipPlayer" // 剪辑影片
| "ClipDetails" // 剪辑详情
| "Statistics" // 统计信息
; ;
const PanelInfoMap = new Map<PanelId, IPanelInfo>(); const PanelInfoMap = new Map<PanelId, IPanelInfo>();
@@ -66,6 +73,18 @@ PanelInfoMap.set("BehaviorDetails", {
nameKey: "Panel.Title.Behavior.Details.View", introKay: "Panel.Info.Behavior.Details.View", nameKey: "Panel.Title.Behavior.Details.View", introKay: "Panel.Info.Behavior.Details.View",
class: BehaviorDetails class: BehaviorDetails
}); });
PanelInfoMap.set("ClipPlayer", {
nameKey: "Panel.Title.Behavior.Clip.Player", introKay: "Panel.Info.Behavior.Clip.Player",
class: ClipPlayer, header: ClipRecorder, hidePadding: true
});
PanelInfoMap.set("ClipDetails", {
nameKey: "Panel.Title.Behavior.Clip.Details", introKay: "Panel.Info.Behavior.Clip.Details",
class: ClipDetails
});
PanelInfoMap.set("Statistics", {
nameKey: "Panel.Title.Statistics", introKay: "Panel.Info.Statistics",
class: Statistics
});
function getPanelById(panelId: PanelId): ReactNode { function getPanelById(panelId: PanelId): ReactNode {
switch (panelId) { switch (panelId) {
+63
View File
@@ -0,0 +1,63 @@
@import "../../Component/Theme/Theme.scss";
div.statistics-panel {
width: 100%;
height: 100%;
min-height: 100%;
div.statistics-chart {
box-sizing: border-box;
padding-top: 10px;
max-width: 400px;
min-height: 100%;
height: 100%;
width: 100%;
}
div.statistics-switch {
width: 100%;
height: 0;
display: flex;
justify-content: flex-end;
div.switch-button {
width: 24px;
height: 24px;
position: relative;
user-select: none;
right: -10px;
top: -2px;
border-radius: 3px;
cursor: pointer;
display: flex;
justify-content: center;
align-items: center;
}
}
}
div.statistics-panel.dark {
div.switch-button {
background-color: $lt-bg-color-lvl2-dark;
color: $lt-font-color-lvl2-dark;
}
div.switch-button:hover {
background-color: $lt-bg-color-lvl1-dark;
color: $lt-font-color-lvl1-dark;
}
}
div.statistics-panel.light {
div.switch-button {
background-color: $lt-bg-color-lvl2-light;
color: $lt-font-color-lvl2-light;
}
div.switch-button:hover {
background-color: $lt-bg-color-lvl1-light;
color: $lt-font-color-lvl1-light;
}
}
+303
View File
@@ -0,0 +1,303 @@
import { Component, ReactNode } from "react";
import { useStatusWithEvent, IMixinStatusProps } from "@Context/Status";
import { useSettingWithEvent, IMixinSettingProps, Themes } from "@Context/Setting";
import {
Chart as ChartJS, CategoryScale, LinearScale,
BarElement, Tooltip, Legend, Decimation,
PointElement, LineElement, Title
} from 'chart.js';
import { Bar, Line } from 'react-chartjs-2';
import { Theme } from "@Component/Theme/Theme";
import { Icon } from "@fluentui/react";
import { IAnyObject, Model } from "@Model/Model";
import { Group } from "@Model/Group";
import { ActuatorModel } from "@Model/Actuator";
import { Message } from "@Input/Message/Message";
import { Clip, IFrame } from "@Model/Clip";
import "./Statistics.scss";
ChartJS.register(
CategoryScale,
LinearScale,
BarElement,
Tooltip,
Legend,
PointElement,
LineElement,
Title,
Decimation
);
interface IStatisticsProps {
}
@useSettingWithEvent("themes", "language", "lineChartType")
@useStatusWithEvent("focusClipChange", "actuatorStartChange", "fileLoad", "modelUpdate", "recordLoop", "individualChange")
class Statistics extends Component<IStatisticsProps & IMixinStatusProps & IMixinSettingProps> {
public barDarkOption = {
responsive: true,
maintainAspectRatio: false,
plugins: { legend: {
position: 'bottom' as const,
labels: { boxWidth: 10, boxHeight: 10, color: 'rgba(255, 255, 255, .5)' }
}},
scales: {
x: { grid: { color: 'rgba(255, 255, 255, .2)' }, title: { color: 'rgba(255, 255, 255, .5)'} },
y: { grid: { color: 'rgba(255, 255, 255, .2)', borderDash: [3, 3] }, title: { color: 'rgba(255, 255, 255, .5)'} }
}
};
public barLightOption = {
responsive: true,
maintainAspectRatio: false,
plugins: { legend: {
position: 'bottom' as const,
labels: { boxWidth: 10, boxHeight: 10, color: 'rgba(0, 0, 0, .5)' }
}},
scales: {
x: { grid: { color: 'rgba(0, 0, 0, .2)' }, title: { color: 'rgba(0, 0, 0, .5)'} },
y: { grid: { color: 'rgba(0, 0, 0, .2)', borderDash: [3, 3] }, title: { color: 'rgba(0, 0, 0, .5)'} }
}
};
private modelBarChart(model: Model, theme: boolean) {
const datasets: any[] = [];
const labels: any[] = ["Group"];
// 收集数据
model.objectPool.forEach((obj) => {
let label = obj.displayName;
let color = `rgb(${obj.color.map((v) => Math.floor(v * 255)).join(",")})`;
if (obj instanceof Group) {
datasets.push({label, data: [obj.individuals.size], backgroundColor: color});
}
});
if (datasets.length <= 0) {
return <Message i18nKey="Panel.Info.Statistics.Nodata"/>
}
return <Bar
data={{datasets, labels}}
options={theme ? this.barLightOption : this.barDarkOption }
/>
}
private clipBarChart(frame: IFrame, theme: boolean) {
const datasets: any[] = [];
const labels: any[] = ["Group"];
// 收集数据
frame.commands.forEach((command) => {
let label = command.name;
let color = `rgb(${command.parameter?.color.map((v: number) => Math.floor(v * 255)).join(",")})`;
if (command.type === "points") {
datasets.push({label, data: [(command.data?.length ?? 0) / 3], backgroundColor: color});
}
});
if (datasets.length <= 0) {
return <Message i18nKey="Panel.Info.Statistics.Nodata"/>
}
return <Bar
data={{datasets, labels}}
options={ theme ? this.barLightOption : this.barDarkOption }
/>
}
public lineDarkOption = {
responsive: true,
maintainAspectRatio: false,
plugins: {
legend: {
position: 'bottom' as const,
labels: { boxWidth: 10, boxHeight: 10, color: 'rgba(255, 255, 255, .5)' },
decimation: { enabled: true }
},
decimation: { enabled: true, algorithm: "lttb" as const, samples: 100 }
},
scales: {
x: { grid: { color: 'rgba(255, 255, 255, .2)' }, type: "linear", title: { color: 'rgba(255, 255, 255, .5)'} },
y: { grid: { color: 'rgba(255, 255, 255, .2)', borderDash: [3, 3] }, title: { color: 'rgba(255, 255, 255, .5)'} }
}
};
public lineLightOption = {
responsive: true,
maintainAspectRatio: false,
plugins: {
legend: {
position: 'bottom' as const,
labels: { boxWidth: 10, boxHeight: 10, color: 'rgba(0, 0, 0, .5)' },
},
decimation: { enabled: true, algorithm: "lttb" as const, samples: 100 }
},
scales: {
x: { grid: { color: 'rgba(0, 0, 0, .2)' }, title: { color: 'rgba(0, 0, 0, .5)'} },
y: { grid: { color: 'rgba(0, 0, 0, .2)', borderDash: [3, 3] }, title: { color: 'rgba(0, 0, 0, .5)'} }
}
};
private clipLineChart(clip: Clip, theme: boolean) {
type IDataSet = {label: string, data: number[], id: string} & IAnyObject;
const datasets: IDataSet[] = [];
const labels: number[] = [];
let frameLen: number = 0;
let lastDataSet: Map<string, number> | undefined;
let lastProcess: number | undefined;
// 收集数据
clip.frames.forEach((frame) => {
const frameData = new Map<string, number>();
frame.commands.forEach((command) => {
if (command.type !== "points") return;
let findKey: IDataSet | undefined;
for (let i = 0; i < datasets.length; i++) {
if (datasets[i].id === command.id) {
findKey = datasets[i];
break;
}
}
// 记录当前数据
frameData.set(command.id, (command.data?.length ?? 0) / 3);
// 新建数据
if (!findKey) {
const color = `rgb(${command.parameter?.color.map((v: number) => Math.floor(v * 255)).join(",")})`;
findKey = {} as any;
findKey!.label = command.name ?? "";
findKey!.backgroundColor = color;
findKey!.borderColor = color;
findKey!.id = command.id;
findKey!.pointRadius = 0;
findKey!.borderWidth = 1.5;
findKey!.borderCapStyle = "round";
findKey!.borderJoinStyle = "round";
findKey!.pointHitRadius = 8;
// 补充数据
findKey!.data = new Array(frameLen).fill(0);
datasets.push(findKey!);
}
});
// 与上一帧数据进行对比
const isSameData = datasets.every((value: IDataSet) => {
if (value.data[frameLen - 1] === frameData.get(value.id)) {
return true;
} else {
return false;
}
});
lastDataSet = frameData;
lastProcess = frame.process;
// 如果是不同数据 纪录
if (!isSameData) {
datasets.forEach((value: IDataSet) => {
value.data.push(frameData.get(value.id) ?? 0);
});
frameLen ++;
labels.push(frame.process);
}
});
// 记录最后一帧数据
if (lastDataSet && lastProcess !== labels[labels.length - 1]) {
datasets.forEach((value: IDataSet) => {
value.data.push(lastDataSet!.get(value.id) ?? 0);
});
frameLen ++;
labels.push(lastProcess!);
}
if (datasets.length <= 0) {
return <Message i18nKey="Panel.Info.Statistics.Nodata"/>
}
return <Line
options={ theme ? this.lineLightOption : this.lineDarkOption }
data={{labels, datasets }}
/>;
}
private renderChart() {
let themes = this.props.setting?.themes === Themes.light;
let lineChartType = this.props.setting?.lineChartType;
// 播放模式
if (this.props.status?.focusClip) {
if (this.props.status.actuator.playClip && lineChartType) {
return this.clipLineChart(this.props.status.actuator.playClip, themes);
}
if (this.props.status.actuator.playFrame) {
return this.clipBarChart(this.props.status.actuator.playFrame, themes);
}
}
// 正在录制中
else if (
this.props.status?.actuator.mod === ActuatorModel.Record ||
this.props.status?.actuator.mod === ActuatorModel.Offline
) {
if (this.props.status.actuator.recordClip && lineChartType) {
return this.clipLineChart(this.props.status.actuator.recordClip, themes);
}
return this.modelBarChart(this.props.status.model, themes);
}
// 主时钟运行
else if (this.props.status) {
return this.modelBarChart(this.props.status.model, themes);
}
}
public render(): ReactNode {
return <Theme className="statistics-panel">
{
(
this.props.status?.focusClip ||
this.props.status?.actuator.mod === ActuatorModel.Record ||
this.props.status?.actuator.mod === ActuatorModel.Offline
) ?
<div className="statistics-switch">
<div className="switch-button" onClick={() => {
this.props.setting?.setProps("lineChartType", !this.props.setting?.lineChartType);
}}>
<Icon iconName={
this.props.setting?.lineChartType ? "BarChartVertical" : "LineChart"
}/>
</div>
</div>
: null
}
<div className="statistics-chart">
{ this.renderChart() }
</div>
</Theme>;
}
}
export { Statistics };