Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:49:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Update repo script with marketplace script"

Browse source 
This reverts commit 5139f3f503.
This commit is contained in:
Alexia Mandeville 2018-03-12 13:17:23 -07:00
parent 61e2814db4
commit c760c44531
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scripts/tutorials/entity_scripts/sit.js
View file

@ -12,9 +12,9 @@
Script.include("/~/system/libraries/utils.js"); Script.include("/~/system/libraries/utils.js");
if (!String.prototype.startsWith) { if (!String.prototype.startsWith) {
String.prototype.startsWith = function(searchString, position){ String.prototype.startsWith = function(searchString, position){
position = position || 0; position = position || 0;
return this.substr(position, searchString.length) === searchString; return this.substr(position, searchString.length) === searchString;
}; };
} }
var SETTING_KEY = "com.highfidelity.avatar.isSitting"; var SETTING_KEY = "com.highfidelity.avatar.isSitting";
@ -122,10 +122,20 @@
this.rolesToOverride = function() { this.rolesToOverride = function() {
return MyAvatar.getAnimationRoles().filter(function(role) { return MyAvatar.getAnimationRoles().filter(function(role) {
return !(role.startsWith("right") || role.startsWith("left")); return !(role.startsWith("right") || role.startsWith("left"));
}); });
} }
// Handler for user changing the avatar model while sitting. There's currently an issue with changing avatar models while override role animations are applied,
// so to avoid that problem, re-apply the role overrides once the model has finished changing.
this.modelURLChangeFinished = function () {
print("Sitter's model has FINISHED changing. Reapply anim role overrides.");
var roles = this.rolesToOverride();
for (i in roles) {
MyAvatar.overrideRoleAnimation(roles[i], ANIMATION_URL, ANIMATION_FPS, true, ANIMATION_FIRST_FRAME, ANIMATION_LAST_FRAME);
}
}
this.sitDown = function() { this.sitDown = function() {
if (this.checkSeatForAvatar()) { if (this.checkSeatForAvatar()) {
print("Someone is already sitting in that chair."); print("Someone is already sitting in that chair.");
@ -164,12 +174,14 @@
return { headType: 0 }; return { headType: 0 };
}, ["headType"]); }, ["headType"]);
Script.update.connect(this, this.update); Script.update.connect(this, this.update);
MyAvatar.onLoadComplete.connect(this, this.modelURLChangeFinished);
} }
this.standUp = function() { this.standUp = function() {
print("Standing up (" + this.entityID + ")"); print("Standing up (" + this.entityID + ")");
MyAvatar.removeAnimationStateHandler(this.animStateHandlerID); MyAvatar.removeAnimationStateHandler(this.animStateHandlerID);
Script.update.disconnect(this, this.update); Script.update.disconnect(this, this.update);
MyAvatar.onLoadComplete.disconnect(this, this.modelURLChangeFinished);
if (MyAvatar.sessionUUID === this.getSeatUser()) { if (MyAvatar.sessionUUID === this.getSeatUser()) {
this.setSeatUser(null); this.setSeatUser(null);
@ -331,7 +343,7 @@
} }
this.cleanupOverlay(); this.cleanupOverlay();
} }
this.clickDownOnEntity = function (id, event) { this.clickDownOnEntity = function (id, event) {
if (isInEditMode()) { if (isInEditMode()) {
return; return;
@ -340,4 +352,4 @@
this.sitDown(); this.sitDown();
} }
} }
}); });