Skip to content
This repository was archived by the owner on Aug 21, 2024. It is now read-only.

Event Sourcing for Grabbables #8283

Merged
HexaField merged 10 commits into from
Jul 19, 2023
Merged

Event Sourcing for Grabbables #8283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8a4be34
fix netcode for authorship transfer
HexaField Jul 14, 2023
fa9c1d8
event sourcing
HexaField Jul 14, 2023
772ff6b
rename system
HexaField Jul 14, 2023
0de8964
rename everything
HexaField Jul 14, 2023
4ed39af
Merge branch 'dev' of https://github.com/EtherealEngine/etherealengin…
HexaField Jul 18, 2023
555bd48
fix tests
HexaField Jul 18, 2023
f9140e6
more tests
HexaField Jul 18, 2023
c46dd69
fix grabbables
HexaField Jul 18, 2023
2d5e36f
make grabbable dynamic
HexaField Jul 18, 2023
a59853a
reenable editor tests
HexaField Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 0 additions & 43 deletions .mocharc.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/client-core/.mocharc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = {
spec: ['**/*.test.*'],
require: [
'tests/mocha.env', // init env here
'ts-node/register'
'jsdom-global/register'
],
extension: [
'ts',
Expand Down
4 changes: 2 additions & 2 deletions packages/client-core/src/world/startClientSystems.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import {
import { startSystems } from '@etherealengine/engine/src/ecs/functions/SystemFunctions'
import { ButtonCleanupSystem } from '@etherealengine/engine/src/input/systems/ButtonCleanupSystem'
import { ClientInputSystem } from '@etherealengine/engine/src/input/systems/ClientInputSystem'
import { EquippableSystem } from '@etherealengine/engine/src/interaction/systems/EquippableSystem'
import { GrabbableSystem } from '@etherealengine/engine/src/interaction/systems/GrabbableSystem'
import { InteractiveSystem } from '@etherealengine/engine/src/interaction/systems/InteractiveSystem'
import { MediaControlSystem } from '@etherealengine/engine/src/interaction/systems/MediaControlSystem'
import { MotionCaptureSystem } from '@etherealengine/engine/src/mocap/MotionCaptureSystem'
Expand All @@ -68,7 +68,7 @@ export const startClientSystems = () => {
})

/** Fixed */
startSystems([IncomingNetworkSystem, EntityNetworkStateSystem, EquippableSystem, AvatarSimulationSystemGroup], {
startSystems([IncomingNetworkSystem, EntityNetworkStateSystem, GrabbableSystem, AvatarSimulationSystemGroup], {
with: SimulationSystemGroup
})

Expand Down
22 changes: 9 additions & 13 deletions packages/client-core/tests/mocha.env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,14 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20
Ethereal Engine. All Rights Reserved.
*/


process.env.APP_ENV = 'test'
process.env.NODE_ENV = 'test'
process.env.TS_NODE_FILES = true
process.env.TS_NODE_PROJECT = 'tsconfig.json'
process.env.TS_NODE_COMPILER_OPTIONS = '{\"module\": \"commonjs\" }'

const sass = require('sass')
const hook = require('css-modules-require-hook')

hook({
extensions: [ '.scss', '.css' ],
generateScopedName: '[local]___[hash:base64:5]',
preprocessCss: data => sass.compileString(data).css
})
process.env.NODE_TLS_REJECT_UNAUTHORIZED='0'

Check failure

Code scanning / CodeQL

Disabling certificate validation

Disabling certificate validation is strongly discouraged.

require("ts-node").register({
project: './tsconfig.json',
files: true,
swc: true
})

require("fix-esm").register()
59 changes: 0 additions & 59 deletions packages/client-core/tests/setup.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/client/.mocharc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = {
spec: ['tests/**/*.test.ts'],
require: [
'tests/mocha.env', // init env here
'ts-node/register'
'jsdom-global/register'
],
extension: [
'ts'
Expand Down
13 changes: 9 additions & 4 deletions packages/client/tests/mocha.env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,14 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20
Ethereal Engine. All Rights Reserved.
*/


process.env.APP_ENV = 'test'
process.env.NODE_ENV = 'test'
process.env.TS_NODE_FILES = true
process.env.TS_NODE_PROJECT = 'tsconfig.json'
process.env.TS_NODE_COMPILER_OPTIONS = '{\"module\": \"commonjs\" }'
process.env.NODE_TLS_REJECT_UNAUTHORIZED='0'

Check failure

Code scanning / CodeQL

Disabling certificate validation

Disabling certificate validation is strongly discouraged.

require("ts-node").register({
project: './tsconfig.json',
files: true,
swc: true
})

require("fix-esm").register()
59 changes: 0 additions & 59 deletions packages/client/tests/setup.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/common/.mocharc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = {
spec: ['tests/**/*.test.ts'],
require: [
'tests/mocha.env', // init env here
'ts-node/register'
'jsdom-global/register'
],
extension: [
'ts'
Expand Down
15 changes: 10 additions & 5 deletions packages/common/tests/mocha.env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,14 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20
Ethereal Engine. All Rights Reserved.
*/

process.env.APP_ENV = 'test'
process.env.NODE_ENV = 'test'
process.env.NODE_TLS_REJECT_UNAUTHORIZED='0'

Check failure

Code scanning / CodeQL

Disabling certificate validation

Disabling certificate validation is strongly discouraged.

process.env.TEST = 'true'
process.env.APP_ENV = 'development'
process.env.TS_NODE_FILES = true
process.env.TS_NODE_PROJECT = 'tsconfig.json'
process.env.TS_NODE_COMPILER_OPTIONS = '{\"module\": \"commonjs\" }'
require("ts-node").register({
project: './tsconfig.json',
files: true,
swc: true
})

require("fix-esm").register()
59 changes: 0 additions & 59 deletions packages/common/tests/setup.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/editor/.mocharc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module.exports = {
],
require: [
'tests/mocha.env', // init env here
'ts-node/register'
'jsdom-global/register'
],
extension: [
'ts'
Expand Down
3 changes: 2 additions & 1 deletion packages/editor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
},
"npmClient": "npm",
"scripts": {
"check-errors": "tsc --noemit"
"check-errors": "tsc --noemit",
"test": "mocha --config .mocharc.js"
},
"resolutions": {
"@types/react": "18.0.28",
Expand Down
13 changes: 9 additions & 4 deletions packages/editor/tests/mocha.env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,14 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20
Ethereal Engine. All Rights Reserved.
*/


process.env.APP_ENV = 'test'
process.env.NODE_ENV = 'test'
process.env.TS_NODE_FILES = true
process.env.TS_NODE_PROJECT = 'tsconfig.json'
process.env.TS_NODE_COMPILER_OPTIONS = '{\"module\": \"commonjs\" }'
process.env.NODE_TLS_REJECT_UNAUTHORIZED='0'

Check failure

Code scanning / CodeQL

Disabling certificate validation

Disabling certificate validation is strongly discouraged.

require("ts-node").register({
project: './tsconfig.json',
files: true,
swc: true
})

require("fix-esm").register()
Loading