merge 'dev' into fix/tests/network-authority

Author: aditya-mitra

.eslintrc.cjs

@@ -0,0 +1,16 @@
+module.exports = {
+  extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'],
+  parser: '@typescript-eslint/parser',
+  plugins: ['@typescript-eslint'],
+  root: true,
+  rules: {
+    '@typescript-eslint/no-empty-function': 'off',
+    // "@typescript-eslint/no-non-null-assertion": "warn",
+    "@typescript-eslint/no-non-null-asserted-optional-chain": "warn",
+    "@typescript-eslint/ban-ts-comment": "warn"
+  },
+  env: {
+    "browser": true,
+    "node": true
+  }
+}

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # etherealengine
+github: etherealengine
 patreon: etherealengine
 open_collective: etherealengine
 ko_fi: # Replace with a single Ko-fi username

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "dbaeumer.vscode-eslint"
+  ]
+}

README.md

@@ -4,18 +4,24 @@
 
 ## Table of Contents
 
+- [Table of Contents](#table-of-contents)
 - [Background](#background)
-  - [Demos](#demos)
-- [Install](#advanced-development-install)
+- [Demos](#demos)
+- [Project API](#project-api)
+  - [Library of EE Projects](#library-of-ee-projects)
+  - [Create your own projects](#create-your-own-projects)
+- [Launch Ethereal Engine with Control Center Install - ***RECOMMENDED***](#launch-ethereal-engine-with-control-center-install---recommended)
+  - [Use Metaverse Control Plane Managment GUI](#use-metaverse-control-plane-managment-gui)
+- [Advanced Development Install](#advanced-development-install)
   - [Pre-Requisites](#pre-requisites)
   - [Getting Started](#getting-started)
-- [XRE XRModule](#xre-xrmodule)
 - [Usage](#usage)
+  - [Documentation](#documentation)
 - [Contributing](#contributing)
   - [Let's build it together](#lets-build-it-together)
+  - [Join our Discord  ](#join-our-discord--)
+  - [Sponsorship ](#sponsorship-)
 - [License](#license)
-- [Releases](https://github.com/etherealengine/etherealengine/releases)
-- [Roadmap](/ROADMAP.md)
 
 ## Background
 
@@ -53,21 +59,15 @@ Guest Demos
 Host Demos 
 
 - [Admin Console - Demo Cluster - Request Demo Access on our Discord](https://demo.etherealengine.com/admin)
-- [XRModule Asset Editor - Demo Cluster - Request Demo Access on our Discord](https://demo.etherealengine.com/editor)
+- [Ethereal Studio - Demo Cluster - Request Demo Access on our Discord](https://demo.etherealengine.com/studio)
 
-## XRModule
+## Project API
 
-### [Library of XRModules](https://github.com/etherealengine?q=project)
+### [Library of EE Projects](https://github.com/EtherealEngine/project-manifest)
 
-Create composable plug-ins for Ethereal Engine scenes with XRModule Projects
+Create composable plug-ins for Ethereal Engine experiences with the Projects API
 
-### [Create XRModule Projects](https://etherealengine.github.io/etherealengine-docs/docs/concepts/projects_api)
-
-XRModules are folders that contain all your custom code, assets and scenes. They are version controlled using git & github, and can be installed to any deployment with a single click. (more on that in the next chapter)
-
-Pictured below is an example of 4 projects installed. By default, only the default-project is installed, which in a production environment is read only. You can find the default project under /packages/projects/default-project/
-
-In a production environment, the builder process will install all projects according to the project database table and will download files from the storage provider. In a local development environment, the local file system is always the source of truth. Any project folders added or removed from the file system will be automatically added or removed from the database. This is to ensure there is no accidental loss of data, as these project folders are all git repositories.
+### [Create your own projects](https://etherealengine.github.io/etherealengine-docs/docs/concepts/projects_api)
 
 ## Launch Ethereal Engine with Control Center Install - ***RECOMMENDED***
 

package.json

@@ -117,8 +117,11 @@
     "@types/cli": "0.11.21",
     "@types/mocha": "10.0.0",
     "@types/pino": "^7.0.5",
+    "@typescript-eslint/eslint-plugin": "5.47.0",
+    "@typescript-eslint/parser": "5.47.0",
     "concurrently": "7.1.0",
     "depcheck": "1.4.3",
+    "eslint": "8.30.0",
     "jsdom": "^20.0.2",
     "kill-port": "1.6.1",
     "lint-staged": "12.3.7",
@@ -133,8 +136,7 @@
     "stylelint": "^14.6.1",
     "stylelint-config-standard-scss": "^3.0.0",
     "stylelint-scss": "^4.2.0",
-    "supertest": "6.2.2",
-    "trace-unhandled": "2.0.1"
+    "supertest": "6.2.2"
   },
   "dependencies": {
     "@feathersjs/commons": "5.0.0-pre.29",

packages/client-core/i18n/en/editor.json

@@ -258,6 +258,7 @@
       "lbl-receiveShadow": "Receive Shadow",
       "lbl-interactable": "Interactable",
       "lbl-generateBVH": "Generate BVH",
+      "lbl-avoidCameraOcclusion": "Avoid Camera Occlusion",
       "lbl-matrixAutoUpdate": "MatrixAutoUpdate",
       "lbl-name": "Name",
       "lbl-url": "Model Url",

packages/client-core/src/admin/adminRoutes.tsx

@@ -1,6 +1,6 @@
 import { t } from 'i18next'
 import React, { lazy, Suspense, useEffect } from 'react'
-import { Navigate, Route, Routes } from 'react-router-dom'
+import { Navigate, Route, Routes, useLocation } from 'react-router-dom'
 
 import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine'
 import { EngineActions } from '@etherealengine/engine/src/ecs/classes/EngineState'
@@ -21,7 +21,8 @@ const AdminSystemInjection = {
   systemLoader: () => Promise.resolve({ default: AdminSystem })
 } as const
 
-const ProtectedRoutes = () => {
+const AdminRoutes = () => {
+  const location = useLocation()
   const admin = useAuthState().user
 
   let allowedRoutes = {
@@ -45,7 +46,8 @@ const ProtectedRoutes = () => {
   const scopes = admin?.scopes?.value || []
 
   useEffect(() => {
-    initSystems(Engine.instance.currentWorld, [AdminSystemInjection]).then(async () => {
+    initSystems([AdminSystemInjection]).then(async () => {
+      // @ts-ignore
       dispatchAction(EngineActions.initializeEngine({ initialised: true }))
     })
   }, [])
@@ -67,7 +69,7 @@ const ProtectedRoutes = () => {
 
   return (
     <Dashboard>
-      <Suspense fallback={<LoadingCircle message={t('common:loader.loadingAdmin')} />}>
+      <Suspense fallback={<LoadingCircle message={`Loading ${location.pathname.split('/')[2]}...`} />}>
         <Routes>
           <Route path="/*" element={<$allowed allowedRoutes={allowedRoutes} />} />
           {<Route path="/" element={<Analytics />} />}
@@ -77,4 +79,4 @@ const ProtectedRoutes = () => {
   )
 }
 
-export default ProtectedRoutes
+export default AdminRoutes

packages/client-core/src/admin/components/Avatars/index.tsx

@@ -4,8 +4,8 @@ import { useTranslation } from 'react-i18next'
 import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog'
 import { AvatarClientModule } from '@etherealengine/engine/src/avatar/AvatarClientModule'
 import { AvatarCommonModule } from '@etherealengine/engine/src/avatar/AvatarCommonModule'
-import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine'
 import { initSystems, unloadSystems } from '@etherealengine/engine/src/ecs/functions/SystemFunctions'
+import { RendererModule } from '@etherealengine/engine/src/renderer/RendererModule'
 import { SceneClientModule } from '@etherealengine/engine/src/scene/SceneClientModule'
 import { SceneCommonModule } from '@etherealengine/engine/src/scene/SceneCommonModule'
 import { TransformModule } from '@etherealengine/engine/src/transform/TransformModule'
@@ -31,17 +31,15 @@ const Avatar = () => {
   useEffect(() => {
     const systems = [
       ...TransformModule(),
+      ...RendererModule(),
       ...SceneCommonModule(),
       ...SceneClientModule(),
       ...AvatarCommonModule(),
       ...AvatarClientModule()
     ]
-    initSystems(Engine.instance.currentWorld, systems)
+    initSystems(systems)
     return () => {
-      unloadSystems(
-        Engine.instance.currentWorld,
-        systems.map((s) => s.uuid)
-      )
+      unloadSystems(systems.map((s) => s.uuid))
     }
   }, [])
 

packages/client-core/src/admin/components/Project/index.tsx

@@ -42,7 +42,7 @@ const Projects = () => {
   } as const
 
   useEffect(() => {
-    initSystems(Engine.instance.currentWorld, [ProjectUpdateSystemInjection])
+    initSystems([ProjectUpdateSystemInjection])
     ProjectService.checkReloadStatus()
   }, [])
 

packages/client-core/src/admin/services/ActiveRouteService.ts

@@ -1,6 +1,6 @@
 import { ActiveRoutesInterface } from '@etherealengine/common/src/interfaces/Route'
 import { matches, Validator } from '@etherealengine/engine/src/common/functions/MatchesUtils'
-import { defineAction, defineState, dispatchAction, getState, useState } from '@etherealengine/hyperflux'
+import { defineAction, defineState, dispatchAction, getMutableState, useState } from '@etherealengine/hyperflux'
 
 import { API } from '../../API'
 import { NotificationService } from '../../common/services/NotificationService'
@@ -24,15 +24,15 @@ const AdminActiveRouteState = defineState({
 })
 
 const activeRoutesRetrievedReceptor = (action: typeof AdminActiveRouteActions.activeRoutesRetrieved.matches._TYPE) => {
-  const state = getState(AdminActiveRouteState)
+  const state = getMutableState(AdminActiveRouteState)
   return state.merge({ activeRoutes: action.data, total: action.data.length, updateNeeded: false })
 }
 
 export const AdminActiveRouteReceptors = {
   activeRoutesRetrievedReceptor
 }
 
-export const accessAdminActiveRouteState = () => getState(AdminActiveRouteState)
+export const accessAdminActiveRouteState = () => getMutableState(AdminActiveRouteState)
 
 export const useAdminActiveRouteState = () => useState(accessAdminActiveRouteState())