reorganize shared props passing

This commit is contained in:
David Tsay 2023-02-09 16:23:51 -08:00
parent 0476466441
commit a82e78365d
4 changed files with 34 additions and 26 deletions

View File

@ -26,16 +26,19 @@
:style="`width: 100%; height: 100%`"
>
<CompassHUD
:sun-heading="sunHeading"
:camera-angle-of-view="cameraAngleOfView"
:heading="heading"
:camera-azimuth="cameraAzimuth"
:transformations="transformations"
:sun-heading="sunHeading"
/>
<CompassRose
:camera-azimuth="cameraAzimuth"
:camera-angle-of-view="cameraAngleOfView"
:heading="heading"
:sized-image-dimensions="sizedImageDimensions"
:sun-heading="sunHeading"
:camera-azimuth="cameraAzimuth"
:transformations="transformations"
:sun-heading="sunHeading"
:sized-image-dimensions="sizedImageDimensions"
/>
</div>
</template>
@ -75,11 +78,8 @@ export default {
cameraAzimuth() {
return this.image.cameraPan;
},
hasCameraAzimuth() {
return this.cameraAzimuth !== undefined;
},
cameraAngleOfView() {
return this.transformations?.cameraAngleOfView;
return this.transformations.cameraAngleOfView;
},
transformations() {
return this.image.transformations;

View File

@ -94,17 +94,25 @@ const COMPASS_POINTS = [
export default {
props: {
sunHeading: {
type: Number,
default: undefined
},
cameraAngleOfView: {
type: Number,
default: undefined
required: true
},
heading: {
type: Number,
required: true
},
cameraAzimuth: {
type: Number,
default: undefined
},
transformations: {
type: Object,
required: true
},
sunHeading: {
type: Number,
default: undefined
}
},
computed: {

View File

@ -259,16 +259,13 @@ import { throttle } from 'lodash';
export default {
props: {
cameraAngleOfView: {
type: Number,
required: true
},
heading: {
type: Number,
required: true,
default() {
return 0;
}
},
sunHeading: {
type: Number,
default: undefined
required: true
},
cameraAzimuth: {
type: Number,
@ -276,6 +273,10 @@ export default {
},
transformations: {
type: Object,
required: true
},
sunHeading: {
type: Number,
default: undefined
},
sizedImageDimensions: {
@ -298,9 +299,6 @@ export default {
? rotate(this.cameraAzimuth)
: rotate(this.heading, -this.transformations?.rotation ?? 0);
},
cameraAngleOfView() {
return this.transformations?.cameraAngleOfView;
},
camAngleAndPositionStyle() {
const translateX = this.transformations?.translateX;
const translateY = this.transformations?.translateY;

View File

@ -430,10 +430,12 @@ export default {
&& imageHeightAndWidth
&& this.zoomFactor === 1
&& this.imagePanned !== true;
const hasCameraConfigurations = this.focusedImage?.transformations !== undefined;
const hasHeading = this.focusedImage?.heading !== undefined;
const hasCameraAngleOfView = this.focusedImage?.transformations?.cameraAngleOfView > 0;
return display && hasCameraConfigurations && hasHeading;
return display
&& hasCameraAngleOfView
&& hasHeading;
},
isSpacecraftPositionFresh() {
let isFresh = undefined;