Browse Source

添加备注

tremble 6 years ago
parent
commit
a82cb62ef7
2 changed files with 14 additions and 73 deletions
  1. 4 3
      js/main.js
  2. 10 70
      js/util.js

+ 4 - 3
js/main.js

@@ -116,9 +116,9 @@ var faceArr = [
   [27, 17, 28, 7],
   [28, 18, 29, 8],
   [29, 19, 20, 9],
-  [19, 18, 17, 16, 15, 25, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 14, 13, 12, 11, 10],
-  [25, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4],
-  [5, 6, 7, 8, 9, 0, 1, 2, 3, 4]
+  // [19, 18, 17, 16, 15, 25, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 14, 13, 12, 11, 10],
+  // [25, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4],
+  // [5, 6, 7, 8, 9, 0, 1, 2, 3, 4]
 ];
 
 var selectArray;
@@ -142,6 +142,7 @@ function draw() {
   context.strokeStyle = "#ff0000";
   context.lineWidth = w / 250;
   var rx1 = _3dLine(r2x, r3x, ret);
+  // 生成3d格式数据
   fix3dLineArr(rx1,faceArr)
   var lineArr = _3dTo2d(
     make_matrix_from_quat([

+ 10 - 70
js/util.js

@@ -62,7 +62,7 @@ function isTwoLine(arr) {
       ["", ""],
       ["", ""]
     ];
-    ret[0][0] = r2x[r3x[0][0]];
+    // ret[0][0] = r2x[r3x[0][0]];
     for (var i = 0; i < r3x.length; i++) {
         ret[i] = {
             "3d_id":i,
@@ -82,10 +82,13 @@ function isTwoLine(arr) {
     return ret;
   }
 
+  /**
+   * 生成3D格式数据
+   * @param {三维线段数组} arr 
+   * @param {组成面得线段数组} faceArr 
+   */
   function fix3dLineArr(arr,faceArr) {
       var ret = []
-    
-      
       for (let i = 0; i < faceArr.length; i++) {
         var item = {
             faceLine:[],
@@ -105,9 +108,7 @@ function isTwoLine(arr) {
         }         
         ret.push(item) 
       }
-      console.log('====================================');
-      console.log('ret',ret);
-      console.log('====================================');
+      return ret
   }
   
   // 归一化
@@ -250,9 +251,9 @@ function isTwoLine(arr) {
       ret_t[i].line.push(toDecimal(r7x_t));
       item.push(toDecimal(r7x_t))
       ret.push({
-            "3d_id":[line[i]["3d_id"]][0],  
-            '2d_arr':fixLine(item)
-        })
+          "3d_id":[line[i]["3d_id"]][0],  
+          '2d_arr':fixLine(item)
+      })
     }
 
     // ret2dObj(ret)
@@ -741,64 +742,3 @@ function arrayOnly(array1, array2) {
     }
     return false;
 }
-
-function fix3dData(arr) {
-    var ret = []
-    var idxItem
-    var idxArr = []
-   
-  
-    for (var i = 0; i < arr.length; i++) {
-        idxItem = []
-        for (var j = 0; j < arr[i].length; j++) {
-            ret.push(arr[i][j].points[0])
-            idxItem.push(arr[i][j].id)
-        }
-        idxArr.push(idxItem)
-    }
-
-    // return idxArr;
-
-    var r2x_t = [
-        [-0.5, -0.5, +0.5],
-        [-0.5, +0.5, +0.5],
-        [+0.5, +0.5, +0.5],
-        [+0.5, -0.5, +0.5],
-        [-0.5, -0.5, -0.5],
-        [-0.5, +0.5, -0.5],
-        [+0.5, +0.5, -0.5],
-        [+0.5, -0.5, -0.5]
-      ];
-      // 线段的坐标
-      // z轴
-      var r3x_t = [
-        [0, 1],
-        [1, 2],
-        [2, 3],
-        [3, 0],
-        [4, 5],
-        [5, 6],
-        [6, 7],
-        [7, 4],
-        [0, 4],
-        [1, 5],
-        [2, 6],
-        [3, 7]
-      ];
-    
-      // 各个线段的坐标
-      var ret_t = [
-        ["", ""],
-        ["", ""],
-        ["", ""],
-        ["", ""],
-        ["", ""],
-        ["", ""],
-        ["", ""],
-        ["", ""],
-        ["", ""],
-        ["", ""],
-        ["", ""],
-        ["", ""]
-      ];
-}