Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix assets location #2311

Merged
merged 2 commits into from Mar 25, 2024
Merged

Fix assets location #2311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
170473f
core: frontend: Move assets from public to src
joaoantoniocardoso Jan 16, 2024
7919453
core: frontend: Update models assets to /src location
joaoantoniocardoso Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
0 ...assets/vehicles/models/boat/UNDEFINED.glb → ...assets/vehicles/models/boat/UNDEFINED.glb
View file
Open in desktop
File renamed without changes.
0 ...ssets/vehicles/models/boat/UNDEFINED.json → ...ssets/vehicles/models/boat/UNDEFINED.json
View file
Open in desktop
File renamed without changes.
0 .../assets/vehicles/models/rover/unknown.glb → .../assets/vehicles/models/rover/unknown.glb
View file
Open in desktop
File renamed without changes.
0 ...c/assets/vehicles/models/sub/BLUEROV1.glb → ...c/assets/vehicles/models/sub/BLUEROV1.glb
View file
Open in desktop
File renamed without changes.
0 .../assets/vehicles/models/sub/BLUEROV1.json → .../assets/vehicles/models/sub/BLUEROV1.json
View file
Open in desktop
File renamed without changes.
0 ...ssets/vehicles/models/sub/SIMPLEROV_3.glb → ...ssets/vehicles/models/sub/SIMPLEROV_3.glb
View file
Open in desktop
File renamed without changes.
0 ...sets/vehicles/models/sub/SIMPLEROV_3.json → ...sets/vehicles/models/sub/SIMPLEROV_3.json
View file
Open in desktop
File renamed without changes.
0 ...ssets/vehicles/models/sub/SIMPLEROV_4.glb → ...ssets/vehicles/models/sub/SIMPLEROV_4.glb
View file
Open in desktop
File renamed without changes.
0 ...sets/vehicles/models/sub/SIMPLEROV_4.json → ...sets/vehicles/models/sub/SIMPLEROV_4.json
View file
Open in desktop
File renamed without changes.
0 ...ssets/vehicles/models/sub/SIMPLEROV_5.glb → ...ssets/vehicles/models/sub/SIMPLEROV_5.glb
View file
Open in desktop
File renamed without changes.
0 ...c/assets/vehicles/models/sub/VECTORED.glb → ...c/assets/vehicles/models/sub/VECTORED.glb
View file
Open in desktop
File renamed without changes.
0 .../assets/vehicles/models/sub/VECTORED.json → .../assets/vehicles/models/sub/VECTORED.json
View file
Open in desktop
File renamed without changes.
0 ...ets/vehicles/models/sub/VECTORED_6DOF.glb → ...ets/vehicles/models/sub/VECTORED_6DOF.glb
View file
Open in desktop
File renamed without changes.
0 ...ts/vehicles/models/sub/VECTORED_6DOF.json → ...ts/vehicles/models/sub/VECTORED_6DOF.json
View file
Open in desktop
File renamed without changes.
0 ...ic/assets/vehicles/models/sub/bluerov.glb → ...rc/assets/vehicles/models/sub/bluerov.glb
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions core/frontend/src/components/vehiclesetup/viewers/GenericViewer.vue
View file
Open in desktop
Expand Up @@ -91,12 +91,12 @@ import { Dictionary, Indexed, Keyed } from '@/types/common'
import { PingType } from '@/types/ping'
import { sleep } from '@/utils/helper_functions'

const models: Record<string, string> = import.meta.glob('/public/assets/vehicles/models/**', { eager: true })
const models: Record<string, string> = import.meta.glob('/src/assets/vehicles/models/**', { eager: true })

function get_model(vehicle_name: string, frame_name: string): undefined | string {
const release_path = `assets/vehicles/models/${vehicle_name}/${frame_name}.glb`
if (models[`/public/${release_path}`]) {
return `/assets/vehicles/models/${vehicle_name}/${frame_name}.glb`
const release_path = `/src/assets/vehicles/models/${vehicle_name}/${frame_name}.glb`
if (models[release_path]) {
return release_path
}
return undefined
}
Expand Down Expand Up @@ -349,8 +349,8 @@ export default Vue.extend({
const file = new File([await cropped_image.toBlob(mimeType)], 'viewer.png', { type: mimeType })
saveAs(file)
},
async reloadAnnotations() {
const json = await models[`./${this.vehicle_folder}/${this.frame_name}.json`]
reloadAnnotations() {
const json = models[`/src/assets/vehicles/models/${this.vehicle_folder}/${this.frame_name}.json`]
if (json) {
this.annotations = json.annotations ?? {}
}
Expand Down
9 changes: 3 additions & 6 deletions core/frontend/src/components/wizard/Wizard.vue
View file
Open in desktop
Expand Up @@ -280,14 +280,11 @@ import RequireInternet from './RequireInternet.vue'
const WIZARD_VERSION = 4
const models: Record<string, string> = import.meta.glob('/public/assets/vehicles/models/**', { eager: true })
const models: Record<string, string> = import.meta.glob('/src/assets/vehicles/models/**', { eager: true })
function get_model(vehicle_name: string, frame_name: string): undefined | string {
const release_path = `assets/vehicles/models/${vehicle_name}/${frame_name}.glb`
if (models[`/public/${release_path}`]) {
return `/assets/vehicles/models/${vehicle_name}/${frame_name}.glb`
}
return undefined
const release_path = `/src/assets/vehicles/models/${vehicle_name}/${frame_name}.glb`
return models?.[release_path] ? release_path : undefined
}
enum ApplyStatus {
Expand Down