Skip to content

Commit 1fa5799

Browse files
major refactor
1 parent dda35bf commit 1fa5799

496 files changed

Lines changed: 54791 additions & 37800 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.depcheckrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
ignores: [
2+
"rimraf",
3+
"cross-env",
4+
"tsx"
5+
]

.env.example

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
export vpsuser="your_vps_user"
2-
export vpsaddress="your_vps_address"
3-
export mmlappdir="app_directory_in_your_vps_user_home"
4-
1+
export vpsuser="user"
2+
export vpsaddress="domain.fqdn"
3+
export mmlappdir="directory/path/to/app"

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
node_modules
22
dist
3+
build

.eslintrc

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
"parserOptions": {
44
"ecmaVersion": 12,
55
"sourceType": "module",
6-
"project": "./tsconfig.json",
6+
"project": [
7+
"./tsconfig.json",
8+
"./apps/*/client/tsconfig.json",
9+
"./apps/*/server/tsconfig.json"
10+
]
711
},
812
"extends": [
913
"plugin:@typescript-eslint/recommended",
@@ -13,7 +17,7 @@
1317
"plugin:import/typescript",
1418
"plugin:react/recommended",
1519
"plugin:react/jsx-runtime",
16-
"plugin:react-hooks/recommended",
20+
"plugin:react-hooks/recommended"
1721
],
1822
"plugins": ["@typescript-eslint", "prettier"],
1923
"rules": {
@@ -22,8 +26,8 @@
2226
"error",
2327
{
2428
"newlines-between": "always",
25-
"alphabetize": { "order": "asc", "caseInsensitive": true },
26-
},
29+
"alphabetize": { "order": "asc", "caseInsensitive": true }
30+
}
2731
],
2832
"@typescript-eslint/lines-between-class-members": "off",
2933
"@typescript-eslint/no-inferrable-types": "off",
@@ -33,20 +37,20 @@
3337
"@typescript-eslint/no-non-null-assertion": "off",
3438
"@typescript-eslint/no-empty-interface": "off",
3539
"@typescript-eslint/no-unused-expressions": "off",
36-
"import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
37-
"import/extensions": "off",
40+
"import/no-extraneous-dependencies": ["error", {"devDependencies": true}],
41+
"import/extensions": "off"
3842
},
3943
"overrides": [
4044
{
4145
"files": ["*.js"],
4246
"rules": {
43-
"@typescript-eslint/no-var-requires": "off",
44-
},
45-
},
47+
"@typescript-eslint/no-var-requires": "off"
48+
}
49+
}
4650
],
4751
"settings": {
4852
"react": {
49-
"version": "detect",
50-
},
51-
},
53+
"version": "detect"
54+
}
55+
}
5256
}

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
*.glb filter=lfs diff=lfs merge=lfs -text
22
*.blend filter=lfs diff=lfs merge=lfs -text
3+
*.fbx filter=lfs diff=lfs merge=lfs -text
4+
*.obj filter=lfs diff=lfs merge=lfs -text
5+
*.usdz filter=lfs diff=lfs merge=lfs -text

.gitignore

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ tsconfig.tsbuildinfo
2020
build
2121
dist
2222

23+
# Coverage
24+
coverage
25+
2326
# IDEs and editors
2427
.idea
2528
.project
@@ -38,9 +41,8 @@ dist
3841

3942
.nx
4043

41-
*.copy.html
4244
.envrc
4345
.direnv
44-
renamed-packages.json
45-
example/web-asset-compress/server/uploads
46-
copyenv.sh
46+
.turbo/
47+
test-results/
48+
apps/web-asset-compress/server/uploads

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.eslintrc

.vscode/settings.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
"editor.formatOnSave": true
1616
},
1717
"[json][jsonc]": {
18-
"editor.formatOnSave": true,
19-
"editor.defaultFormatter": "esbenp.prettier-vscode"
18+
"editor.defaultFormatter": "esbenp.prettier-vscode",
19+
"editor.formatOnPaste": true,
20+
"editor.formatOnSave": true
2021
},
2122
"search.exclude": {
2223
"package-lock.json": true

LICENSE

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
Copyright (c) 2023 Marco Gomez (TheCodeTherapy)
1+
Copyright (c) 2023 Improbable MV Limited
22

3-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
4-
associated documentation files (the "Software"), to deal in the Software without restriction,
5-
including without limitation the rights to use, copy, modify, merge, publish, distribute,
6-
sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is
78
furnished to do so, subject to the following conditions:
89

9-
The above copyright notice and this permission notice shall be included in all copies or substantial
10-
portions of the Software.
10+
The above copyright notice and this permission notice shall be included in all
11+
copies or substantial portions of the Software.
1112

12-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
13-
NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
14-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
15-
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
16-
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
SOFTWARE.

README.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ This repository includes the following published packages:
3030
- An MML avatar editor (using `m-character`).
3131
- [`@mml-io/3d-web-text-chat`](./packages/3d-web-text-chat)
3232
- Contains WebSocket server and client implementations for text chat.
33-
- [`@mml-io/3d-web-voice-chat`](./packages/3d-web-voice-chat)
34-
- Client implementation for spatial voice chat.
3533

3634
## Main features
3735

@@ -61,21 +59,16 @@ npm install
6159
npm run iterate
6260
```
6361

64-
## Examples
62+
## Apps
6563

66-
- [`example/multi-user-3d-web-experience`](./example/multi-user-3d-web-experience)
64+
- [`apps/multi-user-3d-web-experience`](./apps/multi-user-3d-web-experience)
6765
- Once the server is running (see [above](#running-examples--iterating-locally)), open
6866
`http://localhost:8080`.
6967
- A client and server pair of packages that uses the `@mml-io/3d-web-experience-client` and
7068
`@mml-io/3d-web-experience-server` packages to create a multi-user 3d web experience that
7169
includes MML hosting and text chat.
72-
- [`example/local-only-multi-user-3d-web-experience`](./example/local-only-multi-user-3d-web-experience)
70+
- [`apps/local-only-multi-user-3d-web-experience`](./apps/local-only-multi-user-3d-web-experience)
7371
- Once the server is running (see [above](#running-examples--iterating-locally)), open
7472
`http://localhost:8081`.
7573
- A client that uses the various packages to create a 3d web experience that only works locally.
7674
No server is needed, but there is a server to serve the client.
77-
- [`example/web-avatar-editor`](./example/web-avatar-editor)
78-
- Once the server is running (see [above](#running-examples--iterating-locally)), open
79-
`http://localhost:8082`.
80-
- An avatar editor that uses the `@mml-io/3d-web-standalone-avatar-editor` to create and edit MML
81-
avatars and a simple Express server that hosts the editor.

0 commit comments

Comments
 (0)