Skip to content

Commit 2f937d8

Browse files
refactor
1 parent 8e01eab commit 2f937d8

107 files changed

Lines changed: 2145 additions & 5393 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.

LICENSE

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

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
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
87
furnished to do so, subject to the following conditions:
98

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

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.
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.
-4.37 MB
Binary file not shown.
-381 KB
Binary file not shown.
-142 KB
Binary file not shown.
-168 KB
Binary file not shown.
-141 KB
Binary file not shown.

example/assets/models/anim_frontflip.glb

Lines changed: 0 additions & 3 deletions
This file was deleted.
1.61 MB
Binary file not shown.

example/local-only-multi-user-3d-web-experience/client/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@example/local-only-multi-user-3d-web-experience-client",
33
"private": true,
4-
"version": "0.21.3",
4+
"version": "0.22.0",
55
"files": [
66
"/build"
77
],
@@ -14,14 +14,14 @@
1414
"lint-fix": "eslint \"./{src,test}/**/*.{js,jsx,ts,tsx}\" --fix"
1515
},
1616
"dependencies": {
17-
"@mml-io/3d-web-client-core": "^0.21.3",
18-
"@mml-io/3d-web-text-chat": "^0.21.3",
19-
"@mml-io/3d-web-user-networking": "^0.21.3",
20-
"@mml-io/3d-web-voice-chat": "^0.21.3",
21-
"@mml-io/mml-web": "0.19.6",
22-
"@mml-io/mml-web-runner": "0.19.6",
23-
"@mml-io/mml-web-threejs-standalone": "0.19.6",
24-
"@mml-io/networked-dom-document": "0.19.6",
17+
"@mml-io/3d-web-client-core": "^0.22.0",
18+
"@mml-io/3d-web-text-chat": "^0.22.0",
19+
"@mml-io/3d-web-user-networking": "^0.22.0",
20+
"@mml-io/3d-web-voice-chat": "^0.22.0",
21+
"@mml-io/mml-web": "0.19.7",
22+
"@mml-io/mml-web-runner": "0.19.7",
23+
"@mml-io/mml-web-threejs-standalone": "0.19.7",
24+
"@mml-io/networked-dom-document": "0.19.7",
2525
"three": "0.163.0"
2626
},
2727
"devDependencies": {

example/local-only-multi-user-3d-web-experience/client/src/LocalAvatarClient.ts

Lines changed: 6 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -19,58 +19,20 @@ import { AudioListener, Euler, Scene, Vector3 } from "three";
1919

2020
import hdrJpgUrl from "../../../assets/hdr/puresky_2k.jpg";
2121
import airAnimationFileUrl from "../../../assets/models/anim_air.glb";
22-
import altFrontFlipFileUrl from "../../../assets/models/anim_alt_frontflip.glb";
23-
import backFlipFileUrl from "../../../assets/models/anim_backflip.glb";
24-
import frontFlipFileUrl from "../../../assets/models/anim_frontflip.glb";
22+
import doubleJumpAnimationFileUrl from "../../../assets/models/anim_double_jump.glb";
2523
import idleAnimationFileUrl from "../../../assets/models/anim_idle.glb";
2624
import jogAnimationFileUrl from "../../../assets/models/anim_jog.glb";
2725
import sprintAnimationFileUrl from "../../../assets/models/anim_run.glb";
2826
import defaultAvatarMeshFileUrl from "../../../assets/models/bot.glb";
2927

3028
import { LocalAvatarServer } from "./LocalAvatarServer";
3129

32-
const useBackFlip = true;
33-
const useAltFrontFlip = false;
34-
35-
const doubleJumpAnimationFileUrl = useBackFlip
36-
? backFlipFileUrl
37-
: useAltFrontFlip
38-
? altFrontFlipFileUrl
39-
: frontFlipFileUrl;
40-
41-
const idleAnimationSettings = {
42-
fileUrl: idleAnimationFileUrl,
43-
loop: true,
44-
};
45-
46-
const jogAnimationSettings = {
47-
fileUrl: jogAnimationFileUrl,
48-
loop: true,
49-
};
50-
51-
const sprintAnimationSettings = {
52-
fileUrl: sprintAnimationFileUrl,
53-
loop: true,
54-
};
55-
56-
const airAnimationSettings = {
57-
fileUrl: airAnimationFileUrl,
58-
loop: true,
59-
};
60-
61-
const doubleJumpAnimationSettings = {
62-
fileUrl: doubleJumpAnimationFileUrl,
63-
loop: false,
64-
discardNonRotationTransform: true,
65-
playbackSpeed: 1.42,
66-
};
67-
6830
const animationConfig: AnimationConfig = {
69-
idleAnimation: idleAnimationSettings,
70-
jogAnimation: jogAnimationSettings,
71-
sprintAnimation: sprintAnimationSettings,
72-
airAnimation: airAnimationSettings,
73-
doubleJumpAnimation: doubleJumpAnimationSettings,
31+
airAnimationFileUrl,
32+
idleAnimationFileUrl,
33+
jogAnimationFileUrl,
34+
sprintAnimationFileUrl,
35+
doubleJumpAnimationFileUrl,
7436
};
7537

7638
// Specify the avatar to use here:

0 commit comments

Comments
 (0)