Browse Source

放大镜loadData

jinx 2 years ago
parent
commit
75070475ea

File diff suppressed because it is too large
+ 1 - 1
server/test/a0k4xu045_202305311600080410/attach/sceneStore


+ 6 - 1
src/graphic/Geometry/Magnifier.js

@@ -111,7 +111,11 @@ export default class Magnifier extends Geometry {
   //     };
   //   }
   // }
-  setPopPosition(positionRaw) {
+  setPopPosition(positionRaw,loadPosition) {
+    if(loadPosition){
+      this.popPosition = loadPosition
+      return
+    }
     const position = coordinate.getScreenXY(this.position);
     const center = coordinate.getScreenXY(coordinate.center);
     let line = mathUtil.createLine1(position, center);
@@ -145,6 +149,7 @@ export default class Magnifier extends Geometry {
     this.photoUrl = src;
   }
 
+
   setImageData() {
     return new Promise(async (resolve, reject) => {
       if (this.photoUrl) {

+ 4 - 0
src/graphic/Load.js

@@ -57,6 +57,7 @@ export default class Load {
         }
       }
       if (dataLocal.magnifiers) {
+
         for (let key in dataLocal.magnifiers) {
           let magnifier = magnifierService.create(
             dataLocal.magnifiers[key].position,
@@ -64,6 +65,9 @@ export default class Load {
           );
           magnifier.setSrc(dataLocal.magnifiers[key].photoUrl);
           magnifier.setDisplay(dataLocal.magnifiers[key].display);
+     
+          magnifier.setPopPosition(null,dataLocal.magnifiers[key].popPosition)
+      
           try {
             if (dataLocal.magnifiers[key].photoUrl) {
               await magnifier.setImageData();