Feature/2024.2.0 (#225)

* Bump packages; add other packages; update paths for SDK. * Update paths and include paths. * Mild refactor; begin adding Script functionality. * Scripting works now. * Make skybox not pickable. * Fix scripting timing. * Bump Babylon to 7.27.0 * Remove unused code. * Fix desktop build. * Bump node vers for desktop build 16 -> 20 * WIP * Revert "WIP" This reverts commit 7b218d6. * Update how avatars are handled.
vircadia · Sep 30, 2024 · bea1e0b · bea1e0b
1 parent d127ef7
commit bea1e0b
Show file tree

Hide file tree

Showing 22 changed files with 2,160 additions and 1,845 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -27,7 +27,7 @@ module.exports = {
         parser: "@typescript-eslint/parser",
         project: resolve(__dirname, "./tsconfig.json"),
         tsconfigRootDir: __dirname,
-        ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features
+        ecmaVersion: 2022, // Allows for the parsing of modern ECMAScript features
         sourceType: "module", // Allows for the use of imports
     },
 

diff --git a/.github/workflows/build_desktop.yml b/.github/workflows/build_desktop.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20.x
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable

diff --git a/README.md b/README.md
@@ -46,6 +46,11 @@ Vircadia Web relies on the Vircadia Assets submodule, so you must pull recursive
 git clone --recursive https://github.com/vircadia/vircadia-web.git
 ```
 
+If you forget to pull recursively, you can initialize the submodule later with:
+```sh
+git submodule update --init --recursive
+```
+
 ### Install the dependencies
 
 ```sh

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,28 +20,32 @@
         "copy-workers": "node build_scripts/copyWorkers.mjs"
     },
     "dependencies": {
-        "@babylonjs/core": "^7.24.0",
-        "@babylonjs/inspector": "^7.24.0",
-        "@babylonjs/loaders": "^7.24.0",
+        "@babylonjs/core": "^7.27.0",
+        "@babylonjs/inspector": "^7.27.0",
+        "@babylonjs/loaders": "^7.27.0",
         "@quasar/extras": "^1.16.12",
         "@vircadia/web-sdk": "^2024.1.0",
         "@vueuse/core": "^11.0.3",
         "ammojs-typed": "^1.0.6",
         "dompurify": "^3.0.3",
         "eight-colors": "^1.3.0",
+        "mobx": "^6.10.0",
         "pinia": "^2.2.2",
-        "quasar": "^2.16.10",
+        "quasar": "^2.17.0",
         "unique-names-generator": "^4.7.1",
         "vue": "^3.5.3",
-        "vue-router": "^4.4.3"
+        "vue-router": "^4.4.3",
+        "zod": "^3.23.8",
+        "@supabase/supabase-js": "^2.45.4",
+        "console-log-colors": "^0.5.0"
     },
     "devDependencies": {
         "@jitsi/vue-sdk": "^1.0.4",
-        "@quasar/app-vite": "^1.9.3",
+        "@quasar/app-vite": "^1.10.0",
         "@types/dompurify": "^3.0.2",
         "@types/node": "^12.20.21",
-        "@typescript-eslint/eslint-plugin": "^5.10.0",
-        "@typescript-eslint/parser": "^5.10.0",
+        "@typescript-eslint/eslint-plugin": "^8.0.0",
+        "@typescript-eslint/parser": "^8.0.0",
         "autoprefixer": "^10.4.2",
         "eslint": "^8.10.0",
         "eslint-config-standard": "^17.0.0",
@@ -54,7 +58,7 @@
         "typescript": "^5.5.4"
     },
     "engines": {
-        "node": "^20 || ^18",
+        "node": "^22 || ^20",
         "npm": ">= 10.1.0",
         "yarn": ">= 1.21.1"
     },

diff --git a/quasar.config.js b/quasar.config.js
@@ -92,10 +92,7 @@ module.exports = configure(function (ctx) {
                 "@Modules": path.resolve(__dirname, "./src/modules"),
                 "@Public": path.resolve(__dirname, "./public"),
                 "@Stores": path.resolve(__dirname, "./src/stores"),
-                "@World-Client": path.resolve(
-                    __dirname,
-                    "./src/vircadia-world/typescript/src/client"
-                ),
+                "@World": path.resolve(__dirname, "./src/vircadia-world/src"),
             },
 
             env: {
@@ -183,6 +180,219 @@ module.exports = configure(function (ctx) {
                     process.env.VRCA_WIZARD_BUTTON_TEXT ?? "Get Started",
                 // Desktop App
                 VRCA_DESKTOP_MODE: process.env.VRCA_DESKTOP_MODE,
+                // Profile
+                // Profile
+                VRCA_DEFAULT_AVATAR_DISPLAY_NAME:
+                    process.env.VRCA_DEFAULT_AVATAR_DISPLAY_NAME ?? "anonymous",
+                VRCA_DEFAULT_AVATARS:
+                    process.env.VRCA_DEFAULT_AVATARS ??
+                    JSON.stringify({
+                        HTP45FSQ: {
+                            name: "Sara",
+                            image: "https://staging.vircadia.com/O12OR634/UA92/sara-cropped-small.webp",
+                            file: "https://staging.vircadia.com/O12OR634/UA92/sara.glb",
+                            scale: 1,
+                            starred: true,
+                        },
+                        KLM23NOP: {
+                            name: "Mark",
+                            image: "/assets/models/avatars/Mark-small.webp",
+                            file: "/assets/models/avatars/Mark.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        QRS78TUV: {
+                            name: "Megan",
+                            image: "/assets/models/avatars/Megan-small.webp",
+                            file: "/assets/models/avatars/Megan.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        WXY12ZAB: {
+                            name: "Jack",
+                            image: "/assets/models/avatars/Jack-small.webp",
+                            file: "/assets/models/avatars/Jack.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        CDE56FGH: {
+                            name: "Martha",
+                            image: "/assets/models/avatars/Martha-small.webp",
+                            file: "/assets/models/avatars/Martha.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        IJK90LMN: {
+                            name: "Miles",
+                            image: "/assets/models/avatars/Miles-small.webp",
+                            file: "/assets/models/avatars/Miles.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        OPQ34RST: {
+                            name: "Taylor",
+                            image: "/assets/models/avatars/Taylor-small.webp",
+                            file: "/assets/models/avatars/Taylor.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        UVW78XYZ: {
+                            name: "Tiffany",
+                            image: "/assets/models/avatars/Tiffany-small.webp",
+                            file: "/assets/models/avatars/Tiffany.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        ABC12DEF: {
+                            name: "Victor",
+                            image: "/assets/models/avatars/Victor-small.webp",
+                            file: "/assets/models/avatars/Victor.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        GHI56JKL: {
+                            name: "Audrey",
+                            image: "/assets/models/avatars/Audrey-small.webp",
+                            file: "/assets/models/avatars/Audrey.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        MNO90PQR: {
+                            name: "Kristine",
+                            image: "/assets/models/avatars/Kristine-small.webp",
+                            file: "/assets/models/avatars/Kristine.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        STU34VWX: {
+                            name: "William",
+                            image: "/assets/models/avatars/William-small.webp",
+                            file: "/assets/models/avatars/William.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        YZA78BCD: {
+                            name: "Erica",
+                            image: "/assets/models/avatars/Erica-small.webp",
+                            file: "/assets/models/avatars/Erica.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        EFG12HIJ: {
+                            name: "Samantha",
+                            image: "/assets/models/avatars/Samantha-small.webp",
+                            file: "/assets/models/avatars/Samantha.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        KLM56NOP: {
+                            name: "Roman",
+                            image: "/assets/models/avatars/Roman-small.webp",
+                            file: "/assets/models/avatars/Roman.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        QRS90TUV: {
+                            name: "Cathy",
+                            image: "/assets/models/avatars/Cathy-small.webp",
+                            file: "/assets/models/avatars/Cathy.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        WXY34ZAB: {
+                            name: "Lucas",
+                            image: "/assets/models/avatars/Lucas-small.webp",
+                            file: "/assets/models/avatars/Lucas.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        CDE78FGH: {
+                            name: "Michaella",
+                            image: "/assets/models/avatars/Michaella-small.webp",
+                            file: "/assets/models/avatars/Michaella.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        IJK12LMN: {
+                            name: "David",
+                            image: "/assets/models/avatars/David-small.webp",
+                            file: "/assets/models/avatars/David.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        OPQ56RST: {
+                            name: "Rochella",
+                            image: "/assets/models/avatars/Rochella-small.webp",
+                            file: "/assets/models/avatars/Rochella.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        UVW90XYZ: {
+                            name: "Susan",
+                            image: "/assets/models/avatars/Susan-small.webp",
+                            file: "/assets/models/avatars/Susan.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        ABC34DEF: {
+                            name: "Diego",
+                            image: "/assets/models/avatars/Diego-small.webp",
+                            file: "/assets/models/avatars/Diego.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        GHI78JKL: {
+                            name: "Jameson",
+                            image: "/assets/models/avatars/Jameson-small.webp",
+                            file: "/assets/models/avatars/Jameson.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        MNO12PQR: {
+                            name: "Kevin",
+                            image: "/assets/models/avatars/Kevin-small.webp",
+                            file: "/assets/models/avatars/Kevin.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        STU56VWX: {
+                            name: "Lila",
+                            image: "/assets/models/avatars/Lila-small.webp",
+                            file: "/assets/models/avatars/Lila.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        YZA90BCD: {
+                            name: "Vikki",
+                            image: "/assets/models/avatars/Vikki-small.webp",
+                            file: "/assets/models/avatars/Vikki.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        EFG34HIJ: {
+                            name: "Jonas",
+                            image: "/assets/models/avatars/Jonas-small.webp",
+                            file: "/assets/models/avatars/Jonas.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                        KLM78NOP: {
+                            name: "Kelly",
+                            image: "/assets/models/avatars/Kelly-small.webp",
+                            file: "/assets/models/avatars/Kelly.glb",
+                            scale: 1,
+                            starred: false,
+                        },
+                    }),
+                VRCA_FALLBACK_AVATAR:
+                    process.env.VRCA_FALLBACK_AVATAR ??
+                    JSON.stringify({
+                        name: "Maria",
+                        image: "/assets/models/avatars/Maria-small.webp",
+                        file: "/assets/models/avatars/Maria.glb",
+                        scale: 1,
+                        starred: false,
+                    }),
             },
         },
 

diff --git a/src/App.vue b/src/App.vue
@@ -14,14 +14,13 @@
 import { onMounted } from "vue";
 import { applicationStore } from "@Stores/index";
 import { Utility } from "@Modules/utility";
-import { Client } from "@World-Client/client";
 import Log from "@Modules/debugging/log";
 
 // Fetch and initialize configuration info
 Log.debug(Log.types.OTHER, `APP: Initialize`);
 Utility.initializeConfig();
 
-onMounted(async () => {
+onMounted(() => {
     // Log the SDK version.
     console.log("Starting Vircadia Web using SDK version:", applicationStore.globalConsts.SDK_VERSION_TAG);
     // Called after the APP is visible. This starts the engines doing things.
@@ -32,11 +31,5 @@ onMounted(async () => {
     if (preloader) {
         preloader.classList.add("hide");
     }
-
-    // await Client.Setup.InitializeVircadiaWorld({
-    //     host: "http://localhost",
-    //     port: 3000,
-    //     agentId: "1234567890",
-    // });
 });
 </script>