Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-16 21:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

wrap far trigger too with seated check

Browse source
This commit is contained in:
Philip Rosedale 2017-01-05 13:08:50 -08:00
parent 0ad9a8625b
commit a689d52004
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/tutorials/entity_scripts/chair.js
View file

@ -99,7 +99,6 @@
var howFar = howFarAway(props.position); var howFar = howFarAway(props.position);
if ((state === STANDING) && (howFar < sitDistance) && isSeatOpen(props.position, sitDistance)) { if ((state === STANDING) && (howFar < sitDistance) && isSeatOpen(props.position, sitDistance)) {
moveToSeat(props.position, props.rotation); moveToSeat(props.position, props.rotation);
//MyAvatar.characterControllerEnabled = true;
enterSitPose(); enterSitPose();
state = SITTING; state = SITTING;
debugPrint("Sitting from being close"); debugPrint("Sitting from being close");
@ -117,7 +116,6 @@
props = Entities.getEntityProperties(entity, [ "position", "rotation" ]); props = Entities.getEntityProperties(entity, [ "position", "rotation" ]);
if ((state === STANDING) && isSeatOpen(props.position, sitDistance)) { if ((state === STANDING) && isSeatOpen(props.position, sitDistance)) {
moveToSeat(props.position, props.rotation); moveToSeat(props.position, props.rotation);
//MyAvatar.characterControllerEnabled = false;
enterSitPose(); enterSitPose();
state = SITTING; state = SITTING;
debugPrint("Sitting from mouse click"); debugPrint("Sitting from mouse click");
@ -125,12 +123,13 @@
} }
this.startFarTrigger = function() { this.startFarTrigger = function() {
if ((state === STANDING) && isSeatOpen(props.position, sitDistance)) {
moveToSeat(props.position, props.rotation); moveToSeat(props.position, props.rotation);
//MyAvatar.characterControllerEnabled = false;
enterSitPose(); enterSitPose();
state = SITTING; state = SITTING;
debugPrint("Sitting from far trigger"); debugPrint("Sitting from far trigger");
} }
}
this.checkSettings = function() { this.checkSettings = function() {
var dataProps = Entities.getEntityProperties(entity, [ "userData" ]); var dataProps = Entities.getEntityProperties(entity, [ "userData" ]);