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

Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models

Browse source
This commit is contained in:
Seth Alves 2017-07-21 16:19:51 -07:00
commit 71f0899178
3 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
View file

@ -506,7 +506,7 @@ Rectangle {
} }
HifiControls.Tree { HifiControls.Tree {
id: treeView id: treeView
height: 430 height: 290
anchors.leftMargin: hifi.dimensions.contentMargin.x + 2 // Extra for border anchors.leftMargin: hifi.dimensions.contentMargin.x + 2 // Extra for border
anchors.rightMargin: hifi.dimensions.contentMargin.x + 2 // Extra for border anchors.rightMargin: hifi.dimensions.contentMargin.x + 2 // Extra for border
anchors.left: parent.left anchors.left: parent.left

15
scripts/system/controllers/handControllerGrab.js
View file

@ -1034,9 +1034,18 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp) {
function getControllerJointIndex(hand) { function getControllerJointIndex(hand) {
if (HMD.isHandControllerAvailable()) { if (HMD.isHandControllerAvailable()) {
return MyAvatar.getJointIndex(hand === RIGHT_HAND ? var controllerJointIndex = -1;
"_CONTROLLER_RIGHTHAND" : if (Camera.mode === "first person") {
"_CONTROLLER_LEFTHAND"); controllerJointIndex = MyAvatar.getJointIndex(hand === RIGHT_HAND ?
"_CONTROLLER_RIGHTHAND" :
"_CONTROLLER_LEFTHAND");
} else if (Camera.mode === "third person") {
controllerJointIndex = MyAvatar.getJointIndex(hand === RIGHT_HAND ?
"_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" :
"_CAMERA_RELATIVE_CONTROLLER_LEFTHAND");
}
return controllerJointIndex;
} }
return MyAvatar.getJointIndex("Head"); return MyAvatar.getJointIndex("Head");

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

@ -126,6 +126,16 @@
}); });
} }
// 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);