|
|
@@ -87,6 +87,8 @@
|
|
|
/>
|
|
|
<DefaultCameraIcon :position="favPosition" />
|
|
|
</div>
|
|
|
+
|
|
|
+ <CameraPreview :json="cameraJSON" />
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -109,6 +111,7 @@
|
|
|
import { CameraImage } from './MapBase/types';
|
|
|
import { createSelectedPositionHash, getFavPositionByCamera } from './MapBase/utils';
|
|
|
import SelectedCameraToolbar from './components/SelectedCameraToolbar.vue';
|
|
|
+ import CameraPreview from './MapBase/CameraPreview.vue';
|
|
|
|
|
|
const miniMap = useMiniMap();
|
|
|
const globSetting = useGlobSetting();
|
|
|
@@ -128,18 +131,13 @@
|
|
|
rightSelectedCamera.value = e.target;
|
|
|
};
|
|
|
|
|
|
- const defaultCameraId = computed(() => defaultCamera.value?.cameraId);
|
|
|
-
|
|
|
const handleMoving = (e) => {
|
|
|
const target = e.transform.target;
|
|
|
selectedPositionHash.value = createSelectedPositionHash(target);
|
|
|
console.log('moving', target.cameraId);
|
|
|
console.log(' defaultCamera.value?.cameraId', defaultCamera.value?.cameraId);
|
|
|
if (target?.cameraId === defaultCamera.value?.cameraId) {
|
|
|
- favPosition.value = getFavPositionByCamera({
|
|
|
- left: target.oCoords.tr.x,
|
|
|
- top: target.oCoords.tr.y,
|
|
|
- });
|
|
|
+ favPosition.value = getFavPositionByCamera(target);
|
|
|
}
|
|
|
};
|
|
|
|
|
|
@@ -147,10 +145,7 @@
|
|
|
const target = e.transform.target;
|
|
|
selectedPositionHash.value = createSelectedPositionHash(target);
|
|
|
if (target.cameraId === defaultCamera.value?.cameraId) {
|
|
|
- favPosition.value = getFavPositionByCamera({
|
|
|
- left: target.oCoords.tr.x,
|
|
|
- top: target.oCoords.tr.y,
|
|
|
- });
|
|
|
+ favPosition.value = getFavPositionByCamera(target);
|
|
|
}
|
|
|
};
|
|
|
|
|
|
@@ -179,16 +174,15 @@
|
|
|
|
|
|
const renderMap = () => {
|
|
|
map.renderCamera();
|
|
|
- favPosition.value = getFavPositionByCamera({
|
|
|
- left: defaultCamera.value?.oCoords?.tr.x,
|
|
|
- top: defaultCamera.value?.oCoords?.tr.y,
|
|
|
- });
|
|
|
+ favPosition.value = getFavPositionByCamera(defaultCamera.value);
|
|
|
};
|
|
|
|
|
|
const changeShop = (code: string) => {
|
|
|
getShopContent(code);
|
|
|
};
|
|
|
|
|
|
+ const cameraJSON = ref();
|
|
|
+
|
|
|
const getShopContent = (code: string) => {
|
|
|
getShowCameras(code);
|
|
|
getMapLayout(code).then((res) => {
|
|
|
@@ -197,6 +191,8 @@
|
|
|
defaultCamera.value = null;
|
|
|
return;
|
|
|
}
|
|
|
+ cameraJSON.value = res;
|
|
|
+
|
|
|
map.loadFromJSON(res).then(() => {
|
|
|
console.log('loadFromJSON', res);
|
|
|
if (res.defaultCameraId) {
|
|
|
@@ -295,10 +291,7 @@
|
|
|
favPosition.value = null;
|
|
|
return;
|
|
|
}
|
|
|
- favPosition.value = getFavPositionByCamera({
|
|
|
- left: defaultCamera.value?.oCoords?.tr.x,
|
|
|
- top: defaultCamera.value?.oCoords?.tr.y,
|
|
|
- });
|
|
|
+ favPosition.value = getFavPositionByCamera(defaultCamera.value);
|
|
|
});
|
|
|
</script>
|
|
|
|