Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pick up tree animation problem. #3010

Merged
merged 73 commits into from
May 26, 2022
Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
e5a5104
dev: use left to z-targeting.
gonnavis May 5, 2022
11828a6
dev
gonnavis May 5, 2022
f76bfd4
uses zTargeting.focusTargetReticle instead of cameraManager.target2.
gonnavis May 5, 2022
1e7a602
dev
gonnavis May 5, 2022
9d5c73e
Merge remote-tracking branch 'upstream/z-targeting' into zTargetingEy…
gonnavis May 5, 2022
d1c3d83
dev
gonnavis May 5, 2022
03497b4
Merge remote-tracking branch 'upstream/z-targeting' into zTargetingDev
gonnavis May 5, 2022
e13e116
doing.
gonnavis May 5, 2022
00b9ce2
dev
gonnavis May 6, 2022
ace5695
Merge remote-tracking branch 'upstream/z-targeting' into zTargetingDev
gonnavis May 15, 2022
b1b72c2
dev
gonnavis May 15, 2022
53ef3fc
dev
gonnavis May 15, 2022
b8ff837
dev
gonnavis May 15, 2022
f6d8346
adjust anim: pick up arms.
gonnavis May 15, 2022
af0aeac
dev
gonnavis May 15, 2022
917388d
add scilly_drophunter_v31.6_Guilty.vrm, fix bone structure bug.
gonnavis May 17, 2022
53dca87
version1 and version2.
gonnavis May 17, 2022
3d62d6d
Merge remote-tracking branch 'upstream/z-targeting' into PickUpTree
gonnavis May 17, 2022
93ce67d
clean.
gonnavis May 17, 2022
cdf084d
lerp app.position to average position/quaternion/scale of boneAttachm…
gonnavis May 17, 2022
fd83bcb
use pick up anim blend version 1.
gonnavis May 17, 2022
403803c
clean.
gonnavis May 17, 2022
c6e935f
dev
gonnavis May 17, 2022
36692fa
adjust pick up anim when run and crouch.
gonnavis May 17, 2022
0b4440b
Merge branch 'PickUpTree' into PickUpTreePr
gonnavis May 17, 2022
932dd70
clean.
gonnavis May 17, 2022
c60cbcd
fix comment error.
gonnavis May 17, 2022
d03ddb7
Merge branch 'PickUpTree' into PickUpTreePr
gonnavis May 17, 2022
f604eaf
fix pick up problem when jump.
gonnavis May 17, 2022
01139f9
Merge branch 'PickUpTree' into PickUpTreePr
gonnavis May 17, 2022
e5277d7
dev
gonnavis May 18, 2022
3e8f3da
ok: throw rotation, but no localPlayer rotation.
gonnavis May 18, 2022
b67faa5
ok: throw rotation and position.
gonnavis May 18, 2022
c79047e
clean.
gonnavis May 18, 2022
c6944dc
check `quaternion === 'upVectorHipsToPosition'`.
gonnavis May 18, 2022
4ef2c57
use localXXX instead of new XXX.
gonnavis May 18, 2022
c0c0677
use player instead of localPlayer.
gonnavis May 18, 2022
d4ee917
dev
gonnavis May 18, 2022
0d69133
speed up throwReleaseTime from 750 to 220.
gonnavis May 18, 2022
279eb03
one click play a full throw/attack animation.
gonnavis May 18, 2022
5db0595
fix not play pick up anim after used bow ( unuseAnimation not clear )…
gonnavis May 18, 2022
e8da397
Merge branch 'PickUpTree' into PickUpTreePr
gonnavis May 18, 2022
59a41a4
clean.
gonnavis May 18, 2022
a9a6283
Merge remote-tracking branch 'upstream/z-targeting' into PickUpTree
gonnavis May 18, 2022
fce0701
Merge branch 'PickUpTree' into PickUpTreePr
gonnavis May 18, 2022
c4f575a
Merge branch 'z-targeting' into PickUpTreePr
May 20, 2022
3457224
dev
gonnavis May 20, 2022
af34123
Merge remote-tracking branch 'upstream/z-targeting' into PickUpTree
gonnavis May 20, 2022
6ad30e2
Use textametron's new continuous combo animation.
gonnavis May 20, 2022
0ac88af
Merge branch 'z-targeting' into PickUpTreePr
May 20, 2022
9a5f48b
Merge branch 'PickUpTree' into PickUpTreePr
gonnavis May 20, 2022
69feb51
Add player's velocity to the thrown object.
gonnavis May 20, 2022
d4b5525
Merge branch 'PickUpTree' into PickUpTreePr
gonnavis May 20, 2022
cfebd94
Merge branch 'z-targeting' into PickUpTreePr
May 20, 2022
e35fc0e
dev
gonnavis May 21, 2022
f596444
simplify logic: _mousedown(), _mouseup(). && don't auto endUse() when…
gonnavis May 21, 2022
d98645f
simplify logic: delete `needResetUseTime`, add/use `localPlayer.actio…
gonnavis May 21, 2022
f751818
simplify logic: del `needEndUse` and avatar's `animationEnd` event, c…
gonnavis May 21, 2022
c684c4d
Merge branch 'PickUpTree' into PickUpTreePr
gonnavis May 21, 2022
d420a6e
Merge branch 'PickUpTreePr' of https://github.com/gonnavis/app into P…
gonnavis May 21, 2022
36a88c8
use `const`.
gonnavis May 21, 2022
942e979
Merge branch 'PickUpTree' into PickUpTreePr
gonnavis May 21, 2022
be06415
use `setFromMatrix` instead of `decompose`.
gonnavis May 21, 2022
5a23ecb
Merge branch 'PickUpTree' into PickUpTreePr
gonnavis May 21, 2022
a818d11
fix no localPlayer bug.
gonnavis May 25, 2022
a08dbe2
fix no localPlayer bug.
gonnavis May 25, 2022
6de94e6
Merge branch 'z-targeting' into Vis/PickUpTree
gonnavis May 26, 2022
2b15229
Merge branch 'Vis/PickUpTree' into Vis/PickUpTreePr
gonnavis May 26, 2022
00b62b1
dev
gonnavis May 26, 2022
9b8d96f
fix hold animation when fly.
gonnavis May 26, 2022
5d57055
del one click logics.
gonnavis May 26, 2022
26fbedb
Merge branch 'Vis/PickUpTree' into Vis/PickUpTreePr
gonnavis May 26, 2022
501d188
del one click.
gonnavis May 26, 2022
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
Prev Previous commit
Next Next commit
doing.
gonnavis committed May 5, 2022
commit e13e1168e830a5780dbb987d1e9201f699ec195e
2 changes: 1 addition & 1 deletion game.js
Original file line number Diff line number Diff line change
@@ -435,7 +435,7 @@ let lastHitTimes = new WeakMap();
const _gameUpdate = (timestamp, timeDiff) => {
const now = timestamp;
const renderer = getRenderer();
console.log(zTargeting?.focusTargetReticle?.position?.x, zTargeting?.focusTargetReticle?.position?.y, zTargeting?.focusTargetReticle?.position?.z);
console.log(cameraManager.focus, zTargeting?.focusTargetReticle?.position?.x, zTargeting?.focusTargetReticle?.position?.y, zTargeting?.focusTargetReticle?.position?.z);

const localPlayer = metaversefileApi.useLocalPlayer();

1 change: 0 additions & 1 deletion scenes/test.scn
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@
}
},
{ "position": [ 0, 0, 0 ], "start_url": "http://localhost/lib/webaverse_resource/street/index.js" },
{ "position": [ 0, 0, 0 ], "start_url": "http://localhost/lib/webaverse_resource/mirror/" },
{ "position": [ 0, 1, -5 ], "start_url": "http://localhost/lib/webaverse_resource/bow/" },
{ "position": [ 1.5, 1, -5 ], "start_url": "http://localhost/lib/webaverse_resource/pistol/" },
{ "position": [ 3, 1, -5 ], "start_url": "http://localhost/lib/webaverse_resource/rifle/" },
3 changes: 3 additions & 0 deletions webaverse.js
Original file line number Diff line number Diff line change
@@ -371,6 +371,9 @@ const _startHacks = webaverse => {
const localPlayer = metaversefileApi.useLocalPlayer();
const vpdAnimations = Avatar.getAnimations().filter(animation => animation.name.endsWith('.vpd'));

window.localPlayer = localPlayer;
window.game = game;

// let playerDiorama = null;
const lastEmotionKey = {
key: -1,
11 changes: 8 additions & 3 deletions z-targeting.js
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@ import * as sounds from './sounds.js';
import cameraManager from './camera-manager.js';
import physicsManager from './physics-manager.js';
import {localPlayer} from './players.js';
import game from './game.js';

const localVector = new THREE.Vector3();

@@ -131,6 +132,7 @@ class ZTargeting extends THREE.Object3D {
}
setQueryResult(timestamp) {
let reticles;
if (cameraManager.focus) return;
if (localPlayer.hasAction('aim')) {
this.queryResults.snapshot(camera);
reticles = this.queryResults.results;
@@ -185,9 +187,9 @@ class ZTargeting extends THREE.Object3D {
}

cameraManager.setFocus(true);
const remoteApp = this.focusTargetReticle ? metaversefile.getAppByPhysicsId(this.focusTargetReticle.physicsId) : null;
if (this.focusTargetReticle) debugger
cameraManager.setStaticTarget(localPlayer.avatar.modelBones.Head, remoteApp);
// const remoteApp = this.focusTargetReticle ? metaversefile.getAppByPhysicsId(this.focusTargetReticle.physicsId) : null;
// if (this.focusTargetReticle) debugger
// cameraManager.setStaticTarget(localPlayer.avatar.modelBones.Head, remoteApp);
}
}
handleUp() {
@@ -198,13 +200,16 @@ class ZTargeting extends THREE.Object3D {
if (this.focusTargetReticle) {
sounds.playSoundName('zTargetCancel');
}

game.menuUnaim();
}
}
toggle() {
if (cameraManager.focus) {
this.handleUp();
} else {
this.handleDown(localPlayer);
game.menuAim();

if (this.queryResults.results.length === 0) {
setTimeout(() => {