Browse Source

Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/bigSceneEdit_java

tremble 5 years ago
parent
commit
c1fd0fdb85
1 changed files with 4 additions and 4 deletions
  1. 4 4
      js/edit.js

+ 4 - 4
js/edit.js

@@ -1322,12 +1322,12 @@ EditGuide.prototype.uploadGuide = function (urlData, guide, renew, target) {
       var sid = rs.data.substring(rs.data.lastIndexOf('/') + 1, rs.data.lastIndexOf('.'));
       var thumbnail_signed_src = rs.data;
       var args = JSON.parse("{" + guide + "}");
-
+ 
       args.sid = sid;
       args.name = sid;
       args.thumbnail_signed_src = thumbnail_signed_src;
       args.metadata = JSON.stringify({
-        camera_mode: 0,
+        camera_mode: args.metadata.camera_mode,
         camera_position: {
           x: args.metadata.camera_position[0],
           y: args.metadata.camera_position[1],
@@ -1339,8 +1339,8 @@ EditGuide.prototype.uploadGuide = function (urlData, guide, renew, target) {
           z: args.metadata.camera_quaternion[2],
           w: args.metadata.camera_quaternion[3]
         },
-        ortho_zoom: -1,
-        scan_id: args.metadata.scan_id,
+        ortho_zoom: args.metadata.ortho_zoom,
+        scan_id: args.metadata.scan_id || "outside",
         final_angle: 110,
         is_ortho: false,
         zoom: args.metadata.zoom  // fyz zoom是内部计算的zoomLevel, 乘以系数1.06才是实际缩放倍数