From 3b06e28a50df252b22890aebd706fa0b61b3c74c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 18 十二月 2021 13:41:52 +0800
Subject: [PATCH] #
---
static/js/object/CrnTask.js | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/static/js/object/CrnTask.js b/static/js/object/CrnTask.js
index d42e511..b85ef13 100644
--- a/static/js/object/CrnTask.js
+++ b/static/js/object/CrnTask.js
@@ -1,3 +1,16 @@
+
+const xOffset = -1735;
+const yOffset = -289;
+const zOffset = -480;
+
+const xOffset0 = -1735;
+const yOffset0 = -108;
+const zOffset0 = -480;
+
+const xOffset1 = -1735;
+const yOffset1 = -107;
+const zOffset1 = -475;
+
// 鍫嗗灈鏈哄綋鍓嶈繍琛岀姸鎬佸璞�
function CrnTask(crnData, object) {
let that = this;
@@ -26,8 +39,6 @@
that.crnFork = null;
let curves = [];
- that.curve = null;
- that.progress = 0;
let init = function () {
that.crnNo = crnData.crnNo;
@@ -46,8 +57,8 @@
init();
that.modify = function (crnData) {
- if (that.run || that.crnNo === 0) {
- console.error(that.crnNo + "鍙峰爢鍨涙満鏇存柊澶辫触");
+ if (that.run || that.crnNo === 0 || that.crnBody===null || that.crnLoad===null || that.crnFork==null) {
+ // console.log(that.crnNo + "鍙峰爢鍨涙満鏇存柊澶辫触");
} else {
if (JSON.stringify(crnData.position) === JSON.stringify(that.position)) {
return;
@@ -134,14 +145,12 @@
])
})
}
+
+ curves.map((value, index) => {
+ console.log(value.part + " --> " + JSON.stringify(value.route.points))
+ });
+
curves[0].start = true;
-
- console.log(curves);
-
- // new Route(); // load
- // console.log(that.curve);
- // console.log("pre" + JSON.stringify(that.prePosition));
- // console.log(JSON.stringify(that.position));
}
}
@@ -161,19 +170,18 @@
}
} else {
let point = curves[i].route.getPoint(curves[i].progress);
- console.log(point)
if ( point && point.x ) {
switch (curves[i].part) {
case 'body':
that.crnBody.position.set(point.x, point.y, point.z);
break
case 'load':
- that.crnBody.position.z = point.z;
- that.crnLoad.position.set(point.x, point.y, point.z);
- that.crnFork.position.set(point.x, point.y, point.z);
+ that.crnBody.position.z = point.z + zOffset;
+ that.crnLoad.position.set(point.x, point.y + yOffset0, point.z + zOffset0);
+ that.crnFork.position.set(point.x, point.y + yOffset1, point.z + zOffset1);
break
case 'fork':
- that.crnFork.position.set(point.x, point.y, point.z);
+ that.crnFork.position.set(point.x + xOffset1, point.y, point.z);
break
default:
break
--
Gitblit v1.9.1