Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

make sure observed held objects are active in bullet, disable equip spring action

Browse source
This commit is contained in:
Seth Alves 2015-12-01 10:49:07 -08:00
parent 11f18c3ada
commit 7f95e1eec6
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
examples/controllers/handControllerGrab.js
View file

@ -479,7 +479,11 @@ function MyController(hand) {
this.setState(STATE_NEAR_GRABBING); this.setState(STATE_NEAR_GRABBING);
} else { // equipping } else { // equipping
if (typeof grabbableData.spatialKey !== 'undefined') { if (typeof grabbableData.spatialKey !== 'undefined') {
this.setState(STATE_EQUIP_SPRING); // TODO
// if we go to STATE_EQUIP_SPRING the item will be pulled to the hand and will then switch
// to STATE_EQUIP. This needs some debugging, so just jump straight to STATE_EQUIP here.
// this.setState(STATE_EQUIP_SPRING);
this.setState(STATE_EQUIP);
} else { } else {
this.setState(STATE_EQUIP); this.setState(STATE_EQUIP);
} }
@ -493,7 +497,9 @@ function MyController(hand) {
this.grabbedEntity = intersection.entityID; this.grabbedEntity = intersection.entityID;
if (typeof grabbableData.spatialKey !== 'undefined' && this.state == STATE_EQUIP_SEARCHING) { if (typeof grabbableData.spatialKey !== 'undefined' && this.state == STATE_EQUIP_SEARCHING) {
// if a distance pick in equip mode hits something with a spatialKey, equip it // if a distance pick in equip mode hits something with a spatialKey, equip it
this.setState(STATE_EQUIP_SPRING); // TODO use STATE_EQUIP_SPRING here once it works right.
// this.setState(STATE_EQUIP_SPRING);
this.setState(STATE_EQUIP);
return; return;
} else if (this.state == STATE_SEARCHING) { } else if (this.state == STATE_SEARCHING) {
this.setState(STATE_DISTANCE_HOLDING); this.setState(STATE_DISTANCE_HOLDING);
@ -1248,4 +1254,4 @@ function cleanup() {
} }
Script.scriptEnding.connect(cleanup); Script.scriptEnding.connect(cleanup);
Script.update.connect(update); Script.update.connect(update);

1
interface/src/avatar/AvatarActionHold.cpp
View file

@ -330,5 +330,6 @@ void AvatarActionHold::deserialize(QByteArray serializedArguments) {
_active = true; _active = true;
}); });
activateBody();
forceBodyNonStatic(); forceBodyNonStatic();
} }