Merge branch 'dev' into ir-3787

packages/client-core/src/admin/components/scene/SceneItem.tsx

@@ -43,11 +43,18 @@ import { twMerge } from 'tailwind-merge'
 type SceneItemProps = {
   scene: StaticResourceType
   updateEditorState?: boolean
+  moveMenuUp?: boolean
   handleOpenScene: () => void
   refetchProjectsData: () => void
 }
 
-export const SceneItem = ({ scene, updateEditorState, handleOpenScene, refetchProjectsData }: SceneItemProps) => {
+export const SceneItem = ({
+  scene,
+  updateEditorState,
+  moveMenuUp,
+  handleOpenScene,
+  refetchProjectsData
+}: SceneItemProps) => {
   const { t } = useTranslation()
   const editorState = useMutableState(EditorState)
 
@@ -118,7 +125,8 @@ export const SceneItem = ({ scene, updateEditorState, handleOpenScene, refetchPr
           <ul
             className={twMerge(
               'fixed z-10 block w-max translate-x-5 rounded-lg bg-theme-primary px-4 py-3 pr-10',
-              showContentMenu.value ? 'visible' : 'hidden'
+              showContentMenu.value ? 'visible' : 'hidden',
+              moveMenuUp ? '-translate-y-10' : ''
             )}
             style={{
               top: menuPosition.top.value,

packages/editor/src/components/prefabs/PrefabEditors.tsx

@@ -98,12 +98,6 @@ export const PrefabShelfState = defineState({
         category: 'Collider',
         detail: 'Simple cylinder collider'
       },
-      {
-        name: 'Mesh Collider',
-        url: `${config.client.fileServer}/projects/default-project/assets/prefabs/mesh-collider.prefab.gltf`,
-        category: 'Collider',
-        detail: 'Simple mesh collider, drag and drop your mesh'
-      },
       {
         name: 'Text',
         url: `${config.client.fileServer}/projects/default-project/assets/prefabs/text.prefab.gltf`,

packages/editor/src/functions/EditorControlFunctions.ts

@@ -40,7 +40,6 @@ import {
 import { Entity } from '@etherealengine/ecs/src/Entity'
 import { GLTFDocumentState, GLTFSnapshotAction } from '@etherealengine/engine/src/gltf/GLTFDocumentState'
 import { GLTFSnapshotState, GLTFSourceState } from '@etherealengine/engine/src/gltf/GLTFState'
-import { PrimitiveGeometryComponent } from '@etherealengine/engine/src/scene/components/PrimitiveGeometryComponent'
 import { SkyboxComponent } from '@etherealengine/engine/src/scene/components/SkyboxComponent'
 import { SourceComponent } from '@etherealengine/engine/src/scene/components/SourceComponent'
 import { TransformSpace } from '@etherealengine/engine/src/scene/constants/transformConstants'
@@ -224,8 +223,7 @@ const overwriteLookdevObject = (
         SkyboxComponent,
         HemisphereLightComponent,
         DirectionalLightComponent,
-        PostProcessingComponent,
-        PrimitiveGeometryComponent //this component is for test will remove later
+        PostProcessingComponent
       ]
       let overwrited = false
       for (const comp of lookDevComponent) {

packages/engine/src/scene/components/ModelComponent.tsx

@@ -148,7 +148,6 @@ function ModelReactor() {
     /**if we've loaded or converted to vrm, create animation component whose mixer's root is the normalized rig */
     if (boneMatchedAsset instanceof VRM)
       setComponent(entity, AnimationComponent, {
-        animations: gltf.animations,
         mixer: new AnimationMixer(boneMatchedAsset.humanoid.normalizedHumanBonesRoot)
       })
 

packages/engine/src/scene/systems/SceneObjectSystem.tsx

@@ -37,7 +37,7 @@ import {
   Texture
 } from 'three'
 
-import { useEntityContext, UUIDComponent } from '@etherealengine/ecs'
+import { entityExists, useEntityContext, UUIDComponent } from '@etherealengine/ecs'
 import {
   getComponent,
   getOptionalComponent,
@@ -52,7 +52,7 @@ import { Entity, EntityUUID } from '@etherealengine/ecs/src/Entity'
 import { defineQuery, QueryReactor } from '@etherealengine/ecs/src/QueryFunctions'
 import { defineSystem } from '@etherealengine/ecs/src/SystemFunctions'
 import { AnimationSystemGroup } from '@etherealengine/ecs/src/SystemGroups'
-import { getMutableState, getState, useHookstate } from '@etherealengine/hyperflux'
+import { getMutableState, getState, useHookstate, useImmediateEffect } from '@etherealengine/hyperflux'
 import { CallbackComponent } from '@etherealengine/spatial/src/common/CallbackComponent'
 import { ColliderComponent } from '@etherealengine/spatial/src/physics/components/ColliderComponent'
 import { RigidBodyComponent } from '@etherealengine/spatial/src/physics/components/RigidBodyComponent'
@@ -167,6 +167,13 @@ function SceneObjectReactor(props: { entity: Entity; obj: Object3D }) {
   const renderState = getMutableState(RendererState)
   const forceBasicMaterials = useHookstate(renderState.forceBasicMaterials)
 
+  useImmediateEffect(() => {
+    setComponent(entity, DistanceFromCameraComponent)
+    return () => {
+      if (entityExists(entity)) removeComponent(entity, DistanceFromCameraComponent)
+    }
+  }, [])
+
   useEffect(() => {
     const source = hasComponent(entity, ModelComponent)
       ? getModelSceneID(entity)

packages/spatial/src/renderer/components/MeshComponent.ts

@@ -24,7 +24,7 @@ Ethereal Engine. All Rights Reserved.
 */
 
 import { useEffect } from 'react'
-import { BufferGeometry, Material, Mesh } from 'three'
+import { Box3, BufferGeometry, Material, Mesh } from 'three'
 
 import { Entity, useEntityContext } from '@etherealengine/ecs'
 import {
@@ -34,9 +34,10 @@ import {
   setComponent,
   useComponent
 } from '@etherealengine/ecs/src/ComponentFunctions'
-import { State, useImmediateEffect } from '@etherealengine/hyperflux'
+import { NO_PROXY, State, useImmediateEffect } from '@etherealengine/hyperflux'
 
 import { useResource } from '../../resources/resourceHooks'
+import { BoundingBoxComponent } from '../../transform/components/BoundingBoxComponents'
 import { addObjectToGroup, removeObjectFromGroup } from './GroupComponent'
 
 export const MeshComponent = defineComponent({
@@ -61,6 +62,16 @@ export const MeshComponent = defineComponent({
       !Array.isArray(meshComponent.material.value) ? (meshComponent.material.value as Material).uuid : undefined
     )
 
+    useEffect(() => {
+      const box = geometryResource.boundingBox.get(NO_PROXY) as Box3 | null
+      if (!box) return
+
+      setComponent(entity, BoundingBoxComponent, { box: box })
+      return () => {
+        removeComponent(entity, BoundingBoxComponent)
+      }
+    }, [geometryResource.boundingBox])
+
     useEffect(() => {
       if (meshComponent.value !== meshResource.value) meshResource.set(meshComponent.value)
     }, [meshComponent])

packages/spatial/src/renderer/csm/CSM.ts

@@ -43,6 +43,7 @@ import { Engine } from '@etherealengine/ecs/src/Engine'
 import { Entity } from '@etherealengine/ecs/src/Entity'
 import { createEntity, removeEntity } from '@etherealengine/ecs/src/EntityFunctions'
 
+import { getState } from '@etherealengine/hyperflux'
 import { CameraComponent } from '../../camera/components/CameraComponent'
 import { NameComponent } from '../../common/NameComponent'
 import { Vector3_Zero } from '../../common/constants/MathConstants'
@@ -51,6 +52,7 @@ import { addObjectToGroup } from '../../renderer/components/GroupComponent'
 import { VisibleComponent } from '../../renderer/components/VisibleComponent'
 import { EntityTreeComponent } from '../../transform/components/EntityTree'
 import { TransformComponent } from '../../transform/components/TransformComponent'
+import { RendererState } from '../RendererState'
 import Frustum from './Frustum'
 import Shader from './Shader'
 
@@ -319,7 +321,8 @@ export class CSM {
     if (this.sourceLight) this.lightDirection.subVectors(this.sourceLight.target.position, this.sourceLight.position)
     if (this.needsUpdate) {
       this.injectInclude()
-      this.updateFrustums()
+      // Only update uniforms if WebGLRendererSystem isn't already updating them every frame
+      this.updateFrustums(!getState(RendererState).updateCSMFrustums)
       for (const light of this.lights) {
         light.shadow.map?.dispose()
         light.shadow.map = null as any
@@ -439,7 +442,8 @@ export class CSM {
   updateUniforms(): void {
     const camera = getComponent(Engine.instance.cameraEntity, CameraComponent)
     const far = Math.min(camera.far, this.maxFar)
-    this.shaders.forEach(function (shader: ShaderType, material: Material) {
+
+    for (const [material, shader] of this.shaders.entries()) {
       const camera = getComponent(Engine.instance.cameraEntity, CameraComponent)
 
       if (shader !== null) {
@@ -456,7 +460,7 @@ export class CSM {
         material.defines!.CSM_FADE = ''
         material.needsUpdate = true
       }
-    }, this)
+    }
   }
 
   getExtendedBreaks(target: Vector2[]): void {
@@ -474,11 +478,11 @@ export class CSM {
     }
   }
 
-  updateFrustums(): void {
+  updateFrustums(updateUniforms = true): void {
     this.getBreaks()
     this.initCascades()
     this.updateShadowBounds()
-    this.updateUniforms()
+    if (updateUniforms) this.updateUniforms()
   }
 
   remove(): void {

packages/ui/src/components/editor/panels/Scenes/container/index.tsx

@@ -96,6 +96,7 @@ export default function ScenesPanel() {
                   key={scene.id}
                   scene={scene}
                   updateEditorState
+                  moveMenuUp={true}
                   handleOpenScene={() => onClickScene(scene)}
                   refetchProjectsData={scenesQuery.refetch}
                 />