2024.2.1

.gitignore

@@ -36,3 +36,29 @@ yarn-error.log*
 *.njsproj
 *.sln
 VERSION.json
+
+# Ignore BabylonJS_Docs folder
+/BabylonJS_Docs/
+public/local-assets/cityscape2048f.png
+public/local-assets/Collisions_10-25-2023.glb
+public/local-assets/Decor_10-25-2023.glb
+public/local-assets/Foliage_10-25-2023.glb
+public/local-assets/FurnitureCulling_10-25-2023.glb
+public/local-assets/Headquarters_10-25-2023.glb
+public/local-assets/Hologram_10-25-2023.glb
+public/local-assets/LandscapeTilesLOD_10-25-2023.glb
+public/local-assets/LandscapeTrimLOD_10-25-2023.glb
+public/local-assets/LandscapeWalkwayLOD_10-25-2023.glb
+public/local-assets/OuterWrap_10-25-2023.glb
+public/local-assets/Path_10-25-2023.glb
+public/local-assets/Reflections1k.hdr
+public/local-assets/SitObjects_10-25-2023.glb
+public/local-assets/SitObjectsNoSit_10-25-2023.glb
+public/local-assets/Water_10-25-2023.glb
+public/local-assets/Waterfalls_10-25-2023.glb
+src/modules/directory_structure.txt
+public/local-assets/Skybox2k.png
+public/local-assets/Reflections4.hdr
+public/local-assets/monkey.glb
+public/local-assets/Cylinder.glb
+public/local-assets/Meters.glb

desktop/src-tauri/Cargo.toml

@@ -1,23 +1,24 @@
-[package]
-name = "vircadia-desktop"
-version = "0.0.0"
-description = ""
-authors = ["DigiSomni", "Giga", "Vircadia Contributors"]
-license = ""
-repository = ""
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[build-dependencies]
-tauri-build = { version = "1.5", features = [] }
-
-[dependencies]
-tauri = { version = "1.5", features = ["shell-open"] }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-
-[features]
-# this feature is used for production builds or when `devPath` points to the filesystem
-# DO NOT REMOVE!!
-custom-protocol = ["tauri/custom-protocol"]
+[package]
+name = "vircadia-desktop"
+version = "0.0.0"
+description = ""
+authors = ["DigiSomni", "Giga", "Vircadia Contributors"]
+license = ""
+repository = ""
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[build-dependencies]
+tauri-build = { version = "1.5", features = [] }
+
+[dependencies]
+tauri = { version = "1.5", features = ["shell-open"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+time = "0.3.35"
+
+[features]
+# this feature is used for production builds or when `devPath` points to the filesystem
+# DO NOT REMOVE!!
+custom-protocol = ["tauri/custom-protocol"]

quasar.config.js

@@ -189,10 +189,10 @@ module.exports = configure(function (ctx) {
                     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",
+                            image: "/assets/models/avatars/sara-cropped-small.webp",
+                            file: "/assets/models/avatars/sara.glb",
                             scale: 1,
-                            starred: true,
+                            starred: false,
                         },
                         KLM23NOP: {
                             name: "Mark",
@@ -391,7 +391,7 @@ module.exports = configure(function (ctx) {
                         image: "/assets/models/avatars/Maria-small.webp",
                         file: "/assets/models/avatars/Maria.glb",
                         scale: 1,
-                        starred: false,
+                        starred: true,
                     }),
             },
         },

src/modules/entity/EntityInterfaces.ts

@@ -1,102 +1,105 @@
-//
-//  IEntity.ts
-//
-//  Created by Nolan Huang on 3 Aug 2022.
-//  Copyright 2022 Vircadia contributors.
-//  Copyright 2022 DigiSomni LLC.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-import { IEntityProperties, ISpatialProperties, IBehaviorProperties,
-    IModelEProperties, IShapeProperties, ILightProperties,
-    IZoneProperties, IImageProperties, IMaterialProperties, IWebProperties } from "./EntityProperties";
-import { Observable } from "@babylonjs/core";
-
-export interface IEntity extends
-    IEntityProperties,
-    ISpatialProperties,
-    IBehaviorProperties {
-
-    onCommonPropertiesChanged?: Observable<IEntity>;
-    onParentChanged?: Observable<IEntity>;
-    onPositionAndRotationChanged?: Observable<IEntity>;
-    onDimensionChanged?: Observable<IEntity>;
-    onRenderModeChanged?: Observable<IEntity>;
-    onScriptChanged?: Observable<IEntity>;
-    onUserDataChanged?: Observable<IEntity>;
-    onCollisionPropertiesChanged?: Observable<IEntity>;
-    onPhysicsPropertiesChanged?: Observable<IEntity>;
-}
-
-export interface IModelEntity extends
-    IEntity,
-    IModelEProperties {
-
-    onModelURLChanged?: Observable<IEntity>;
-    onAnimationChanged?: Observable<IEntity>
-}
-
-export type JitsiSettings = {
-    roomID: string;
-    roomName: string;
-};
-
-export type WebExtensions = {
-    jitsi: JitsiSettings | undefined
-};
-
-export interface IWebEntity extends
-    IEntity,
-    IWebProperties {
-
-    onColorChanged: Observable<IEntity>;
-    onSourceURLChanged: Observable<IEntity>;
-    onWebPropertiesChanged: Observable<IEntity>;
-}
-
-export interface IShapeEntity extends
-    IEntity,
-    IShapeProperties {
-
-    onShapeChanged?: Observable<IEntity>;
-    onColorChanged?: Observable<IEntity>;
-}
-
-export interface ILightEntity extends
-    IEntity,
-    ILightProperties {
-
-    onLightPropertiesChanged?: Observable<IEntity>;
-    onLightTypeChanged?: Observable<IEntity>;
-}
-
-export interface IZoneEntity extends
-    IEntity,
-    IZoneProperties {
-
-    onShapeTypeChanged: Observable<IEntity>;
-    onAmbientLightPropertiesChanged: Observable<IEntity>;
-    onKeyLightPropertiesChanged: Observable<IEntity>;
-    onSkyboxPropertiesChanged: Observable<IEntity>;
-    onHazePropertiesChanged: Observable<IEntity>;
-    onBloomPropertiesChanged: Observable<IEntity>;
-}
-
-export interface IImageEntity extends
-    IEntity,
-    IImageProperties {
-
-    onColorChanged: Observable<IEntity>;
-    onImageURLChanged: Observable<IEntity>
-}
-
-export interface IMaterialEntity extends
-    IEntity,
-    IMaterialProperties {
-
-    onMaterialDataChanged?: Observable<IEntity>;
-    onMaterialMappingModeChanged?: Observable<IEntity>;
-    onMaterialPriorityChanged?: Observable<IEntity>;
-    onParentMaterialNameChanged?: Observable<IEntity>;
-}
+//
+//  IEntity.ts
+//
+//  Created by Nolan Huang on 3 Aug 2022.
+//  Copyright 2022 Vircadia contributors.
+//  Copyright 2022 DigiSomni LLC.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+import {
+    IEntityProperties, ISpatialProperties, IBehaviorProperties,
+    IModelEProperties, IShapeProperties, ILightProperties,
+    IZoneProperties, IImageProperties, IMaterialProperties, IWebProperties
+} from "./EntityProperties";
+import { Observable } from "@babylonjs/core";
+
+export interface IEntity extends
+    IEntityProperties,
+    ISpatialProperties,
+    IBehaviorProperties {
+
+    onCommonPropertiesChanged?: Observable<IEntity>;
+    onParentChanged?: Observable<IEntity>;
+    onPositionAndRotationChanged?: Observable<IEntity>;
+    onDimensionChanged?: Observable<IEntity>;
+    onRenderModeChanged?: Observable<IEntity>;
+    onScriptChanged?: Observable<IEntity>;
+    onUserDataChanged?: Observable<IEntity>;
+    onCollisionPropertiesChanged?: Observable<IEntity>;
+    onPhysicsPropertiesChanged?: Observable<IEntity>;
+}
+
+export interface IModelEntity extends
+    IEntity,
+    IModelEProperties {
+
+    onModelURLChanged?: Observable<IEntity>;
+    onAnimationChanged?: Observable<IEntity>
+}
+
+export type JitsiSettings = {
+    roomID: string;
+    roomName: string;
+};
+
+export type WebExtensions = {
+    jitsi: JitsiSettings | undefined
+};
+
+export interface IWebEntity extends
+    IEntity,
+    IWebProperties {
+
+    onColorChanged: Observable<IEntity>;
+    onSourceURLChanged: Observable<IEntity>;
+    onWebPropertiesChanged: Observable<IEntity>;
+}
+
+export interface IShapeEntity extends
+    IEntity,
+    IShapeProperties {
+
+    onShapeChanged?: Observable<IEntity>;
+    onColorChanged?: Observable<IEntity>;
+}
+
+export interface ILightEntity extends
+    IEntity,
+    ILightProperties {
+
+    onLightPropertiesChanged?: Observable<IEntity>;
+    onLightTypeChanged?: Observable<IEntity>;
+}
+
+export interface IZoneEntity extends
+    IEntity,
+    IZoneProperties {
+
+    onShapeTypeChanged: Observable<IEntity>;
+    onCompoundShapeURLChanged: Observable<IEntity>;
+    onAmbientLightPropertiesChanged: Observable<IEntity>;
+    onKeyLightPropertiesChanged: Observable<IEntity>;
+    onSkyboxPropertiesChanged: Observable<IEntity>;
+    onHazePropertiesChanged: Observable<IEntity>;
+    onBloomPropertiesChanged: Observable<IEntity>;
+}
+
+export interface IImageEntity extends
+    IEntity,
+    IImageProperties {
+
+    onColorChanged: Observable<IEntity>;
+    onImageURLChanged: Observable<IEntity>
+}
+
+export interface IMaterialEntity extends
+    IEntity,
+    IMaterialProperties {
+
+    onMaterialDataChanged?: Observable<IEntity>;
+    onMaterialMappingModeChanged?: Observable<IEntity>;
+    onMaterialPriorityChanged?: Observable<IEntity>;
+    onParentMaterialNameChanged?: Observable<IEntity>;
+}

src/modules/entity/EntityManager.ts

@@ -87,7 +87,7 @@ export class EntityManager {
             return undefined;
         }
         const entity = factory(props.entityItemID.stringify());
-        entity.copyFormPacketData(props);
+        entity.copyFromPacketData(props);
         // prevent to emit change event
         entity.update();
 
@@ -99,7 +99,7 @@ export class EntityManager {
     public updateEntity(props: EntityProperties): void {
         const entity = this._entities.get(props.entityItemID.stringify());
         if (entity) {
-            entity.copyFormPacketData(props);
+            entity.copyFromPacketData(props);
         }
     }
 
@@ -114,7 +114,7 @@ export class EntityManager {
             this._entityPropertiesArray.forEach((props) => {
                 const entity = this._entities.get(props.entityItemID.stringify());
                 if (entity) {
-                    entity.copyFormPacketData(props);
+                    entity.copyFromPacketData(props);
                 } else {
                     this.createEntity(props);
                 }
@@ -124,9 +124,9 @@ export class EntityManager {
     }
 
     private _handleOnEntityData(data: EntityProperties[]): void {
-        if (data.length > 0) {
+        if (data && data.length > 0) {
             Log.info(Log.types.ENTITIES,
-                `Receive entity data:`, data);
+                "Receive entity data:", data.length.toString());
 
             this._entityPropertiesArray = this._entityPropertiesArray.concat(data);
         }