mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-11 21:52:43 +02:00
Make sit script more stable.
This commit is contained in:
Atlante45
parent
f0d971fc6f
commit
9e6312ba0e
1 changed files with 76 additions and 71 deletions
|
|
@ -10,8 +10,8 @@
|
|||
var RELEASE_KEYS = ['w', 'a', 's', 'd', 'UP', 'LEFT', 'DOWN', 'RIGHT'];
|
||||
var RELEASE_TIME = 500; // ms
|
||||
var RELEASE_DISTANCE = 0.2; // meters
|
||||
var MAX_IK_ERROR = 20;
|
||||
var DESKTOP_UI_CHECK_INTERVAL = 250;
|
||||
var MAX_IK_ERROR = 30;
|
||||
var DESKTOP_UI_CHECK_INTERVAL = 100;
|
||||
var DESKTOP_MAX_DISTANCE = 5;
|
||||
var SIT_DELAY = 25
|
||||
var MAX_RESET_DISTANCE = 0.5
|
||||
|
|
@ -19,15 +19,16 @@
|
|||
this.entityID = null;
|
||||
this.timers = {};
|
||||
this.animStateHandlerID = null;
|
||||
this.interval = null;
|
||||
|
||||
this.preload = function(entityID) {
|
||||
this.entityID = entityID;
|
||||
}
|
||||
this.unload = function() {
|
||||
if (MyAvatar.sessionUUID === this.getSeatUser()) {
|
||||
if (Settings.getValue(SETTING_KEY) === this.entityID) {
|
||||
this.sitUp();
|
||||
}
|
||||
if (this.interval) {
|
||||
if (this.interval !== null) {
|
||||
Script.clearInterval(this.interval);
|
||||
this.interval = null;
|
||||
}
|
||||
|
|
@ -35,42 +36,60 @@
|
|||
}
|
||||
|
||||
this.setSeatUser = function(user) {
|
||||
var userData = Entities.getEntityProperties(this.entityID, ["userData"]).userData;
|
||||
userData = JSON.parse(userData);
|
||||
try {
|
||||
var userData = Entities.getEntityProperties(this.entityID, ["userData"]).userData;
|
||||
userData = JSON.parse(userData);
|
||||
|
||||
if (user) {
|
||||
userData.seat.user = user;
|
||||
} else {
|
||||
delete userData.seat.user;
|
||||
if (user !== null) {
|
||||
userData.seat.user = user;
|
||||
} else {
|
||||
delete userData.seat.user;
|
||||
}
|
||||
|
||||
Entities.editEntity(this.entityID, {
|
||||
userData: JSON.stringify(userData)
|
||||
});
|
||||
} catch (e) {
|
||||
// Do Nothing
|
||||
}
|
||||
|
||||
Entities.editEntity(this.entityID, {
|
||||
userData: JSON.stringify(userData)
|
||||
});
|
||||
}
|
||||
this.getSeatUser = function() {
|
||||
var properties = Entities.getEntityProperties(this.entityID, ["userData", "position"]);
|
||||
var userData = JSON.parse(properties.userData);
|
||||
try {
|
||||
var properties = Entities.getEntityProperties(this.entityID, ["userData", "position"]);
|
||||
var userData = JSON.parse(properties.userData);
|
||||
|
||||
if (userData.seat.user && userData.seat.user !== MyAvatar.sessionUUID) {
|
||||
var avatar = AvatarList.getAvatar(userData.seat.user);
|
||||
if (avatar && Vec3.distance(avatar.position, properties.position) > RELEASE_DISTANCE) {
|
||||
return null;
|
||||
// If MyAvatar return my uuid
|
||||
if (userData.seat.user === MyAvatar.sessionUUID) {
|
||||
return userData.seat.user;
|
||||
}
|
||||
|
||||
|
||||
// If Avatar appears to be sitting
|
||||
if (userData.seat.user) {
|
||||
var avatar = AvatarList.getAvatar(userData.seat.user);
|
||||
if (avatar && (Vec3.distance(avatar.position, properties.position) < RELEASE_DISTANCE)) {
|
||||
return userData.seat.user;
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
// Do nothing
|
||||
}
|
||||
return userData.seat.user;
|
||||
|
||||
// Nobody on the seat
|
||||
return null;
|
||||
}
|
||||
|
||||
// Is the seat used
|
||||
this.checkSeatForAvatar = function() {
|
||||
var seatUser = this.getSeatUser();
|
||||
var avatarIdentifiers = AvatarList.getAvatarIdentifiers();
|
||||
for (var i in avatarIdentifiers) {
|
||||
var avatar = AvatarList.getAvatar(avatarIdentifiers[i]);
|
||||
if (avatar && avatar.sessionUUID === seatUser) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// If MyAvatar appears to be sitting
|
||||
if (seatUser === MyAvatar.sessionUUID) {
|
||||
var properties = Entities.getEntityProperties(this.entityID, ["position"]);
|
||||
return Vec3.distance(MyAvatar.position, properties.position) < RELEASE_DISTANCE;
|
||||
}
|
||||
return false;
|
||||
|
||||
return seatUser !== null;
|
||||
}
|
||||
|
||||
this.sitDown = function() {
|
||||
|
|
@ -79,10 +98,9 @@
|
|||
return;
|
||||
}
|
||||
|
||||
this.setSeatUser(MyAvatar.sessionUUID);
|
||||
|
||||
var previousValue = Settings.getValue(SETTING_KEY);
|
||||
Settings.setValue(SETTING_KEY, this.entityID);
|
||||
this.setSeatUser(MyAvatar.sessionUUID);
|
||||
if (previousValue === "") {
|
||||
MyAvatar.characterControllerEnabled = false;
|
||||
MyAvatar.hmdLeanRecenterEnabled = false;
|
||||
|
|
@ -92,32 +110,34 @@
|
|||
MyAvatar.resetSensorsAndBody();
|
||||
}
|
||||
|
||||
var that = this;
|
||||
Script.setTimeout(function() {
|
||||
var properties = Entities.getEntityProperties(that.entityID, ["position", "rotation"]);
|
||||
var index = MyAvatar.getJointIndex("Hips");
|
||||
MyAvatar.pinJoint(index, properties.position, properties.rotation);
|
||||
var properties = Entities.getEntityProperties(this.entityID, ["position", "rotation"]);
|
||||
var index = MyAvatar.getJointIndex("Hips");
|
||||
MyAvatar.pinJoint(index, properties.position, properties.rotation);
|
||||
|
||||
that.animStateHandlerID = MyAvatar.addAnimationStateHandler(function(properties) {
|
||||
return { headType: 0 };
|
||||
}, ["headType"]);
|
||||
Script.update.connect(that, that.update);
|
||||
Controller.keyPressEvent.connect(that, that.keyPressed);
|
||||
Controller.keyReleaseEvent.connect(that, that.keyReleased);
|
||||
for (var i in RELEASE_KEYS) {
|
||||
Controller.captureKeyEvents({ text: RELEASE_KEYS[i] });
|
||||
}
|
||||
}, SIT_DELAY);
|
||||
this.animStateHandlerID = MyAvatar.addAnimationStateHandler(function(properties) {
|
||||
return { headType: 0 };
|
||||
}, ["headType"]);
|
||||
Script.update.connect(this, this.update);
|
||||
Controller.keyPressEvent.connect(this, this.keyPressed);
|
||||
Controller.keyReleaseEvent.connect(this, this.keyReleased);
|
||||
for (var i in RELEASE_KEYS) {
|
||||
Controller.captureKeyEvents({ text: RELEASE_KEYS[i] });
|
||||
}
|
||||
}
|
||||
|
||||
this.sitUp = function() {
|
||||
if (MyAvatar.sessionUUID !== this.getSeatUser()) {
|
||||
// Duplicate call, bail
|
||||
return;
|
||||
MyAvatar.removeAnimationStateHandler(this.animStateHandlerID);
|
||||
Script.update.disconnect(this, this.update);
|
||||
Controller.keyPressEvent.disconnect(this, this.keyPressed);
|
||||
Controller.keyReleaseEvent.disconnect(this, this.keyReleased);
|
||||
for (var i in RELEASE_KEYS) {
|
||||
Controller.releaseKeyEvents({ text: RELEASE_KEYS[i] });
|
||||
}
|
||||
this.setSeatUser(null);
|
||||
|
||||
this.setSeatUser(null);
|
||||
if (Settings.getValue(SETTING_KEY) === this.entityID) {
|
||||
Settings.setValue(SETTING_KEY, "");
|
||||
|
||||
for (i in ROLES) {
|
||||
MyAvatar.restoreRoleAnimation(ROLES[i]);
|
||||
}
|
||||
|
|
@ -133,16 +153,6 @@
|
|||
MyAvatar.bodyPitch = 0.0;
|
||||
MyAvatar.bodyRoll = 0.0;
|
||||
}, SIT_DELAY);
|
||||
|
||||
Settings.setValue(SETTING_KEY, "");
|
||||
}
|
||||
|
||||
MyAvatar.removeAnimationStateHandler(this.animStateHandlerID);
|
||||
Script.update.disconnect(this, this.update);
|
||||
Controller.keyPressEvent.disconnect(this, this.keyPressed);
|
||||
Controller.keyReleaseEvent.disconnect(this, this.keyReleased);
|
||||
for (var i in RELEASE_KEYS) {
|
||||
Controller.releaseKeyEvents({ text: RELEASE_KEYS[i] });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -203,15 +213,11 @@
|
|||
// Move avatar in front of the chair to avoid getting stuck in collision hulls
|
||||
if (avatarDistance < MAX_RESET_DISTANCE) {
|
||||
var offset = { x: 0, y: 1.0, z: -0.5 - properties.dimensions.z * properties.registrationPoint.z };
|
||||
Vec3.print("offset:", Vec3.multiplyQbyV(properties.rotation, offset));
|
||||
var position = Vec3.sum(properties.position, Vec3.multiplyQbyV(properties.rotation, offset));
|
||||
MyAvatar.position = position;
|
||||
}
|
||||
|
||||
var that = this;
|
||||
Script.setTimeout(function() {
|
||||
that.sitUp();
|
||||
}, SIT_DELAY);
|
||||
this.sitUp();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -223,20 +229,19 @@
|
|||
if (RELEASE_KEYS.indexOf(event.text) !== -1) {
|
||||
var that = this;
|
||||
this.timers[event.text] = Script.setTimeout(function() {
|
||||
delete that.timers[event.text];
|
||||
|
||||
var properties = Entities.getEntityProperties(that.entityID);
|
||||
var avatarDistance = Vec3.distance(MyAvatar.position, properties.position);
|
||||
|
||||
// Move avatar in front of the chair to avoid getting stuck in collision hulls
|
||||
if (avatarDistance < MAX_RESET_DISTANCE) {
|
||||
var offset = { x: 0, y: 1.0, z: -0.5 - properties.dimensions.z * properties.registrationPoint.z };
|
||||
Vec3.print("offset1:", Vec3.multiplyQbyV(properties.rotation, offset));
|
||||
var position = Vec3.sum(properties.position, Vec3.multiplyQbyV(properties.rotation, offset));
|
||||
MyAvatar.position = position;
|
||||
}
|
||||
|
||||
Script.setTimeout(function() {
|
||||
that.sitUp();
|
||||
}, SIT_DELAY);
|
||||
that.sitUp();
|
||||
}, RELEASE_TIME);
|
||||
}
|
||||
}
|
||||
|
|
@ -256,7 +261,7 @@
|
|||
}
|
||||
|
||||
this.hoverEnterEntity = function(event) {
|
||||
if (isInEditMode() || (MyAvatar.sessionUUID === this.getSeatUser())) {
|
||||
if (isInEditMode() || this.interval !== null) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -272,7 +277,7 @@
|
|||
}, DESKTOP_UI_CHECK_INTERVAL);
|
||||
}
|
||||
this.hoverLeaveEntity = function(event) {
|
||||
if (this.interval) {
|
||||
if (this.interval !== null) {
|
||||
Script.clearInterval(this.interval);
|
||||
this.interval = null;
|
||||
}
|
||||
|
|
@ -280,7 +285,7 @@
|
|||
}
|
||||
|
||||
this.clickDownOnEntity = function (id, event) {
|
||||
if (isInEditMode() || (MyAvatar.sessionUUID === this.getSeatUser())) {
|
||||
if (isInEditMode()) {
|
||||
return;
|
||||
}
|
||||
if (event.isPrimaryButton && this.canSitDesktop()) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue